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.2 by root, Wed Nov 25 10:01:39 2015 UTC vs.
Revision 1.24 by root, Fri Nov 27 02:12:08 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
22# include <unistd.h> 27# include <unistd.h>
23#endif 28#endif
24#if USE_MATH 29#if USE_MATH
25# include <math.h> 30# include <math.h>
26#endif 31#endif
32
33#include "ecb.h"
27 34
28#include <sys/types.h> 35#include <sys/types.h>
29#include <sys/stat.h> 36#include <sys/stat.h>
30#include <fcntl.h> 37#include <fcntl.h>
31 38
… …
128 c += 'a' - 'A'; 135 c += 'a' - 'A';
129 136
130 return c; 137 return c;
131} 138}
132 139
133#if USE_STRLWR 140static int
141xisdigit (char c)
142{
143 return c >= '0' && c <= '9';
144}
145
146#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c)
149
150#if USE_IGNORECASE
134static const char * 151static const char *
135strlwr (char *s) 152xstrlwr (char *s)
136{ 153{
137 const char *p = s; 154 const char *p = s;
138 155
139 while (*s) 156 while (*s)
140 { 157 {
… …
142 s++; 159 s++;
143 } 160 }
144 161
145 return p; 162 return p;
146} 163}
147#endif
148 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
149#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 170# define strlwr(s) (s)
151#define toupper(c) xtoupper(c) 171#endif
152#define tolower(c) xtolower(c)
153 172
154#ifndef prompt 173#ifndef prompt
155# define prompt "ts> " 174# define prompt "ts> "
156#endif 175#endif
157 176
… …
188#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
192 211
193static num num_add (num a, num b); 212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
194static num num_mul (num a, num b); 213
195static num num_div (num a, num b); 214static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 215static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 216static num num_rem (num a, num b);
199static num num_mod (num a, num b); 217static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 218
206#if USE_MATH 219#if USE_MATH
207static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
208#endif 221#endif
209static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
210 223
211static INLINE int 224ecb_inline int
212num_is_integer (pointer p) 225num_is_integer (pointer p)
213{ 226{
214 return num_is_fixnum (p->object.number); 227 return num_is_fixnum (p->object.number);
215} 228}
216 229
… …
220/* macros for cell operations */ 233/* macros for cell operations */
221#define typeflag(p) ((p)->flag + 0) 234#define typeflag(p) ((p)->flag + 0)
222#define set_typeflag(p,v) ((p)->flag = (v)) 235#define set_typeflag(p,v) ((p)->flag = (v))
223#define type(p) (typeflag (p) & T_MASKTYPE) 236#define type(p) (typeflag (p) & T_MASKTYPE)
224 237
225INTERFACE INLINE int 238INTERFACE int
226is_string (pointer p) 239is_string (pointer p)
227{ 240{
228 return type (p) == T_STRING; 241 return type (p) == T_STRING;
229} 242}
230 243
231#define strvalue(p) ((p)->object.string.svalue) 244#define strvalue(p) ((p)->object.string.svalue)
232#define strlength(p) ((p)->object.string.length) 245#define strlength(p) ((p)->object.string.length)
233 246
234INTERFACE int is_list (SCHEME_P_ pointer p); 247INTERFACE int is_list (SCHEME_P_ pointer p);
248
235INTERFACE INLINE int 249INTERFACE int
236is_vector (pointer p) 250is_vector (pointer p)
237{ 251{
238 return type (p) == T_VECTOR; 252 return type (p) == T_VECTOR;
239} 253}
240 254
255#define vecvalue(p) ((p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 257INTERFACE void fill_vector (pointer vec, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
242INTERFACE pointer vector_elem (pointer vec, int ielem); 259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);
243INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);
244 261
262INTERFACE uint32_t
263vector_length (pointer vec)
264{
265 return vec->object.vector.length;
266}
267
245INTERFACE INLINE int 268INTERFACE int
246is_number (pointer p) 269is_number (pointer p)
247{ 270{
248 return type (p) == T_NUMBER; 271 return type (p) == T_NUMBER;
249} 272}
250 273
251INTERFACE INLINE int 274INTERFACE int
252is_integer (pointer p) 275is_integer (pointer p)
253{ 276{
254 if (!is_number (p)) 277 if (!is_number (p))
255 return 0; 278 return 0;
256 279
… …
258 return 1; 281 return 1;
259 282
260 return 0; 283 return 0;
261} 284}
262 285
263INTERFACE INLINE int 286INTERFACE int
264is_real (pointer p) 287is_real (pointer p)
265{ 288{
266 return is_number (p) && !num_is_fixnum (p->object.number); 289 return is_number (p) && !num_is_fixnum (p->object.number);
267} 290}
268 291
269INTERFACE INLINE int 292INTERFACE int
270is_character (pointer p) 293is_character (pointer p)
271{ 294{
272 return type (p) == T_CHARACTER; 295 return type (p) == T_CHARACTER;
273} 296}
274 297
275INTERFACE INLINE char * 298INTERFACE char *
276string_value (pointer p) 299string_value (pointer p)
277{ 300{
278 return strvalue (p); 301 return strvalue (p);
279} 302}
280 303
281INLINE num 304ecb_inline num
282nvalue (pointer p) 305nvalue (pointer p)
283{ 306{
284 return (p)->object.number; 307 return (p)->object.number;
285} 308}
286 309
… …
307{ 330{
308 return num_get_rvalue (p->object.number); 331 return num_get_rvalue (p->object.number);
309} 332}
310 333
311#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 334#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)
312#if USE_FLOAT 335#if USE_REAL
313# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)
314# define set_num_integer(p) (p)->object.number.is_fixnum=1; 337# define set_num_integer(p) (p)->object.number.is_fixnum=1;
315# define set_num_real(p) (p)->object.number.is_fixnum=0; 338# define set_num_real(p) (p)->object.number.is_fixnum=0;
316#else 339#else
317# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
318# define set_num_integer(p) 0 341# define set_num_integer(p) 0
319# define set_num_real(p) 0 342# define set_num_real(p) 0
320#endif 343#endif
344
321INTERFACE long 345INTERFACE long
322charvalue (pointer p) 346charvalue (pointer p)
323{ 347{
324 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
325} 349}
326 350
327INTERFACE INLINE int 351INTERFACE int
328is_port (pointer p) 352is_port (pointer p)
329{ 353{
330 return type (p) == T_PORT; 354 return type (p) == T_PORT;
331} 355}
332 356
333INTERFACE INLINE int 357INTERFACE int
334is_inport (pointer p) 358is_inport (pointer p)
335{ 359{
336 return is_port (p) && p->object.port->kind & port_input; 360 return is_port (p) && p->object.port->kind & port_input;
337} 361}
338 362
339INTERFACE INLINE int 363INTERFACE int
340is_outport (pointer p) 364is_outport (pointer p)
341{ 365{
342 return is_port (p) && p->object.port->kind & port_output; 366 return is_port (p) && p->object.port->kind & port_output;
343} 367}
344 368
345INTERFACE INLINE int 369INTERFACE int
346is_pair (pointer p) 370is_pair (pointer p)
347{ 371{
348 return type (p) == T_PAIR; 372 return type (p) == T_PAIR;
349} 373}
350 374
351#define car(p) ((p)->object.cons.car + 0) 375#define car(p) ((p)->object.cons.car + 0)
352#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 376#define cdr(p) ((p)->object.cons.cdr + 0)
353 377
354#define caar(p) car (car (p)) 378static pointer caar (pointer p) { return car (car (p)); }
355#define cadr(p) car (cdr (p)) 379static pointer cadr (pointer p) { return car (cdr (p)); }
356#define cdar(p) cdr (car (p)) 380static pointer cdar (pointer p) { return cdr (car (p)); }
357#define cddr(p) cdr (cdr (p)) 381static pointer cddr (pointer p) { return cdr (cdr (p)); }
358 382
359#define cadar(p) car (cdr (car (p))) 383static pointer cadar (pointer p) { return car (cdr (car (p))); }
360#define caddr(p) car (cdr (cdr (p))) 384static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
361#define cdaar(p) cdr (car (car (p))) 385static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 386
363INTERFACE void 387INTERFACE void
364set_car (pointer p, pointer q) 388set_car (pointer p, pointer q)
365{ 389{
366 p->object.cons.car = q; 390 p->object.cons.car = q;
… …
382pair_cdr (pointer p) 406pair_cdr (pointer p)
383{ 407{
384 return cdr (p); 408 return cdr (p);
385} 409}
386 410
387INTERFACE INLINE int 411INTERFACE int
388is_symbol (pointer p) 412is_symbol (pointer p)
389{ 413{
390 return type (p) == T_SYMBOL; 414 return type (p) == T_SYMBOL;
391} 415}
392 416
393INTERFACE INLINE char * 417INTERFACE char *
394symname (pointer p) 418symname (pointer p)
395{ 419{
396 return strvalue (car (p)); 420 return strvalue (car (p));
397} 421}
398 422
399#if USE_PLIST 423#if USE_PLIST
400SCHEME_EXPORT INLINE int 424SCHEME_EXPORT int
401hasprop (pointer p) 425hasprop (pointer p)
402{ 426{
403 return typeflag (p) & T_SYMBOL; 427 return typeflag (p) & T_SYMBOL;
404} 428}
405 429
406# define symprop(p) cdr(p) 430# define symprop(p) cdr(p)
407#endif 431#endif
408 432
409INTERFACE INLINE int 433INTERFACE int
410is_syntax (pointer p) 434is_syntax (pointer p)
411{ 435{
412 return typeflag (p) & T_SYNTAX; 436 return typeflag (p) & T_SYNTAX;
413} 437}
414 438
415INTERFACE INLINE int 439INTERFACE int
416is_proc (pointer p) 440is_proc (pointer p)
417{ 441{
418 return type (p) == T_PROC; 442 return type (p) == T_PROC;
419} 443}
420 444
421INTERFACE INLINE int 445INTERFACE int
422is_foreign (pointer p) 446is_foreign (pointer p)
423{ 447{
424 return type (p) == T_FOREIGN; 448 return type (p) == T_FOREIGN;
425} 449}
426 450
427INTERFACE INLINE char * 451INTERFACE char *
428syntaxname (pointer p) 452syntaxname (pointer p)
429{ 453{
430 return strvalue (car (p)); 454 return strvalue (car (p));
431} 455}
432 456
433#define procnum(p) ivalue (p) 457#define procnum(p) ivalue (p)
434static const char *procname (pointer x); 458static const char *procname (pointer x);
435 459
436INTERFACE INLINE int 460INTERFACE int
437is_closure (pointer p) 461is_closure (pointer p)
438{ 462{
439 return type (p) == T_CLOSURE; 463 return type (p) == T_CLOSURE;
440} 464}
441 465
442INTERFACE INLINE int 466INTERFACE int
443is_macro (pointer p) 467is_macro (pointer p)
444{ 468{
445 return type (p) == T_MACRO; 469 return type (p) == T_MACRO;
446} 470}
447 471
448INTERFACE INLINE pointer 472INTERFACE pointer
449closure_code (pointer p) 473closure_code (pointer p)
450{ 474{
451 return car (p); 475 return car (p);
452} 476}
453 477
454INTERFACE INLINE pointer 478INTERFACE pointer
455closure_env (pointer p) 479closure_env (pointer p)
456{ 480{
457 return cdr (p); 481 return cdr (p);
458} 482}
459 483
460INTERFACE INLINE int 484INTERFACE int
461is_continuation (pointer p) 485is_continuation (pointer p)
462{ 486{
463 return type (p) == T_CONTINUATION; 487 return type (p) == T_CONTINUATION;
464} 488}
465 489
466#define cont_dump(p) cdr (p) 490#define cont_dump(p) cdr (p)
467#define set_cont_dump(p,v) set_cdr ((p), (v)) 491#define set_cont_dump(p,v) set_cdr ((p), (v))
468 492
469/* To do: promise should be forced ONCE only */ 493/* To do: promise should be forced ONCE only */
470INTERFACE INLINE int 494INTERFACE int
471is_promise (pointer p) 495is_promise (pointer p)
472{ 496{
473 return type (p) == T_PROMISE; 497 return type (p) == T_PROMISE;
474} 498}
475 499
476INTERFACE INLINE int 500INTERFACE int
477is_environment (pointer p) 501is_environment (pointer p)
478{ 502{
479 return type (p) == T_ENVIRONMENT; 503 return type (p) == T_ENVIRONMENT;
480} 504}
481 505
482#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 506#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
483 507
484#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
485#define is_atom(p) (typeflag (p) & T_ATOM) 508#define is_atom(p) (typeflag (p) & T_ATOM)
486#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 509#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
487#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 510#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
488 511
489#define is_mark(p) (typeflag (p) & T_MARK) 512#define is_mark(p) (typeflag (p) & T_MARK)
490#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 513#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
491#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 514#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
492 515
493#if 0
494static int
495is_atom(pointer p)
496{
497 if (!is_atom1(p) != !is_atom2(p))
498 printf ("atoms disagree %x\n", typeflag(p));
499
500 return is_atom2(p);
501}
502#endif
503
504INTERFACE INLINE int 516INTERFACE int
505is_immutable (pointer p) 517is_immutable (pointer p)
506{ 518{
507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 519 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
508} 520}
509 521
510INTERFACE INLINE void 522INTERFACE void
511setimmutable (pointer p) 523setimmutable (pointer p)
512{ 524{
513#if USE_ERROR_CHECKING 525#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 526 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 527#endif
516} 528}
517 529
518#if USE_CHAR_CLASSIFIERS 530#if USE_CHAR_CLASSIFIERS
519static INLINE int 531ecb_inline int
520Cisalpha (int c) 532Cisalpha (int c)
521{ 533{
522 return isascii (c) && isalpha (c); 534 return isascii (c) && isalpha (c);
523} 535}
524 536
525static INLINE int 537ecb_inline int
526Cisdigit (int c) 538Cisdigit (int c)
527{ 539{
528 return isascii (c) && isdigit (c); 540 return isascii (c) && isdigit (c);
529} 541}
530 542
531static INLINE int 543ecb_inline int
532Cisspace (int c) 544Cisspace (int c)
533{ 545{
534 return isascii (c) && isspace (c); 546 return isascii (c) && isspace (c);
535} 547}
536 548
537static INLINE int 549ecb_inline int
538Cisupper (int c) 550Cisupper (int c)
539{ 551{
540 return isascii (c) && isupper (c); 552 return isascii (c) && isupper (c);
541} 553}
542 554
543static INLINE int 555ecb_inline int
544Cislower (int c) 556Cislower (int c)
545{ 557{
546 return isascii (c) && islower (c); 558 return isascii (c) && islower (c);
547} 559}
548#endif 560#endif
… …
609#endif 621#endif
610 622
611static int file_push (SCHEME_P_ const char *fname); 623static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 624static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 625static int file_interactive (SCHEME_P);
614static INLINE int is_one_of (char *s, int c); 626ecb_inline int is_one_of (char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 627static int alloc_cellseg (SCHEME_P_ int n);
616static long binary_decode (const char *s);
617static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 628ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
618static pointer reserve_cells (SCHEME_P_ int n);
619static pointer get_consecutive_cells (SCHEME_P_ int n);
620static pointer find_consecutive_cells (SCHEME_P_ int n);
621static void finalize_cell (SCHEME_P_ pointer a); 629static void finalize_cell (SCHEME_P_ pointer a);
622static int count_consecutive_cells (pointer x, int needed); 630static int count_consecutive_cells (pointer x, int needed);
623static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 631static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
624static pointer mk_number (SCHEME_P_ const num n); 632static pointer mk_number (SCHEME_P_ const num n);
625static char *store_string (SCHEME_P_ int len, const char *str, char fill); 633static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
626static pointer mk_vector (SCHEME_P_ int len); 634static pointer mk_vector (SCHEME_P_ uint32_t len);
627static pointer mk_atom (SCHEME_P_ char *q); 635static pointer mk_atom (SCHEME_P_ char *q);
628static pointer mk_sharp_const (SCHEME_P_ char *name); 636static pointer mk_sharp_const (SCHEME_P_ char *name);
629 637
630#if USE_PORTS 638#if USE_PORTS
631static pointer mk_port (SCHEME_P_ port *p); 639static pointer mk_port (SCHEME_P_ port *p);
… …
642static int basic_inchar (port *pt); 650static int basic_inchar (port *pt);
643static int inchar (SCHEME_P); 651static int inchar (SCHEME_P);
644static void backchar (SCHEME_P_ int c); 652static void backchar (SCHEME_P_ int c);
645static char *readstr_upto (SCHEME_P_ char *delim); 653static char *readstr_upto (SCHEME_P_ char *delim);
646static pointer readstrexp (SCHEME_P); 654static pointer readstrexp (SCHEME_P);
647static INLINE int skipspace (SCHEME_P); 655ecb_inline int skipspace (SCHEME_P);
648static int token (SCHEME_P); 656static int token (SCHEME_P);
649static void printslashstring (SCHEME_P_ char *s, int len); 657static void printslashstring (SCHEME_P_ char *s, int len);
650static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 658static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
651static void printatom (SCHEME_P_ pointer l, int f); 659static void printatom (SCHEME_P_ pointer l, int f);
652static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 660static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
656static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 664static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
657static pointer revappend (SCHEME_P_ pointer a, pointer b); 665static pointer revappend (SCHEME_P_ pointer a, pointer b);
658static pointer ss_get_cont (SCHEME_P); 666static pointer ss_get_cont (SCHEME_P);
659static void ss_set_cont (SCHEME_P_ pointer cont); 667static void ss_set_cont (SCHEME_P_ pointer cont);
660static void dump_stack_mark (SCHEME_P); 668static void dump_stack_mark (SCHEME_P);
661static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 669static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
670static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
662static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 671static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
663static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 672static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
664static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 673static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
665static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 674static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 675static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
667static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 676static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
668static void assign_syntax (SCHEME_P_ const char *name); 677static void assign_syntax (SCHEME_P_ const char *name);
669static int syntaxnum (pointer p); 678static int syntaxnum (pointer p);
670static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 679static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
671 680
672static num 681static num
673num_add (num a, num b) 682num_op (enum num_op op, num a, num b)
674{ 683{
675 num ret; 684 num ret;
676 685
677 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 686 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
678 687
679 if (num_is_fixnum (ret)) 688 if (num_is_fixnum (ret))
680 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 689 {
690 IVALUE av = num_get_ivalue (a);
691 IVALUE bv = num_get_ivalue (b);
692
693 switch (op)
694 {
695 case NUM_ADD: av += bv; break;
696 case NUM_SUB: av -= bv; break;
697 case NUM_MUL: av *= bv; break;
698 case NUM_INTDIV: av /= bv; break;
699 }
700
701 num_set_ivalue (ret, av);
702 }
681 else 703 else
682 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 704 {
705 RVALUE av = num_get_rvalue (a);
706 RVALUE bv = num_get_rvalue (b);
683 707
684 return ret; 708 switch (op)
685} 709 {
710 case NUM_ADD: av += bv; break;
711 case NUM_SUB: av -= bv; break;
712 case NUM_MUL: av *= bv; break;
713 case NUM_INTDIV: av /= bv; break;
714 }
686 715
687static num 716 num_set_rvalue (ret, av);
688num_mul (num a, num b) 717 }
689{
690 num ret;
691
692 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
693
694 if (num_is_fixnum (ret))
695 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
696 else
697 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
698 718
699 return ret; 719 return ret;
700} 720}
701 721
702static num 722static num
… …
713 733
714 return ret; 734 return ret;
715} 735}
716 736
717static num 737static num
718num_intdiv (num a, num b)
719{
720 num ret;
721
722 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
723
724 if (num_is_fixnum (ret))
725 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
726 else
727 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
728
729 return ret;
730}
731
732static num
733num_sub (num a, num b)
734{
735 num ret;
736
737 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
738
739 if (num_is_fixnum (ret))
740 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
741 else
742 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
743
744 return ret;
745}
746
747static num
748num_rem (num a, num b) 738num_rem (num a, num b)
749{ 739{
750 num ret; 740 num ret;
751 long e1, e2, res; 741 long e1, e2, res;
752 742
… …
788 778
789 num_set_ivalue (ret, res); 779 num_set_ivalue (ret, res);
790 return ret; 780 return ret;
791} 781}
792 782
783/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
793static int 784static int
794num_eq (num a, num b) 785num_cmp (num a, num b)
795{ 786{
787 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796 int ret; 788 int ret;
797 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
798 789
799 if (is_fixnum) 790 if (is_fixnum)
800 ret = num_get_ivalue (a) == num_get_ivalue (b); 791 {
792 IVALUE av = num_get_ivalue (a);
793 IVALUE bv = num_get_ivalue (b);
794
795 ret = av == bv ? 0 : av < bv ? -1 : +1;
796 }
801 else 797 else
802 ret = num_get_rvalue (a) == num_get_rvalue (b); 798 {
799 RVALUE av = num_get_rvalue (a);
800 RVALUE bv = num_get_rvalue (b);
801
802 ret = av == bv ? 0 : av < bv ? -1 : +1;
803 }
803 804
804 return ret; 805 return ret;
805}
806
807
808static int
809num_gt (num a, num b)
810{
811 int ret;
812 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
813
814 if (is_fixnum)
815 ret = num_get_ivalue (a) > num_get_ivalue (b);
816 else
817 ret = num_get_rvalue (a) > num_get_rvalue (b);
818
819 return ret;
820}
821
822static int
823num_ge (num a, num b)
824{
825 return !num_lt (a, b);
826}
827
828static int
829num_lt (num a, num b)
830{
831 int ret;
832 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
833
834 if (is_fixnum)
835 ret = num_get_ivalue (a) < num_get_ivalue (b);
836 else
837 ret = num_get_rvalue (a) < num_get_rvalue (b);
838
839 return ret;
840}
841
842static int
843num_le (num a, num b)
844{
845 return !num_gt (a, b);
846} 806}
847 807
848#if USE_MATH 808#if USE_MATH
849 809
850/* Round to nearest. Round to even if midway */ 810/* Round to nearest. Round to even if midway */
… …
860 return ce; 820 return ce;
861 else if (dfl < dce) 821 else if (dfl < dce)
862 return fl; 822 return fl;
863 else 823 else
864 { 824 {
865 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 825 if (fmod (fl, 2) == 0) /* I imagine this holds */
866 return fl; 826 return fl;
867 else 827 else
868 return ce; 828 return ce;
869 } 829 }
870} 830}
871#endif 831#endif
872 832
873static int 833static int
874is_zero_rvalue (RVALUE x) 834is_zero_rvalue (RVALUE x)
875{ 835{
876#if USE_FLOAT 836 return x == 0;
837#if 0
838#if USE_REAL
877 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 839 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
878#else 840#else
879 return x == 0; 841 return x == 0;
880#endif 842#endif
881} 843#endif
882
883static long
884binary_decode (const char *s)
885{
886 long x = 0;
887
888 while (*s != 0 && (*s == '1' || *s == '0'))
889 {
890 x <<= 1;
891 x += *s - '0';
892 s++;
893 }
894
895 return x;
896} 844}
897 845
898/* allocate new cell segment */ 846/* allocate new cell segment */
899static int 847static int
900alloc_cellseg (SCHEME_P_ int n) 848alloc_cellseg (SCHEME_P_ int n)
… …
971 919
972 return n; 920 return n;
973} 921}
974 922
975/* get new cell. parameter a, b is marked by gc. */ 923/* get new cell. parameter a, b is marked by gc. */
976static INLINE pointer 924ecb_inline pointer
977get_cell_x (SCHEME_P_ pointer a, pointer b) 925get_cell_x (SCHEME_P_ pointer a, pointer b)
978{ 926{
979 if (SCHEME_V->free_cell == NIL) 927 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
980 { 928 {
981 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
982 return S_SINK; 930 return S_SINK;
983 931
984 if (SCHEME_V->free_cell == NIL) 932 if (SCHEME_V->free_cell == NIL)
… …
1008 --SCHEME_V->fcells; 956 --SCHEME_V->fcells;
1009 return x; 957 return x;
1010 } 958 }
1011} 959}
1012 960
1013/* make sure that there is a given number of cells free */
1014static pointer
1015reserve_cells (SCHEME_P_ int n)
1016{
1017 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1018 return NIL;
1019
1020 /* Are there enough cells available? */
1021 if (SCHEME_V->fcells < n)
1022 {
1023 /* If not, try gc'ing some */
1024 gc (SCHEME_A_ NIL, NIL);
1025
1026 if (SCHEME_V->fcells < n)
1027 {
1028 /* If there still aren't, try getting more heap */
1029 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1030 {
1031 SCHEME_V->no_memory = 1;
1032 return NIL;
1033 }
1034 }
1035
1036 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1037 {
1038 /* If all fail, report failure */
1039 SCHEME_V->no_memory = 1;
1040 return NIL;
1041 }
1042 }
1043
1044 return S_T;
1045}
1046
1047static pointer
1048get_consecutive_cells (SCHEME_P_ int n)
1049{
1050 pointer x;
1051
1052 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1053 return S_SINK;
1054
1055 /* Are there any cells available? */
1056 x = find_consecutive_cells (SCHEME_A_ n);
1057
1058 if (x != NIL)
1059 return x;
1060
1061 /* If not, try gc'ing some */
1062 gc (SCHEME_A_ NIL, NIL);
1063
1064 for (;;)
1065 {
1066 x = find_consecutive_cells (SCHEME_A_ n);
1067
1068 if (x != NIL)
1069 return x;
1070
1071 /* If there still aren't, try getting more heap */
1072 if (!alloc_cellseg (SCHEME_A_ 1))
1073 {
1074#if USE_ERROR_CHECKING
1075 SCHEME_V->no_memory = 1;
1076 return S_SINK;
1077#endif
1078 }
1079 }
1080}
1081
1082static int
1083count_consecutive_cells (pointer x, int needed)
1084{
1085 int n = 1;
1086
1087 while (cdr (x) == x + 1)
1088 {
1089 x = cdr (x);
1090 n++;
1091
1092 if (n >= needed)
1093 break;
1094 }
1095
1096 return n;
1097}
1098
1099static pointer
1100find_consecutive_cells (SCHEME_P_ int n)
1101{
1102 pointer *pp = &SCHEME_V->free_cell;
1103
1104 while (*pp != NIL)
1105 {
1106 int cnt = count_consecutive_cells (*pp, n);
1107
1108 if (cnt >= n)
1109 {
1110 pointer x = *pp;
1111
1112 *pp = cdr (*pp + n - 1);
1113 SCHEME_V->fcells -= n;
1114 return x;
1115 }
1116
1117 pp = &cdr (*pp + cnt - 1);
1118 }
1119
1120 return NIL;
1121}
1122
1123/* To retain recent allocs before interpreter knows about them - 961/* To retain recent allocs before interpreter knows about them -
1124 Tehom */ 962 Tehom */
1125 963
1126static void 964static void
1127push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 965push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
… …
1150 988
1151 return cell; 989 return cell;
1152} 990}
1153 991
1154static pointer 992static pointer
1155get_vector_object (SCHEME_P_ int len, pointer init) 993get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1156{ 994{
1157 pointer cells = get_consecutive_cells (SCHEME_A_ len / 2 + len % 2 + 1); 995 pointer v = get_cell_x (SCHEME_A_ 0, 0);
996 pointer *e = malloc (len * sizeof (pointer));
1158 997
1159#if USE_ERROR_CHECKING 998 if (!e && USE_ERROR_CHECKING)
1160 if (SCHEME_V->no_memory)
1161 return S_SINK; 999 return S_SINK;
1162#endif
1163 1000
1164 /* Record it as a vector so that gc understands it. */ 1001 /* Record it as a vector so that gc understands it. */
1165 set_typeflag (cells, T_VECTOR | T_ATOM); 1002 set_typeflag (v, T_VECTOR | T_ATOM);
1166 ivalue_unchecked (cells) = len; 1003
1167 set_num_integer (cells); 1004 v->object.vector.vvalue = e;
1005 v->object.vector.length = len;
1168 fill_vector (cells, init); 1006 fill_vector (v, init);
1169 push_recent_alloc (SCHEME_A_ cells, NIL); 1007 push_recent_alloc (SCHEME_A_ v, NIL);
1170 1008
1171 return cells; 1009 return v;
1172} 1010}
1173 1011
1174static INLINE void 1012ecb_inline void
1175ok_to_freely_gc (SCHEME_P) 1013ok_to_freely_gc (SCHEME_P)
1176{ 1014{
1177 set_car (S_SINK, NIL); 1015 set_car (S_SINK, NIL);
1178} 1016}
1179 1017
… …
1212 if (immutable) 1050 if (immutable)
1213 setimmutable (x); 1051 setimmutable (x);
1214 1052
1215 set_car (x, a); 1053 set_car (x, a);
1216 set_cdr (x, b); 1054 set_cdr (x, b);
1055
1217 return x; 1056 return x;
1218} 1057}
1219 1058
1220/* ========== oblist implementation ========== */ 1059/* ========== oblist implementation ========== */
1221 1060
… …
1237 1076
1238 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1077 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1239 set_typeflag (x, T_SYMBOL); 1078 set_typeflag (x, T_SYMBOL);
1240 setimmutable (car (x)); 1079 setimmutable (car (x));
1241 1080
1242 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1081 location = hash_fn (name, veclength (SCHEME_V->oblist));
1243 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1082 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location)));
1244 return x; 1083 return x;
1245} 1084}
1246 1085
1247static INLINE pointer 1086ecb_inline pointer
1248oblist_find_by_name (SCHEME_P_ const char *name) 1087oblist_find_by_name (SCHEME_P_ const char *name)
1249{ 1088{
1250 int location; 1089 int location;
1251 pointer x; 1090 pointer x;
1252 char *s; 1091 char *s;
1253 1092
1254 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1093 location = hash_fn (name, veclength (SCHEME_V->oblist));
1255 1094
1256 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1095 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1257 { 1096 {
1258 s = symname (car (x)); 1097 s = symname (car (x));
1259 1098
… …
1270{ 1109{
1271 int i; 1110 int i;
1272 pointer x; 1111 pointer x;
1273 pointer ob_list = NIL; 1112 pointer ob_list = NIL;
1274 1113
1275 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1114 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1276 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1115 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1277 ob_list = cons (x, ob_list); 1116 ob_list = cons (x, ob_list);
1278 1117
1279 return ob_list; 1118 return ob_list;
1280} 1119}
… …
1285oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1286{ 1125{
1287 return NIL; 1126 return NIL;
1288} 1127}
1289 1128
1290static INLINE pointer 1129ecb_inline pointer
1291oblist_find_by_name (SCHEME_P_ const char *name) 1130oblist_find_by_name (SCHEME_P_ const char *name)
1292{ 1131{
1293 pointer x; 1132 pointer x;
1294 char *s; 1133 char *s;
1295 1134
… …
1393 return mk_real (SCHEME_A_ num_get_rvalue (n)); 1232 return mk_real (SCHEME_A_ num_get_rvalue (n));
1394} 1233}
1395 1234
1396/* allocate name to string area */ 1235/* allocate name to string area */
1397static char * 1236static char *
1398store_string (SCHEME_P_ int len_str, const char *str, char fill) 1237store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1399{ 1238{
1400 char *q = malloc (len_str + 1); 1239 char *q = malloc (len_str + 1);
1401 1240
1402 if (q == 0 && USE_ERROR_CHECKING) 1241 if (q == 0 && USE_ERROR_CHECKING)
1403 { 1242 {
… …
1422 } 1261 }
1423 1262
1424 return q; 1263 return q;
1425} 1264}
1426 1265
1427/* get new string */
1428INTERFACE pointer 1266INTERFACE pointer
1429mk_string (SCHEME_P_ const char *str) 1267mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1430{ 1268{
1431 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270
1271 set_typeflag (x, T_STRING | T_ATOM);
1272 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1273 strlength (x) = len;
1274 return x;
1432} 1275}
1433 1276
1434INTERFACE pointer 1277INTERFACE pointer
1435mk_counted_string (SCHEME_P_ const char *str, int len) 1278mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1436{ 1279{
1437 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1280 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1438 1281
1439 set_typeflag (x, T_STRING | T_ATOM); 1282 set_typeflag (x, T_STRING | T_ATOM);
1440 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1283 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1441 strlength (x) = len; 1284 strlength (x) = len;
1442 return x; 1285 return x;
1443} 1286}
1444 1287
1445INTERFACE pointer 1288INTERFACE pointer
1446mk_empty_string (SCHEME_P_ int len, char fill) 1289mk_string (SCHEME_P_ const char *str)
1447{ 1290{
1448 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1291 return mk_counted_string (SCHEME_A_ str, strlen (str));
1449
1450 set_typeflag (x, T_STRING | T_ATOM);
1451 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1452 strlength (x) = len;
1453 return x;
1454} 1292}
1455 1293
1456INTERFACE pointer 1294INTERFACE pointer
1457mk_vector (SCHEME_P_ int len) 1295mk_vector (SCHEME_P_ uint32_t len)
1458{ 1296{
1459 return get_vector_object (SCHEME_A_ len, NIL); 1297 return get_vector_object (SCHEME_A_ len, NIL);
1460} 1298}
1461 1299
1462INTERFACE void 1300INTERFACE void
1463fill_vector (pointer vec, pointer obj) 1301fill_vector (pointer vec, pointer obj)
1464{ 1302{
1465 int i; 1303 int i;
1466 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1467 1304
1468 for (i = 0; i < num; i++) 1305 for (i = 0; i < vec->object.vector.length; i++)
1469 { 1306 vecvalue (vec)[i] = obj;
1470 set_typeflag (vec + 1 + i, T_PAIR);
1471 setimmutable (vec + 1 + i);
1472 set_car (vec + 1 + i, obj);
1473 set_cdr (vec + 1 + i, obj);
1474 }
1475} 1307}
1476 1308
1477INTERFACE pointer 1309INTERFACE pointer
1478vector_elem (pointer vec, int ielem) 1310vector_elem (pointer vec, uint32_t ielem)
1479{ 1311{
1480 int n = ielem / 2; 1312 return vecvalue(vec)[ielem];
1481
1482 if (ielem % 2 == 0)
1483 return car (vec + 1 + n);
1484 else
1485 return cdr (vec + 1 + n);
1486} 1313}
1487 1314
1488INTERFACE void 1315INTERFACE void
1489set_vector_elem (pointer vec, int ielem, pointer a) 1316set_vector_elem (pointer vec, uint32_t ielem, pointer a)
1490{ 1317{
1491 int n = ielem / 2; 1318 vecvalue(vec)[ielem] = a;
1492
1493 if (ielem % 2 == 0)
1494 set_car (vec + 1 + n, a);
1495 else
1496 set_cdr (vec + 1 + n, a);
1497} 1319}
1498 1320
1499/* get new symbol */ 1321/* get new symbol */
1500INTERFACE pointer 1322INTERFACE pointer
1501mk_symbol (SCHEME_P_ const char *name) 1323mk_symbol (SCHEME_P_ const char *name)
… …
1511 1333
1512INTERFACE pointer 1334INTERFACE pointer
1513gensym (SCHEME_P) 1335gensym (SCHEME_P)
1514{ 1336{
1515 pointer x; 1337 pointer x;
1516 char name[40];
1517 1338
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 { 1340 {
1520 strcpy (name, "gensym-"); 1341 char name[40] = "gensym-";
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1342 xnum (name + 7, SCHEME_V->gensym_cnt);
1522 1343
1523 /* first check oblist */ 1344 /* first check oblist */
1524 x = oblist_find_by_name (SCHEME_A_ name); 1345 x = oblist_find_by_name (SCHEME_A_ name);
1525 1346
1526 if (x != NIL) 1347 if (x == NIL)
1527 continue;
1528 else
1529 { 1348 {
1530 x = oblist_add_by_name (SCHEME_A_ name); 1349 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x; 1350 return x;
1532 } 1351 }
1533 } 1352 }
… …
1542 char c, *p; 1361 char c, *p;
1543 int has_dec_point = 0; 1362 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1363 int has_fp_exp = 0;
1545 1364
1546#if USE_COLON_HOOK 1365#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1366 if ((p = strstr (q, "::")) != 0)
1549 { 1367 {
1550 *p = 0; 1368 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1369 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1370 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1371 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1372 }
1555
1556#endif 1373#endif
1557 1374
1558 p = q; 1375 p = q;
1559 c = *p++; 1376 c = *p++;
1560 1377
… …
1609 1426
1610 return mk_symbol (SCHEME_A_ strlwr (q)); 1427 return mk_symbol (SCHEME_A_ strlwr (q));
1611 } 1428 }
1612 } 1429 }
1613 1430
1614#if USE_FLOAT 1431#if USE_REAL
1615 if (has_dec_point) 1432 if (has_dec_point)
1616 return mk_real (SCHEME_A_ atof (q)); 1433 return mk_real (SCHEME_A_ atof (q));
1617#endif 1434#endif
1618 1435
1619 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1436 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1621 1438
1622/* make constant */ 1439/* make constant */
1623static pointer 1440static pointer
1624mk_sharp_const (SCHEME_P_ char *name) 1441mk_sharp_const (SCHEME_P_ char *name)
1625{ 1442{
1626 long x;
1627 char tmp[STRBUFFSIZE];
1628
1629 if (!strcmp (name, "t")) 1443 if (!strcmp (name, "t"))
1630 return S_T; 1444 return S_T;
1631 else if (!strcmp (name, "f")) 1445 else if (!strcmp (name, "f"))
1632 return S_F; 1446 return S_F;
1633 else if (*name == 'o') /* #o (octal) */
1634 {
1635 x = strtol (name + 1, 0, 8);
1636 return mk_integer (SCHEME_A_ x);
1637 }
1638 else if (*name == 'd') /* #d (decimal) */
1639 {
1640 x = strtol (name + 1, 0, 10);
1641 return mk_integer (SCHEME_A_ x);
1642 }
1643 else if (*name == 'x') /* #x (hex) */
1644 {
1645 x = strtol (name + 1, 0, 16);
1646 return mk_integer (SCHEME_A_ x);
1647 }
1648 else if (*name == 'b') /* #b (binary) */
1649 {
1650 x = binary_decode (name + 1);
1651 return mk_integer (SCHEME_A_ x);
1652 }
1653 else if (*name == '\\') /* #\w (character) */ 1447 else if (*name == '\\') /* #\w (character) */
1654 { 1448 {
1655 int c = 0; 1449 int c;
1656 1450
1657 if (stricmp (name + 1, "space") == 0) 1451 if (stricmp (name + 1, "space") == 0)
1658 c = ' '; 1452 c = ' ';
1659 else if (stricmp (name + 1, "newline") == 0) 1453 else if (stricmp (name + 1, "newline") == 0)
1660 c = '\n'; 1454 c = '\n';
… …
1662 c = '\r'; 1456 c = '\r';
1663 else if (stricmp (name + 1, "tab") == 0) 1457 else if (stricmp (name + 1, "tab") == 0)
1664 c = '\t'; 1458 c = '\t';
1665 else if (name[1] == 'x' && name[2] != 0) 1459 else if (name[1] == 'x' && name[2] != 0)
1666 { 1460 {
1667 int c1 = strtol (name + 2, 0, 16); 1461 long c1 = strtol (name + 2, 0, 16);
1668 1462
1669 if (c1 <= UCHAR_MAX) 1463 if (0 <= c1 && c1 <= UCHAR_MAX)
1670 c = c1; 1464 c = c1;
1671 else 1465 else
1672 return NIL; 1466 return NIL;
1673 1467 }
1674#if USE_ASCII_NAMES 1468#if USE_ASCII_NAMES
1675 }
1676 else if (is_ascii_name (name + 1, &c)) 1469 else if (is_ascii_name (name + 1, &c))
1677 {
1678 /* nothing */ 1470 /* nothing */;
1679#endif 1471#endif
1680 }
1681 else if (name[2] == 0) 1472 else if (name[2] == 0)
1682 c = name[1]; 1473 c = name[1];
1683 else 1474 else
1684 return NIL; 1475 return NIL;
1685 1476
1686 return mk_character (SCHEME_A_ c); 1477 return mk_character (SCHEME_A_ c);
1687 } 1478 }
1688 else 1479 else
1480 {
1481 /* identify base by string index */
1482 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1483 char *base = strchr (baseidx, *name);
1484
1485 if (base)
1486 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1487
1689 return NIL; 1488 return NIL;
1489 }
1690} 1490}
1691 1491
1692/* ========== garbage collector ========== */ 1492/* ========== garbage collector ========== */
1693 1493
1694/*-- 1494/*--
1695 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1495 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1696 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1697 * for marking. 1497 * for marking.
1498 *
1499 * The exception is vectors - vectors are currently marked recursively,
1500 * which is inherited form tinyscheme and could be fixed by having another
1501 * word of context in the vector
1698 */ 1502 */
1699static void 1503static void
1700mark (pointer a) 1504mark (pointer a)
1701{ 1505{
1702 pointer t, q, p; 1506 pointer t, q, p;
… …
1704 t = 0; 1508 t = 0;
1705 p = a; 1509 p = a;
1706E2: 1510E2:
1707 setmark (p); 1511 setmark (p);
1708 1512
1709 if (is_vector (p)) 1513 if (ecb_expect_false (is_vector (p)))
1710 { 1514 {
1711 int i; 1515 int i;
1712 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1713 1516
1714 for (i = 0; i < num; i++) 1517 for (i = 0; i < p->object.vector.length; i++)
1715 { 1518 mark (vecvalue (p)[i]);
1716 /* Vector cells will be treated like ordinary cells */
1717 mark (p + 1 + i);
1718 }
1719 } 1519 }
1720 1520
1721 if (is_atom (p)) 1521 if (is_atom (p))
1722 goto E6; 1522 goto E6;
1723 1523
… …
1841} 1641}
1842 1642
1843static void 1643static void
1844finalize_cell (SCHEME_P_ pointer a) 1644finalize_cell (SCHEME_P_ pointer a)
1845{ 1645{
1646 /* TODO, fast bitmap check? */
1846 if (is_string (a)) 1647 if (is_string (a))
1847 free (strvalue (a)); 1648 free (strvalue (a));
1649 else if (is_vector (a))
1650 free (vecvalue (a));
1848#if USE_PORTS 1651#if USE_PORTS
1849 else if (is_port (a)) 1652 else if (is_port (a))
1850 { 1653 {
1851 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1654 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1852 port_close (SCHEME_A_ a, port_input | port_output); 1655 port_close (SCHEME_A_ a, port_input | port_output);
… …
2429 } 2232 }
2430 } 2233 }
2431} 2234}
2432 2235
2433/* check c is in chars */ 2236/* check c is in chars */
2434static INLINE int 2237ecb_inline int
2435is_one_of (char *s, int c) 2238is_one_of (char *s, int c)
2436{ 2239{
2437 if (c == EOF) 2240 if (c == EOF)
2438 return 1; 2241 return 1;
2439 2242
2440 return !!strchr (s, c); 2243 return !!strchr (s, c);
2441} 2244}
2442 2245
2443/* skip white characters */ 2246/* skip white characters */
2444static INLINE int 2247ecb_inline int
2445skipspace (SCHEME_P) 2248skipspace (SCHEME_P)
2446{ 2249{
2447 int c, curr_line = 0; 2250 int c, curr_line = 0;
2448 2251
2449 do 2252 do
… …
2679 2482
2680 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2483 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2681 { 2484 {
2682 if (num_is_integer (l)) 2485 if (num_is_integer (l))
2683 xnum (p, ivalue_unchecked (l)); 2486 xnum (p, ivalue_unchecked (l));
2684#if USE_FLOAT 2487#if USE_REAL
2685 else 2488 else
2686 { 2489 {
2687 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2490 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2688 /* r5rs says there must be a '.' (unless 'e'?) */ 2491 /* r5rs says there must be a '.' (unless 'e'?) */
2689 f = strcspn (p, ".e"); 2492 f = strcspn (p, ".e");
… …
2943 } 2746 }
2944 else if (is_number (a)) 2747 else if (is_number (a))
2945 { 2748 {
2946 if (is_number (b)) 2749 if (is_number (b))
2947 if (num_is_integer (a) == num_is_integer (b)) 2750 if (num_is_integer (a) == num_is_integer (b))
2948 return num_eq (nvalue (a), nvalue (b)); 2751 return num_cmp (nvalue (a), nvalue (b)) == 0;
2949 2752
2950 return 0; 2753 return 0;
2951 } 2754 }
2952 else if (is_character (a)) 2755 else if (is_character (a))
2953 { 2756 {
… …
2985#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST) 2788#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2986 2789
2987static int 2790static int
2988hash_fn (const char *key, int table_size) 2791hash_fn (const char *key, int table_size)
2989{ 2792{
2990 unsigned int hashed = 0; 2793 const unsigned char *p = key;
2991 const char *c; 2794 uint32_t hash = 2166136261;
2992 int bits_per_int = sizeof (unsigned int) * 8;
2993 2795
2994 for (c = key; *c; c++) 2796 while (*p)
2995 { 2797 hash = (hash ^ *p++) * 16777619;
2996 /* letters have about 5 bits in them */
2997 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
2998 hashed ^= *c;
2999 }
3000 2798
3001 return hashed % table_size; 2799 return hash % table_size;
3002} 2800}
3003#endif 2801#endif
3004 2802
3005#ifndef USE_ALIST_ENV 2803#ifndef USE_ALIST_ENV
3006 2804
… …
3025 2823
3026 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2824 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3027 setenvironment (SCHEME_V->envir); 2825 setenvironment (SCHEME_V->envir);
3028} 2826}
3029 2827
3030static INLINE void 2828ecb_inline void
3031new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2829new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3032{ 2830{
3033 pointer slot = immutable_cons (variable, value); 2831 pointer slot = immutable_cons (variable, value);
3034 2832
3035 if (is_vector (car (env))) 2833 if (is_vector (car (env)))
3036 { 2834 {
3037 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2835 int location = hash_fn (symname (variable), veclength (car (env)));
3038 2836
3039 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2837 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location)));
3040 } 2838 }
3041 else 2839 else
3042 set_car (env, immutable_cons (slot, car (env))); 2840 set_car (env, immutable_cons (slot, car (env)));
… …
3050 2848
3051 for (x = env; x != NIL; x = cdr (x)) 2849 for (x = env; x != NIL; x = cdr (x))
3052 { 2850 {
3053 if (is_vector (car (x))) 2851 if (is_vector (car (x)))
3054 { 2852 {
3055 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2853 location = hash_fn (symname (hdl), veclength (car (x)));
3056 y = vector_elem (car (x), location); 2854 y = vector_elem (car (x), location);
3057 } 2855 }
3058 else 2856 else
3059 y = car (x); 2857 y = car (x);
3060 2858
… …
3075 return NIL; 2873 return NIL;
3076} 2874}
3077 2875
3078#else /* USE_ALIST_ENV */ 2876#else /* USE_ALIST_ENV */
3079 2877
3080static INLINE void 2878ecb_inline void
3081new_frame_in_env (SCHEME_P_ pointer old_env) 2879new_frame_in_env (SCHEME_P_ pointer old_env)
3082{ 2880{
3083 SCHEME_V->envir = immutable_cons (NIL, old_env); 2881 SCHEME_V->envir = immutable_cons (NIL, old_env);
3084 setenvironment (SCHEME_V->envir); 2882 setenvironment (SCHEME_V->envir);
3085} 2883}
3086 2884
3087static INLINE void 2885ecb_inline void
3088new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2886new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3089{ 2887{
3090 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3091} 2889}
3092 2890
… …
3114 return NIL; 2912 return NIL;
3115} 2913}
3116 2914
3117#endif /* USE_ALIST_ENV else */ 2915#endif /* USE_ALIST_ENV else */
3118 2916
3119static INLINE void 2917ecb_inline void
3120new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3121{ 2919{
3122 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2920 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
3123} 2921}
3124 2922
3125static INLINE void 2923ecb_inline void
3126set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3127{ 2925{
3128 set_cdr (slot, value); 2926 set_cdr (slot, value);
3129} 2927}
3130 2928
3131static INLINE pointer 2929ecb_inline pointer
3132slot_value_in_env (pointer slot) 2930slot_value_in_env (pointer slot)
3133{ 2931{
3134 return cdr (slot); 2932 return cdr (slot);
3135} 2933}
3136 2934
3137/* ========== Evaluation Cycle ========== */ 2935/* ========== Evaluation Cycle ========== */
3138 2936
3139static pointer 2937static int
3140xError_1 (SCHEME_P_ const char *s, pointer a) 2938xError_1 (SCHEME_P_ const char *s, pointer a)
3141{ 2939{
3142#if USE_ERROR_HOOK 2940#if USE_ERROR_HOOK
3143 pointer x; 2941 pointer x;
3144 pointer hdl = SCHEME_V->ERROR_HOOK; 2942 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3170#if USE_ERROR_HOOK 2968#if USE_ERROR_HOOK
3171 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2969 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3172 2970
3173 if (x != NIL) 2971 if (x != NIL)
3174 { 2972 {
3175 if (a) 2973 pointer code = a
3176 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2974 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3177 else 2975 : NIL;
3178 SCHEME_V->code = NIL;
3179 2976
3180 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2977 code = cons (mk_string (SCHEME_A_ s), code);
3181 setimmutable (car (SCHEME_V->code)); 2978 setimmutable (car (code));
3182 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2979 SCHEME_V->code = cons (slot_value_in_env (x), code);
3183 SCHEME_V->op = OP_EVAL; 2980 SCHEME_V->op = OP_EVAL;
3184 2981
3185 return S_T; 2982 return 0;
3186 } 2983 }
3187#endif 2984#endif
3188 2985
3189 if (a) 2986 if (a)
3190 SCHEME_V->args = cons (a, NIL); 2987 SCHEME_V->args = cons (a, NIL);
… …
3192 SCHEME_V->args = NIL; 2989 SCHEME_V->args = NIL;
3193 2990
3194 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 2991 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3195 setimmutable (car (SCHEME_V->args)); 2992 setimmutable (car (SCHEME_V->args));
3196 SCHEME_V->op = OP_ERR0; 2993 SCHEME_V->op = OP_ERR0;
2994
3197 return S_T; 2995 return 0;
3198} 2996}
3199 2997
3200#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 2998#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3201#define Error_0(s) Error_1 (s, 0) 2999#define Error_0(s) Error_1 (s, 0)
3202 3000
3203/* Too small to turn into function */ 3001/* Too small to turn into function */
3204#define BEGIN do { 3002#define BEGIN do {
3205#define END } while (0) 3003#define END } while (0)
3206#define s_goto(a) BEGIN \ 3004#define s_goto(a) BEGIN \
3207 SCHEME_V->op = a; \ 3005 SCHEME_V->op = a; \
3208 return S_T; END 3006 return 0; END
3209 3007
3210#define s_return(a) return xs_return (SCHEME_A_ a) 3008#define s_return(a) return xs_return (SCHEME_A_ a)
3211 3009
3212#ifndef USE_SCHEME_STACK 3010#ifndef USE_SCHEME_STACK
3213 3011
… …
3238 next_frame = SCHEME_V->dump_base + nframes; 3036 next_frame = SCHEME_V->dump_base + nframes;
3239 3037
3240 next_frame->op = op; 3038 next_frame->op = op;
3241 next_frame->args = args; 3039 next_frame->args = args;
3242 next_frame->envir = SCHEME_V->envir; 3040 next_frame->envir = SCHEME_V->envir;
3243 next_frame->code = code; 3041 next_frame->code = code;
3244 3042
3245 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3246} 3044}
3247 3045
3248static pointer 3046static int
3249xs_return (SCHEME_P_ pointer a) 3047xs_return (SCHEME_P_ pointer a)
3250{ 3048{
3251 int nframes = (uintptr_t)SCHEME_V->dump; 3049 int nframes = (uintptr_t)SCHEME_V->dump;
3252 struct dump_stack_frame *frame; 3050 struct dump_stack_frame *frame;
3253 3051
3254 SCHEME_V->value = a; 3052 SCHEME_V->value = a;
3255 3053
3256 if (nframes <= 0) 3054 if (nframes <= 0)
3257 return NIL; 3055 return -1;
3258 3056
3259 frame = &SCHEME_V->dump_base[--nframes]; 3057 frame = &SCHEME_V->dump_base[--nframes];
3260 SCHEME_V->op = frame->op; 3058 SCHEME_V->op = frame->op;
3261 SCHEME_V->args = frame->args; 3059 SCHEME_V->args = frame->args;
3262 SCHEME_V->envir = frame->envir; 3060 SCHEME_V->envir = frame->envir;
3263 SCHEME_V->code = frame->code; 3061 SCHEME_V->code = frame->code;
3264 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3265 3063
3266 return S_T; 3064 return 0;
3267} 3065}
3268 3066
3269static INLINE void 3067ecb_inline void
3270dump_stack_reset (SCHEME_P) 3068dump_stack_reset (SCHEME_P)
3271{ 3069{
3272 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3070 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3273 SCHEME_V->dump = (pointer)+0; 3071 SCHEME_V->dump = (pointer)+0;
3274} 3072}
3275 3073
3276static INLINE void 3074ecb_inline void
3277dump_stack_initialize (SCHEME_P) 3075dump_stack_initialize (SCHEME_P)
3278{ 3076{
3279 SCHEME_V->dump_size = 0; 3077 SCHEME_V->dump_size = 0;
3280 SCHEME_V->dump_base = 0; 3078 SCHEME_V->dump_base = 0;
3281 dump_stack_reset (SCHEME_A); 3079 dump_stack_reset (SCHEME_A);
… …
3348 SCHEME_V->dump = (pointer)(uintptr_t)i; 3146 SCHEME_V->dump = (pointer)(uintptr_t)i;
3349} 3147}
3350 3148
3351#else 3149#else
3352 3150
3353static INLINE void 3151ecb_inline void
3354dump_stack_reset (SCHEME_P) 3152dump_stack_reset (SCHEME_P)
3355{ 3153{
3356 SCHEME_V->dump = NIL; 3154 SCHEME_V->dump = NIL;
3357} 3155}
3358 3156
3359static INLINE void 3157ecb_inline void
3360dump_stack_initialize (SCHEME_P) 3158dump_stack_initialize (SCHEME_P)
3361{ 3159{
3362 dump_stack_reset (SCHEME_A); 3160 dump_stack_reset (SCHEME_A);
3363} 3161}
3364 3162
… …
3366dump_stack_free (SCHEME_P) 3164dump_stack_free (SCHEME_P)
3367{ 3165{
3368 SCHEME_V->dump = NIL; 3166 SCHEME_V->dump = NIL;
3369} 3167}
3370 3168
3371static pointer 3169static int
3372xs_return (SCHEME_P_ pointer a) 3170xs_return (SCHEME_P_ pointer a)
3373{ 3171{
3374 pointer dump = SCHEME_V->dump; 3172 pointer dump = SCHEME_V->dump;
3375 3173
3376 SCHEME_V->value = a; 3174 SCHEME_V->value = a;
3377 3175
3378 if (dump == NIL) 3176 if (dump == NIL)
3379 return NIL; 3177 return -1;
3380 3178
3381 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3382 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3180 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3383 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3384 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3182 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3385 3183
3386 SCHEME_V->dump = dump; 3184 SCHEME_V->dump = dump;
3387 3185
3388 return S_T; 3186 return 0;
3389} 3187}
3390 3188
3391static void 3189static void
3392s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3393{ 3191{
… …
3418 3216
3419#endif 3217#endif
3420 3218
3421#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3422 3220
3423static pointer 3221static int
3424opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3222opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3425{ 3223{
3224 pointer args = SCHEME_V->args;
3426 pointer x, y; 3225 pointer x, y;
3427 3226
3428 switch (op) 3227 switch (op)
3429 { 3228 {
3430 case OP_LOAD: /* load */ 3229 case OP_LOAD: /* load */
3431 if (file_interactive (SCHEME_A)) 3230 if (file_interactive (SCHEME_A))
3432 { 3231 {
3433 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3434 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3233 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3435 } 3234 }
3436 3235
3437 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3236 if (!file_push (SCHEME_A_ strvalue (car (args))))
3438 Error_1 ("unable to open", car (SCHEME_V->args)); 3237 Error_1 ("unable to open", car (args));
3439 else 3238 else
3440 { 3239 {
3441 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3240 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3442 s_goto (OP_T0LVL); 3241 s_goto (OP_T0LVL);
3443 } 3242 }
… …
3478 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3277 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3479 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3278 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3480 s_goto (OP_READ_INTERNAL); 3279 s_goto (OP_READ_INTERNAL);
3481 3280
3482 case OP_T1LVL: /* top level */ 3281 case OP_T1LVL: /* top level */
3483 SCHEME_V->code = SCHEME_V->value; 3282 SCHEME_V->code = SCHEME_V->value;
3484 SCHEME_V->inport = SCHEME_V->save_inport; 3283 SCHEME_V->inport = SCHEME_V->save_inport;
3485 s_goto (OP_EVAL); 3284 s_goto (OP_EVAL);
3486 3285
3487 case OP_READ_INTERNAL: /* internal read */ 3286 case OP_READ_INTERNAL: /* internal read */
3488 SCHEME_V->tok = token (SCHEME_A); 3287 SCHEME_V->tok = token (SCHEME_A);
… …
3517 case OP_EVAL: /* main part of evaluation */ 3316 case OP_EVAL: /* main part of evaluation */
3518#if USE_TRACING 3317#if USE_TRACING
3519 if (SCHEME_V->tracing) 3318 if (SCHEME_V->tracing)
3520 { 3319 {
3521 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3320 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3522 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3321 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3523 SCHEME_V->args = SCHEME_V->code; 3322 SCHEME_V->args = SCHEME_V->code;
3524 putstr (SCHEME_A_ "\nEval: "); 3323 putstr (SCHEME_A_ "\nEval: ");
3525 s_goto (OP_P0LIST); 3324 s_goto (OP_P0LIST);
3526 } 3325 }
3527 3326
… …
3538 else 3337 else
3539 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3338 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3540 } 3339 }
3541 else if (is_pair (SCHEME_V->code)) 3340 else if (is_pair (SCHEME_V->code))
3542 { 3341 {
3342 x = car (SCHEME_V->code);
3343
3543 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3344 if (is_syntax (x)) /* SYNTAX */
3544 { 3345 {
3545 SCHEME_V->code = cdr (SCHEME_V->code); 3346 SCHEME_V->code = cdr (SCHEME_V->code);
3546 s_goto (syntaxnum (x)); 3347 s_goto (syntaxnum (x));
3547 } 3348 }
3548 else /* first, eval top element and eval arguments */ 3349 else /* first, eval top element and eval arguments */
3549 { 3350 {
3550 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3351 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3551 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3352 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3552 SCHEME_V->code = car (SCHEME_V->code); 3353 SCHEME_V->code = x;
3553 s_goto (OP_EVAL); 3354 s_goto (OP_EVAL);
3554 } 3355 }
3555 } 3356 }
3556 else 3357 else
3557 s_return (SCHEME_V->code); 3358 s_return (SCHEME_V->code);
… …
3569 SCHEME_V->code = cdr (SCHEME_V->code); 3370 SCHEME_V->code = cdr (SCHEME_V->code);
3570 s_goto (OP_E1ARGS); 3371 s_goto (OP_E1ARGS);
3571 } 3372 }
3572 3373
3573 case OP_E1ARGS: /* eval arguments */ 3374 case OP_E1ARGS: /* eval arguments */
3574 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3375 args = cons (SCHEME_V->value, args);
3575 3376
3576 if (is_pair (SCHEME_V->code)) /* continue */ 3377 if (is_pair (SCHEME_V->code)) /* continue */
3577 { 3378 {
3578 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3379 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3579 SCHEME_V->code = car (SCHEME_V->code); 3380 SCHEME_V->code = car (SCHEME_V->code);
3580 SCHEME_V->args = NIL; 3381 SCHEME_V->args = NIL;
3581 s_goto (OP_EVAL); 3382 s_goto (OP_EVAL);
3582 } 3383 }
3583 else /* end */ 3384 else /* end */
3584 { 3385 {
3585 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3386 args = reverse_in_place (SCHEME_A_ NIL, args);
3586 SCHEME_V->code = car (SCHEME_V->args); 3387 SCHEME_V->code = car (args);
3587 SCHEME_V->args = cdr (SCHEME_V->args); 3388 SCHEME_V->args = cdr (args);
3588 s_goto (OP_APPLY); 3389 s_goto (OP_APPLY);
3589 } 3390 }
3590 3391
3591#if USE_TRACING 3392#if USE_TRACING
3592 3393
3593 case OP_TRACING: 3394 case OP_TRACING:
3594 { 3395 {
3595 int tr = SCHEME_V->tracing; 3396 int tr = SCHEME_V->tracing;
3596 3397
3597 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3398 SCHEME_V->tracing = ivalue (car (args));
3598 s_return (mk_integer (SCHEME_A_ tr)); 3399 s_return (mk_integer (SCHEME_A_ tr));
3599 } 3400 }
3600 3401
3601#endif 3402#endif
3602 3403
3603 case OP_APPLY: /* apply 'code' to 'args' */ 3404 case OP_APPLY: /* apply 'code' to 'args' */
3604#if USE_TRACING 3405#if USE_TRACING
3605 if (SCHEME_V->tracing) 3406 if (SCHEME_V->tracing)
3606 { 3407 {
3607 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3408 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3608 SCHEME_V->print_flag = 1; 3409 SCHEME_V->print_flag = 1;
3609 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3410 /* args=cons(SCHEME_V->code,args); */
3610 putstr (SCHEME_A_ "\nApply to: "); 3411 putstr (SCHEME_A_ "\nApply to: ");
3611 s_goto (OP_P0LIST); 3412 s_goto (OP_P0LIST);
3612 } 3413 }
3613 3414
3614 /* fall through */ 3415 /* fall through */
3615 3416
3616 case OP_REAL_APPLY: 3417 case OP_REAL_APPLY:
3617#endif 3418#endif
3618 if (is_proc (SCHEME_V->code)) 3419 if (is_proc (SCHEME_V->code))
3619 {
3620 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3621 }
3622 else if (is_foreign (SCHEME_V->code)) 3421 else if (is_foreign (SCHEME_V->code))
3623 { 3422 {
3624 /* Keep nested calls from GC'ing the arglist */ 3423 /* Keep nested calls from GC'ing the arglist */
3625 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3424 push_recent_alloc (SCHEME_A_ args, NIL);
3626 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3627 3426
3628 s_return (x); 3427 s_return (x);
3629 } 3428 }
3630 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3429 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3631 { 3430 {
3632 /* Should not accept promise */ 3431 /* Should not accept promise */
3633 /* make environment */ 3432 /* make environment */
3634 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3433 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3635 3434
3636 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3435 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3637 { 3436 {
3638 if (y == NIL) 3437 if (y == NIL)
3639 Error_0 ("not enough arguments"); 3438 Error_0 ("not enough arguments");
3640 else 3439 else
3641 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3440 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3659 s_goto (OP_BEGIN); 3458 s_goto (OP_BEGIN);
3660 } 3459 }
3661 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3460 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3662 { 3461 {
3663 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3462 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3664 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3463 s_return (args != NIL ? car (args) : NIL);
3665 } 3464 }
3666 else 3465 else
3667 Error_0 ("illegal function"); 3466 Error_0 ("illegal function");
3668 3467
3669 case OP_DOMACRO: /* do macro */ 3468 case OP_DOMACRO: /* do macro */
… …
3678 { 3477 {
3679 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3478 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3680 3479
3681 if (f != NIL) 3480 if (f != NIL)
3682 { 3481 {
3683 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3482 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3684 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3483 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3685 SCHEME_V->code = slot_value_in_env (f); 3484 SCHEME_V->code = slot_value_in_env (f);
3686 s_goto (OP_APPLY); 3485 s_goto (OP_APPLY);
3687 } 3486 }
3688 3487
… …
3699 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3700 3499
3701#endif 3500#endif
3702 3501
3703 case OP_MKCLOSURE: /* make-closure */ 3502 case OP_MKCLOSURE: /* make-closure */
3704 x = car (SCHEME_V->args); 3503 x = car (args);
3705 3504
3706 if (car (x) == SCHEME_V->LAMBDA) 3505 if (car (x) == SCHEME_V->LAMBDA)
3707 x = cdr (x); 3506 x = cdr (x);
3708 3507
3709 if (cdr (SCHEME_V->args) == NIL) 3508 if (cdr (args) == NIL)
3710 y = SCHEME_V->envir; 3509 y = SCHEME_V->envir;
3711 else 3510 else
3712 y = cadr (SCHEME_V->args); 3511 y = cadr (args);
3713 3512
3714 s_return (mk_closure (SCHEME_A_ x, y)); 3513 s_return (mk_closure (SCHEME_A_ x, y));
3715 3514
3716 case OP_QUOTE: /* quote */ 3515 case OP_QUOTE: /* quote */
3717 s_return (car (SCHEME_V->code)); 3516 s_return (car (SCHEME_V->code));
… …
3749 3548
3750 3549
3751 case OP_DEFP: /* defined? */ 3550 case OP_DEFP: /* defined? */
3752 x = SCHEME_V->envir; 3551 x = SCHEME_V->envir;
3753 3552
3754 if (cdr (SCHEME_V->args) != NIL) 3553 if (cdr (args) != NIL)
3755 x = cadr (SCHEME_V->args); 3554 x = cadr (args);
3756 3555
3757 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3556 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3758 3557
3759 case OP_SET0: /* set! */ 3558 case OP_SET0: /* set! */
3760 if (is_immutable (car (SCHEME_V->code))) 3559 if (is_immutable (car (SCHEME_V->code)))
3761 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3560 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3762 3561
… …
3793 3592
3794 case OP_IF1: /* if */ 3593 case OP_IF1: /* if */
3795 if (is_true (SCHEME_V->value)) 3594 if (is_true (SCHEME_V->value))
3796 SCHEME_V->code = car (SCHEME_V->code); 3595 SCHEME_V->code = car (SCHEME_V->code);
3797 else 3596 else
3798 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3597 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3799
3800 * car(NIL) = NIL */
3801 s_goto (OP_EVAL); 3598 s_goto (OP_EVAL);
3802 3599
3803 case OP_LET0: /* let */ 3600 case OP_LET0: /* let */
3804 SCHEME_V->args = NIL; 3601 SCHEME_V->args = NIL;
3805 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3806 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3603 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3807 s_goto (OP_LET1); 3604 s_goto (OP_LET1);
3808 3605
3809 case OP_LET1: /* let (calculate parameters) */ 3606 case OP_LET1: /* let (calculate parameters) */
3810 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3607 args = cons (SCHEME_V->value, args);
3811 3608
3812 if (is_pair (SCHEME_V->code)) /* continue */ 3609 if (is_pair (SCHEME_V->code)) /* continue */
3813 { 3610 {
3814 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3611 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3815 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3612 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3816 3613
3817 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3614 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3818 SCHEME_V->code = cadar (SCHEME_V->code); 3615 SCHEME_V->code = cadar (SCHEME_V->code);
3819 SCHEME_V->args = NIL; 3616 SCHEME_V->args = NIL;
3820 s_goto (OP_EVAL); 3617 s_goto (OP_EVAL);
3821 } 3618 }
3822 else /* end */ 3619 else /* end */
3823 { 3620 {
3824 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3621 args = reverse_in_place (SCHEME_A_ NIL, args);
3825 SCHEME_V->code = car (SCHEME_V->args); 3622 SCHEME_V->code = car (args);
3826 SCHEME_V->args = cdr (SCHEME_V->args); 3623 SCHEME_V->args = cdr (args);
3827 s_goto (OP_LET2); 3624 s_goto (OP_LET2);
3828 } 3625 }
3829 3626
3830 case OP_LET2: /* let */ 3627 case OP_LET2: /* let */
3831 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3628 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3832 3629
3833 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3630 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3834 y != NIL; x = cdr (x), y = cdr (y)) 3631 y != NIL; x = cdr (x), y = cdr (y))
3835 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3632 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3836 3633
3837 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3634 if (is_symbol (car (SCHEME_V->code))) /* named let */
3838 { 3635 {
3839 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3636 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3840 { 3637 {
3841 if (!is_pair (x)) 3638 if (!is_pair (x))
3842 Error_1 ("Bad syntax of binding in let :", x); 3639 Error_1 ("Bad syntax of binding in let :", x);
3843 3640
3844 if (!is_list (SCHEME_A_ car (x))) 3641 if (!is_list (SCHEME_A_ car (x)))
3845 Error_1 ("Bad syntax of binding in let :", car (x)); 3642 Error_1 ("Bad syntax of binding in let :", car (x));
3846 3643
3847 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3644 args = cons (caar (x), args);
3848 } 3645 }
3849 3646
3850 x =
3851 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3647 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3852 SCHEME_V->envir); 3648 SCHEME_V->envir);
3853 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3649 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3854 SCHEME_V->code = cddr (SCHEME_V->code); 3650 SCHEME_V->code = cddr (SCHEME_V->code);
3855 SCHEME_V->args = NIL;
3856 } 3651 }
3857 else 3652 else
3858 { 3653 {
3859 SCHEME_V->code = cdr (SCHEME_V->code); 3654 SCHEME_V->code = cdr (SCHEME_V->code);
3655 }
3656
3860 SCHEME_V->args = NIL; 3657 SCHEME_V->args = NIL;
3861 }
3862
3863 s_goto (OP_BEGIN); 3658 s_goto (OP_BEGIN);
3864 3659
3865 case OP_LET0AST: /* let* */ 3660 case OP_LET0AST: /* let* */
3866 if (car (SCHEME_V->code) == NIL) 3661 if (car (SCHEME_V->code) == NIL)
3867 { 3662 {
… …
3885 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3680 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3886 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3887 3682
3888 if (is_pair (SCHEME_V->code)) /* continue */ 3683 if (is_pair (SCHEME_V->code)) /* continue */
3889 { 3684 {
3890 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3685 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3891 SCHEME_V->code = cadar (SCHEME_V->code); 3686 SCHEME_V->code = cadar (SCHEME_V->code);
3892 SCHEME_V->args = NIL; 3687 SCHEME_V->args = NIL;
3893 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3894 } 3689 }
3895 else /* end */ 3690 else /* end */
3896 { 3691 {
3897 SCHEME_V->code = SCHEME_V->args; 3692 SCHEME_V->code = args;
3898 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3899 s_goto (OP_BEGIN); 3694 s_goto (OP_BEGIN);
3900 } 3695 }
3901 3696
3902 case OP_LET0REC: /* letrec */ 3697 case OP_LET0REC: /* letrec */
… …
3905 SCHEME_V->value = SCHEME_V->code; 3700 SCHEME_V->value = SCHEME_V->code;
3906 SCHEME_V->code = car (SCHEME_V->code); 3701 SCHEME_V->code = car (SCHEME_V->code);
3907 s_goto (OP_LET1REC); 3702 s_goto (OP_LET1REC);
3908 3703
3909 case OP_LET1REC: /* letrec (calculate parameters) */ 3704 case OP_LET1REC: /* letrec (calculate parameters) */
3910 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3705 args = cons (SCHEME_V->value, args);
3911 3706
3912 if (is_pair (SCHEME_V->code)) /* continue */ 3707 if (is_pair (SCHEME_V->code)) /* continue */
3913 { 3708 {
3914 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3709 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3915 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3710 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3916 3711
3917 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3712 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3918 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3919 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3920 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3921 } 3716 }
3922 else /* end */ 3717 else /* end */
3923 { 3718 {
3924 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3719 args = reverse_in_place (SCHEME_A_ NIL, args);
3925 SCHEME_V->code = car (SCHEME_V->args); 3720 SCHEME_V->code = car (args);
3926 SCHEME_V->args = cdr (SCHEME_V->args); 3721 SCHEME_V->args = cdr (args);
3927 s_goto (OP_LET2REC); 3722 s_goto (OP_LET2REC);
3928 } 3723 }
3929 3724
3930 case OP_LET2REC: /* letrec */ 3725 case OP_LET2REC: /* letrec */
3931 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3726 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3932 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3727 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3933 3728
3934 SCHEME_V->code = cdr (SCHEME_V->code); 3729 SCHEME_V->code = cdr (SCHEME_V->code);
3935 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3936 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
… …
4022 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3817 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4023 SCHEME_V->code = car (SCHEME_V->code); 3818 SCHEME_V->code = car (SCHEME_V->code);
4024 s_goto (OP_EVAL); 3819 s_goto (OP_EVAL);
4025 3820
4026 case OP_C1STREAM: /* cons-stream */ 3821 case OP_C1STREAM: /* cons-stream */
4027 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3822 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
4028 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3823 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4029 set_typeflag (x, T_PROMISE); 3824 set_typeflag (x, T_PROMISE);
4030 s_return (cons (SCHEME_V->args, x)); 3825 s_return (cons (args, x));
4031 3826
4032 case OP_MACRO0: /* macro */ 3827 case OP_MACRO0: /* macro */
4033 if (is_pair (car (SCHEME_V->code))) 3828 if (is_pair (car (SCHEME_V->code)))
4034 { 3829 {
4035 x = caar (SCHEME_V->code); 3830 x = caar (SCHEME_V->code);
… …
4068 { 3863 {
4069 if (!is_pair (y = caar (x))) 3864 if (!is_pair (y = caar (x)))
4070 break; 3865 break;
4071 3866
4072 for (; y != NIL; y = cdr (y)) 3867 for (; y != NIL; y = cdr (y))
4073 {
4074 if (eqv (car (y), SCHEME_V->value)) 3868 if (eqv (car (y), SCHEME_V->value))
4075 break; 3869 break;
4076 }
4077 3870
4078 if (y != NIL) 3871 if (y != NIL)
4079 break; 3872 break;
4080 } 3873 }
4081 3874
… …
4101 s_goto (OP_BEGIN); 3894 s_goto (OP_BEGIN);
4102 else 3895 else
4103 s_return (NIL); 3896 s_return (NIL);
4104 3897
4105 case OP_PAPPLY: /* apply */ 3898 case OP_PAPPLY: /* apply */
4106 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
4107 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3900 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4108 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3901 /*SCHEME_V->args = cadr(args); */
4109 s_goto (OP_APPLY); 3902 s_goto (OP_APPLY);
4110 3903
4111 case OP_PEVAL: /* eval */ 3904 case OP_PEVAL: /* eval */
4112 if (cdr (SCHEME_V->args) != NIL) 3905 if (cdr (args) != NIL)
4113 SCHEME_V->envir = cadr (SCHEME_V->args); 3906 SCHEME_V->envir = cadr (args);
4114 3907
4115 SCHEME_V->code = car (SCHEME_V->args); 3908 SCHEME_V->code = car (args);
4116 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
4117 3910
4118 case OP_CONTINUATION: /* call-with-current-continuation */ 3911 case OP_CONTINUATION: /* call-with-current-continuation */
4119 SCHEME_V->code = car (SCHEME_V->args); 3912 SCHEME_V->code = car (args);
4120 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3913 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4121 s_goto (OP_APPLY); 3914 s_goto (OP_APPLY);
4122 } 3915 }
4123 3916
4124 return S_T; 3917 if (USE_ERROR_CHECKING) abort ();
4125} 3918}
4126 3919
4127static pointer 3920static int
4128opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3921opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4129{ 3922{
4130 pointer x; 3923 pointer args = SCHEME_V->args;
3924 pointer x = car (args);
4131 num v; 3925 num v;
4132 3926
4133#if USE_MATH 3927#if USE_MATH
4134 RVALUE dd; 3928 RVALUE dd;
4135#endif 3929#endif
4136 3930
4137 switch (op) 3931 switch (op)
4138 { 3932 {
4139#if USE_MATH 3933#if USE_MATH
4140
4141 case OP_INEX2EX: /* inexact->exact */ 3934 case OP_INEX2EX: /* inexact->exact */
4142 x = car (SCHEME_V->args);
4143
4144 if (num_is_integer (x)) 3935 if (num_is_integer (x))
4145 s_return (x); 3936 s_return (x);
4146 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3937 else if (modf (rvalue_unchecked (x), &dd) == 0)
4147 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3938 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4148 else 3939 else
4149 Error_1 ("inexact->exact: not integral:", x); 3940 Error_1 ("inexact->exact: not integral:", x);
4150 3941
4151 case OP_EXP:
4152 x = car (SCHEME_V->args);
4153 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3942 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4154
4155 case OP_LOG:
4156 x = car (SCHEME_V->args);
4157 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3943 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4158
4159 case OP_SIN:
4160 x = car (SCHEME_V->args);
4161 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3944 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4162
4163 case OP_COS:
4164 x = car (SCHEME_V->args);
4165 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3945 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4166
4167 case OP_TAN:
4168 x = car (SCHEME_V->args);
4169 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3946 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4170
4171 case OP_ASIN:
4172 x = car (SCHEME_V->args);
4173 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3947 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4174
4175 case OP_ACOS:
4176 x = car (SCHEME_V->args);
4177 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3948 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4178 3949
4179 case OP_ATAN: 3950 case OP_ATAN:
4180 x = car (SCHEME_V->args);
4181
4182 if (cdr (SCHEME_V->args) == NIL) 3951 if (cdr (args) == NIL)
4183 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4184 else 3953 else
4185 { 3954 {
4186 pointer y = cadr (SCHEME_V->args); 3955 pointer y = cadr (args);
4187
4188 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4189 } 3957 }
4190 3958
4191 case OP_SQRT: 3959 case OP_SQRT:
4192 x = car (SCHEME_V->args);
4193 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4194 3961
4195 case OP_EXPT: 3962 case OP_EXPT:
4196 { 3963 {
4197 RVALUE result; 3964 RVALUE result;
4198 int real_result = 1; 3965 int real_result = 1;
4199 pointer y = cadr (SCHEME_V->args); 3966 pointer y = cadr (args);
4200
4201 x = car (SCHEME_V->args);
4202 3967
4203 if (num_is_integer (x) && num_is_integer (y)) 3968 if (num_is_integer (x) && num_is_integer (y))
4204 real_result = 0; 3969 real_result = 0;
4205 3970
4206 /* This 'if' is an R5RS compatibility fix. */ 3971 /* This 'if' is an R5RS compatibility fix. */
4207 /* NOTE: Remove this 'if' fix for R6RS. */ 3972 /* NOTE: Remove this 'if' fix for R6RS. */
4208 if (rvalue (x) == 0 && rvalue (y) < 0) 3973 if (rvalue (x) == 0 && rvalue (y) < 0)
4209 result = 0.0; 3974 result = 0;
4210 else 3975 else
4211 result = pow (rvalue (x), rvalue (y)); 3976 result = pow (rvalue (x), rvalue (y));
4212 3977
4213 /* Before returning integer result make sure we can. */ 3978 /* Before returning integer result make sure we can. */
4214 /* If the test fails, result is too big for integer. */ 3979 /* If the test fails, result is too big for integer. */
4215 if (!real_result) 3980 if (!real_result)
4216 { 3981 {
4217 long result_as_long = (long) result; 3982 long result_as_long = result;
4218 3983
4219 if (result != (RVALUE) result_as_long) 3984 if (result != (RVALUE) result_as_long)
4220 real_result = 1; 3985 real_result = 1;
4221 } 3986 }
4222 3987
… …
4224 s_return (mk_real (SCHEME_A_ result)); 3989 s_return (mk_real (SCHEME_A_ result));
4225 else 3990 else
4226 s_return (mk_integer (SCHEME_A_ result)); 3991 s_return (mk_integer (SCHEME_A_ result));
4227 } 3992 }
4228 3993
4229 case OP_FLOOR:
4230 x = car (SCHEME_V->args);
4231 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4232
4233 case OP_CEILING:
4234 x = car (SCHEME_V->args);
4235 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4236 3996
4237 case OP_TRUNCATE: 3997 case OP_TRUNCATE:
4238 { 3998 {
4239 RVALUE rvalue_of_x; 3999 RVALUE rvalue_of_x;
4240 4000
4241 x = car (SCHEME_V->args);
4242 rvalue_of_x = rvalue (x); 4001 rvalue_of_x = rvalue (x);
4243 4002
4244 if (rvalue_of_x > 0) 4003 if (rvalue_of_x > 0)
4245 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4246 else 4005 else
4247 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4248 } 4007 }
4249 4008
4250 case OP_ROUND: 4009 case OP_ROUND:
4251 x = car (SCHEME_V->args);
4252
4253 if (num_is_integer (x)) 4010 if (num_is_integer (x))
4254 s_return (x); 4011 s_return (x);
4255 4012
4256 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4257#endif 4014#endif
4258 4015
4259 case OP_ADD: /* + */ 4016 case OP_ADD: /* + */
4260 v = num_zero; 4017 v = num_zero;
4261 4018
4262 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4019 for (x = args; x != NIL; x = cdr (x))
4263 v = num_add (v, nvalue (car (x))); 4020 v = num_op (NUM_ADD, v, nvalue (car (x)));
4264 4021
4265 s_return (mk_number (SCHEME_A_ v)); 4022 s_return (mk_number (SCHEME_A_ v));
4266 4023
4267 case OP_MUL: /* * */ 4024 case OP_MUL: /* * */
4268 v = num_one; 4025 v = num_one;
4269 4026
4270 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4027 for (x = args; x != NIL; x = cdr (x))
4271 v = num_mul (v, nvalue (car (x))); 4028 v = num_op (NUM_MUL, v, nvalue (car (x)));
4272 4029
4273 s_return (mk_number (SCHEME_A_ v)); 4030 s_return (mk_number (SCHEME_A_ v));
4274 4031
4275 case OP_SUB: /* - */ 4032 case OP_SUB: /* - */
4276 if (cdr (SCHEME_V->args) == NIL) 4033 if (cdr (args) == NIL)
4277 { 4034 {
4278 x = SCHEME_V->args; 4035 x = args;
4279 v = num_zero; 4036 v = num_zero;
4280 } 4037 }
4281 else 4038 else
4282 { 4039 {
4283 x = cdr (SCHEME_V->args); 4040 x = cdr (args);
4284 v = nvalue (car (SCHEME_V->args)); 4041 v = nvalue (car (args));
4285 } 4042 }
4286 4043
4287 for (; x != NIL; x = cdr (x)) 4044 for (; x != NIL; x = cdr (x))
4288 v = num_sub (v, nvalue (car (x))); 4045 v = num_op (NUM_SUB, v, nvalue (car (x)));
4289 4046
4290 s_return (mk_number (SCHEME_A_ v)); 4047 s_return (mk_number (SCHEME_A_ v));
4291 4048
4292 case OP_DIV: /* / */ 4049 case OP_DIV: /* / */
4293 if (cdr (SCHEME_V->args) == NIL) 4050 if (cdr (args) == NIL)
4294 { 4051 {
4295 x = SCHEME_V->args; 4052 x = args;
4296 v = num_one; 4053 v = num_one;
4297 } 4054 }
4298 else 4055 else
4299 { 4056 {
4300 x = cdr (SCHEME_V->args); 4057 x = cdr (args);
4301 v = nvalue (car (SCHEME_V->args)); 4058 v = nvalue (car (args));
4302 } 4059 }
4303 4060
4304 for (; x != NIL; x = cdr (x)) 4061 for (; x != NIL; x = cdr (x))
4305 {
4306 if (!is_zero_rvalue (rvalue (car (x)))) 4062 if (!is_zero_rvalue (rvalue (car (x))))
4307 v = num_div (v, nvalue (car (x))); 4063 v = num_div (v, nvalue (car (x)));
4308 else 4064 else
4309 Error_0 ("/: division by zero"); 4065 Error_0 ("/: division by zero");
4310 }
4311 4066
4312 s_return (mk_number (SCHEME_A_ v)); 4067 s_return (mk_number (SCHEME_A_ v));
4313 4068
4314 case OP_INTDIV: /* quotient */ 4069 case OP_INTDIV: /* quotient */
4315 if (cdr (SCHEME_V->args) == NIL) 4070 if (cdr (args) == NIL)
4316 { 4071 {
4317 x = SCHEME_V->args; 4072 x = args;
4318 v = num_one; 4073 v = num_one;
4319 } 4074 }
4320 else 4075 else
4321 { 4076 {
4322 x = cdr (SCHEME_V->args); 4077 x = cdr (args);
4323 v = nvalue (car (SCHEME_V->args)); 4078 v = nvalue (car (args));
4324 } 4079 }
4325 4080
4326 for (; x != NIL; x = cdr (x)) 4081 for (; x != NIL; x = cdr (x))
4327 { 4082 {
4328 if (ivalue (car (x)) != 0) 4083 if (ivalue (car (x)) != 0)
4329 v = num_intdiv (v, nvalue (car (x))); 4084 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4330 else 4085 else
4331 Error_0 ("quotient: division by zero"); 4086 Error_0 ("quotient: division by zero");
4332 } 4087 }
4333 4088
4334 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4335 4090
4336 case OP_REM: /* remainder */ 4091 case OP_REM: /* remainder */
4337 v = nvalue (car (SCHEME_V->args)); 4092 v = nvalue (x);
4338 4093
4339 if (ivalue (cadr (SCHEME_V->args)) != 0) 4094 if (ivalue (cadr (args)) != 0)
4340 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4095 v = num_rem (v, nvalue (cadr (args)));
4341 else 4096 else
4342 Error_0 ("remainder: division by zero"); 4097 Error_0 ("remainder: division by zero");
4343 4098
4344 s_return (mk_number (SCHEME_A_ v)); 4099 s_return (mk_number (SCHEME_A_ v));
4345 4100
4346 case OP_MOD: /* modulo */ 4101 case OP_MOD: /* modulo */
4347 v = nvalue (car (SCHEME_V->args)); 4102 v = nvalue (x);
4348 4103
4349 if (ivalue (cadr (SCHEME_V->args)) != 0) 4104 if (ivalue (cadr (args)) != 0)
4350 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4105 v = num_mod (v, nvalue (cadr (args)));
4351 else 4106 else
4352 Error_0 ("modulo: division by zero"); 4107 Error_0 ("modulo: division by zero");
4353 4108
4354 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4355 4110
4356 case OP_CAR: /* car */ 4111 case OP_CAR: /* car */
4357 s_return (caar (SCHEME_V->args)); 4112 s_return (caar (args));
4358 4113
4359 case OP_CDR: /* cdr */ 4114 case OP_CDR: /* cdr */
4360 s_return (cdar (SCHEME_V->args)); 4115 s_return (cdar (args));
4361 4116
4362 case OP_CONS: /* cons */ 4117 case OP_CONS: /* cons */
4363 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4118 set_cdr (args, cadr (args));
4364 s_return (SCHEME_V->args); 4119 s_return (args);
4365 4120
4366 case OP_SETCAR: /* set-car! */ 4121 case OP_SETCAR: /* set-car! */
4367 if (!is_immutable (car (SCHEME_V->args))) 4122 if (!is_immutable (x))
4368 { 4123 {
4369 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4124 set_car (x, cadr (args));
4370 s_return (car (SCHEME_V->args)); 4125 s_return (car (args));
4371 } 4126 }
4372 else 4127 else
4373 Error_0 ("set-car!: unable to alter immutable pair"); 4128 Error_0 ("set-car!: unable to alter immutable pair");
4374 4129
4375 case OP_SETCDR: /* set-cdr! */ 4130 case OP_SETCDR: /* set-cdr! */
4376 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4377 { 4132 {
4378 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_cdr (x, cadr (args));
4379 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4380 } 4135 }
4381 else 4136 else
4382 Error_0 ("set-cdr!: unable to alter immutable pair"); 4137 Error_0 ("set-cdr!: unable to alter immutable pair");
4383 4138
4384 case OP_CHAR2INT: /* char->integer */ 4139 case OP_CHAR2INT: /* char->integer */
4385 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4140 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4386 4141
4387 case OP_INT2CHAR: /* integer->char */ 4142 case OP_INT2CHAR: /* integer->char */
4388 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4143 s_return (mk_character (SCHEME_A_ ivalue (x)));
4389 4144
4390 case OP_CHARUPCASE: 4145 case OP_CHARUPCASE:
4391 { 4146 {
4392 unsigned char c = ivalue (car (SCHEME_V->args)); 4147 unsigned char c = ivalue (x);
4393 c = toupper (c); 4148 c = toupper (c);
4394 s_return (mk_character (SCHEME_A_ c)); 4149 s_return (mk_character (SCHEME_A_ c));
4395 } 4150 }
4396 4151
4397 case OP_CHARDNCASE: 4152 case OP_CHARDNCASE:
4398 { 4153 {
4399 unsigned char c = ivalue (car (SCHEME_V->args)); 4154 unsigned char c = ivalue (x);
4400 c = tolower (c); 4155 c = tolower (c);
4401 s_return (mk_character (SCHEME_A_ c)); 4156 s_return (mk_character (SCHEME_A_ c));
4402 } 4157 }
4403 4158
4404 case OP_STR2SYM: /* string->symbol */ 4159 case OP_STR2SYM: /* string->symbol */
4405 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4160 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4406 4161
4407 case OP_STR2ATOM: /* string->atom */ 4162 case OP_STR2ATOM: /* string->atom */
4408 { 4163 {
4409 char *s = strvalue (car (SCHEME_V->args)); 4164 char *s = strvalue (x);
4410 long pf = 0; 4165 long pf = 0;
4411 4166
4412 if (cdr (SCHEME_V->args) != NIL) 4167 if (cdr (args) != NIL)
4413 { 4168 {
4414 /* we know cadr(SCHEME_V->args) is a natural number */ 4169 /* we know cadr(args) is a natural number */
4415 /* see if it is 2, 8, 10, or 16, or error */ 4170 /* see if it is 2, 8, 10, or 16, or error */
4416 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4171 pf = ivalue_unchecked (cadr (args));
4417 4172
4418 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4173 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4419 { 4174 {
4420 /* base is OK */ 4175 /* base is OK */
4421 } 4176 }
4422 else 4177 else
4423 pf = -1; 4178 pf = -1;
4424 } 4179 }
4425 4180
4426 if (pf < 0) 4181 if (pf < 0)
4427 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4182 Error_1 ("string->atom: bad base:", cadr (args));
4428 else if (*s == '#') /* no use of base! */ 4183 else if (*s == '#') /* no use of base! */
4429 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4184 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4430 else 4185 else
4431 { 4186 {
4432 if (pf == 0 || pf == 10) 4187 if (pf == 0 || pf == 10)
… …
4443 } 4198 }
4444 } 4199 }
4445 } 4200 }
4446 4201
4447 case OP_SYM2STR: /* symbol->string */ 4202 case OP_SYM2STR: /* symbol->string */
4448 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4203 x = mk_string (SCHEME_A_ symname (x));
4449 setimmutable (x); 4204 setimmutable (x);
4450 s_return (x); 4205 s_return (x);
4451 4206
4452 case OP_ATOM2STR: /* atom->string */ 4207 case OP_ATOM2STR: /* atom->string */
4453 { 4208 {
4454 long pf = 0; 4209 long pf = 0;
4455 4210
4456 x = car (SCHEME_V->args);
4457
4458 if (cdr (SCHEME_V->args) != NIL) 4211 if (cdr (args) != NIL)
4459 { 4212 {
4460 /* we know cadr(SCHEME_V->args) is a natural number */ 4213 /* we know cadr(args) is a natural number */
4461 /* see if it is 2, 8, 10, or 16, or error */ 4214 /* see if it is 2, 8, 10, or 16, or error */
4462 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4215 pf = ivalue_unchecked (cadr (args));
4463 4216
4464 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4217 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4465 { 4218 {
4466 /* base is OK */ 4219 /* base is OK */
4467 } 4220 }
4468 else 4221 else
4469 pf = -1; 4222 pf = -1;
4470 } 4223 }
4471 4224
4472 if (pf < 0) 4225 if (pf < 0)
4473 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4226 Error_1 ("atom->string: bad base:", cadr (args));
4474 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4227 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4475 { 4228 {
4476 char *p; 4229 char *p;
4477 int len; 4230 int len;
4478 4231
… …
4486 case OP_MKSTRING: /* make-string */ 4239 case OP_MKSTRING: /* make-string */
4487 { 4240 {
4488 int fill = ' '; 4241 int fill = ' ';
4489 int len; 4242 int len;
4490 4243
4491 len = ivalue (car (SCHEME_V->args)); 4244 len = ivalue (x);
4492 4245
4493 if (cdr (SCHEME_V->args) != NIL) 4246 if (cdr (args) != NIL)
4494 fill = charvalue (cadr (SCHEME_V->args)); 4247 fill = charvalue (cadr (args));
4495 4248
4496 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4249 s_return (mk_empty_string (SCHEME_A_ len, fill));
4497 } 4250 }
4498 4251
4499 case OP_STRLEN: /* string-length */ 4252 case OP_STRLEN: /* string-length */
4500 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4253 s_return (mk_integer (SCHEME_A_ strlength (x)));
4501 4254
4502 case OP_STRREF: /* string-ref */ 4255 case OP_STRREF: /* string-ref */
4503 { 4256 {
4504 char *str; 4257 char *str;
4505 int index; 4258 int index;
4506 4259
4507 str = strvalue (car (SCHEME_V->args)); 4260 str = strvalue (x);
4508 4261
4509 index = ivalue (cadr (SCHEME_V->args)); 4262 index = ivalue (cadr (args));
4510 4263
4511 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4512 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4513 4266
4514 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4515 } 4268 }
4516 4269
4517 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4518 { 4271 {
4519 char *str; 4272 char *str;
4520 int index; 4273 int index;
4521 int c; 4274 int c;
4522 4275
4523 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4524 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4525 4278
4526 str = strvalue (car (SCHEME_V->args)); 4279 str = strvalue (x);
4527 4280
4528 index = ivalue (cadr (SCHEME_V->args)); 4281 index = ivalue (cadr (args));
4529 4282
4530 if (index >= strlength (car (SCHEME_V->args))) 4283 if (index >= strlength (x))
4531 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4284 Error_1 ("string-set!: out of bounds:", cadr (args));
4532 4285
4533 c = charvalue (caddr (SCHEME_V->args)); 4286 c = charvalue (caddr (args));
4534 4287
4535 str[index] = (char) c; 4288 str[index] = c;
4536 s_return (car (SCHEME_V->args)); 4289 s_return (car (args));
4537 } 4290 }
4538 4291
4539 case OP_STRAPPEND: /* string-append */ 4292 case OP_STRAPPEND: /* string-append */
4540 { 4293 {
4541 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4294 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4542 int len = 0; 4295 int len = 0;
4543 pointer newstr; 4296 pointer newstr;
4544 char *pos; 4297 char *pos;
4545 4298
4546 /* compute needed length for new string */ 4299 /* compute needed length for new string */
4547 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4300 for (x = args; x != NIL; x = cdr (x))
4548 len += strlength (car (x)); 4301 len += strlength (car (x));
4549 4302
4550 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4303 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4551 4304
4552 /* store the contents of the argument strings into the new string */ 4305 /* store the contents of the argument strings into the new string */
4553 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4306 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4554 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4307 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4555 4308
4556 s_return (newstr); 4309 s_return (newstr);
4557 } 4310 }
4558 4311
… …
4561 char *str; 4314 char *str;
4562 int index0; 4315 int index0;
4563 int index1; 4316 int index1;
4564 int len; 4317 int len;
4565 4318
4566 str = strvalue (car (SCHEME_V->args)); 4319 str = strvalue (x);
4567 4320
4568 index0 = ivalue (cadr (SCHEME_V->args)); 4321 index0 = ivalue (cadr (args));
4569 4322
4570 if (index0 > strlength (car (SCHEME_V->args))) 4323 if (index0 > strlength (x))
4571 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4324 Error_1 ("substring: start out of bounds:", cadr (args));
4572 4325
4573 if (cddr (SCHEME_V->args) != NIL) 4326 if (cddr (args) != NIL)
4574 { 4327 {
4575 index1 = ivalue (caddr (SCHEME_V->args)); 4328 index1 = ivalue (caddr (args));
4576 4329
4577 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4330 if (index1 > strlength (x) || index1 < index0)
4578 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4331 Error_1 ("substring: end out of bounds:", caddr (args));
4579 } 4332 }
4580 else 4333 else
4581 index1 = strlength (car (SCHEME_V->args)); 4334 index1 = strlength (x);
4582 4335
4583 len = index1 - index0; 4336 len = index1 - index0;
4584 x = mk_empty_string (SCHEME_A_ len, ' '); 4337 x = mk_empty_string (SCHEME_A_ len, ' ');
4585 memcpy (strvalue (x), str + index0, len); 4338 memcpy (strvalue (x), str + index0, len);
4586 strvalue (x)[len] = 0; 4339 strvalue (x)[len] = 0;
… …
4590 4343
4591 case OP_VECTOR: /* vector */ 4344 case OP_VECTOR: /* vector */
4592 { 4345 {
4593 int i; 4346 int i;
4594 pointer vec; 4347 pointer vec;
4595 int len = list_length (SCHEME_A_ SCHEME_V->args); 4348 int len = list_length (SCHEME_A_ args);
4596 4349
4597 if (len < 0) 4350 if (len < 0)
4598 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4351 Error_1 ("vector: not a proper list:", args);
4599 4352
4600 vec = mk_vector (SCHEME_A_ len); 4353 vec = mk_vector (SCHEME_A_ len);
4601 4354
4602#if USE_ERROR_CHECKING 4355#if USE_ERROR_CHECKING
4603 if (SCHEME_V->no_memory) 4356 if (SCHEME_V->no_memory)
4604 s_return (S_SINK); 4357 s_return (S_SINK);
4605#endif 4358#endif
4606 4359
4607 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4608 set_vector_elem (vec, i, car (x)); 4361 set_vector_elem (vec, i, car (x));
4609 4362
4610 s_return (vec); 4363 s_return (vec);
4611 } 4364 }
4612 4365
… …
4614 { 4367 {
4615 pointer fill = NIL; 4368 pointer fill = NIL;
4616 int len; 4369 int len;
4617 pointer vec; 4370 pointer vec;
4618 4371
4619 len = ivalue (car (SCHEME_V->args)); 4372 len = ivalue (x);
4620 4373
4621 if (cdr (SCHEME_V->args) != NIL) 4374 if (cdr (args) != NIL)
4622 fill = cadr (SCHEME_V->args); 4375 fill = cadr (args);
4623 4376
4624 vec = mk_vector (SCHEME_A_ len); 4377 vec = mk_vector (SCHEME_A_ len);
4625 4378
4626#if USE_ERROR_CHECKING 4379#if USE_ERROR_CHECKING
4627 if (SCHEME_V->no_memory) 4380 if (SCHEME_V->no_memory)
… …
4633 4386
4634 s_return (vec); 4387 s_return (vec);
4635 } 4388 }
4636 4389
4637 case OP_VECLEN: /* vector-length */ 4390 case OP_VECLEN: /* vector-length */
4638 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4391 s_return (mk_integer (SCHEME_A_ veclength (x)));
4639 4392
4640 case OP_VECREF: /* vector-ref */ 4393 case OP_VECREF: /* vector-ref */
4641 { 4394 {
4642 int index; 4395 int index;
4643 4396
4644 index = ivalue (cadr (SCHEME_V->args)); 4397 index = ivalue (cadr (args));
4645 4398
4646 if (index >= ivalue (car (SCHEME_V->args))) 4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4647 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4400 Error_1 ("vector-ref: out of bounds:", cadr (args));
4648 4401
4649 s_return (vector_elem (car (SCHEME_V->args), index)); 4402 s_return (vector_elem (x, index));
4650 } 4403 }
4651 4404
4652 case OP_VECSET: /* vector-set! */ 4405 case OP_VECSET: /* vector-set! */
4653 { 4406 {
4654 int index; 4407 int index;
4655 4408
4656 if (is_immutable (car (SCHEME_V->args))) 4409 if (is_immutable (x))
4657 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4410 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4658 4411
4659 index = ivalue (cadr (SCHEME_V->args)); 4412 index = ivalue (cadr (args));
4660 4413
4661 if (index >= ivalue (car (SCHEME_V->args))) 4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4662 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4415 Error_1 ("vector-set!: out of bounds:", cadr (args));
4663 4416
4664 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4417 set_vector_elem (x, index, caddr (args));
4665 s_return (car (SCHEME_V->args)); 4418 s_return (x);
4666 } 4419 }
4667 } 4420 }
4668 4421
4669 return S_T; 4422 if (USE_ERROR_CHECKING) abort ();
4670} 4423}
4671 4424
4672INTERFACE int 4425INTERFACE int
4673is_list (SCHEME_P_ pointer a) 4426is_list (SCHEME_P_ pointer a)
4674{ 4427{
… …
4721 return -1; 4474 return -1;
4722 } 4475 }
4723 } 4476 }
4724} 4477}
4725 4478
4726static pointer 4479static int
4480opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{
4482 pointer x = SCHEME_V->args;
4483
4484 for (;;)
4485 {
4486 num v = nvalue (car (x));
4487 x = cdr (x);
4488
4489 if (x == NIL)
4490 break;
4491
4492 int r = num_cmp (v, nvalue (car (x)));
4493
4494 switch (op)
4495 {
4496 case OP_NUMEQ: r = r == 0; break;
4497 case OP_LESS: r = r < 0; break;
4498 case OP_GRE: r = r > 0; break;
4499 case OP_LEQ: r = r <= 0; break;
4500 case OP_GEQ: r = r >= 0; break;
4501 }
4502
4503 if (!r)
4504 s_return (S_F);
4505 }
4506
4507 s_return (S_T);
4508}
4509
4510static int
4727opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4511opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4728{ 4512{
4729 pointer x; 4513 pointer args = SCHEME_V->args;
4730 num v; 4514 pointer a = car (args);
4731 int (*comp_func) (num, num); 4515 pointer d = cdr (args);
4516 int r;
4732 4517
4733 switch (op) 4518 switch (op)
4734 { 4519 {
4735 case OP_NOT: /* not */ 4520 case OP_NOT: /* not */ r = is_false (a) ; break;
4736 s_retbool (is_false (car (SCHEME_V->args))); 4521 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4737 4530
4738 case OP_BOOLP: /* boolean? */
4739 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4740
4741 case OP_EOFOBJP: /* boolean? */
4742 s_retbool (car (SCHEME_V->args) == S_EOF);
4743
4744 case OP_NULLP: /* null? */
4745 s_retbool (car (SCHEME_V->args) == NIL);
4746
4747 case OP_NUMEQ: /* = */
4748 case OP_LESS: /* < */
4749 case OP_GRE: /* > */
4750 case OP_LEQ: /* <= */
4751 case OP_GEQ: /* >= */
4752 switch (op)
4753 {
4754 case OP_NUMEQ:
4755 comp_func = num_eq;
4756 break;
4757
4758 case OP_LESS:
4759 comp_func = num_lt;
4760 break;
4761
4762 case OP_GRE:
4763 comp_func = num_gt;
4764 break;
4765
4766 case OP_LEQ:
4767 comp_func = num_le;
4768 break;
4769
4770 case OP_GEQ:
4771 comp_func = num_ge;
4772 break;
4773 }
4774
4775 x = SCHEME_V->args;
4776 v = nvalue (car (x));
4777 x = cdr (x);
4778
4779 for (; x != NIL; x = cdr (x))
4780 {
4781 if (!comp_func (v, nvalue (car (x))))
4782 s_retbool (0);
4783
4784 v = nvalue (car (x));
4785 }
4786
4787 s_retbool (1);
4788
4789 case OP_SYMBOLP: /* symbol? */
4790 s_retbool (is_symbol (car (SCHEME_V->args)));
4791
4792 case OP_NUMBERP: /* number? */
4793 s_retbool (is_number (car (SCHEME_V->args)));
4794
4795 case OP_STRINGP: /* string? */
4796 s_retbool (is_string (car (SCHEME_V->args)));
4797
4798 case OP_INTEGERP: /* integer? */
4799 s_retbool (is_integer (car (SCHEME_V->args)));
4800
4801 case OP_REALP: /* real? */
4802 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4803
4804 case OP_CHARP: /* char? */
4805 s_retbool (is_character (car (SCHEME_V->args)));
4806#if USE_CHAR_CLASSIFIERS 4531#if USE_CHAR_CLASSIFIERS
4807
4808 case OP_CHARAP: /* char-alphabetic? */ 4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
4809 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
4810
4811 case OP_CHARNP: /* char-numeric? */
4812 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4813
4814 case OP_CHARWP: /* char-whitespace? */ 4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
4815 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4816
4817 case OP_CHARUP: /* char-upper-case? */ 4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
4818 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4819
4820 case OP_CHARLP: /* char-lower-case? */ 4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
4821 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4822#endif 4537#endif
4538
4823#if USE_PORTS 4539#if USE_PORTS
4824 4540 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4825 case OP_PORTP: /* port? */
4826 s_retbool (is_port (car (SCHEME_V->args)));
4827
4828 case OP_INPORTP: /* input-port? */ 4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4829 s_retbool (is_inport (car (SCHEME_V->args)));
4830
4831 case OP_OUTPORTP: /* output-port? */ 4542 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4832 s_retbool (is_outport (car (SCHEME_V->args)));
4833#endif 4543#endif
4834 4544
4835 case OP_PROCP: /* procedure? */ 4545 case OP_PROCP: /* procedure? */
4836 4546
4837 /*-- 4547 /*--
4838 * continuation should be procedure by the example 4548 * continuation should be procedure by the example
4839 * (call-with-current-continuation procedure?) ==> #t 4549 * (call-with-current-continuation procedure?) ==> #t
4840 * in R^3 report sec. 6.9 4550 * in R^3 report sec. 6.9
4841 */ 4551 */
4842 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4552 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4843 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4553 break;
4844 4554
4845 case OP_PAIRP: /* pair? */ 4555 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4846 s_retbool (is_pair (car (SCHEME_V->args))); 4556 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4847 4557 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4848 case OP_LISTP: /* list? */ 4558 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4849 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4559 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4850 4560 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4851 case OP_ENVP: /* environment? */
4852 s_retbool (is_environment (car (SCHEME_V->args)));
4853
4854 case OP_VECTORP: /* vector? */
4855 s_retbool (is_vector (car (SCHEME_V->args)));
4856
4857 case OP_EQ: /* eq? */
4858 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4859
4860 case OP_EQV: /* eqv? */
4861 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4862 } 4561 }
4863 4562
4864 return S_T; 4563 s_retbool (r);
4865} 4564}
4866 4565
4867static pointer 4566static int
4868opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4567opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4869{ 4568{
4569 pointer args = SCHEME_V->args;
4570 pointer a = car (args);
4870 pointer x, y; 4571 pointer x, y;
4871 4572
4872 switch (op) 4573 switch (op)
4873 { 4574 {
4874 case OP_FORCE: /* force */ 4575 case OP_FORCE: /* force */
4875 SCHEME_V->code = car (SCHEME_V->args); 4576 SCHEME_V->code = a;
4876 4577
4877 if (is_promise (SCHEME_V->code)) 4578 if (is_promise (SCHEME_V->code))
4878 { 4579 {
4879 /* Should change type to closure here */ 4580 /* Should change type to closure here */
4880 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4581 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4901 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4602 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4902 SCHEME_V->outport = cadr (SCHEME_V->args); 4603 SCHEME_V->outport = cadr (SCHEME_V->args);
4903 } 4604 }
4904 } 4605 }
4905 4606
4906 SCHEME_V->args = car (SCHEME_V->args); 4607 SCHEME_V->args = a;
4907 4608
4908 if (op == OP_WRITE) 4609 if (op == OP_WRITE)
4909 SCHEME_V->print_flag = 1; 4610 SCHEME_V->print_flag = 1;
4910 else 4611 else
4911 SCHEME_V->print_flag = 0; 4612 SCHEME_V->print_flag = 0;
4912 4613
4913 s_goto (OP_P0LIST); 4614 s_goto (OP_P0LIST);
4914 4615
4915 case OP_NEWLINE: /* newline */ 4616 case OP_NEWLINE: /* newline */
4916 if (is_pair (SCHEME_V->args)) 4617 if (is_pair (args))
4917 { 4618 {
4918 if (car (SCHEME_V->args) != SCHEME_V->outport) 4619 if (a != SCHEME_V->outport)
4919 { 4620 {
4920 x = cons (SCHEME_V->outport, NIL); 4621 x = cons (SCHEME_V->outport, NIL);
4921 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4622 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4922 SCHEME_V->outport = car (SCHEME_V->args); 4623 SCHEME_V->outport = a;
4923 } 4624 }
4924 } 4625 }
4925 4626
4926 putstr (SCHEME_A_ "\n"); 4627 putstr (SCHEME_A_ "\n");
4927 s_return (S_T); 4628 s_return (S_T);
4928#endif 4629#endif
4929 4630
4930 case OP_ERR0: /* error */ 4631 case OP_ERR0: /* error */
4931 SCHEME_V->retcode = -1; 4632 SCHEME_V->retcode = -1;
4932 4633
4933 if (!is_string (car (SCHEME_V->args))) 4634 if (!is_string (a))
4934 { 4635 {
4935 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4636 args = cons (mk_string (SCHEME_A_ " -- "), args);
4936 setimmutable (car (SCHEME_V->args)); 4637 setimmutable (car (args));
4937 } 4638 }
4938 4639
4939 putstr (SCHEME_A_ "Error: "); 4640 putstr (SCHEME_A_ "Error: ");
4940 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4641 putstr (SCHEME_A_ strvalue (car (args)));
4941 SCHEME_V->args = cdr (SCHEME_V->args); 4642 SCHEME_V->args = cdr (args);
4942 s_goto (OP_ERR1); 4643 s_goto (OP_ERR1);
4943 4644
4944 case OP_ERR1: /* error */ 4645 case OP_ERR1: /* error */
4945 putstr (SCHEME_A_ " "); 4646 putstr (SCHEME_A_ " ");
4946 4647
4947 if (SCHEME_V->args != NIL) 4648 if (args != NIL)
4948 { 4649 {
4949 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4650 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4950 SCHEME_V->args = car (SCHEME_V->args); 4651 SCHEME_V->args = a;
4951 SCHEME_V->print_flag = 1; 4652 SCHEME_V->print_flag = 1;
4952 s_goto (OP_P0LIST); 4653 s_goto (OP_P0LIST);
4953 } 4654 }
4954 else 4655 else
4955 { 4656 {
4956 putstr (SCHEME_A_ "\n"); 4657 putstr (SCHEME_A_ "\n");
4957 4658
4958 if (SCHEME_V->interactive_repl) 4659 if (SCHEME_V->interactive_repl)
4959 s_goto (OP_T0LVL); 4660 s_goto (OP_T0LVL);
4960 else 4661 else
4961 return NIL; 4662 return -1;
4962 } 4663 }
4963 4664
4964 case OP_REVERSE: /* reverse */ 4665 case OP_REVERSE: /* reverse */
4965 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4666 s_return (reverse (SCHEME_A_ a));
4966 4667
4967 case OP_LIST_STAR: /* list* */ 4668 case OP_LIST_STAR: /* list* */
4968 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4669 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4969 4670
4970 case OP_APPEND: /* append */ 4671 case OP_APPEND: /* append */
4971 x = NIL; 4672 x = NIL;
4972 y = SCHEME_V->args; 4673 y = args;
4973 4674
4974 if (y == x) 4675 if (y == x)
4975 s_return (x); 4676 s_return (x);
4976 4677
4977 /* cdr() in the while condition is not a typo. If car() */ 4678 /* cdr() in the while condition is not a typo. If car() */
… …
4988 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4689 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4989 4690
4990#if USE_PLIST 4691#if USE_PLIST
4991 4692
4992 case OP_PUT: /* put */ 4693 case OP_PUT: /* put */
4993 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4694 if (!hasprop (a) || !hasprop (cadr (args)))
4994 Error_0 ("illegal use of put"); 4695 Error_0 ("illegal use of put");
4995 4696
4996 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4697 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4997 { 4698 {
4998 if (caar (x) == y) 4699 if (caar (x) == y)
4999 break; 4700 break;
5000 } 4701 }
5001 4702
5002 if (x != NIL) 4703 if (x != NIL)
5003 cdar (x) = caddr (SCHEME_V->args); 4704 cdar (x) = caddr (args);
5004 else 4705 else
5005 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4706 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5006 4707
5007 s_return (S_T); 4708 s_return (S_T);
5008 4709
5009 case OP_GET: /* get */ 4710 case OP_GET: /* get */
5010 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4711 if (!hasprop (a) || !hasprop (cadr (args)))
5011 Error_0 ("illegal use of get"); 4712 Error_0 ("illegal use of get");
5012 4713
5013 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4714 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5014 if (caar (x) == y) 4715 if (caar (x) == y)
5015 break; 4716 break;
5016 4717
5017 if (x != NIL) 4718 if (x != NIL)
5018 s_return (cdar (x)); 4719 s_return (cdar (x));
… …
5020 s_return (NIL); 4721 s_return (NIL);
5021 4722
5022#endif /* USE_PLIST */ 4723#endif /* USE_PLIST */
5023 4724
5024 case OP_QUIT: /* quit */ 4725 case OP_QUIT: /* quit */
5025 if (is_pair (SCHEME_V->args)) 4726 if (is_pair (args))
5026 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4727 SCHEME_V->retcode = ivalue (a);
5027 4728
5028 return NIL; 4729 return -1;
5029 4730
5030 case OP_GC: /* gc */ 4731 case OP_GC: /* gc */
5031 gc (SCHEME_A_ NIL, NIL); 4732 gc (SCHEME_A_ NIL, NIL);
5032 s_return (S_T); 4733 s_return (S_T);
5033 4734
5034 case OP_GCVERB: /* gc-verbose */ 4735 case OP_GCVERB: /* gc-verbose */
5035 { 4736 {
5036 int was = SCHEME_V->gc_verbose; 4737 int was = SCHEME_V->gc_verbose;
5037 4738
5038 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4739 SCHEME_V->gc_verbose = (a != S_F);
5039 s_retbool (was); 4740 s_retbool (was);
5040 } 4741 }
5041 4742
5042 case OP_NEWSEGMENT: /* new-segment */ 4743 case OP_NEWSEGMENT: /* new-segment */
5043 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4744 if (!is_pair (args) || !is_number (a))
5044 Error_0 ("new-segment: argument must be a number"); 4745 Error_0 ("new-segment: argument must be a number");
5045 4746
5046 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
5047 4748
5048 s_return (S_T); 4749 s_return (S_T);
5049 4750
5050 case OP_OBLIST: /* oblist */ 4751 case OP_OBLIST: /* oblist */
5051 s_return (oblist_all_symbols (SCHEME_A)); 4752 s_return (oblist_all_symbols (SCHEME_A));
… …
5078 case OP_OPEN_INOUTFILE: 4779 case OP_OPEN_INOUTFILE:
5079 prop = port_input | port_output; 4780 prop = port_input | port_output;
5080 break; 4781 break;
5081 } 4782 }
5082 4783
5083 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4784 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5084 4785
5085 if (p == NIL) 4786 s_return (p == NIL ? S_F : p);
5086 s_return (S_F);
5087
5088 s_return (p);
5089 } 4787 }
5090 4788
5091# if USE_STRING_PORTS 4789# if USE_STRING_PORTS
5092 4790
5093 case OP_OPEN_INSTRING: /* open-input-string */ 4791 case OP_OPEN_INSTRING: /* open-input-string */
… …
5105 case OP_OPEN_INOUTSTRING: 4803 case OP_OPEN_INOUTSTRING:
5106 prop = port_input | port_output; 4804 prop = port_input | port_output;
5107 break; 4805 break;
5108 } 4806 }
5109 4807
5110 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
5111 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4809 strvalue (a) + strlength (a), prop);
5112 4810
5113 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
5114 s_return (S_F);
5115
5116 s_return (p);
5117 } 4812 }
5118 4813
5119 case OP_OPEN_OUTSTRING: /* open-output-string */ 4814 case OP_OPEN_OUTSTRING: /* open-output-string */
5120 { 4815 {
5121 pointer p; 4816 pointer p;
5122 4817
5123 if (car (SCHEME_V->args) == NIL) 4818 if (a == NIL)
5124 {
5125 p = port_from_scratch (SCHEME_A); 4819 p = port_from_scratch (SCHEME_A);
5126
5127 if (p == NIL)
5128 s_return (S_F);
5129 }
5130 else 4820 else
5131 {
5132 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4821 p = port_from_string (SCHEME_A_ strvalue (a),
5133 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4822 strvalue (a) + strlength (a), port_output);
5134 4823
5135 if (p == NIL) 4824 s_return (p == NIL ? S_F : p);
5136 s_return (S_F);
5137 }
5138
5139 s_return (p);
5140 } 4825 }
5141 4826
5142 case OP_GET_OUTSTRING: /* get-output-string */ 4827 case OP_GET_OUTSTRING: /* get-output-string */
5143 { 4828 {
5144 port *p; 4829 port *p;
5145 4830
5146 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4831 if ((p = a->object.port)->kind & port_string)
5147 { 4832 {
5148 off_t size; 4833 off_t size;
5149 char *str; 4834 char *str;
5150 4835
5151 size = p->rep.string.curr - p->rep.string.start + 1; 4836 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5167 } 4852 }
5168 4853
5169# endif 4854# endif
5170 4855
5171 case OP_CLOSE_INPORT: /* close-input-port */ 4856 case OP_CLOSE_INPORT: /* close-input-port */
5172 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4857 port_close (SCHEME_A_ a, port_input);
5173 s_return (S_T); 4858 s_return (S_T);
5174 4859
5175 case OP_CLOSE_OUTPORT: /* close-output-port */ 4860 case OP_CLOSE_OUTPORT: /* close-output-port */
5176 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4861 port_close (SCHEME_A_ a, port_output);
5177 s_return (S_T); 4862 s_return (S_T);
5178#endif 4863#endif
5179 4864
5180 case OP_INT_ENV: /* interaction-environment */ 4865 case OP_INT_ENV: /* interaction-environment */
5181 s_return (SCHEME_V->global_env); 4866 s_return (SCHEME_V->global_env);
… …
5183 case OP_CURR_ENV: /* current-environment */ 4868 case OP_CURR_ENV: /* current-environment */
5184 s_return (SCHEME_V->envir); 4869 s_return (SCHEME_V->envir);
5185 4870
5186 } 4871 }
5187 4872
5188 return S_T; 4873 if (USE_ERROR_CHECKING) abort ();
5189} 4874}
5190 4875
5191static pointer 4876static int
5192opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4877opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5193{ 4878{
4879 pointer args = SCHEME_V->args;
5194 pointer x; 4880 pointer x;
5195 4881
5196 if (SCHEME_V->nesting != 0) 4882 if (SCHEME_V->nesting != 0)
5197 { 4883 {
5198 int n = SCHEME_V->nesting; 4884 int n = SCHEME_V->nesting;
… …
5205 switch (op) 4891 switch (op)
5206 { 4892 {
5207 /* ========== reading part ========== */ 4893 /* ========== reading part ========== */
5208#if USE_PORTS 4894#if USE_PORTS
5209 case OP_READ: 4895 case OP_READ:
5210 if (!is_pair (SCHEME_V->args)) 4896 if (!is_pair (args))
5211 s_goto (OP_READ_INTERNAL); 4897 s_goto (OP_READ_INTERNAL);
5212 4898
5213 if (!is_inport (car (SCHEME_V->args))) 4899 if (!is_inport (car (args)))
5214 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4900 Error_1 ("read: not an input port:", car (args));
5215 4901
5216 if (car (SCHEME_V->args) == SCHEME_V->inport) 4902 if (car (args) == SCHEME_V->inport)
5217 s_goto (OP_READ_INTERNAL); 4903 s_goto (OP_READ_INTERNAL);
5218 4904
5219 x = SCHEME_V->inport; 4905 x = SCHEME_V->inport;
5220 SCHEME_V->inport = car (SCHEME_V->args); 4906 SCHEME_V->inport = car (args);
5221 x = cons (x, NIL); 4907 x = cons (x, NIL);
5222 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4908 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5223 s_goto (OP_READ_INTERNAL); 4909 s_goto (OP_READ_INTERNAL);
5224 4910
5225 case OP_READ_CHAR: /* read-char */ 4911 case OP_READ_CHAR: /* read-char */
5226 case OP_PEEK_CHAR: /* peek-char */ 4912 case OP_PEEK_CHAR: /* peek-char */
5227 { 4913 {
5228 int c; 4914 int c;
5229 4915
5230 if (is_pair (SCHEME_V->args)) 4916 if (is_pair (args))
5231 { 4917 {
5232 if (car (SCHEME_V->args) != SCHEME_V->inport) 4918 if (car (args) != SCHEME_V->inport)
5233 { 4919 {
5234 x = SCHEME_V->inport; 4920 x = SCHEME_V->inport;
5235 x = cons (x, NIL); 4921 x = cons (x, NIL);
5236 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4922 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5237 SCHEME_V->inport = car (SCHEME_V->args); 4923 SCHEME_V->inport = car (args);
5238 } 4924 }
5239 } 4925 }
5240 4926
5241 c = inchar (SCHEME_A); 4927 c = inchar (SCHEME_A);
5242 4928
… …
5252 case OP_CHAR_READY: /* char-ready? */ 4938 case OP_CHAR_READY: /* char-ready? */
5253 { 4939 {
5254 pointer p = SCHEME_V->inport; 4940 pointer p = SCHEME_V->inport;
5255 int res; 4941 int res;
5256 4942
5257 if (is_pair (SCHEME_V->args)) 4943 if (is_pair (args))
5258 p = car (SCHEME_V->args); 4944 p = car (args);
5259 4945
5260 res = p->object.port->kind & port_string; 4946 res = p->object.port->kind & port_string;
5261 4947
5262 s_retbool (res); 4948 s_retbool (res);
5263 } 4949 }
5264 4950
5265 case OP_SET_INPORT: /* set-input-port */ 4951 case OP_SET_INPORT: /* set-input-port */
5266 SCHEME_V->inport = car (SCHEME_V->args); 4952 SCHEME_V->inport = car (args);
5267 s_return (SCHEME_V->value); 4953 s_return (SCHEME_V->value);
5268 4954
5269 case OP_SET_OUTPORT: /* set-output-port */ 4955 case OP_SET_OUTPORT: /* set-output-port */
5270 SCHEME_V->outport = car (SCHEME_V->args); 4956 SCHEME_V->outport = car (args);
5271 s_return (SCHEME_V->value); 4957 s_return (SCHEME_V->value);
5272#endif 4958#endif
5273 4959
5274 case OP_RDSEXPR: 4960 case OP_RDSEXPR:
5275 switch (SCHEME_V->tok) 4961 switch (SCHEME_V->tok)
… …
5361 } 5047 }
5362 5048
5363 break; 5049 break;
5364 5050
5365 case OP_RDLIST: 5051 case OP_RDLIST:
5366 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5052 SCHEME_V->args = cons (SCHEME_V->value, args);
5367 SCHEME_V->tok = token (SCHEME_A); 5053 SCHEME_V->tok = token (SCHEME_A);
5368 5054
5369 switch (SCHEME_V->tok) 5055 switch (SCHEME_V->tok)
5370 { 5056 {
5371 case TOK_EOF: 5057 case TOK_EOF:
… …
5399 case OP_RDDOT: 5085 case OP_RDDOT:
5400 if (token (SCHEME_A) != TOK_RPAREN) 5086 if (token (SCHEME_A) != TOK_RPAREN)
5401 Error_0 ("syntax error: illegal dot expression"); 5087 Error_0 ("syntax error: illegal dot expression");
5402 5088
5403 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5089 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5404 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5090 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5405 5091
5406 case OP_RDQUOTE: 5092 case OP_RDQUOTE:
5407 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5093 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5408 5094
5409 case OP_RDQQUOTE: 5095 case OP_RDQQUOTE:
… …
5431 SCHEME_V->args = SCHEME_V->value; 5117 SCHEME_V->args = SCHEME_V->value;
5432 s_goto (OP_VECTOR); 5118 s_goto (OP_VECTOR);
5433 5119
5434 /* ========== printing part ========== */ 5120 /* ========== printing part ========== */
5435 case OP_P0LIST: 5121 case OP_P0LIST:
5436 if (is_vector (SCHEME_V->args)) 5122 if (is_vector (args))
5437 { 5123 {
5438 putstr (SCHEME_A_ "#("); 5124 putstr (SCHEME_A_ "#(");
5439 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5125 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5440 s_goto (OP_PVECFROM); 5126 s_goto (OP_PVECFROM);
5441 } 5127 }
5442 else if (is_environment (SCHEME_V->args)) 5128 else if (is_environment (args))
5443 { 5129 {
5444 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5130 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5445 s_return (S_T); 5131 s_return (S_T);
5446 } 5132 }
5447 else if (!is_pair (SCHEME_V->args)) 5133 else if (!is_pair (args))
5448 { 5134 {
5449 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5135 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5450 s_return (S_T); 5136 s_return (S_T);
5451 } 5137 }
5452 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5138 else
5453 { 5139 {
5140 pointer a = car (args);
5141 pointer b = cdr (args);
5142 int ok_abbr = ok_abbrev (b);
5143 SCHEME_V->args = car (b);
5144
5145 if (a == SCHEME_V->QUOTE && ok_abbr)
5454 putstr (SCHEME_A_ "'"); 5146 putstr (SCHEME_A_ "'");
5455 SCHEME_V->args = cadr (SCHEME_V->args); 5147 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5148 putstr (SCHEME_A_ "`");
5149 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5150 putstr (SCHEME_A_ ",");
5151 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5152 putstr (SCHEME_A_ ",@");
5153 else
5154 {
5155 putstr (SCHEME_A_ "(");
5156 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5157 SCHEME_V->args = a;
5158 }
5159
5456 s_goto (OP_P0LIST); 5160 s_goto (OP_P0LIST);
5457 } 5161 }
5458 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5162
5163 case OP_P1LIST:
5164 if (is_pair (args))
5459 { 5165 {
5166 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5460 putstr (SCHEME_A_ "`"); 5167 putstr (SCHEME_A_ " ");
5461 SCHEME_V->args = cadr (SCHEME_V->args); 5168 SCHEME_V->args = car (args);
5462 s_goto (OP_P0LIST); 5169 s_goto (OP_P0LIST);
5463 } 5170 }
5464 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5465 {
5466 putstr (SCHEME_A_ ",");
5467 SCHEME_V->args = cadr (SCHEME_V->args);
5468 s_goto (OP_P0LIST);
5469 }
5470 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5471 {
5472 putstr (SCHEME_A_ ",@");
5473 SCHEME_V->args = cadr (SCHEME_V->args);
5474 s_goto (OP_P0LIST);
5475 }
5476 else
5477 {
5478 putstr (SCHEME_A_ "(");
5479 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5480 SCHEME_V->args = car (SCHEME_V->args);
5481 s_goto (OP_P0LIST);
5482 }
5483
5484 case OP_P1LIST:
5485 if (is_pair (SCHEME_V->args))
5486 {
5487 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5488 putstr (SCHEME_A_ " ");
5489 SCHEME_V->args = car (SCHEME_V->args);
5490 s_goto (OP_P0LIST);
5491 }
5492 else if (is_vector (SCHEME_V->args)) 5171 else if (is_vector (args))
5493 { 5172 {
5494 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5173 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5495 putstr (SCHEME_A_ " . "); 5174 putstr (SCHEME_A_ " . ");
5496 s_goto (OP_P0LIST); 5175 s_goto (OP_P0LIST);
5497 } 5176 }
5498 else 5177 else
5499 { 5178 {
5500 if (SCHEME_V->args != NIL) 5179 if (args != NIL)
5501 { 5180 {
5502 putstr (SCHEME_A_ " . "); 5181 putstr (SCHEME_A_ " . ");
5503 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5182 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5504 } 5183 }
5505 5184
5506 putstr (SCHEME_A_ ")"); 5185 putstr (SCHEME_A_ ")");
5507 s_return (S_T); 5186 s_return (S_T);
5508 } 5187 }
5509 5188
5510 case OP_PVECFROM: 5189 case OP_PVECFROM:
5511 { 5190 {
5512 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5191 int i = ivalue_unchecked (cdr (args));
5513 pointer vec = car (SCHEME_V->args); 5192 pointer vec = car (args);
5514 int len = ivalue_unchecked (vec); 5193 int len = veclength (vec);
5515 5194
5516 if (i == len) 5195 if (i == len)
5517 { 5196 {
5518 putstr (SCHEME_A_ ")"); 5197 putstr (SCHEME_A_ ")");
5519 s_return (S_T); 5198 s_return (S_T);
5520 } 5199 }
5521 else 5200 else
5522 { 5201 {
5523 pointer elem = vector_elem (vec, i); 5202 pointer elem = vector_elem (vec, i);
5524 5203
5525 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5204 ivalue_unchecked (cdr (args)) = i + 1;
5526 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5205 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5527 SCHEME_V->args = elem; 5206 SCHEME_V->args = elem;
5528 5207
5529 if (i > 0) 5208 if (i > 0)
5530 putstr (SCHEME_A_ " "); 5209 putstr (SCHEME_A_ " ");
5531 5210
5532 s_goto (OP_P0LIST); 5211 s_goto (OP_P0LIST);
5533 } 5212 }
5534 } 5213 }
5535 } 5214 }
5536 5215
5537 return S_T; 5216 if (USE_ERROR_CHECKING) abort ();
5538} 5217}
5539 5218
5540static pointer 5219static int
5541opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5220opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5542{ 5221{
5222 pointer args = SCHEME_V->args;
5223 pointer a = car (args);
5543 pointer x, y; 5224 pointer x, y;
5544 5225
5545 switch (op) 5226 switch (op)
5546 { 5227 {
5547 case OP_LIST_LENGTH: /* length *//* a.k */ 5228 case OP_LIST_LENGTH: /* length *//* a.k */
5548 { 5229 {
5549 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5230 long v = list_length (SCHEME_A_ a);
5550 5231
5551 if (v < 0) 5232 if (v < 0)
5552 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5233 Error_1 ("length: not a list:", a);
5553 5234
5554 s_return (mk_integer (SCHEME_A_ v)); 5235 s_return (mk_integer (SCHEME_A_ v));
5555 } 5236 }
5556 5237
5557 case OP_ASSQ: /* assq *//* a.k */ 5238 case OP_ASSQ: /* assq *//* a.k */
5558 x = car (SCHEME_V->args); 5239 x = a;
5559 5240
5560 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5241 for (y = cadr (args); is_pair (y); y = cdr (y))
5561 { 5242 {
5562 if (!is_pair (car (y))) 5243 if (!is_pair (car (y)))
5563 Error_0 ("unable to handle non pair element"); 5244 Error_0 ("unable to handle non pair element");
5564 5245
5565 if (x == caar (y)) 5246 if (x == caar (y))
… …
5571 else 5252 else
5572 s_return (S_F); 5253 s_return (S_F);
5573 5254
5574 5255
5575 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5256 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5576 SCHEME_V->args = car (SCHEME_V->args); 5257 SCHEME_V->args = a;
5577 5258
5578 if (SCHEME_V->args == NIL) 5259 if (SCHEME_V->args == NIL)
5579 s_return (S_F); 5260 s_return (S_F);
5580 else if (is_closure (SCHEME_V->args)) 5261 else if (is_closure (SCHEME_V->args))
5581 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5262 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5587 case OP_CLOSUREP: /* closure? */ 5268 case OP_CLOSUREP: /* closure? */
5588 /* 5269 /*
5589 * Note, macro object is also a closure. 5270 * Note, macro object is also a closure.
5590 * Therefore, (closure? <#MACRO>) ==> #t 5271 * Therefore, (closure? <#MACRO>) ==> #t
5591 */ 5272 */
5592 s_retbool (is_closure (car (SCHEME_V->args))); 5273 s_retbool (is_closure (a));
5593 5274
5594 case OP_MACROP: /* macro? */ 5275 case OP_MACROP: /* macro? */
5595 s_retbool (is_macro (car (SCHEME_V->args))); 5276 s_retbool (is_macro (a));
5596 } 5277 }
5597 5278
5598 return S_T; /* NOTREACHED */ 5279 if (USE_ERROR_CHECKING) abort ();
5599} 5280}
5600 5281
5282/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5601typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5283typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5602 5284
5603typedef int (*test_predicate) (pointer); 5285typedef int (*test_predicate)(pointer);
5604static int 5286static int
5605is_any (pointer p) 5287is_any (pointer p)
5606{ 5288{
5607 return 1; 5289 return 1;
5608} 5290}
5609 5291
5610static int 5292static int
5611is_nonneg (pointer p) 5293is_nonneg (pointer p)
5612{ 5294{
5613 return ivalue (p) >= 0 && is_integer (p); 5295 return ivalue (p) >= 0 && is_integer (p);
5296}
5297
5298static int
5299tst_is_list (pointer p)
5300{
5301 return p == NIL || is_pair (p);
5614} 5302}
5615 5303
5616/* Correspond carefully with following defines! */ 5304/* Correspond carefully with following defines! */
5617static struct 5305static struct
5618{ 5306{
5619 test_predicate fct; 5307 test_predicate fct;
5620 const char *kind; 5308 const char *kind;
5621} tests[] = 5309} tests[] =
5622{ 5310{
5623 { 0, 0}, /* unused */ 5311 { is_any, 0 },
5624 { is_any, 0}, 5312 { is_string, "string" },
5625 { is_string, "string" }, 5313 { is_symbol, "symbol" },
5626 { is_symbol, "symbol" }, 5314 { is_port, "port" },
5627 { is_port, "port" },
5628 { is_inport, "input port" }, 5315 { is_inport, "input port" },
5629 { is_outport, "output port" }, 5316 { is_outport, "output port" },
5630 { is_environment, "environment" }, 5317 { is_environment, "environment" },
5631 { is_pair, "pair" }, 5318 { is_pair, "pair" },
5632 { 0, "pair or '()" }, 5319 { tst_is_list, "pair or '()" },
5633 { is_character, "character" }, 5320 { is_character, "character" },
5634 { is_vector, "vector" }, 5321 { is_vector, "vector" },
5635 { is_number, "number" }, 5322 { is_number, "number" },
5636 { is_integer, "integer" }, 5323 { is_integer, "integer" },
5637 { is_nonneg, "non-negative integer" } 5324 { is_nonneg, "non-negative integer" }
5638}; 5325};
5639 5326
5640#define TST_NONE 0 5327#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5641#define TST_ANY "\001" 5328#define TST_ANY "\001"
5642#define TST_STRING "\002" 5329#define TST_STRING "\002"
5643#define TST_SYMBOL "\003" 5330#define TST_SYMBOL "\003"
5644#define TST_PORT "\004" 5331#define TST_PORT "\004"
5645#define TST_INPORT "\005" 5332#define TST_INPORT "\005"
5646#define TST_OUTPORT "\006" 5333#define TST_OUTPORT "\006"
5647#define TST_ENVIRONMENT "\007" 5334#define TST_ENVIRONMENT "\007"
5648#define TST_PAIR "\010" 5335#define TST_PAIR "\010"
5649#define TST_LIST "\011" 5336#define TST_LIST "\011"
5650#define TST_CHAR "\012" 5337#define TST_CHAR "\012"
5651#define TST_VECTOR "\013" 5338#define TST_VECTOR "\013"
5652#define TST_NUMBER "\014" 5339#define TST_NUMBER "\014"
5653#define TST_INTEGER "\015" 5340#define TST_INTEGER "\015"
5654#define TST_NATURAL "\016" 5341#define TST_NATURAL "\016"
5342
5343#define INF_ARG 0xff
5344#define UNNAMED_OP ""
5345
5346static const char opnames[] =
5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5348#include "opdefines.h"
5349#undef OP_DEF
5350;
5351
5352static const char *
5353opname (int idx)
5354{
5355 const char *name = opnames;
5356
5357 /* should do this at compile time, but would require external program, right? */
5358 while (idx--)
5359 name += strlen (name) + 1;
5360
5361 return *name ? name : "ILLEGAL";
5362}
5363
5364static const char *
5365procname (pointer x)
5366{
5367 return opname (procnum (x));
5368}
5655 5369
5656typedef struct 5370typedef struct
5657{ 5371{
5658 dispatch_func func; 5372 uint8_t func;
5659 char *name; 5373 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374 uint8_t builtin;
5660 int min_arity; 5375 uint8_t min_arity;
5661 int max_arity; 5376 uint8_t max_arity;
5662 char *arg_tests_encoding; 5377 char arg_tests_encoding[3];
5663} op_code_info; 5378} op_code_info;
5664 5379
5665#define INF_ARG 0xffff
5666
5667static op_code_info dispatch_table[] = { 5380static const op_code_info dispatch_table[] = {
5668#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5381#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5669#include "opdefines.h" 5382#include "opdefines.h"
5383#undef OP_DEF
5670 {0} 5384 {0}
5671}; 5385};
5672 5386
5673static const char *
5674procname (pointer x)
5675{
5676 int n = procnum (x);
5677 const char *name = dispatch_table[n].name;
5678
5679 if (name == 0)
5680 name = "ILLEGAL!";
5681
5682 return name;
5683}
5684
5685/* kernel of this interpreter */ 5387/* kernel of this interpreter */
5686static void 5388static void ecb_hot
5687Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5389Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5688{ 5390{
5689 SCHEME_V->op = op; 5391 SCHEME_V->op = op;
5690 5392
5691 for (;;) 5393 for (;;)
5692 { 5394 {
5693 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5395 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5694 5396
5397#if USE_ERROR_CHECKING
5695 if (pcd->name) /* if built-in function, check arguments */ 5398 if (pcd->builtin) /* if built-in function, check arguments */
5696 { 5399 {
5697#if USE_ERROR_CHECKING
5698 char msg[STRBUFFSIZE]; 5400 char msg[STRBUFFSIZE];
5699 int ok = 1;
5700 int n = list_length (SCHEME_A_ SCHEME_V->args); 5401 int n = list_length (SCHEME_A_ SCHEME_V->args);
5701 5402
5702 /* Check number of arguments */ 5403 /* Check number of arguments */
5703 if (n < pcd->min_arity) 5404 if (ecb_expect_false (n < pcd->min_arity))
5704 { 5405 {
5705 ok = 0;
5706 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5406 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5707 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5407 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5408 xError_1 (SCHEME_A_ msg, 0);
5409 continue;
5708 } 5410 }
5709 5411 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5710 if (ok && n > pcd->max_arity)
5711 { 5412 {
5712 ok = 0;
5713 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5413 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5714 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5414 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5415 xError_1 (SCHEME_A_ msg, 0);
5416 continue;
5715 } 5417 }
5716#endif 5418 else
5717
5718 if (ok)
5719 { 5419 {
5720 if (pcd->arg_tests_encoding && USE_ERROR_CHECKING) 5420 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5721 { 5421 {
5722 int i = 0; 5422 int i = 0;
5723 int j; 5423 int j;
5724 const char *t = pcd->arg_tests_encoding; 5424 const char *t = pcd->arg_tests_encoding;
5725 pointer arglist = SCHEME_V->args; 5425 pointer arglist = SCHEME_V->args;
5726 5426
5727 do 5427 do
5728 { 5428 {
5729 pointer arg = car (arglist); 5429 pointer arg = car (arglist);
5730 5430
5731 j = (int) t[0]; 5431 j = t[0];
5732 5432
5733 if (j == TST_LIST[0]) 5433 if (!tests[j - 1].fct (arg))
5734 {
5735 if (arg != NIL && !is_pair (arg))
5736 break; 5434 break;
5737 }
5738 else
5739 {
5740 if (!tests[j].fct (arg))
5741 break;
5742 }
5743 5435
5744 if (t[1] != 0) /* last test is replicated as necessary */ 5436 if (t[1]) /* last test is replicated as necessary */
5745 t++; 5437 t++;
5746 5438
5747 arglist = cdr (arglist); 5439 arglist = cdr (arglist);
5748 i++; 5440 i++;
5749 } 5441 }
5750 while (i < n); 5442 while (i < n);
5751 5443
5752 if (i < n) 5444 if (i < n)
5753 { 5445 {
5754 ok = 0;
5755 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5446 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5447 xError_1 (SCHEME_A_ msg, 0);
5448 continue;
5756 } 5449 }
5757 } 5450 }
5758 } 5451 }
5759
5760 if (!ok)
5761 {
5762 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5763 return;
5764
5765 pcd = dispatch_table + SCHEME_V->op;
5766 }
5767 } 5452 }
5453#endif
5768 5454
5769 ok_to_freely_gc (SCHEME_A); 5455 ok_to_freely_gc (SCHEME_A);
5770 5456
5771 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5457 static const dispatch_func dispatch_funcs[] = {
5458 opexe_0,
5459 opexe_1,
5460 opexe_2,
5461 opexe_3,
5462 opexe_4,
5463 opexe_5,
5464 opexe_6,
5465 };
5466
5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5772 return; 5468 return;
5773 5469
5774#if USE_ERROR_CHECKING 5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5775 if (SCHEME_V->no_memory)
5776 { 5471 {
5777 xwrstr ("No memory!\n"); 5472 xwrstr ("No memory!\n");
5778 return; 5473 return;
5779 } 5474 }
5780#endif
5781 } 5475 }
5782} 5476}
5783 5477
5784/* ========== Initialization of internal keywords ========== */ 5478/* ========== Initialization of internal keywords ========== */
5785 5479
… …
5836 5530
5837 case 'd': 5531 case 'd':
5838 return OP_COND0; /* cond */ 5532 return OP_COND0; /* cond */
5839 5533
5840 case '*': 5534 case '*':
5841 return OP_LET0AST; /* let* */ 5535 return OP_LET0AST;/* let* */
5842 5536
5843 default: 5537 default:
5844 return OP_SET0; /* set! */ 5538 return OP_SET0; /* set! */
5845 } 5539 }
5846 5540
… …
5868 5562
5869 case 'f': 5563 case 'f':
5870 return OP_DEF0; /* define */ 5564 return OP_DEF0; /* define */
5871 5565
5872 default: 5566 default:
5873 return OP_LET0REC; /* letrec */ 5567 return OP_LET0REC;/* letrec */
5874 } 5568 }
5875 5569
5876 default: 5570 default:
5877 return OP_C0STREAM; /* cons-stream */ 5571 return OP_C0STREAM; /* cons-stream */
5878 } 5572 }
5879} 5573}
5880 5574
5881#if USE_MULTIPLICITY 5575#if USE_MULTIPLICITY
5882scheme * 5576ecb_cold scheme *
5883scheme_init_new () 5577scheme_init_new ()
5884{ 5578{
5885 scheme *sc = malloc (sizeof (scheme)); 5579 scheme *sc = malloc (sizeof (scheme));
5886 5580
5887 if (!scheme_init (SCHEME_A)) 5581 if (!scheme_init (SCHEME_A))
… …
5892 else 5586 else
5893 return sc; 5587 return sc;
5894} 5588}
5895#endif 5589#endif
5896 5590
5897int 5591ecb_cold int
5898scheme_init (SCHEME_P) 5592scheme_init (SCHEME_P)
5899{ 5593{
5900 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5594 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5901 pointer x; 5595 pointer x;
5902 5596
… …
5945 set_cdr (S_T, S_T); 5639 set_cdr (S_T, S_T);
5946 /* init F */ 5640 /* init F */
5947 set_typeflag (S_F, T_ATOM | T_MARK); 5641 set_typeflag (S_F, T_ATOM | T_MARK);
5948 set_car (S_F, S_F); 5642 set_car (S_F, S_F);
5949 set_cdr (S_F, S_F); 5643 set_cdr (S_F, S_F);
5644 /* init EOF_OBJ */
5645 set_typeflag (S_EOF, T_ATOM | T_MARK);
5646 set_car (S_EOF, S_EOF);
5647 set_cdr (S_EOF, S_EOF);
5950 /* init sink */ 5648 /* init sink */
5951 set_typeflag (S_SINK, T_PAIR | T_MARK); 5649 set_typeflag (S_SINK, T_PAIR | T_MARK);
5952 set_car (S_SINK, NIL); 5650 set_car (S_SINK, NIL);
5651
5953 /* init c_nest */ 5652 /* init c_nest */
5954 SCHEME_V->c_nest = NIL; 5653 SCHEME_V->c_nest = NIL;
5955 5654
5956 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5655 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5957 /* init global_env */ 5656 /* init global_env */
… …
5970 5669
5971 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5670 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5972 assign_syntax (SCHEME_A_ syntax_names[i]); 5671 assign_syntax (SCHEME_A_ syntax_names[i]);
5973 } 5672 }
5974 5673
5674 // TODO: should iterate via strlen, to avoid n² complexity
5975 for (i = 0; i < n; i++) 5675 for (i = 0; i < n; i++)
5976 if (dispatch_table[i].name != 0) 5676 if (dispatch_table[i].builtin)
5977 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5677 assign_proc (SCHEME_A_ i, opname (i));
5978 5678
5979 /* initialization of global pointers to special symbols */ 5679 /* initialization of global pointers to special symbols */
5980 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5680 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5981 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5681 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5982 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5682 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5983 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5683 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5984 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5684 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5985 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5685 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5986 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5686 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5987 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5687 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5988 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5688 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5989 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5689 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5990 5690
5991 return !SCHEME_V->no_memory; 5691 return !SCHEME_V->no_memory;
5992} 5692}
5993 5693
… …
6021scheme_set_external_data (SCHEME_P_ void *p) 5721scheme_set_external_data (SCHEME_P_ void *p)
6022{ 5722{
6023 SCHEME_V->ext_data = p; 5723 SCHEME_V->ext_data = p;
6024} 5724}
6025 5725
6026void 5726ecb_cold void
6027scheme_deinit (SCHEME_P) 5727scheme_deinit (SCHEME_P)
6028{ 5728{
6029 int i; 5729 int i;
6030 5730
6031#if SHOW_ERROR_LINE 5731#if SHOW_ERROR_LINE
… …
6123{ 5823{
6124 dump_stack_reset (SCHEME_A); 5824 dump_stack_reset (SCHEME_A);
6125 SCHEME_V->envir = SCHEME_V->global_env; 5825 SCHEME_V->envir = SCHEME_V->global_env;
6126 SCHEME_V->file_i = 0; 5826 SCHEME_V->file_i = 0;
6127 SCHEME_V->load_stack[0].kind = port_input | port_string; 5827 SCHEME_V->load_stack[0].kind = port_input | port_string;
6128 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5828 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6129 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5829 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6130 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5830 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6131#if USE_PORTS 5831#if USE_PORTS
6132 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5832 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6133#endif 5833#endif
6134 SCHEME_V->retcode = 0; 5834 SCHEME_V->retcode = 0;
6135 SCHEME_V->interactive_repl = 0; 5835 SCHEME_V->interactive_repl = 0;
… …
6240 5940
6241/* ========== Main ========== */ 5941/* ========== Main ========== */
6242 5942
6243#if STANDALONE 5943#if STANDALONE
6244 5944
6245# if defined(__APPLE__) && !defined (OSX)
6246int
6247main ()
6248{
6249 extern MacTS_main (int argc, char **argv);
6250 char **argv;
6251 int argc = ccommand (&argv);
6252
6253 MacTS_main (argc, argv);
6254 return 0;
6255}
6256
6257int
6258MacTS_main (int argc, char **argv)
6259{
6260# else
6261int 5945int
6262main (int argc, char **argv) 5946main (int argc, char **argv)
6263{ 5947{
6264# endif
6265# if USE_MULTIPLICITY 5948# if USE_MULTIPLICITY
6266 scheme ssc; 5949 scheme ssc;
6267 scheme *const SCHEME_V = &ssc; 5950 scheme *const SCHEME_V = &ssc;
6268# else 5951# else
6269# endif 5952# endif

Diff Legend

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