ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/microscheme/scheme.c
(Generate patch)

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.26 by root, Sat Nov 28 05:12:53 2015 UTC

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

Diff Legend

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