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.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.27 by root, Sat Nov 28 05:13:08 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
37#include <string.h> 39#include <string.h>
… …
143 145
144#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
147 149
148#if USE_STRLWR 150#if USE_IGNORECASE
149static const char * 151static const char *
150strlwr (char *s) 152xstrlwr (char *s)
151{ 153{
152 const char *p = s; 154 const char *p = s;
153 155
154 while (*s) 156 while (*s)
155 { 157 {
… …
157 s++; 159 s++;
158 } 160 }
159 161
160 return p; 162 return p;
161} 163}
162#endif
163 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
164#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
166 172
167#ifndef prompt 173#ifndef prompt
168# define prompt "ts> " 174# define prompt "ts> "
169#endif 175#endif
170 176
… …
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 INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 665ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 666static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 667static int count_consecutive_cells (pointer x, int needed);
629static 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);
630static pointer mk_number (SCHEME_P_ const num n); 669static pointer mk_number (SCHEME_P_ const num n);
631static 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);
… …
648static int basic_inchar (port *pt); 687static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 688static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 689static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 690static char *readstr_upto (SCHEME_P_ char *delim);
652static pointer readstrexp (SCHEME_P); 691static pointer readstrexp (SCHEME_P);
653static INLINE int skipspace (SCHEME_P); 692ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 693static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 694static void printslashstring (SCHEME_P_ char *s, int len);
656static 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);
657static void printatom (SCHEME_P_ pointer l, int f); 696static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 697static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 701static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 702static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 703static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 704static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 705static void dump_stack_mark (SCHEME_P);
667static 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);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 708static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 709static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 710static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 711static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 713static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 714static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 715static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 716static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 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
678static num 745static num
679num_add (num a, num b) 746num_op (enum num_op op, num a, num b)
680{ 747{
681 num ret; 748 num ret;
682 749
683 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));
684 751
685 if (num_is_fixnum (ret)) 752 if (num_is_fixnum (ret))
686 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
687 else 765 else
688 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 }
689 774
690 return ret; 775 num_set_rvalue (ret, a.rvalue);
691} 776 }
692 777#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 778
705 return ret; 779 return ret;
706} 780}
707 781
708static num 782static num
709num_div (num a, num b) 783num_div (num a, num b)
710{ 784{
711 num ret; 785 num ret;
712 786
713 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);
714 788
715 if (num_is_fixnum (ret)) 789 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 790 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 791 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 792 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 793
750 return ret; 794 return ret;
751} 795}
752 796
753static num 797static num
… …
755{ 799{
756 num ret; 800 num ret;
757 long e1, e2, res; 801 long e1, e2, res;
758 802
759 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));
760 e1 = num_get_ivalue (a); 804 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 805 e2 = num_ivalue (b);
762 res = e1 % e2; 806 res = e1 % e2;
763 807
764 /* remainder should have same sign as second operand */ 808 /* remainder should have same sign as second operand */
765 if (res > 0) 809 if (res > 0)
766 { 810 {
… …
782{ 826{
783 num ret; 827 num ret;
784 long e1, e2, res; 828 long e1, e2, res;
785 829
786 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));
787 e1 = num_get_ivalue (a); 831 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 832 e2 = num_ivalue (b);
789 res = e1 % e2; 833 res = e1 % e2;
790 834
791 /* modulo should have same sign as second operand */ 835 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 836 if (res * e2 < 0)
793 res += e2; 837 res += e2;
794 838
795 num_set_ivalue (ret, res); 839 num_set_ivalue (ret, res);
796 return ret; 840 return ret;
797} 841}
798 842
843/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 844static int
800num_eq (num a, num b) 845num_cmp (num a, num b)
801{ 846{
847 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 848 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 849
805 if (is_fixnum) 850 if (is_fixnum)
806 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 }
807 else 857 else
808 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 }
809 864
810 return ret; 865 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 866}
853 867
854#if USE_MATH 868#if USE_MATH
855 869
856/* Round to nearest. Round to even if midway */ 870/* Round to nearest. Round to even if midway */
… …
866 return ce; 880 return ce;
867 else if (dfl < dce) 881 else if (dfl < dce)
868 return fl; 882 return fl;
869 else 883 else
870 { 884 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 885 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 886 return fl;
873 else 887 else
874 return ce; 888 return ce;
875 } 889 }
876} 890}
877#endif 891#endif
878 892
879static int 893static int
880is_zero_rvalue (RVALUE x) 894is_zero_rvalue (RVALUE x)
881{ 895{
896 return x == 0;
897#if 0
882#if USE_REAL 898#if USE_REAL
883 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. */
884#else 900#else
885 return x == 0; 901 return x == 0;
902#endif
886#endif 903#endif
887} 904}
888 905
889/* allocate new cell segment */ 906/* allocate new cell segment */
890static int 907static int
… …
935 SCHEME_V->fcells += segsize; 952 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 953 last = newp + segsize - 1;
937 954
938 for (p = newp; p <= last; p++) 955 for (p = newp; p <= last; p++)
939 { 956 {
940 set_typeflag (p, T_FREE); 957 set_typeflag (p, T_PAIR);
941 set_car (p, NIL); 958 set_car (p, NIL);
942 set_cdr (p, p + 1); 959 set_cdr (p, p + 1);
943 } 960 }
944 961
945 /* insert new cells in address order on free list */ 962 /* insert new cells in address order on free list */
… …
962 979
963 return n; 980 return n;
964} 981}
965 982
966/* get new cell. parameter a, b is marked by gc. */ 983/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 984ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 985get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 986{
970 if (SCHEME_V->free_cell == NIL) 987 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 988 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 989 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 990 return S_SINK;
974 991
975 if (SCHEME_V->free_cell == NIL) 992 if (SCHEME_V->free_cell == NIL)
… …
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1067 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1068
1052 return v; 1069 return v;
1053} 1070}
1054 1071
1055static INLINE void 1072ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1073ok_to_freely_gc (SCHEME_P)
1057{ 1074{
1058 set_car (S_SINK, NIL); 1075 set_car (S_SINK, NIL);
1059} 1076}
1060 1077
… …
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1141 location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 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)));
1126 return x; 1143 return x;
1127} 1144}
1128 1145
1129static INLINE pointer 1146ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1147oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1148{
1132 int location; 1149 int location;
1133 pointer x; 1150 pointer x;
1134 char *s; 1151 char *s;
… …
1167oblist_initial_value (SCHEME_P) 1184oblist_initial_value (SCHEME_P)
1168{ 1185{
1169 return NIL; 1186 return NIL;
1170} 1187}
1171 1188
1172static INLINE pointer 1189ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1190oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1191{
1175 pointer x; 1192 pointer x;
1176 char *s; 1193 char *s;
1177 1194
… …
1236mk_character (SCHEME_P_ int c) 1253mk_character (SCHEME_P_ int c)
1237{ 1254{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1255 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1256
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1257 set_typeflag (x, (T_CHARACTER | T_ATOM));
1241 ivalue_unchecked (x) = c & 0xff; 1258 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1259
1243 return x; 1260 return x;
1244} 1261}
1245 1262
1246/* get number atom (integer) */ 1263/* get number atom (integer) */
1247INTERFACE pointer 1264INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1265mk_integer (SCHEME_P_ long n)
1249{ 1266{
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1267 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1268
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1269 set_typeflag (x, (T_INTEGER | T_ATOM));
1253 ivalue_unchecked (x) = num; 1270 set_ivalue (x, n);
1254 set_num_integer (x); 1271
1255 return x; 1272 return x;
1256} 1273}
1257 1274
1258INTERFACE pointer 1275INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1276mk_real (SCHEME_P_ RVALUE n)
1260{ 1277{
1278#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1279 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1280
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1281 set_typeflag (x, (T_REAL | T_ATOM));
1264 rvalue_unchecked (x) = n; 1282 set_rvalue (x, n);
1265 set_num_real (x); 1283
1266 return x; 1284 return x;
1285#else
1286 return mk_integer (SCHEME_A_ n);
1287#endif
1267} 1288}
1268 1289
1269static pointer 1290static pointer
1270mk_number (SCHEME_P_ const num n) 1291mk_number (SCHEME_P_ const num n)
1271{ 1292{
1293#if USE_REAL
1272 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
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1298 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1299#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1300}
1277 1301
1278/* allocate name to string area */ 1302/* allocate name to string area */
1279static char * 1303static char *
1280store_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)
… …
1456 } 1480 }
1457 else if ((c == 'e') || (c == 'E')) 1481 else if ((c == 'e') || (c == 'E'))
1458 { 1482 {
1459 if (!has_fp_exp) 1483 if (!has_fp_exp)
1460 { 1484 {
1461 has_dec_point = 1; /* decimal point illegal 1485 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1486 p++;
1464 1487
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1488 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1489 continue;
1467 } 1490 }
… …
1481 1504
1482/* make constant */ 1505/* make constant */
1483static pointer 1506static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1507mk_sharp_const (SCHEME_P_ char *name)
1485{ 1508{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1509 if (!strcmp (name, "t"))
1490 return S_T; 1510 return S_T;
1491 else if (!strcmp (name, "f")) 1511 else if (!strcmp (name, "f"))
1492 return S_F; 1512 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1513 else if (*name == '\\') /* #\w (character) */
1494 { 1514 {
1495 int c = 0; 1515 int c;
1496 1516
1497 if (stricmp (name + 1, "space") == 0) 1517 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1518 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1519 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1520 c = '\n';
… …
1502 c = '\r'; 1522 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1523 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1524 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1525 else if (name[1] == 'x' && name[2] != 0)
1506 { 1526 {
1507 int c1 = strtol (name + 2, 0, 16); 1527 long c1 = strtol (name + 2, 0, 16);
1508 1528
1509 if (c1 <= UCHAR_MAX) 1529 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1530 c = c1;
1511 else 1531 else
1512 return NIL; 1532 return NIL;
1513 1533 }
1514#if USE_ASCII_NAMES 1534#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1535 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1536 /* nothing */;
1519#endif 1537#endif
1520 }
1521 else if (name[2] == 0) 1538 else if (name[2] == 0)
1522 c = name[1]; 1539 c = name[1];
1523 else 1540 else
1524 return NIL; 1541 return NIL;
1525 1542
… …
1542 1559
1543/*-- 1560/*--
1544 * 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,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1562 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * 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
1547 */ 1568 */
1548static void 1569static void
1549mark (pointer a) 1570mark (pointer a)
1550{ 1571{
1551 pointer t, q, p; 1572 pointer t, q, p;
… …
1553 t = 0; 1574 t = 0;
1554 p = a; 1575 p = a;
1555E2: 1576E2:
1556 setmark (p); 1577 setmark (p);
1557 1578
1558 if (is_vector (p)) 1579 if (ecb_expect_false (is_vector (p)))
1559 { 1580 {
1560 int i; 1581 int i;
1561 1582
1562 for (i = 0; i < p->object.vector.length; i++) 1583 for (i = 0; i < p->object.vector.length; i++)
1563 mark (vecvalue (p)[i]); 1584 mark (vecvalue (p)[i]);
… …
1665 if (is_mark (p)) 1686 if (is_mark (p))
1666 clrmark (p); 1687 clrmark (p);
1667 else 1688 else
1668 { 1689 {
1669 /* reclaim cell */ 1690 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1691 if (typeflag (p) != T_PAIR)
1671 { 1692 {
1672 finalize_cell (SCHEME_A_ p); 1693 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_FREE); 1694 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL); 1695 set_car (p, NIL);
1675 } 1696 }
1676 1697
1677 ++SCHEME_V->fcells; 1698 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1699 set_cdr (p, SCHEME_V->free_cell);
… …
1680 } 1701 }
1681 } 1702 }
1682 } 1703 }
1683 1704
1684 if (SCHEME_V->gc_verbose) 1705 if (SCHEME_V->gc_verbose)
1706 {
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1707 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1708 }
1686} 1709}
1687 1710
1688static void 1711static void
1689finalize_cell (SCHEME_P_ pointer a) 1712finalize_cell (SCHEME_P_ pointer a)
1690{ 1713{
1714 /* TODO, fast bitmap check? */
1691 if (is_string (a)) 1715 if (is_string (a))
1692 free (strvalue (a)); 1716 free (strvalue (a));
1693 else if (is_vector (a)) 1717 else if (is_vector (a))
1694 free (vecvalue (a)); 1718 free (vecvalue (a));
1695#if USE_PORTS 1719#if USE_PORTS
… …
2276 } 2300 }
2277 } 2301 }
2278} 2302}
2279 2303
2280/* check c is in chars */ 2304/* check c is in chars */
2281static INLINE int 2305ecb_inline int
2282is_one_of (char *s, int c) 2306is_one_of (char *s, int c)
2283{ 2307{
2284 if (c == EOF) 2308 if (c == EOF)
2285 return 1; 2309 return 1;
2286 2310
2287 return !!strchr (s, c); 2311 return !!strchr (s, c);
2288} 2312}
2289 2313
2290/* skip white characters */ 2314/* skip white characters */
2291static INLINE int 2315ecb_inline int
2292skipspace (SCHEME_P) 2316skipspace (SCHEME_P)
2293{ 2317{
2294 int c, curr_line = 0; 2318 int c, curr_line = 0;
2295 2319
2296 do 2320 do
… …
2524 { 2548 {
2525 p = SCHEME_V->strbuff; 2549 p = SCHEME_V->strbuff;
2526 2550
2527 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 */
2528 { 2552 {
2529 if (num_is_integer (l)) 2553 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2554 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2555#if USE_REAL
2532 else 2556 else
2533 { 2557 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2558 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2789 return 0; 2813 return 0;
2790 } 2814 }
2791 else if (is_number (a)) 2815 else if (is_number (a))
2792 { 2816 {
2793 if (is_number (b)) 2817 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2818 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2819
2797 return 0; 2820 return 0;
2798 } 2821 }
2799 else if (is_character (a)) 2822 else if (is_character (a))
2800 { 2823 {
… …
2867 2890
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2891 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2892 setenvironment (SCHEME_V->envir);
2870} 2893}
2871 2894
2872static INLINE void 2895ecb_inline void
2873new_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)
2874{ 2897{
2875 pointer slot = immutable_cons (variable, value); 2898 pointer slot = immutable_cons (variable, value);
2876 2899
2877 if (is_vector (car (env))) 2900 if (is_vector (car (env)))
… …
2917 return NIL; 2940 return NIL;
2918} 2941}
2919 2942
2920#else /* USE_ALIST_ENV */ 2943#else /* USE_ALIST_ENV */
2921 2944
2922static INLINE void 2945ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2946new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2947{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2948 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2949 setenvironment (SCHEME_V->envir);
2927} 2950}
2928 2951
2929static INLINE void 2952ecb_inline void
2930new_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)
2931{ 2954{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2955 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2956}
2934 2957
… …
2956 return NIL; 2979 return NIL;
2957} 2980}
2958 2981
2959#endif /* USE_ALIST_ENV else */ 2982#endif /* USE_ALIST_ENV else */
2960 2983
2961static INLINE void 2984ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2985new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2986{
2964 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);
2965} 2988}
2966 2989
2967static INLINE void 2990ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2991set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2992{
2970 set_cdr (slot, value); 2993 set_cdr (slot, value);
2971} 2994}
2972 2995
2973static INLINE pointer 2996ecb_inline pointer
2974slot_value_in_env (pointer slot) 2997slot_value_in_env (pointer slot)
2975{ 2998{
2976 return cdr (slot); 2999 return cdr (slot);
2977} 3000}
2978 3001
2979/* ========== Evaluation Cycle ========== */ 3002/* ========== Evaluation Cycle ========== */
2980 3003
2981static pointer 3004static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 3005xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 3006{
2984#if USE_ERROR_HOOK 3007#if USE_ERROR_HOOK
2985 pointer x; 3008 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 3009 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 3044 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 3045 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 3046 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 3047 SCHEME_V->op = OP_EVAL;
3025 3048
3026 return S_T; 3049 return 0;
3027 } 3050 }
3028#endif 3051#endif
3029 3052
3030 if (a) 3053 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3054 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3056 SCHEME_V->args = NIL;
3034 3057
3035 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);
3036 setimmutable (car (SCHEME_V->args)); 3059 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3060 SCHEME_V->op = OP_ERR0;
3061
3038 return S_T; 3062 return 0;
3039} 3063}
3040 3064
3041#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)
3042#define Error_0(s) Error_1 (s, 0) 3066#define Error_0(s) Error_1 (s, 0)
3043 3067
3044/* Too small to turn into function */ 3068/* Too small to turn into function */
3045#define BEGIN do { 3069#define BEGIN do {
3046#define END } while (0) 3070#define END } while (0)
3047#define s_goto(a) BEGIN \ 3071#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3072 SCHEME_V->op = a; \
3049 return S_T; END 3073 return 0; END
3050 3074
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3075#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3076
3053#ifndef USE_SCHEME_STACK 3077#ifndef USE_SCHEME_STACK
3054 3078
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3103 next_frame = SCHEME_V->dump_base + nframes;
3080 3104
3081 next_frame->op = op; 3105 next_frame->op = op;
3082 next_frame->args = args; 3106 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3107 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3108 next_frame->code = code;
3085 3109
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3110 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3111}
3088 3112
3089static pointer 3113static int
3090xs_return (SCHEME_P_ pointer a) 3114xs_return (SCHEME_P_ pointer a)
3091{ 3115{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3117 struct dump_stack_frame *frame;
3094 3118
3095 SCHEME_V->value = a; 3119 SCHEME_V->value = a;
3096 3120
3097 if (nframes <= 0) 3121 if (nframes <= 0)
3098 return NIL; 3122 return -1;
3099 3123
3100 frame = &SCHEME_V->dump_base[--nframes]; 3124 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3125 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3126 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3127 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3128 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3129 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3130
3107 return S_T; 3131 return 0;
3108} 3132}
3109 3133
3110static INLINE void 3134ecb_inline void
3111dump_stack_reset (SCHEME_P) 3135dump_stack_reset (SCHEME_P)
3112{ 3136{
3113 /* 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 */
3114 SCHEME_V->dump = (pointer)+0; 3138 SCHEME_V->dump = (pointer)+0;
3115} 3139}
3116 3140
3117static INLINE void 3141ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3142dump_stack_initialize (SCHEME_P)
3119{ 3143{
3120 SCHEME_V->dump_size = 0; 3144 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3145 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3146 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3199 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3200 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3201
3178 while (cont != NIL) 3202 while (cont != NIL)
3179 { 3203 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3204 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3205 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3206 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3207 frame->code = car (cont) ; cont = cdr (cont);
3184 3208
3185 ++frame; 3209 ++frame;
3186 ++i; 3210 ++i;
3187 } 3211 }
3188 3212
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3213 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3214}
3191 3215
3192#else 3216#else
3193 3217
3194static INLINE void 3218ecb_inline void
3195dump_stack_reset (SCHEME_P) 3219dump_stack_reset (SCHEME_P)
3196{ 3220{
3197 SCHEME_V->dump = NIL; 3221 SCHEME_V->dump = NIL;
3198} 3222}
3199 3223
3200static INLINE void 3224ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3225dump_stack_initialize (SCHEME_P)
3202{ 3226{
3203 dump_stack_reset (SCHEME_A); 3227 dump_stack_reset (SCHEME_A);
3204} 3228}
3205 3229
… …
3207dump_stack_free (SCHEME_P) 3231dump_stack_free (SCHEME_P)
3208{ 3232{
3209 SCHEME_V->dump = NIL; 3233 SCHEME_V->dump = NIL;
3210} 3234}
3211 3235
3212static pointer 3236static int
3213xs_return (SCHEME_P_ pointer a) 3237xs_return (SCHEME_P_ pointer a)
3214{ 3238{
3215 pointer dump = SCHEME_V->dump; 3239 pointer dump = SCHEME_V->dump;
3216 3240
3217 SCHEME_V->value = a; 3241 SCHEME_V->value = a;
3218 3242
3219 if (dump == NIL) 3243 if (dump == NIL)
3220 return NIL; 3244 return -1;
3221 3245
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3246 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3247 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3248 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3249 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3250
3227 SCHEME_V->dump = dump; 3251 SCHEME_V->dump = dump;
3228 3252
3229 return S_T; 3253 return 0;
3230} 3254}
3231 3255
3232static void 3256static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3257s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3258{
… …
3259 3283
3260#endif 3284#endif
3261 3285
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3286#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3287
3264static pointer 3288static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3289opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3290{
3291 pointer args = SCHEME_V->args;
3267 pointer x, y; 3292 pointer x, y;
3268 3293
3269 switch (op) 3294 switch (op)
3270 { 3295 {
3271 case OP_LOAD: /* load */ 3296 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3297 if (file_interactive (SCHEME_A))
3273 { 3298 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3299 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3275 //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)));
3276 } 3301 }
3277 3302
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3303 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3304 Error_1 ("unable to open", car (args));
3280 else 3305 else
3281 { 3306 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3307 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3308 s_goto (OP_T0LVL);
3284 } 3309 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3383 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3384#if USE_TRACING
3360 if (SCHEME_V->tracing) 3385 if (SCHEME_V->tracing)
3361 { 3386 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3387 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 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);
3364 SCHEME_V->args = SCHEME_V->code; 3389 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3390 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3391 s_goto (OP_P0LIST);
3367 } 3392 }
3368 3393
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3437 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3438 s_goto (OP_E1ARGS);
3414 } 3439 }
3415 3440
3416 case OP_E1ARGS: /* eval arguments */ 3441 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3442 args = cons (SCHEME_V->value, args);
3418 3443
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3444 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3445 {
3421 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));
3422 SCHEME_V->code = car (SCHEME_V->code); 3447 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3448 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3449 s_goto (OP_EVAL);
3425 } 3450 }
3426 else /* end */ 3451 else /* end */
3427 { 3452 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3453 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3454 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3455 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3456 s_goto (OP_APPLY);
3432 } 3457 }
3433 3458
3434#if USE_TRACING 3459#if USE_TRACING
3435 3460
3436 case OP_TRACING: 3461 case OP_TRACING:
3437 { 3462 {
3438 int tr = SCHEME_V->tracing; 3463 int tr = SCHEME_V->tracing;
3439 3464
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3465 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3466 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3467 }
3443 3468
3444#endif 3469#endif
3445 3470
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3471 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3472#if USE_TRACING
3448 if (SCHEME_V->tracing) 3473 if (SCHEME_V->tracing)
3449 { 3474 {
3450 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);
3451 SCHEME_V->print_flag = 1; 3476 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3477 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3478 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3479 s_goto (OP_P0LIST);
3455 } 3480 }
3456 3481
3457 /* fall through */ 3482 /* fall through */
3458 3483
3459 case OP_REAL_APPLY: 3484 case OP_REAL_APPLY:
3460#endif 3485#endif
3461 if (is_proc (SCHEME_V->code)) 3486 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3487 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3488 else if (is_foreign (SCHEME_V->code))
3466 { 3489 {
3467 /* Keep nested calls from GC'ing the arglist */ 3490 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3491 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3492 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3493
3471 s_return (x); 3494 s_return (x);
3472 } 3495 }
3473 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 */
3474 { 3497 {
3475 /* Should not accept promise */ 3498 /* Should not accept promise */
3476 /* make environment */ 3499 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3500 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3501
3479 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))
3480 { 3503 {
3481 if (y == NIL) 3504 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3505 Error_0 ("not enough arguments");
3483 else 3506 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3507 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3525 s_goto (OP_BEGIN);
3503 } 3526 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3527 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3528 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3529 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3530 s_return (args != NIL ? car (args) : NIL);
3508 } 3531 }
3509 else 3532 else
3510 Error_0 ("illegal function"); 3533 Error_0 ("illegal function");
3511 3534
3512 case OP_DOMACRO: /* do macro */ 3535 case OP_DOMACRO: /* do macro */
… …
3521 { 3544 {
3522 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);
3523 3546
3524 if (f != NIL) 3547 if (f != NIL)
3525 { 3548 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3549 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3550 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3551 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3552 s_goto (OP_APPLY);
3530 } 3553 }
3531 3554
… …
3542 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));
3543 3566
3544#endif 3567#endif
3545 3568
3546 case OP_MKCLOSURE: /* make-closure */ 3569 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3570 x = car (args);
3548 3571
3549 if (car (x) == SCHEME_V->LAMBDA) 3572 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3573 x = cdr (x);
3551 3574
3552 if (cdr (SCHEME_V->args) == NIL) 3575 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3576 y = SCHEME_V->envir;
3554 else 3577 else
3555 y = cadr (SCHEME_V->args); 3578 y = cadr (args);
3556 3579
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3580 s_return (mk_closure (SCHEME_A_ x, y));
3558 3581
3559 case OP_QUOTE: /* quote */ 3582 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3583 s_return (car (SCHEME_V->code));
… …
3592 3615
3593 3616
3594 case OP_DEFP: /* defined? */ 3617 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3618 x = SCHEME_V->envir;
3596 3619
3597 if (cdr (SCHEME_V->args) != NIL) 3620 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3621 x = cadr (args);
3599 3622
3600 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);
3601 3624
3602 case OP_SET0: /* set! */ 3625 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3626 if (is_immutable (car (SCHEME_V->code)))
3604 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));
3605 3628
… …
3636 3659
3637 case OP_IF1: /* if */ 3660 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3661 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3662 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3663 else
3641 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 */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3665 s_goto (OP_EVAL);
3645 3666
3646 case OP_LET0: /* let */ 3667 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3668 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3669 SCHEME_V->value = SCHEME_V->code;
3649 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);
3650 s_goto (OP_LET1); 3671 s_goto (OP_LET1);
3651 3672
3652 case OP_LET1: /* let (calculate parameters) */ 3673 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3674 args = cons (SCHEME_V->value, args);
3654 3675
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3676 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3677 {
3657 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)))
3658 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));
3659 3680
3660 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));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3682 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3683 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3684 s_goto (OP_EVAL);
3664 } 3685 }
3665 else /* end */ 3686 else /* end */
3666 { 3687 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3688 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3689 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3690 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3691 s_goto (OP_LET2);
3671 } 3692 }
3672 3693
3673 case OP_LET2: /* let */ 3694 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3695 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3696
3676 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;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3698 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3699 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3700
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3701 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3702 {
3682 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))
3683 { 3704 {
3684 if (!is_pair (x)) 3705 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3706 Error_1 ("Bad syntax of binding in let :", x);
3686 3707
3687 if (!is_list (SCHEME_A_ car (x))) 3708 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3709 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3710
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3711 args = cons (caar (x), args);
3691 } 3712 }
3692 3713
3693 x =
3694 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)),
3695 SCHEME_V->envir); 3715 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3716 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3717 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3718 }
3700 else 3719 else
3701 { 3720 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3721 SCHEME_V->code = cdr (SCHEME_V->code);
3722 }
3723
3703 SCHEME_V->args = NIL; 3724 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3725 s_goto (OP_BEGIN);
3707 3726
3708 case OP_LET0AST: /* let* */ 3727 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3728 if (car (SCHEME_V->code) == NIL)
3710 { 3729 {
… …
3728 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);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3748 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3749
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3750 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3751 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3752 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3753 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3754 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3755 s_goto (OP_EVAL);
3737 } 3756 }
3738 else /* end */ 3757 else /* end */
3739 { 3758 {
3740 SCHEME_V->code = SCHEME_V->args; 3759 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3760 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3761 s_goto (OP_BEGIN);
3743 } 3762 }
3744 3763
3745 case OP_LET0REC: /* letrec */ 3764 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3767 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3768 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3769 s_goto (OP_LET1REC);
3751 3770
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3771 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3772 args = cons (SCHEME_V->value, args);
3754 3773
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3774 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3775 {
3757 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)))
3758 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));
3759 3778
3760 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));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3780 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3781 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3782 s_goto (OP_EVAL);
3764 } 3783 }
3765 else /* end */ 3784 else /* end */
3766 { 3785 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3786 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3787 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3788 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3789 s_goto (OP_LET2REC);
3771 } 3790 }
3772 3791
3773 case OP_LET2REC: /* letrec */ 3792 case OP_LET2REC: /* letrec */
3774 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))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3794 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3795
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3796 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3797 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3798 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3884 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3885 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3886 s_goto (OP_EVAL);
3868 3887
3869 case OP_C1STREAM: /* cons-stream */ 3888 case OP_C1STREAM: /* cons-stream */
3870 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 */
3871 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);
3872 set_typeflag (x, T_PROMISE); 3891 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3892 s_return (cons (args, x));
3874 3893
3875 case OP_MACRO0: /* macro */ 3894 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3895 if (is_pair (car (SCHEME_V->code)))
3877 { 3896 {
3878 x = caar (SCHEME_V->code); 3897 x = caar (SCHEME_V->code);
… …
3911 { 3930 {
3912 if (!is_pair (y = caar (x))) 3931 if (!is_pair (y = caar (x)))
3913 break; 3932 break;
3914 3933
3915 for (; y != NIL; y = cdr (y)) 3934 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3935 if (eqv (car (y), SCHEME_V->value))
3918 break; 3936 break;
3919 }
3920 3937
3921 if (y != NIL) 3938 if (y != NIL)
3922 break; 3939 break;
3923 } 3940 }
3924 3941
… …
3944 s_goto (OP_BEGIN); 3961 s_goto (OP_BEGIN);
3945 else 3962 else
3946 s_return (NIL); 3963 s_return (NIL);
3947 3964
3948 case OP_PAPPLY: /* apply */ 3965 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3966 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3967 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3968 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3969 s_goto (OP_APPLY);
3953 3970
3954 case OP_PEVAL: /* eval */ 3971 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3972 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3973 SCHEME_V->envir = cadr (args);
3957 3974
3958 SCHEME_V->code = car (SCHEME_V->args); 3975 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3976 s_goto (OP_EVAL);
3960 3977
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3978 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3979 SCHEME_V->code = car (args);
3963 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);
3964 s_goto (OP_APPLY); 3981 s_goto (OP_APPLY);
3965 } 3982 }
3966 3983
3967 return S_T; 3984 if (USE_ERROR_CHECKING) abort ();
3968} 3985}
3969 3986
3970static pointer 3987static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3988opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3989{
3973 pointer x; 3990 pointer args = SCHEME_V->args;
3991 pointer x = car (args);
3974 num v; 3992 num v;
3975 3993
3994 switch (op)
3995 {
3976#if USE_MATH 3996#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 3997 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 3998 {
3986
3987 if (num_is_integer (x)) 3999 if (is_integer (x))
3988 s_return (x); 4000 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4001
4002 RVALUE r = rvalue_unchecked (x);
4003
4004 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4005 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 4006 else
3992 Error_1 ("inexact->exact: not integral:", x); 4007 Error_1 ("inexact->exact: not integral:", x);
4008 }
3993 4009
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4010 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4011 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4012 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4013 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4014 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4015 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4016 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4017
4022 case OP_ATAN: 4018 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 4019 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 4021 else
4028 { 4022 {
4029 pointer y = cadr (SCHEME_V->args); 4023 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4024 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 4025 }
4033 4026
4034 case OP_SQRT: 4027 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4028 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 4029
4038 case OP_EXPT: 4030 case OP_EXPT:
4039 { 4031 {
4040 RVALUE result; 4032 RVALUE result;
4041 int real_result = 1; 4033 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4034 pointer y = cadr (args);
4043 4035
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4036 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4037 real_result = 0;
4048 4038
4049 /* This 'if' is an R5RS compatibility fix. */ 4039 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4040 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4041 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4042 result = 0;
4053 else 4043 else
4054 result = pow (rvalue (x), rvalue (y)); 4044 result = pow (rvalue (x), rvalue (y));
4055 4045
4056 /* Before returning integer result make sure we can. */ 4046 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4047 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4048 if (!real_result)
4059 { 4049 {
4060 long result_as_long = (long) result; 4050 long result_as_long = result;
4061 4051
4062 if (result != (RVALUE) result_as_long) 4052 if (result != result_as_long)
4063 real_result = 1; 4053 real_result = 1;
4064 } 4054 }
4065 4055
4066 if (real_result) 4056 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4057 s_return (mk_real (SCHEME_A_ result));
4068 else 4058 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4059 s_return (mk_integer (SCHEME_A_ result));
4070 } 4060 }
4071 4061
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4062 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4063 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4064
4080 case OP_TRUNCATE: 4065 case OP_TRUNCATE:
4081 { 4066 {
4082 RVALUE rvalue_of_x; 4067 RVALUE n = rvalue (x);
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4068 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4069 }
4092 4070
4093 case OP_ROUND: 4071 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4072 if (is_integer (x))
4097 s_return (x); 4073 s_return (x);
4098 4074
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4075 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4076#endif
4101 4077
4102 case OP_ADD: /* + */ 4078 case OP_ADD: /* + */
4103 v = num_zero; 4079 v = num_zero;
4104 4080
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4081 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4082 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4083
4108 s_return (mk_number (SCHEME_A_ v)); 4084 s_return (mk_number (SCHEME_A_ v));
4109 4085
4110 case OP_MUL: /* * */ 4086 case OP_MUL: /* * */
4111 v = num_one; 4087 v = num_one;
4112 4088
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4089 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4090 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4091
4116 s_return (mk_number (SCHEME_A_ v)); 4092 s_return (mk_number (SCHEME_A_ v));
4117 4093
4118 case OP_SUB: /* - */ 4094 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4095 if (cdr (args) == NIL)
4120 { 4096 {
4121 x = SCHEME_V->args; 4097 x = args;
4122 v = num_zero; 4098 v = num_zero;
4123 } 4099 }
4124 else 4100 else
4125 { 4101 {
4126 x = cdr (SCHEME_V->args); 4102 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4103 v = nvalue (car (args));
4128 } 4104 }
4129 4105
4130 for (; x != NIL; x = cdr (x)) 4106 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4107 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4108
4133 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4134 4110
4135 case OP_DIV: /* / */ 4111 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4112 if (cdr (args) == NIL)
4137 { 4113 {
4138 x = SCHEME_V->args; 4114 x = args;
4139 v = num_one; 4115 v = num_one;
4140 } 4116 }
4141 else 4117 else
4142 { 4118 {
4143 x = cdr (SCHEME_V->args); 4119 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4120 v = nvalue (car (args));
4145 } 4121 }
4146 4122
4147 for (; x != NIL; x = cdr (x)) 4123 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4124 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4125 v = num_div (v, nvalue (car (x)));
4151 else 4126 else
4152 Error_0 ("/: division by zero"); 4127 Error_0 ("/: division by zero");
4153 }
4154 4128
4155 s_return (mk_number (SCHEME_A_ v)); 4129 s_return (mk_number (SCHEME_A_ v));
4156 4130
4157 case OP_INTDIV: /* quotient */ 4131 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4132 if (cdr (args) == NIL)
4159 { 4133 {
4160 x = SCHEME_V->args; 4134 x = args;
4161 v = num_one; 4135 v = num_one;
4162 } 4136 }
4163 else 4137 else
4164 { 4138 {
4165 x = cdr (SCHEME_V->args); 4139 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4140 v = nvalue (car (args));
4167 } 4141 }
4168 4142
4169 for (; x != NIL; x = cdr (x)) 4143 for (; x != NIL; x = cdr (x))
4170 { 4144 {
4171 if (ivalue (car (x)) != 0) 4145 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4146 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4147 else
4174 Error_0 ("quotient: division by zero"); 4148 Error_0 ("quotient: division by zero");
4175 } 4149 }
4176 4150
4177 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4178 4152
4179 case OP_REM: /* remainder */ 4153 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4154 v = nvalue (x);
4181 4155
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4156 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4157 v = num_rem (v, nvalue (cadr (args)));
4184 else 4158 else
4185 Error_0 ("remainder: division by zero"); 4159 Error_0 ("remainder: division by zero");
4186 4160
4187 s_return (mk_number (SCHEME_A_ v)); 4161 s_return (mk_number (SCHEME_A_ v));
4188 4162
4189 case OP_MOD: /* modulo */ 4163 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4164 v = nvalue (x);
4191 4165
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4166 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4167 v = num_mod (v, nvalue (cadr (args)));
4194 else 4168 else
4195 Error_0 ("modulo: division by zero"); 4169 Error_0 ("modulo: division by zero");
4196 4170
4197 s_return (mk_number (SCHEME_A_ v)); 4171 s_return (mk_number (SCHEME_A_ v));
4198 4172
4199 case OP_CAR: /* car */ 4173 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4174 s_return (caar (args));
4201 4175
4202 case OP_CDR: /* cdr */ 4176 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4177 s_return (cdar (args));
4204 4178
4205 case OP_CONS: /* cons */ 4179 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4180 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4181 s_return (args);
4208 4182
4209 case OP_SETCAR: /* set-car! */ 4183 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4184 if (!is_immutable (x))
4211 { 4185 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4186 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4187 s_return (car (args));
4214 } 4188 }
4215 else 4189 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4190 Error_0 ("set-car!: unable to alter immutable pair");
4217 4191
4218 case OP_SETCDR: /* set-cdr! */ 4192 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4193 if (!is_immutable (x))
4220 { 4194 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4195 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4196 s_return (car (args));
4223 } 4197 }
4224 else 4198 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4199 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4200
4227 case OP_CHAR2INT: /* char->integer */ 4201 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4202 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4203
4230 case OP_INT2CHAR: /* integer->char */ 4204 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4205 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4206
4233 case OP_CHARUPCASE: 4207 case OP_CHARUPCASE:
4234 { 4208 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4209 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4210 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4211 s_return (mk_character (SCHEME_A_ c));
4238 } 4212 }
4239 4213
4240 case OP_CHARDNCASE: 4214 case OP_CHARDNCASE:
4241 { 4215 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4216 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4217 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4218 s_return (mk_character (SCHEME_A_ c));
4245 } 4219 }
4246 4220
4247 case OP_STR2SYM: /* string->symbol */ 4221 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4222 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4223
4250 case OP_STR2ATOM: /* string->atom */ 4224 case OP_STR2ATOM: /* string->atom */
4251 { 4225 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4226 char *s = strvalue (x);
4253 long pf = 0; 4227 long pf = 0;
4254 4228
4255 if (cdr (SCHEME_V->args) != NIL) 4229 if (cdr (args) != NIL)
4256 { 4230 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4231 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4232 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4233 pf = ivalue_unchecked (cadr (args));
4260 4234
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4235 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4236 {
4263 /* base is OK */ 4237 /* base is OK */
4264 } 4238 }
4265 else 4239 else
4266 pf = -1; 4240 pf = -1;
4267 } 4241 }
4268 4242
4269 if (pf < 0) 4243 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4244 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4245 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4246 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4247 else
4274 { 4248 {
4275 if (pf == 0 || pf == 10) 4249 if (pf == 0 || pf == 10)
… …
4286 } 4260 }
4287 } 4261 }
4288 } 4262 }
4289 4263
4290 case OP_SYM2STR: /* symbol->string */ 4264 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4265 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4266 setimmutable (x);
4293 s_return (x); 4267 s_return (x);
4294 4268
4295 case OP_ATOM2STR: /* atom->string */ 4269 case OP_ATOM2STR: /* atom->string */
4296 { 4270 {
4297 long pf = 0; 4271 long pf = 0;
4298 4272
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4273 if (cdr (args) != NIL)
4302 { 4274 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4275 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4276 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4277 pf = ivalue_unchecked (cadr (args));
4306 4278
4307 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))
4308 { 4280 {
4309 /* base is OK */ 4281 /* base is OK */
4310 } 4282 }
4311 else 4283 else
4312 pf = -1; 4284 pf = -1;
4313 } 4285 }
4314 4286
4315 if (pf < 0) 4287 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4288 Error_1 ("atom->string: bad base:", cadr (args));
4317 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))
4318 { 4290 {
4319 char *p; 4291 char *p;
4320 int len; 4292 int len;
4321 4293
… …
4326 Error_1 ("atom->string: not an atom:", x); 4298 Error_1 ("atom->string: not an atom:", x);
4327 } 4299 }
4328 4300
4329 case OP_MKSTRING: /* make-string */ 4301 case OP_MKSTRING: /* make-string */
4330 { 4302 {
4331 int fill = ' '; 4303 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4304 int len = ivalue_unchecked (x);
4333 4305
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4306 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4307 }
4341 4308
4342 case OP_STRLEN: /* string-length */ 4309 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4310 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4311
4345 case OP_STRREF: /* string-ref */ 4312 case OP_STRREF: /* string-ref */
4346 { 4313 {
4347 char *str; 4314 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4315 int index = ivalue_unchecked (cadr (args));
4353 4316
4354 if (index >= strlength (car (SCHEME_V->args))) 4317 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4318 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4319
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4320 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4321 }
4359 4322
4360 case OP_STRSET: /* string-set! */ 4323 case OP_STRSET: /* string-set! */
4361 { 4324 {
4362 char *str; 4325 char *str = strvalue (x);
4363 int index; 4326 int index = ivalue_unchecked (cadr (args));
4364 int c; 4327 int c;
4365 4328
4366 if (is_immutable (car (SCHEME_V->args))) 4329 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4330 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4331
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4332 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4333 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4334
4376 c = charvalue (caddr (SCHEME_V->args)); 4335 c = charvalue (caddr (args));
4377 4336
4378 str[index] = (char) c; 4337 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4338 s_return (car (args));
4380 } 4339 }
4381 4340
4382 case OP_STRAPPEND: /* string-append */ 4341 case OP_STRAPPEND: /* string-append */
4383 { 4342 {
4384 /* 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 */
4385 int len = 0; 4344 int len = 0;
4386 pointer newstr; 4345 pointer newstr;
4387 char *pos; 4346 char *pos;
4388 4347
4389 /* compute needed length for new string */ 4348 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4349 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4350 len += strlength (car (x));
4392 4351
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4352 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4353
4395 /* store the contents of the argument strings into the new string */ 4354 /* store the contents of the argument strings into the new string */
4396 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))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4356 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4357
4399 s_return (newstr); 4358 s_return (newstr);
4400 } 4359 }
4401 4360
4402 case OP_SUBSTR: /* substring */ 4361 case OP_SUBSTR: /* substring */
4403 { 4362 {
4404 char *str; 4363 char *str = strvalue (x);
4405 int index0; 4364 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4365 int index1;
4407 int len; 4366 int len;
4408 4367
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4368 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4369 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4370
4416 if (cddr (SCHEME_V->args) != NIL) 4371 if (cddr (args) != NIL)
4417 { 4372 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4373 index1 = ivalue_unchecked (caddr (args));
4419 4374
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4375 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4376 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4377 }
4423 else 4378 else
4424 index1 = strlength (car (SCHEME_V->args)); 4379 index1 = strlength (x);
4425 4380
4426 len = index1 - index0; 4381 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4382 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4383 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4384 strvalue (x)[len] = 0;
… …
4433 4388
4434 case OP_VECTOR: /* vector */ 4389 case OP_VECTOR: /* vector */
4435 { 4390 {
4436 int i; 4391 int i;
4437 pointer vec; 4392 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4393 int len = list_length (SCHEME_A_ args);
4439 4394
4440 if (len < 0) 4395 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4396 Error_1 ("vector: not a proper list:", args);
4442 4397
4443 vec = mk_vector (SCHEME_A_ len); 4398 vec = mk_vector (SCHEME_A_ len);
4444 4399
4445#if USE_ERROR_CHECKING 4400#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4401 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4402 s_return (S_SINK);
4448#endif 4403#endif
4449 4404
4450 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++)
4451 set_vector_elem (vec, i, car (x)); 4406 set_vector_elem (vec, i, car (x));
4452 4407
4453 s_return (vec); 4408 s_return (vec);
4454 } 4409 }
4455 4410
4456 case OP_MKVECTOR: /* make-vector */ 4411 case OP_MKVECTOR: /* make-vector */
4457 { 4412 {
4458 pointer fill = NIL; 4413 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4414 pointer vec;
4415 int len = ivalue_unchecked (x);
4461 4416
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4417 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4418 fill = cadr (args);
4466 4419
4467 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4468 4421
4469#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
… …
4476 4429
4477 s_return (vec); 4430 s_return (vec);
4478 } 4431 }
4479 4432
4480 case OP_VECLEN: /* vector-length */ 4433 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4434 s_return (mk_integer (SCHEME_A_ veclength (x)));
4482 4435
4483 case OP_VECREF: /* vector-ref */ 4436 case OP_VECREF: /* vector-ref */
4484 { 4437 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4438 int index = ivalue_unchecked (cadr (args));
4488 4439
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4440 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4441 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4442
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4443 s_return (vector_elem (x, index));
4493 } 4444 }
4494 4445
4495 case OP_VECSET: /* vector-set! */ 4446 case OP_VECSET: /* vector-set! */
4496 { 4447 {
4497 int index; 4448 int index = ivalue_unchecked (cadr (args));
4498 4449
4499 if (is_immutable (car (SCHEME_V->args))) 4450 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4451 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4452
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4453 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4454 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4455
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4456 set_vector_elem (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4457 s_return (x);
4509 } 4458 }
4510 } 4459 }
4511 4460
4512 return S_T; 4461 if (USE_ERROR_CHECKING) abort ();
4513} 4462}
4514 4463
4515INTERFACE int 4464static int
4516is_list (SCHEME_P_ pointer a) 4465opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4466{
4518 return list_length (SCHEME_A_ a) >= 0; 4467 pointer x = SCHEME_V->args;
4519}
4520 4468
4521/* Result is: 4469 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4470 {
4471 num v = nvalue (car (x));
4472 x = cdr (x);
4473
4537 if (fast == NIL) 4474 if (x == NIL)
4538 return i; 4475 break;
4539 4476
4540 if (!is_pair (fast)) 4477 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4478
4543 fast = cdr (fast); 4479 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4480 {
4561 /* the fast pointer has looped back around and caught up 4481 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4482 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4483 case OP_GRE: r = r > 0; break;
4564 return -1; 4484 case OP_LEQ: r = r <= 0; break;
4485 case OP_GEQ: r = r >= 0; break;
4565 } 4486 }
4566 }
4567}
4568 4487
4488 if (!r)
4489 s_return (S_F);
4490 }
4491
4492 s_return (S_T);
4493}
4494
4569static pointer 4495static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4496opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4497{
4572 pointer x; 4498 pointer args = SCHEME_V->args;
4573 num v; 4499 pointer a = car (args);
4574 int (*comp_func) (num, num); 4500 pointer d = cdr (args);
4501 int r;
4575 4502
4576 switch (op) 4503 switch (op)
4577 { 4504 {
4578 case OP_NOT: /* not */ 4505 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 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;
4580 4515
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4516#if USE_CHAR_CLASSIFIERS
4650 4517 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4518 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4519 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4520 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4521 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4522#endif
4523
4666#if USE_PORTS 4524#if USE_PORTS
4667 4525 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4526 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4527 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4528#endif
4677 4529
4678 case OP_PROCP: /* procedure? */ 4530 case OP_PROCP: /* procedure? */
4679 4531
4680 /*-- 4532 /*--
4681 * continuation should be procedure by the example 4533 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4534 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4535 * in R^3 report sec. 6.9
4684 */ 4536 */
4685 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);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4538 break;
4687 4539
4688 case OP_PAIRP: /* pair? */ 4540 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4541 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4542 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4543 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4544 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4545 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4546 }
4706 4547
4707 return S_T; 4548 s_retbool (r);
4708} 4549}
4709 4550
4710static pointer 4551static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4552opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4553{
4554 pointer args = SCHEME_V->args;
4555 pointer a = car (args);
4713 pointer x, y; 4556 pointer x, y;
4714 4557
4715 switch (op) 4558 switch (op)
4716 { 4559 {
4717 case OP_FORCE: /* force */ 4560 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4561 SCHEME_V->code = a;
4719 4562
4720 if (is_promise (SCHEME_V->code)) 4563 if (is_promise (SCHEME_V->code))
4721 { 4564 {
4722 /* Should change type to closure here */ 4565 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4566 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4587 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4588 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4589 }
4747 } 4590 }
4748 4591
4749 SCHEME_V->args = car (SCHEME_V->args); 4592 SCHEME_V->args = a;
4750 4593
4751 if (op == OP_WRITE) 4594 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4595 SCHEME_V->print_flag = 1;
4753 else 4596 else
4754 SCHEME_V->print_flag = 0; 4597 SCHEME_V->print_flag = 0;
4755 4598
4756 s_goto (OP_P0LIST); 4599 s_goto (OP_P0LIST);
4757 4600
4758 case OP_NEWLINE: /* newline */ 4601 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4602 if (is_pair (args))
4760 { 4603 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4604 if (a != SCHEME_V->outport)
4762 { 4605 {
4763 x = cons (SCHEME_V->outport, NIL); 4606 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4607 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4608 SCHEME_V->outport = a;
4766 } 4609 }
4767 } 4610 }
4768 4611
4769 putstr (SCHEME_A_ "\n"); 4612 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4613 s_return (S_T);
4771#endif 4614#endif
4772 4615
4773 case OP_ERR0: /* error */ 4616 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4617 SCHEME_V->retcode = -1;
4775 4618
4776 if (!is_string (car (SCHEME_V->args))) 4619 if (!is_string (a))
4777 { 4620 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4621 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4622 setimmutable (car (args));
4780 } 4623 }
4781 4624
4782 putstr (SCHEME_A_ "Error: "); 4625 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4626 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4627 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4628 s_goto (OP_ERR1);
4786 4629
4787 case OP_ERR1: /* error */ 4630 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4631 putstr (SCHEME_A_ " ");
4789 4632
4790 if (SCHEME_V->args != NIL) 4633 if (args != NIL)
4791 { 4634 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4635 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4636 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4637 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4638 s_goto (OP_P0LIST);
4796 } 4639 }
4797 else 4640 else
4798 { 4641 {
4799 putstr (SCHEME_A_ "\n"); 4642 putstr (SCHEME_A_ "\n");
4800 4643
4801 if (SCHEME_V->interactive_repl) 4644 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4645 s_goto (OP_T0LVL);
4803 else 4646 else
4804 return NIL; 4647 return -1;
4805 } 4648 }
4806 4649
4807 case OP_REVERSE: /* reverse */ 4650 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4651 s_return (reverse (SCHEME_A_ a));
4809 4652
4810 case OP_LIST_STAR: /* list* */ 4653 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4654 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4655
4813 case OP_APPEND: /* append */ 4656 case OP_APPEND: /* append */
4814 x = NIL; 4657 x = NIL;
4815 y = SCHEME_V->args; 4658 y = args;
4816 4659
4817 if (y == x) 4660 if (y == x)
4818 s_return (x); 4661 s_return (x);
4819 4662
4820 /* cdr() in the while condition is not a typo. If car() */ 4663 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4674 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4675
4833#if USE_PLIST 4676#if USE_PLIST
4834 4677
4835 case OP_PUT: /* put */ 4678 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4679 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4680 Error_0 ("illegal use of put");
4838 4681
4839 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))
4840 { 4683 {
4841 if (caar (x) == y) 4684 if (caar (x) == y)
4842 break; 4685 break;
4843 } 4686 }
4844 4687
4845 if (x != NIL) 4688 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4689 cdar (x) = caddr (args);
4847 else 4690 else
4848 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));
4849 4692
4850 s_return (S_T); 4693 s_return (S_T);
4851 4694
4852 case OP_GET: /* get */ 4695 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4696 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4697 Error_0 ("illegal use of get");
4855 4698
4856 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))
4857 if (caar (x) == y) 4700 if (caar (x) == y)
4858 break; 4701 break;
4859 4702
4860 if (x != NIL) 4703 if (x != NIL)
4861 s_return (cdar (x)); 4704 s_return (cdar (x));
… …
4863 s_return (NIL); 4706 s_return (NIL);
4864 4707
4865#endif /* USE_PLIST */ 4708#endif /* USE_PLIST */
4866 4709
4867 case OP_QUIT: /* quit */ 4710 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4711 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4712 SCHEME_V->retcode = ivalue (a);
4870 4713
4871 return NIL; 4714 return -1;
4872 4715
4873 case OP_GC: /* gc */ 4716 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4717 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4718 s_return (S_T);
4876 4719
4877 case OP_GCVERB: /* gc-verbose */ 4720 case OP_GCVERB: /* gc-verbose */
4878 { 4721 {
4879 int was = SCHEME_V->gc_verbose; 4722 int was = SCHEME_V->gc_verbose;
4880 4723
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4724 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4725 s_retbool (was);
4883 } 4726 }
4884 4727
4885 case OP_NEWSEGMENT: /* new-segment */ 4728 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4729 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4730 Error_0 ("new-segment: argument must be a number");
4888 4731
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4732 alloc_cellseg (SCHEME_A_ ivalue (a));
4890 4733
4891 s_return (S_T); 4734 s_return (S_T);
4892 4735
4893 case OP_OBLIST: /* oblist */ 4736 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4737 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4764 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4765 prop = port_input | port_output;
4923 break; 4766 break;
4924 } 4767 }
4925 4768
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4769 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4770
4928 if (p == NIL) 4771 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4772 }
4933 4773
4934# if USE_STRING_PORTS 4774# if USE_STRING_PORTS
4935 4775
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4776 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4788 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4789 prop = port_input | port_output;
4950 break; 4790 break;
4951 } 4791 }
4952 4792
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4793 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4794 strvalue (a) + strlength (a), prop);
4955 4795
4956 if (p == NIL) 4796 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4797 }
4961 4798
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4799 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4800 {
4964 pointer p; 4801 pointer p;
4965 4802
4966 if (car (SCHEME_V->args) == NIL) 4803 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4804 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4805 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4806 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4807 strvalue (a) + strlength (a), port_output);
4977 4808
4978 if (p == NIL) 4809 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4810 }
4984 4811
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4812 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4813 {
4987 port *p; 4814 port *p;
4988 4815
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4816 if ((p = a->object.port)->kind & port_string)
4990 { 4817 {
4991 off_t size; 4818 off_t size;
4992 char *str; 4819 char *str;
4993 4820
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4821 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4837 }
5011 4838
5012# endif 4839# endif
5013 4840
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4841 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4842 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4843 s_return (S_T);
5017 4844
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4845 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4846 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4847 s_return (S_T);
5021#endif 4848#endif
5022 4849
5023 case OP_INT_ENV: /* interaction-environment */ 4850 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4851 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4853 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4854 s_return (SCHEME_V->envir);
5028 4855
5029 } 4856 }
5030 4857
5031 return S_T; 4858 if (USE_ERROR_CHECKING) abort ();
5032} 4859}
5033 4860
5034static pointer 4861static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4862opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4863{
4864 pointer args = SCHEME_V->args;
5037 pointer x; 4865 pointer x;
5038 4866
5039 if (SCHEME_V->nesting != 0) 4867 if (SCHEME_V->nesting != 0)
5040 { 4868 {
5041 int n = SCHEME_V->nesting; 4869 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4876 switch (op)
5049 { 4877 {
5050 /* ========== reading part ========== */ 4878 /* ========== reading part ========== */
5051#if USE_PORTS 4879#if USE_PORTS
5052 case OP_READ: 4880 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4881 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4882 s_goto (OP_READ_INTERNAL);
5055 4883
5056 if (!is_inport (car (SCHEME_V->args))) 4884 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4885 Error_1 ("read: not an input port:", car (args));
5058 4886
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4887 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4888 s_goto (OP_READ_INTERNAL);
5061 4889
5062 x = SCHEME_V->inport; 4890 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4891 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4892 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4893 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4894 s_goto (OP_READ_INTERNAL);
5067 4895
5068 case OP_READ_CHAR: /* read-char */ 4896 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4897 case OP_PEEK_CHAR: /* peek-char */
5070 { 4898 {
5071 int c; 4899 int c;
5072 4900
5073 if (is_pair (SCHEME_V->args)) 4901 if (is_pair (args))
5074 { 4902 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4903 if (car (args) != SCHEME_V->inport)
5076 { 4904 {
5077 x = SCHEME_V->inport; 4905 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4906 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4907 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4908 SCHEME_V->inport = car (args);
5081 } 4909 }
5082 } 4910 }
5083 4911
5084 c = inchar (SCHEME_A); 4912 c = inchar (SCHEME_A);
5085 4913
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4923 case OP_CHAR_READY: /* char-ready? */
5096 { 4924 {
5097 pointer p = SCHEME_V->inport; 4925 pointer p = SCHEME_V->inport;
5098 int res; 4926 int res;
5099 4927
5100 if (is_pair (SCHEME_V->args)) 4928 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4929 p = car (args);
5102 4930
5103 res = p->object.port->kind & port_string; 4931 res = p->object.port->kind & port_string;
5104 4932
5105 s_retbool (res); 4933 s_retbool (res);
5106 } 4934 }
5107 4935
5108 case OP_SET_INPORT: /* set-input-port */ 4936 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4937 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4938 s_return (SCHEME_V->value);
5111 4939
5112 case OP_SET_OUTPORT: /* set-output-port */ 4940 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4941 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4942 s_return (SCHEME_V->value);
5115#endif 4943#endif
5116 4944
5117 case OP_RDSEXPR: 4945 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4946 switch (SCHEME_V->tok)
… …
5204 } 5032 }
5205 5033
5206 break; 5034 break;
5207 5035
5208 case OP_RDLIST: 5036 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5037 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5038 SCHEME_V->tok = token (SCHEME_A);
5211 5039
5212 switch (SCHEME_V->tok) 5040 switch (SCHEME_V->tok)
5213 { 5041 {
5214 case TOK_EOF: 5042 case TOK_EOF:
… …
5242 case OP_RDDOT: 5070 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5071 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5072 Error_0 ("syntax error: illegal dot expression");
5245 5073
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5074 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5075 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5076
5249 case OP_RDQUOTE: 5077 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5078 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5079
5252 case OP_RDQQUOTE: 5080 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5102 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5103 s_goto (OP_VECTOR);
5276 5104
5277 /* ========== printing part ========== */ 5105 /* ========== printing part ========== */
5278 case OP_P0LIST: 5106 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5107 if (is_vector (args))
5280 { 5108 {
5281 putstr (SCHEME_A_ "#("); 5109 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5110 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5111 s_goto (OP_PVECFROM);
5284 } 5112 }
5285 else if (is_environment (SCHEME_V->args)) 5113 else if (is_environment (args))
5286 { 5114 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5115 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5116 s_return (S_T);
5289 } 5117 }
5290 else if (!is_pair (SCHEME_V->args)) 5118 else if (!is_pair (args))
5291 { 5119 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5120 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5121 s_return (S_T);
5294 } 5122 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5123 else
5296 { 5124 {
5125 pointer a = car (args);
5126 pointer b = cdr (args);
5127 int ok_abbr = ok_abbrev (b);
5128 SCHEME_V->args = car (b);
5129
5130 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5131 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5132 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5133 putstr (SCHEME_A_ "`");
5134 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5135 putstr (SCHEME_A_ ",");
5136 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5137 putstr (SCHEME_A_ ",@");
5138 else
5139 {
5140 putstr (SCHEME_A_ "(");
5141 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5142 SCHEME_V->args = a;
5143 }
5144
5299 s_goto (OP_P0LIST); 5145 s_goto (OP_P0LIST);
5300 } 5146 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5147
5148 case OP_P1LIST:
5149 if (is_pair (args))
5302 { 5150 {
5151 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5152 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5153 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5154 s_goto (OP_P0LIST);
5306 } 5155 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5156 else if (is_vector (args))
5336 { 5157 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5158 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5159 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5160 s_goto (OP_P0LIST);
5340 } 5161 }
5341 else 5162 else
5342 { 5163 {
5343 if (SCHEME_V->args != NIL) 5164 if (args != NIL)
5344 { 5165 {
5345 putstr (SCHEME_A_ " . "); 5166 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5167 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5168 }
5348 5169
5349 putstr (SCHEME_A_ ")"); 5170 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5171 s_return (S_T);
5351 } 5172 }
5352 5173
5353 case OP_PVECFROM: 5174 case OP_PVECFROM:
5354 { 5175 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5176 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5177 pointer vec = car (args);
5357 int len = veclength (vec); 5178 int len = veclength (vec);
5358 5179
5359 if (i == len) 5180 if (i == len)
5360 { 5181 {
5361 putstr (SCHEME_A_ ")"); 5182 putstr (SCHEME_A_ ")");
… …
5363 } 5184 }
5364 else 5185 else
5365 { 5186 {
5366 pointer elem = vector_elem (vec, i); 5187 pointer elem = vector_elem (vec, i);
5367 5188
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5189 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5190 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5191 SCHEME_V->args = elem;
5371 5192
5372 if (i > 0) 5193 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5194 putstr (SCHEME_A_ " ");
5374 5195
5375 s_goto (OP_P0LIST); 5196 s_goto (OP_P0LIST);
5376 } 5197 }
5377 } 5198 }
5378 } 5199 }
5379 5200
5380 return S_T; 5201 if (USE_ERROR_CHECKING) abort ();
5381} 5202}
5382 5203
5383static pointer 5204static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5205opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5206{
5207 pointer args = SCHEME_V->args;
5208 pointer a = car (args);
5386 pointer x, y; 5209 pointer x, y;
5387 5210
5388 switch (op) 5211 switch (op)
5389 { 5212 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5213 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5214 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5215 long v = list_length (SCHEME_A_ a);
5393 5216
5394 if (v < 0) 5217 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5218 Error_1 ("length: not a list:", a);
5396 5219
5397 s_return (mk_integer (SCHEME_A_ v)); 5220 s_return (mk_integer (SCHEME_A_ v));
5398 } 5221 }
5399 5222
5400 case OP_ASSQ: /* assq *//* a.k */ 5223 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5224 x = a;
5402 5225
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5226 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5227 {
5405 if (!is_pair (car (y))) 5228 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5229 Error_0 ("unable to handle non pair element");
5407 5230
5408 if (x == caar (y)) 5231 if (x == caar (y))
… …
5414 else 5237 else
5415 s_return (S_F); 5238 s_return (S_F);
5416 5239
5417 5240
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5241 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5242 SCHEME_V->args = a;
5420 5243
5421 if (SCHEME_V->args == NIL) 5244 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5245 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5246 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5247 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5430 case OP_CLOSUREP: /* closure? */ 5253 case OP_CLOSUREP: /* closure? */
5431 /* 5254 /*
5432 * Note, macro object is also a closure. 5255 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5256 * Therefore, (closure? <#MACRO>) ==> #t
5434 */ 5257 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5258 s_retbool (is_closure (a));
5436 5259
5437 case OP_MACROP: /* macro? */ 5260 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5261 s_retbool (is_macro (a));
5439 } 5262 }
5440 5263
5441 return S_T; /* NOTREACHED */ 5264 if (USE_ERROR_CHECKING) abort ();
5442} 5265}
5443 5266
5267/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5268typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5269
5446typedef int (*test_predicate) (pointer); 5270typedef int (*test_predicate)(pointer);
5447static int 5271static int
5448is_any (pointer p) 5272tst_any (pointer p)
5449{ 5273{
5450 return 1; 5274 return 1;
5451} 5275}
5452 5276
5453static int 5277static int
5454is_nonneg (pointer p) 5278tst_inonneg (pointer p)
5455{ 5279{
5456 return ivalue (p) >= 0 && is_integer (p); 5280 return is_integer (p) && ivalue_unchecked (p) >= 0;
5281}
5282
5283static int
5284tst_is_list (SCHEME_P_ pointer p)
5285{
5286 return p == NIL || is_pair (p);
5457} 5287}
5458 5288
5459/* Correspond carefully with following defines! */ 5289/* Correspond carefully with following defines! */
5460static struct 5290static struct
5461{ 5291{
5462 test_predicate fct; 5292 test_predicate fct;
5463 const char *kind; 5293 const char *kind;
5464} tests[] = 5294} tests[] = {
5465{ 5295 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5296 { is_string , "string" },
5467 { is_any, 0}, 5297 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5298 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5299 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5300 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5301 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5302 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5303 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5304 { is_character , "character" },
5477 { is_vector, "vector" }, 5305 { is_vector , "vector" },
5478 { is_number, "number" }, 5306 { is_number , "number" },
5479 { is_integer, "integer" }, 5307 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5308 { tst_inonneg , "non-negative integer" }
5481}; 5309};
5482 5310
5483#define TST_NONE 0 5311#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5312#define TST_ANY "\001"
5485#define TST_STRING "\002" 5313#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5314#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5315#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5316#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5317#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5318#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5319#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5320#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5321#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5322#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5323#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5324#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5325#define TST_NATURAL "\016"
5326
5327#define INF_ARG 0xff
5328#define UNNAMED_OP ""
5329
5330static const char opnames[] =
5331#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5332#include "opdefines.h"
5333#undef OP_DEF
5334;
5335
5336static const char *
5337opname (int idx)
5338{
5339 const char *name = opnames;
5340
5341 /* should do this at compile time, but would require external program, right? */
5342 while (idx--)
5343 name += strlen (name) + 1;
5344
5345 return *name ? name : "ILLEGAL";
5346}
5347
5348static const char *
5349procname (pointer x)
5350{
5351 return opname (procnum (x));
5352}
5498 5353
5499typedef struct 5354typedef struct
5500{ 5355{
5501 dispatch_func func; 5356 uint8_t func;
5502 char *name; 5357 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5358 uint8_t builtin;
5359#if USE_ERROR_CHECKING
5503 int min_arity; 5360 uint8_t min_arity;
5504 int max_arity; 5361 uint8_t max_arity;
5505 char *arg_tests_encoding; 5362 char arg_tests_encoding[3];
5363#endif
5506} op_code_info; 5364} op_code_info;
5507 5365
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5366static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5367#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5369#else
5370#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5371#endif
5512#include "opdefines.h" 5372#include "opdefines.h"
5373#undef OP_DEF
5513 {0} 5374 {0}
5514}; 5375};
5515 5376
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5377/* kernel of this interpreter */
5529static void 5378static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5379Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5380{
5532 SCHEME_V->op = op; 5381 SCHEME_V->op = op;
5533 5382
5534 for (;;) 5383 for (;;)
5535 { 5384 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5385 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5386
5538#if USE_ERROR_CHECKING 5387#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5388 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5389 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5390 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5391 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5392
5545 /* Check number of arguments */ 5393 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5394 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5395 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5396 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5397 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5398 xError_1 (SCHEME_A_ msg, 0);
5399 continue;
5551 } 5400 }
5552 5401 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5402 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5403 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5404 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5405 xError_1 (SCHEME_A_ msg, 0);
5406 continue;
5558 } 5407 }
5559 5408 else
5560 if (ok)
5561 { 5409 {
5562 if (pcd->arg_tests_encoding) 5410 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5411 {
5564 int i = 0; 5412 int i = 0;
5565 int j; 5413 int j;
5566 const char *t = pcd->arg_tests_encoding; 5414 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5415 pointer arglist = SCHEME_V->args;
5568 5416
5569 do 5417 do
5570 { 5418 {
5571 pointer arg = car (arglist); 5419 pointer arg = car (arglist);
5572 5420
5573 j = (int) t[0]; 5421 j = t[0];
5574 5422
5423 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5424 if (j == TST_LIST[0])
5576 { 5425 {
5577 if (arg != NIL && !is_pair (arg)) 5426 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5427 break;
5579 } 5428 }
5580 else 5429 else
5581 { 5430 {
5582 if (!tests[j].fct (arg)) 5431 if (!tests[j - 1].fct (arg))
5583 break; 5432 break;
5584 } 5433 }
5585 5434
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5435 if (t[1]) /* last test is replicated as necessary */
5587 t++; 5436 t++;
5588 5437
5589 arglist = cdr (arglist); 5438 arglist = cdr (arglist);
5590 i++; 5439 i++;
5591 } 5440 }
5592 while (i < n); 5441 while (i < n);
5593 5442
5594 if (i < n) 5443 if (i < n)
5595 { 5444 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5445 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5446 xError_1 (SCHEME_A_ msg, 0);
5447 continue;
5598 } 5448 }
5599 } 5449 }
5600 } 5450 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5451 }
5610#endif 5452#endif
5611 5453
5612 ok_to_freely_gc (SCHEME_A); 5454 ok_to_freely_gc (SCHEME_A);
5613 5455
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5456 static const dispatch_func dispatch_funcs[] = {
5457 opexe_0,
5458 opexe_1,
5459 opexe_2,
5460 opexe_3,
5461 opexe_4,
5462 opexe_5,
5463 opexe_6,
5464 };
5465
5466 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5467 return;
5616 5468
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5469 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5470 {
5619 xwrstr ("No memory!\n"); 5471 xwrstr ("No memory!\n");
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5495mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5496{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5497 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5498 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5499 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5500 return y;
5650} 5501}
5651 5502
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5503/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5504static int
… …
5677 5528
5678 case 'd': 5529 case 'd':
5679 return OP_COND0; /* cond */ 5530 return OP_COND0; /* cond */
5680 5531
5681 case '*': 5532 case '*':
5682 return OP_LET0AST; /* let* */ 5533 return OP_LET0AST;/* let* */
5683 5534
5684 default: 5535 default:
5685 return OP_SET0; /* set! */ 5536 return OP_SET0; /* set! */
5686 } 5537 }
5687 5538
… …
5709 5560
5710 case 'f': 5561 case 'f':
5711 return OP_DEF0; /* define */ 5562 return OP_DEF0; /* define */
5712 5563
5713 default: 5564 default:
5714 return OP_LET0REC; /* letrec */ 5565 return OP_LET0REC;/* letrec */
5715 } 5566 }
5716 5567
5717 default: 5568 default:
5718 return OP_C0STREAM; /* cons-stream */ 5569 return OP_C0STREAM; /* cons-stream */
5719 } 5570 }
5720} 5571}
5721 5572
5722#if USE_MULTIPLICITY 5573#if USE_MULTIPLICITY
5723scheme * 5574ecb_cold scheme *
5724scheme_init_new () 5575scheme_init_new ()
5725{ 5576{
5726 scheme *sc = malloc (sizeof (scheme)); 5577 scheme *sc = malloc (sizeof (scheme));
5727 5578
5728 if (!scheme_init (SCHEME_A)) 5579 if (!scheme_init (SCHEME_A))
… …
5733 else 5584 else
5734 return sc; 5585 return sc;
5735} 5586}
5736#endif 5587#endif
5737 5588
5738int 5589ecb_cold int
5739scheme_init (SCHEME_P) 5590scheme_init (SCHEME_P)
5740{ 5591{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5592 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5593 pointer x;
5743 5594
… …
5816 5667
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5668 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5669 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5670 }
5820 5671
5672 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5673 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5674 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5675 assign_proc (SCHEME_A_ i, opname (i));
5824 5676
5825 /* initialization of global pointers to special symbols */ 5677 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5678 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5679 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5680 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5719scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5720{
5869 SCHEME_V->ext_data = p; 5721 SCHEME_V->ext_data = p;
5870} 5722}
5871 5723
5872void 5724ecb_cold void
5873scheme_deinit (SCHEME_P) 5725scheme_deinit (SCHEME_P)
5874{ 5726{
5875 int i; 5727 int i;
5876 5728
5877#if SHOW_ERROR_LINE 5729#if SHOW_ERROR_LINE
… …
5969{ 5821{
5970 dump_stack_reset (SCHEME_A); 5822 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5823 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5824 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5825 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5826 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5827 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5828 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5829#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5830 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5831#endif
5980 SCHEME_V->retcode = 0; 5832 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5833 SCHEME_V->interactive_repl = 0;

Diff Legend

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