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.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.26 by root, Sat Nov 28 05:12:53 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
37#include <string.h> 39#include <string.h>
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 69#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 70#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 71
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76
77#if !USE_MULTIPLICITY 72#if !USE_MULTIPLICITY
78static scheme sc; 73static scheme sc;
79#endif 74#endif
80 75
81static void 76static void
… …
150 145
151#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
154 149
155#if USE_STRLWR 150#if USE_IGNORECASE
156static const char * 151static const char *
157strlwr (char *s) 152xstrlwr (char *s)
158{ 153{
159 const char *p = s; 154 const char *p = s;
160 155
161 while (*s) 156 while (*s)
162 { 157 {
… …
164 s++; 159 s++;
165 } 160 }
166 161
167 return p; 162 return p;
168} 163}
169#endif
170 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
171#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
173 172
174#ifndef prompt 173#ifndef prompt
175# define prompt "ts> " 174# define prompt "ts> "
176#endif 175#endif
177 176
… …
183# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
184#endif 183#endif
185 184
186enum scheme_types 185enum scheme_types
187{ 186{
187 T_INTEGER,
188 T_FREE, 188 T_REAL,
189 T_STRING, 189 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 190 T_SYMBOL,
192 T_PROC, 191 T_PROC,
193 T_PAIR, 192 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 193 T_CLOSURE,
195 T_CONTINUATION, 194 T_CONTINUATION,
196 T_FOREIGN, 195 T_FOREIGN,
197 T_CHARACTER, 196 T_CHARACTER,
198 T_PORT, 197 T_PORT,
… …
208#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
212 211
213static num num_add (num a, num b); 212/* num, for generic arithmetic */
214static num num_mul (num a, num b); 213struct num
215static 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);
216static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 242static num num_rem (num a, num b);
219static num num_mod (num a, num b); 243static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 244
226#if USE_MATH 245#if USE_MATH
227static double round_per_R5RS (double x); 246static double round_per_R5RS (double x);
228#endif 247#endif
229static int is_zero_rvalue (RVALUE x); 248static int is_zero_rvalue (RVALUE x);
230
231static INLINE int
232num_is_integer (pointer p)
233{
234 return num_is_fixnum (p->object.number);
235}
236 249
237static num num_zero; 250static num num_zero;
238static num num_one; 251static num num_one;
239 252
240/* macros for cell operations */ 253/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 254#define typeflag(p) ((p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 255#define set_typeflag(p,v) ((p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 256#define type(p) (typeflag (p) & T_MASKTYPE)
244 257
245INTERFACE INLINE int 258INTERFACE int
246is_string (pointer p) 259is_string (pointer p)
247{ 260{
248 return type (p) == T_STRING; 261 return type (p) == T_STRING;
249} 262}
250 263
251#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
253 266
254INTERFACE int is_list (SCHEME_P_ pointer p);
255INTERFACE INLINE int 267INTERFACE int
256is_vector (pointer p) 268is_vector (pointer p)
257{ 269{
258 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
259} 271}
260 272
… …
269vector_length (pointer vec) 281vector_length (pointer vec)
270{ 282{
271 return vec->object.vector.length; 283 return vec->object.vector.length;
272} 284}
273 285
274INTERFACE 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
275is_number (pointer p) 300is_number (pointer p)
276{ 301{
277 return type (p) == T_NUMBER; 302 return is_integer (p) || is_real (p);
278} 303}
279 304
280INTERFACE INLINE int 305INTERFACE int
281is_integer (pointer p)
282{
283 if (!is_number (p))
284 return 0;
285
286 if (num_is_integer (p) || ivalue (p) == rvalue (p))
287 return 1;
288
289 return 0;
290}
291
292INTERFACE INLINE int
293is_real (pointer p)
294{
295 return is_number (p) && !num_is_fixnum (p->object.number);
296}
297
298INTERFACE INLINE int
299is_character (pointer p) 306is_character (pointer p)
300{ 307{
301 return type (p) == T_CHARACTER; 308 return type (p) == T_CHARACTER;
302} 309}
303 310
304INTERFACE INLINE char * 311INTERFACE char *
305string_value (pointer p) 312string_value (pointer p)
306{ 313{
307 return strvalue (p); 314 return strvalue (p);
308} 315}
309 316
310INLINE num
311nvalue (pointer p)
312{
313 return (p)->object.number;
314}
315
316static IVALUE
317num_get_ivalue (const num n)
318{
319 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
320}
321
322static RVALUE
323num_get_rvalue (const num n)
324{
325 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
326}
327
328INTERFACE IVALUE
329ivalue (pointer p)
330{
331 return num_get_ivalue (p->object.number);
332}
333
334INTERFACE RVALUE
335rvalue (pointer p)
336{
337 return num_get_rvalue (p->object.number);
338}
339
340#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
341#if USE_REAL 320#if USE_REAL
342# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 321#define rvalue_unchecked(p) (p)->object.rvalue
343# define set_num_integer(p) (p)->object.number.is_fixnum=1; 322#define set_rvalue(p,v) (p)->object.rvalue = (v)
344# define set_num_real(p) (p)->object.number.is_fixnum=0;
345#else 323#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 324#define rvalue_unchecked(p) (p)->object.ivalue
347# define set_num_integer(p) 0 325#define set_rvalue(p,v) (p)->object.ivalue = (v)
348# define set_num_real(p) 0
349#endif 326#endif
327
350INTERFACE long 328INTERFACE long
351charvalue (pointer p) 329charvalue (pointer p)
352{ 330{
353 return ivalue_unchecked (p); 331 return ivalue_unchecked (p);
354} 332}
355 333
356INTERFACE INLINE int 334INTERFACE int
357is_port (pointer p) 335is_port (pointer p)
358{ 336{
359 return type (p) == T_PORT; 337 return type (p) == T_PORT;
360} 338}
361 339
362INTERFACE INLINE int 340INTERFACE int
363is_inport (pointer p) 341is_inport (pointer p)
364{ 342{
365 return is_port (p) && p->object.port->kind & port_input; 343 return is_port (p) && p->object.port->kind & port_input;
366} 344}
367 345
368INTERFACE INLINE int 346INTERFACE int
369is_outport (pointer p) 347is_outport (pointer p)
370{ 348{
371 return is_port (p) && p->object.port->kind & port_output; 349 return is_port (p) && p->object.port->kind & port_output;
372} 350}
373 351
374INTERFACE INLINE int 352INTERFACE int
375is_pair (pointer p) 353is_pair (pointer p)
376{ 354{
377 return type (p) == T_PAIR; 355 return type (p) == T_PAIR;
378} 356}
379 357
380#define car(p) ((p)->object.cons.car + 0) 358#define car(p) ((p)->object.cons.car + 0)
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 359#define cdr(p) ((p)->object.cons.cdr + 0)
382 360
383#define caar(p) car (car (p)) 361static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 362static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 363static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 364static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 365
388#define cadar(p) car (cdr (car (p))) 366static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 367static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 368static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 369
392INTERFACE void 370INTERFACE void
393set_car (pointer p, pointer q) 371set_car (pointer p, pointer q)
394{ 372{
395 p->object.cons.car = q; 373 p->object.cons.car = q;
… …
411pair_cdr (pointer p) 389pair_cdr (pointer p)
412{ 390{
413 return cdr (p); 391 return cdr (p);
414} 392}
415 393
416INTERFACE INLINE int 394INTERFACE int
417is_symbol (pointer p) 395is_symbol (pointer p)
418{ 396{
419 return type (p) == T_SYMBOL; 397 return type (p) == T_SYMBOL;
420} 398}
421 399
422INTERFACE INLINE char * 400INTERFACE char *
423symname (pointer p) 401symname (pointer p)
424{ 402{
425 return strvalue (car (p)); 403 return strvalue (car (p));
426} 404}
427 405
428#if USE_PLIST 406#if USE_PLIST
429SCHEME_EXPORT INLINE int 407SCHEME_EXPORT int
430hasprop (pointer p) 408hasprop (pointer p)
431{ 409{
432 return typeflag (p) & T_SYMBOL; 410 return typeflag (p) & T_SYMBOL;
433} 411}
434 412
435# define symprop(p) cdr(p) 413# define symprop(p) cdr(p)
436#endif 414#endif
437 415
438INTERFACE INLINE int 416INTERFACE int
439is_syntax (pointer p) 417is_syntax (pointer p)
440{ 418{
441 return typeflag (p) & T_SYNTAX; 419 return typeflag (p) & T_SYNTAX;
442} 420}
443 421
444INTERFACE INLINE int 422INTERFACE int
445is_proc (pointer p) 423is_proc (pointer p)
446{ 424{
447 return type (p) == T_PROC; 425 return type (p) == T_PROC;
448} 426}
449 427
450INTERFACE INLINE int 428INTERFACE int
451is_foreign (pointer p) 429is_foreign (pointer p)
452{ 430{
453 return type (p) == T_FOREIGN; 431 return type (p) == T_FOREIGN;
454} 432}
455 433
456INTERFACE INLINE char * 434INTERFACE char *
457syntaxname (pointer p) 435syntaxname (pointer p)
458{ 436{
459 return strvalue (car (p)); 437 return strvalue (car (p));
460} 438}
461 439
462#define procnum(p) ivalue (p) 440#define procnum(p) ivalue_unchecked (p)
463static const char *procname (pointer x); 441static const char *procname (pointer x);
464 442
465INTERFACE INLINE int 443INTERFACE int
466is_closure (pointer p) 444is_closure (pointer p)
467{ 445{
468 return type (p) == T_CLOSURE; 446 return type (p) == T_CLOSURE;
469} 447}
470 448
471INTERFACE INLINE int 449INTERFACE int
472is_macro (pointer p) 450is_macro (pointer p)
473{ 451{
474 return type (p) == T_MACRO; 452 return type (p) == T_MACRO;
475} 453}
476 454
477INTERFACE INLINE pointer 455INTERFACE pointer
478closure_code (pointer p) 456closure_code (pointer p)
479{ 457{
480 return car (p); 458 return car (p);
481} 459}
482 460
483INTERFACE INLINE pointer 461INTERFACE pointer
484closure_env (pointer p) 462closure_env (pointer p)
485{ 463{
486 return cdr (p); 464 return cdr (p);
487} 465}
488 466
489INTERFACE INLINE int 467INTERFACE int
490is_continuation (pointer p) 468is_continuation (pointer p)
491{ 469{
492 return type (p) == T_CONTINUATION; 470 return type (p) == T_CONTINUATION;
493} 471}
494 472
495#define cont_dump(p) cdr (p) 473#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 474#define set_cont_dump(p,v) set_cdr ((p), (v))
497 475
498/* To do: promise should be forced ONCE only */ 476/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 477INTERFACE int
500is_promise (pointer p) 478is_promise (pointer p)
501{ 479{
502 return type (p) == T_PROMISE; 480 return type (p) == T_PROMISE;
503} 481}
504 482
505INTERFACE INLINE int 483INTERFACE int
506is_environment (pointer p) 484is_environment (pointer p)
507{ 485{
508 return type (p) == T_ENVIRONMENT; 486 return type (p) == T_ENVIRONMENT;
509} 487}
510 488
… …
516 494
517#define is_mark(p) (typeflag (p) & T_MARK) 495#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 496#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 497#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 498
521INTERFACE INLINE int 499INTERFACE int
522is_immutable (pointer p) 500is_immutable (pointer p)
523{ 501{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 502 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 503}
526 504
527INTERFACE INLINE void 505INTERFACE void
528setimmutable (pointer p) 506setimmutable (pointer p)
529{ 507{
530#if USE_ERROR_CHECKING 508#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 509 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 510#endif
533} 511}
534 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
535#if USE_CHAR_CLASSIFIERS 567#if USE_CHAR_CLASSIFIERS
536static INLINE int 568ecb_inline int
537Cisalpha (int c) 569Cisalpha (int c)
538{ 570{
539 return isascii (c) && isalpha (c); 571 return isascii (c) && isalpha (c);
540} 572}
541 573
542static INLINE int 574ecb_inline int
543Cisdigit (int c) 575Cisdigit (int c)
544{ 576{
545 return isascii (c) && isdigit (c); 577 return isascii (c) && isdigit (c);
546} 578}
547 579
548static INLINE int 580ecb_inline int
549Cisspace (int c) 581Cisspace (int c)
550{ 582{
551 return isascii (c) && isspace (c); 583 return isascii (c) && isspace (c);
552} 584}
553 585
554static INLINE int 586ecb_inline int
555Cisupper (int c) 587Cisupper (int c)
556{ 588{
557 return isascii (c) && isupper (c); 589 return isascii (c) && isupper (c);
558} 590}
559 591
560static INLINE int 592ecb_inline int
561Cislower (int c) 593Cislower (int c)
562{ 594{
563 return isascii (c) && islower (c); 595 return isascii (c) && islower (c);
564} 596}
565#endif 597#endif
… …
626#endif 658#endif
627 659
628static int file_push (SCHEME_P_ const char *fname); 660static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 661static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 662static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 663ecb_inline int is_one_of (char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 664static int alloc_cellseg (SCHEME_P_ int n);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 665ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 666static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 667static int count_consecutive_cells (pointer x, int needed);
636static 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);
637static pointer mk_number (SCHEME_P_ const num n); 669static pointer mk_number (SCHEME_P_ const num n);
638static 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);
… …
655static int basic_inchar (port *pt); 687static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 688static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 689static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 690static char *readstr_upto (SCHEME_P_ char *delim);
659static pointer readstrexp (SCHEME_P); 691static pointer readstrexp (SCHEME_P);
660static INLINE int skipspace (SCHEME_P); 692ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 693static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 694static void printslashstring (SCHEME_P_ char *s, int len);
663static 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);
664static void printatom (SCHEME_P_ pointer l, int f); 696static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 697static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 701static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 702static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 703static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 704static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 705static void dump_stack_mark (SCHEME_P);
674static 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);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 708static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 709static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 710static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 711static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 713static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 714static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 715static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 716static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 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
685static num 745static num
686num_add (num a, num b) 746num_op (enum num_op op, num a, num b)
687{ 747{
688 num ret; 748 num ret;
689 749
690 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));
691 751
692 if (num_is_fixnum (ret)) 752 if (num_is_fixnum (ret))
693 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
694 else 765 else
695 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 }
696 774
697 return ret; 775 num_set_rvalue (ret, a.rvalue);
698} 776 }
699 777#endif
700static num
701num_mul (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 778
712 return ret; 779 return ret;
713} 780}
714 781
715static num 782static num
716num_div (num a, num b) 783num_div (num a, num b)
717{ 784{
718 num ret; 785 num ret;
719 786
720 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);
721 788
722 if (num_is_fixnum (ret)) 789 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 790 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
724 else 791 else
725 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 792 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
726
727 return ret;
728}
729
730static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756 793
757 return ret; 794 return ret;
758} 795}
759 796
760static num 797static num
… …
762{ 799{
763 num ret; 800 num ret;
764 long e1, e2, res; 801 long e1, e2, res;
765 802
766 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));
767 e1 = num_get_ivalue (a); 804 e1 = num_ivalue (a);
768 e2 = num_get_ivalue (b); 805 e2 = num_ivalue (b);
769 res = e1 % e2; 806 res = e1 % e2;
770 807
771 /* remainder should have same sign as second operand */ 808 /* remainder should have same sign as second operand */
772 if (res > 0) 809 if (res > 0)
773 { 810 {
… …
789{ 826{
790 num ret; 827 num ret;
791 long e1, e2, res; 828 long e1, e2, res;
792 829
793 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));
794 e1 = num_get_ivalue (a); 831 e1 = num_ivalue (a);
795 e2 = num_get_ivalue (b); 832 e2 = num_ivalue (b);
796 res = e1 % e2; 833 res = e1 % e2;
797 834
798 /* modulo should have same sign as second operand */ 835 /* modulo should have same sign as second operand */
799 if (res * e2 < 0) 836 if (res * e2 < 0)
800 res += e2; 837 res += e2;
801 838
802 num_set_ivalue (ret, res); 839 num_set_ivalue (ret, res);
803 return ret; 840 return ret;
804} 841}
805 842
843/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 844static int
807num_eq (num a, num b) 845num_cmp (num a, num b)
808{ 846{
847 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 848 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 849
812 if (is_fixnum) 850 if (is_fixnum)
813 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 }
814 else 857 else
815 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 }
816 864
817 return ret; 865 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 866}
860 867
861#if USE_MATH 868#if USE_MATH
862 869
863/* Round to nearest. Round to even if midway */ 870/* Round to nearest. Round to even if midway */
… …
873 return ce; 880 return ce;
874 else if (dfl < dce) 881 else if (dfl < dce)
875 return fl; 882 return fl;
876 else 883 else
877 { 884 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 885 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 886 return fl;
880 else 887 else
881 return ce; 888 return ce;
882 } 889 }
883} 890}
884#endif 891#endif
885 892
886static int 893static int
887is_zero_rvalue (RVALUE x) 894is_zero_rvalue (RVALUE x)
888{ 895{
896 return x == 0;
897#if 0
889#if USE_REAL 898#if USE_REAL
890 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. */
891#else 900#else
892 return x == 0; 901 return x == 0;
902#endif
893#endif 903#endif
894} 904}
895 905
896/* allocate new cell segment */ 906/* allocate new cell segment */
897static int 907static int
… …
942 SCHEME_V->fcells += segsize; 952 SCHEME_V->fcells += segsize;
943 last = newp + segsize - 1; 953 last = newp + segsize - 1;
944 954
945 for (p = newp; p <= last; p++) 955 for (p = newp; p <= last; p++)
946 { 956 {
947 set_typeflag (p, T_FREE); 957 set_typeflag (p, T_PAIR);
948 set_car (p, NIL); 958 set_car (p, NIL);
949 set_cdr (p, p + 1); 959 set_cdr (p, p + 1);
950 } 960 }
951 961
952 /* insert new cells in address order on free list */ 962 /* insert new cells in address order on free list */
… …
969 979
970 return n; 980 return n;
971} 981}
972 982
973/* get new cell. parameter a, b is marked by gc. */ 983/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 984ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 985get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 986{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 987 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 988 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 989 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1057 push_recent_alloc (SCHEME_A_ v, NIL); 1067 push_recent_alloc (SCHEME_A_ v, NIL);
1058 1068
1059 return v; 1069 return v;
1060} 1070}
1061 1071
1062static INLINE void 1072ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1073ok_to_freely_gc (SCHEME_P)
1064{ 1074{
1065 set_car (S_SINK, NIL); 1075 set_car (S_SINK, NIL);
1066} 1076}
1067 1077
… …
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1141 location = hash_fn (name, veclength (SCHEME_V->oblist));
1132 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)));
1133 return x; 1143 return x;
1134} 1144}
1135 1145
1136static INLINE pointer 1146ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1147oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1148{
1139 int location; 1149 int location;
1140 pointer x; 1150 pointer x;
1141 char *s; 1151 char *s;
… …
1174oblist_initial_value (SCHEME_P) 1184oblist_initial_value (SCHEME_P)
1175{ 1185{
1176 return NIL; 1186 return NIL;
1177} 1187}
1178 1188
1179static INLINE pointer 1189ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1190oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1191{
1182 pointer x; 1192 pointer x;
1183 char *s; 1193 char *s;
1184 1194
… …
1243mk_character (SCHEME_P_ int c) 1253mk_character (SCHEME_P_ int c)
1244{ 1254{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1255 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1256
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1257 set_typeflag (x, (T_CHARACTER | T_ATOM));
1248 ivalue_unchecked (x) = c & 0xff; 1258 set_ivalue (x, c & 0xff);
1249 set_num_integer (x); 1259
1250 return x; 1260 return x;
1251} 1261}
1252 1262
1253/* get number atom (integer) */ 1263/* get number atom (integer) */
1254INTERFACE pointer 1264INTERFACE pointer
1255mk_integer (SCHEME_P_ long num) 1265mk_integer (SCHEME_P_ long n)
1256{ 1266{
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1267 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1268
1259 set_typeflag (x, (T_NUMBER | T_ATOM)); 1269 set_typeflag (x, (T_INTEGER | T_ATOM));
1260 ivalue_unchecked (x) = num; 1270 set_ivalue (x, n);
1261 set_num_integer (x); 1271
1262 return x; 1272 return x;
1263} 1273}
1264 1274
1265INTERFACE pointer 1275INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1276mk_real (SCHEME_P_ RVALUE n)
1267{ 1277{
1278#if USE_REAL
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1279 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1280
1270 set_typeflag (x, (T_NUMBER | T_ATOM)); 1281 set_typeflag (x, (T_REAL | T_ATOM));
1271 rvalue_unchecked (x) = n; 1282 set_rvalue (x, n);
1272 set_num_real (x); 1283
1273 return x; 1284 return x;
1285#else
1286 return mk_integer (SCHEME_A_ n);
1287#endif
1274} 1288}
1275 1289
1276static pointer 1290static pointer
1277mk_number (SCHEME_P_ const num n) 1291mk_number (SCHEME_P_ const num n)
1278{ 1292{
1293#if USE_REAL
1279 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
1280 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1298 return mk_integer (SCHEME_A_ num_ivalue (n));
1281 else 1299#endif
1282 return mk_real (SCHEME_A_ num_get_rvalue (n));
1283} 1300}
1284 1301
1285/* allocate name to string area */ 1302/* allocate name to string area */
1286static char * 1303static char *
1287store_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)
… …
1463 } 1480 }
1464 else if ((c == 'e') || (c == 'E')) 1481 else if ((c == 'e') || (c == 'E'))
1465 { 1482 {
1466 if (!has_fp_exp) 1483 if (!has_fp_exp)
1467 { 1484 {
1468 has_dec_point = 1; /* decimal point illegal 1485 has_dec_point = 1; /* decimal point illegal from now on */
1469 from now on */
1470 p++; 1486 p++;
1471 1487
1472 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1488 if ((*p == '-') || (*p == '+') || isdigit (*p))
1473 continue; 1489 continue;
1474 } 1490 }
… …
1670 if (is_mark (p)) 1686 if (is_mark (p))
1671 clrmark (p); 1687 clrmark (p);
1672 else 1688 else
1673 { 1689 {
1674 /* reclaim cell */ 1690 /* reclaim cell */
1675 if (typeflag (p) != T_FREE) 1691 if (typeflag (p) != T_PAIR)
1676 { 1692 {
1677 finalize_cell (SCHEME_A_ p); 1693 finalize_cell (SCHEME_A_ p);
1678 set_typeflag (p, T_FREE); 1694 set_typeflag (p, T_PAIR);
1679 set_car (p, NIL); 1695 set_car (p, NIL);
1680 } 1696 }
1681 1697
1682 ++SCHEME_V->fcells; 1698 ++SCHEME_V->fcells;
1683 set_cdr (p, SCHEME_V->free_cell); 1699 set_cdr (p, SCHEME_V->free_cell);
… …
1685 } 1701 }
1686 } 1702 }
1687 } 1703 }
1688 1704
1689 if (SCHEME_V->gc_verbose) 1705 if (SCHEME_V->gc_verbose)
1706 {
1690 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1707 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1708 }
1691} 1709}
1692 1710
1693static void 1711static void
1694finalize_cell (SCHEME_P_ pointer a) 1712finalize_cell (SCHEME_P_ pointer a)
1695{ 1713{
… …
2282 } 2300 }
2283 } 2301 }
2284} 2302}
2285 2303
2286/* check c is in chars */ 2304/* check c is in chars */
2287static INLINE int 2305ecb_inline int
2288is_one_of (char *s, int c) 2306is_one_of (char *s, int c)
2289{ 2307{
2290 if (c == EOF) 2308 if (c == EOF)
2291 return 1; 2309 return 1;
2292 2310
2293 return !!strchr (s, c); 2311 return !!strchr (s, c);
2294} 2312}
2295 2313
2296/* skip white characters */ 2314/* skip white characters */
2297static INLINE int 2315ecb_inline int
2298skipspace (SCHEME_P) 2316skipspace (SCHEME_P)
2299{ 2317{
2300 int c, curr_line = 0; 2318 int c, curr_line = 0;
2301 2319
2302 do 2320 do
… …
2530 { 2548 {
2531 p = SCHEME_V->strbuff; 2549 p = SCHEME_V->strbuff;
2532 2550
2533 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 */
2534 { 2552 {
2535 if (num_is_integer (l)) 2553 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2554 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2555#if USE_REAL
2538 else 2556 else
2539 { 2557 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2558 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2795 return 0; 2813 return 0;
2796 } 2814 }
2797 else if (is_number (a)) 2815 else if (is_number (a))
2798 { 2816 {
2799 if (is_number (b)) 2817 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2818 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2819
2803 return 0; 2820 return 0;
2804 } 2821 }
2805 else if (is_character (a)) 2822 else if (is_character (a))
2806 { 2823 {
… …
2873 2890
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2891 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2892 setenvironment (SCHEME_V->envir);
2876} 2893}
2877 2894
2878static INLINE void 2895ecb_inline void
2879new_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)
2880{ 2897{
2881 pointer slot = immutable_cons (variable, value); 2898 pointer slot = immutable_cons (variable, value);
2882 2899
2883 if (is_vector (car (env))) 2900 if (is_vector (car (env)))
… …
2923 return NIL; 2940 return NIL;
2924} 2941}
2925 2942
2926#else /* USE_ALIST_ENV */ 2943#else /* USE_ALIST_ENV */
2927 2944
2928static INLINE void 2945ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2946new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2947{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2948 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2949 setenvironment (SCHEME_V->envir);
2933} 2950}
2934 2951
2935static INLINE void 2952ecb_inline void
2936new_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)
2937{ 2954{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2955 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2956}
2940 2957
… …
2962 return NIL; 2979 return NIL;
2963} 2980}
2964 2981
2965#endif /* USE_ALIST_ENV else */ 2982#endif /* USE_ALIST_ENV else */
2966 2983
2967static INLINE void 2984ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2985new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2986{
2970 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);
2971} 2988}
2972 2989
2973static INLINE void 2990ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2991set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2992{
2976 set_cdr (slot, value); 2993 set_cdr (slot, value);
2977} 2994}
2978 2995
2979static INLINE pointer 2996ecb_inline pointer
2980slot_value_in_env (pointer slot) 2997slot_value_in_env (pointer slot)
2981{ 2998{
2982 return cdr (slot); 2999 return cdr (slot);
2983} 3000}
2984 3001
2985/* ========== Evaluation Cycle ========== */ 3002/* ========== Evaluation Cycle ========== */
2986 3003
2987static pointer 3004static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 3005xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 3006{
2990#if USE_ERROR_HOOK 3007#if USE_ERROR_HOOK
2991 pointer x; 3008 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 3009 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 3044 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 3045 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 3046 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 3047 SCHEME_V->op = OP_EVAL;
3031 3048
3032 return S_T; 3049 return 0;
3033 } 3050 }
3034#endif 3051#endif
3035 3052
3036 if (a) 3053 if (a)
3037 SCHEME_V->args = cons (a, NIL); 3054 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 3056 SCHEME_V->args = NIL;
3040 3057
3041 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);
3042 setimmutable (car (SCHEME_V->args)); 3059 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 3060 SCHEME_V->op = OP_ERR0;
3061
3044 return S_T; 3062 return 0;
3045} 3063}
3046 3064
3047#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)
3048#define Error_0(s) Error_1 (s, 0) 3066#define Error_0(s) Error_1 (s, 0)
3049 3067
3050/* Too small to turn into function */ 3068/* Too small to turn into function */
3051#define BEGIN do { 3069#define BEGIN do {
3052#define END } while (0) 3070#define END } while (0)
3053#define s_goto(a) BEGIN \ 3071#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 3072 SCHEME_V->op = a; \
3055 return S_T; END 3073 return 0; END
3056 3074
3057#define s_return(a) return xs_return (SCHEME_A_ a) 3075#define s_return(a) return xs_return (SCHEME_A_ a)
3058 3076
3059#ifndef USE_SCHEME_STACK 3077#ifndef USE_SCHEME_STACK
3060 3078
… …
3085 next_frame = SCHEME_V->dump_base + nframes; 3103 next_frame = SCHEME_V->dump_base + nframes;
3086 3104
3087 next_frame->op = op; 3105 next_frame->op = op;
3088 next_frame->args = args; 3106 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3107 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3108 next_frame->code = code;
3091 3109
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3110 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3111}
3094 3112
3095static pointer 3113static int
3096xs_return (SCHEME_P_ pointer a) 3114xs_return (SCHEME_P_ pointer a)
3097{ 3115{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3117 struct dump_stack_frame *frame;
3100 3118
3101 SCHEME_V->value = a; 3119 SCHEME_V->value = a;
3102 3120
3103 if (nframes <= 0) 3121 if (nframes <= 0)
3104 return NIL; 3122 return -1;
3105 3123
3106 frame = &SCHEME_V->dump_base[--nframes]; 3124 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3125 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3126 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3127 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3128 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3129 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3130
3113 return S_T; 3131 return 0;
3114} 3132}
3115 3133
3116static INLINE void 3134ecb_inline void
3117dump_stack_reset (SCHEME_P) 3135dump_stack_reset (SCHEME_P)
3118{ 3136{
3119 /* 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 */
3120 SCHEME_V->dump = (pointer)+0; 3138 SCHEME_V->dump = (pointer)+0;
3121} 3139}
3122 3140
3123static INLINE void 3141ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3142dump_stack_initialize (SCHEME_P)
3125{ 3143{
3126 SCHEME_V->dump_size = 0; 3144 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3145 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3146 dump_stack_reset (SCHEME_A);
… …
3181 int i = 0; 3199 int i = 0;
3182 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3200 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3183 3201
3184 while (cont != NIL) 3202 while (cont != NIL)
3185 { 3203 {
3186 frame->op = ivalue (car (cont)); cont = cdr (cont); 3204 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3187 frame->args = car (cont) ; cont = cdr (cont); 3205 frame->args = car (cont) ; cont = cdr (cont);
3188 frame->envir = car (cont) ; cont = cdr (cont); 3206 frame->envir = car (cont) ; cont = cdr (cont);
3189 frame->code = car (cont) ; cont = cdr (cont); 3207 frame->code = car (cont) ; cont = cdr (cont);
3190 3208
3191 ++frame; 3209 ++frame;
3192 ++i; 3210 ++i;
3193 } 3211 }
3194 3212
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3213 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3214}
3197 3215
3198#else 3216#else
3199 3217
3200static INLINE void 3218ecb_inline void
3201dump_stack_reset (SCHEME_P) 3219dump_stack_reset (SCHEME_P)
3202{ 3220{
3203 SCHEME_V->dump = NIL; 3221 SCHEME_V->dump = NIL;
3204} 3222}
3205 3223
3206static INLINE void 3224ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3225dump_stack_initialize (SCHEME_P)
3208{ 3226{
3209 dump_stack_reset (SCHEME_A); 3227 dump_stack_reset (SCHEME_A);
3210} 3228}
3211 3229
… …
3213dump_stack_free (SCHEME_P) 3231dump_stack_free (SCHEME_P)
3214{ 3232{
3215 SCHEME_V->dump = NIL; 3233 SCHEME_V->dump = NIL;
3216} 3234}
3217 3235
3218static pointer 3236static int
3219xs_return (SCHEME_P_ pointer a) 3237xs_return (SCHEME_P_ pointer a)
3220{ 3238{
3221 pointer dump = SCHEME_V->dump; 3239 pointer dump = SCHEME_V->dump;
3222 3240
3223 SCHEME_V->value = a; 3241 SCHEME_V->value = a;
3224 3242
3225 if (dump == NIL) 3243 if (dump == NIL)
3226 return NIL; 3244 return -1;
3227 3245
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3246 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3247 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3248 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3249 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3250
3233 SCHEME_V->dump = dump; 3251 SCHEME_V->dump = dump;
3234 3252
3235 return S_T; 3253 return 0;
3236} 3254}
3237 3255
3238static void 3256static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3257s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3258{
… …
3265 3283
3266#endif 3284#endif
3267 3285
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3286#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3287
3270static pointer 3288static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3289opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3290{
3291 pointer args = SCHEME_V->args;
3273 pointer x, y; 3292 pointer x, y;
3274 3293
3275 switch (op) 3294 switch (op)
3276 { 3295 {
3277 case OP_LOAD: /* load */ 3296 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3297 if (file_interactive (SCHEME_A))
3279 { 3298 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3299 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //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)));
3282 } 3301 }
3283 3302
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3303 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3304 Error_1 ("unable to open", car (args));
3286 else 3305 else
3287 { 3306 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3307 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3308 s_goto (OP_T0LVL);
3290 } 3309 }
… …
3364 case OP_EVAL: /* main part of evaluation */ 3383 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3384#if USE_TRACING
3366 if (SCHEME_V->tracing) 3385 if (SCHEME_V->tracing)
3367 { 3386 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3387 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 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);
3370 SCHEME_V->args = SCHEME_V->code; 3389 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3390 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3391 s_goto (OP_P0LIST);
3373 } 3392 }
3374 3393
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3437 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3438 s_goto (OP_E1ARGS);
3420 } 3439 }
3421 3440
3422 case OP_E1ARGS: /* eval arguments */ 3441 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3442 args = cons (SCHEME_V->value, args);
3424 3443
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3444 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3445 {
3427 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));
3428 SCHEME_V->code = car (SCHEME_V->code); 3447 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3448 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3449 s_goto (OP_EVAL);
3431 } 3450 }
3432 else /* end */ 3451 else /* end */
3433 { 3452 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3453 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3454 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3455 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3456 s_goto (OP_APPLY);
3438 } 3457 }
3439 3458
3440#if USE_TRACING 3459#if USE_TRACING
3441 3460
3442 case OP_TRACING: 3461 case OP_TRACING:
3443 { 3462 {
3444 int tr = SCHEME_V->tracing; 3463 int tr = SCHEME_V->tracing;
3445 3464
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3465 SCHEME_V->tracing = ivalue_unchecked (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3466 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3467 }
3449 3468
3450#endif 3469#endif
3451 3470
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3471 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3472#if USE_TRACING
3454 if (SCHEME_V->tracing) 3473 if (SCHEME_V->tracing)
3455 { 3474 {
3456 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);
3457 SCHEME_V->print_flag = 1; 3476 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3477 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3478 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3479 s_goto (OP_P0LIST);
3461 } 3480 }
3462 3481
3463 /* fall through */ 3482 /* fall through */
3464 3483
3465 case OP_REAL_APPLY: 3484 case OP_REAL_APPLY:
3466#endif 3485#endif
3467 if (is_proc (SCHEME_V->code)) 3486 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3487 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3488 else if (is_foreign (SCHEME_V->code))
3472 { 3489 {
3473 /* Keep nested calls from GC'ing the arglist */ 3490 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3491 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3492 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3493
3477 s_return (x); 3494 s_return (x);
3478 } 3495 }
3479 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 */
3480 { 3497 {
3481 /* Should not accept promise */ 3498 /* Should not accept promise */
3482 /* make environment */ 3499 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3500 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3501
3485 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))
3486 { 3503 {
3487 if (y == NIL) 3504 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3505 Error_0 ("not enough arguments");
3489 else 3506 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3507 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3525 s_goto (OP_BEGIN);
3509 } 3526 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3527 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3528 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3529 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3530 s_return (args != NIL ? car (args) : NIL);
3514 } 3531 }
3515 else 3532 else
3516 Error_0 ("illegal function"); 3533 Error_0 ("illegal function");
3517 3534
3518 case OP_DOMACRO: /* do macro */ 3535 case OP_DOMACRO: /* do macro */
… …
3527 { 3544 {
3528 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);
3529 3546
3530 if (f != NIL) 3547 if (f != NIL)
3531 { 3548 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3549 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3550 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3551 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3552 s_goto (OP_APPLY);
3536 } 3553 }
3537 3554
… …
3548 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));
3549 3566
3550#endif 3567#endif
3551 3568
3552 case OP_MKCLOSURE: /* make-closure */ 3569 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3570 x = car (args);
3554 3571
3555 if (car (x) == SCHEME_V->LAMBDA) 3572 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3573 x = cdr (x);
3557 3574
3558 if (cdr (SCHEME_V->args) == NIL) 3575 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3576 y = SCHEME_V->envir;
3560 else 3577 else
3561 y = cadr (SCHEME_V->args); 3578 y = cadr (args);
3562 3579
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3580 s_return (mk_closure (SCHEME_A_ x, y));
3564 3581
3565 case OP_QUOTE: /* quote */ 3582 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3583 s_return (car (SCHEME_V->code));
… …
3598 3615
3599 3616
3600 case OP_DEFP: /* defined? */ 3617 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3618 x = SCHEME_V->envir;
3602 3619
3603 if (cdr (SCHEME_V->args) != NIL) 3620 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3621 x = cadr (args);
3605 3622
3606 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);
3607 3624
3608 case OP_SET0: /* set! */ 3625 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3626 if (is_immutable (car (SCHEME_V->code)))
3610 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));
3611 3628
… …
3642 3659
3643 case OP_IF1: /* if */ 3660 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3661 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3662 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3663 else
3647 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 */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3665 s_goto (OP_EVAL);
3651 3666
3652 case OP_LET0: /* let */ 3667 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3668 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3669 SCHEME_V->value = SCHEME_V->code;
3655 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);
3656 s_goto (OP_LET1); 3671 s_goto (OP_LET1);
3657 3672
3658 case OP_LET1: /* let (calculate parameters) */ 3673 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3674 args = cons (SCHEME_V->value, args);
3660 3675
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3676 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3677 {
3663 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)))
3664 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));
3665 3680
3666 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));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3682 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3683 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3684 s_goto (OP_EVAL);
3670 } 3685 }
3671 else /* end */ 3686 else /* end */
3672 { 3687 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3688 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3689 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3690 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3691 s_goto (OP_LET2);
3677 } 3692 }
3678 3693
3679 case OP_LET2: /* let */ 3694 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3695 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3696
3682 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;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3698 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3699 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3700
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3701 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3702 {
3688 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))
3689 { 3704 {
3690 if (!is_pair (x)) 3705 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3706 Error_1 ("Bad syntax of binding in let :", x);
3692 3707
3693 if (!is_list (SCHEME_A_ car (x))) 3708 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3709 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3710
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3711 args = cons (caar (x), args);
3697 } 3712 }
3698 3713
3699 x =
3700 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)),
3701 SCHEME_V->envir); 3715 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3716 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3717 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3718 }
3706 else 3719 else
3707 { 3720 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3721 SCHEME_V->code = cdr (SCHEME_V->code);
3722 }
3723
3709 SCHEME_V->args = NIL; 3724 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3725 s_goto (OP_BEGIN);
3713 3726
3714 case OP_LET0AST: /* let* */ 3727 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3728 if (car (SCHEME_V->code) == NIL)
3716 { 3729 {
… …
3734 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);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3748 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3749
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3750 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3751 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3752 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3753 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3754 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3755 s_goto (OP_EVAL);
3743 } 3756 }
3744 else /* end */ 3757 else /* end */
3745 { 3758 {
3746 SCHEME_V->code = SCHEME_V->args; 3759 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3760 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3761 s_goto (OP_BEGIN);
3749 } 3762 }
3750 3763
3751 case OP_LET0REC: /* letrec */ 3764 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3767 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3768 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3769 s_goto (OP_LET1REC);
3757 3770
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3771 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3772 args = cons (SCHEME_V->value, args);
3760 3773
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3774 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3775 {
3763 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)))
3764 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));
3765 3778
3766 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));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3780 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3781 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3782 s_goto (OP_EVAL);
3770 } 3783 }
3771 else /* end */ 3784 else /* end */
3772 { 3785 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3786 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3787 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3788 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3789 s_goto (OP_LET2REC);
3777 } 3790 }
3778 3791
3779 case OP_LET2REC: /* letrec */ 3792 case OP_LET2REC: /* letrec */
3780 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))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3794 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3795
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3796 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3797 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3798 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3884 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3885 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3886 s_goto (OP_EVAL);
3874 3887
3875 case OP_C1STREAM: /* cons-stream */ 3888 case OP_C1STREAM: /* cons-stream */
3876 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 */
3877 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);
3878 set_typeflag (x, T_PROMISE); 3891 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3892 s_return (cons (args, x));
3880 3893
3881 case OP_MACRO0: /* macro */ 3894 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3895 if (is_pair (car (SCHEME_V->code)))
3883 { 3896 {
3884 x = caar (SCHEME_V->code); 3897 x = caar (SCHEME_V->code);
… …
3917 { 3930 {
3918 if (!is_pair (y = caar (x))) 3931 if (!is_pair (y = caar (x)))
3919 break; 3932 break;
3920 3933
3921 for (; y != NIL; y = cdr (y)) 3934 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3935 if (eqv (car (y), SCHEME_V->value))
3924 break; 3936 break;
3925 }
3926 3937
3927 if (y != NIL) 3938 if (y != NIL)
3928 break; 3939 break;
3929 } 3940 }
3930 3941
… …
3950 s_goto (OP_BEGIN); 3961 s_goto (OP_BEGIN);
3951 else 3962 else
3952 s_return (NIL); 3963 s_return (NIL);
3953 3964
3954 case OP_PAPPLY: /* apply */ 3965 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3966 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3967 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3968 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3969 s_goto (OP_APPLY);
3959 3970
3960 case OP_PEVAL: /* eval */ 3971 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3972 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3973 SCHEME_V->envir = cadr (args);
3963 3974
3964 SCHEME_V->code = car (SCHEME_V->args); 3975 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3976 s_goto (OP_EVAL);
3966 3977
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3978 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3979 SCHEME_V->code = car (args);
3969 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);
3970 s_goto (OP_APPLY); 3981 s_goto (OP_APPLY);
3971 } 3982 }
3972 3983
3973 return S_T; 3984 if (USE_ERROR_CHECKING) abort ();
3974} 3985}
3975 3986
3976static pointer 3987static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3988opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3989{
3979 pointer x; 3990 pointer args = SCHEME_V->args;
3991 pointer x = car (args);
3980 num v; 3992 num v;
3981 3993
3994 switch (op)
3995 {
3982#if USE_MATH 3996#if USE_MATH
3983 RVALUE dd;
3984#endif
3985
3986 switch (op)
3987 {
3988#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3997 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args); 3998 {
3992
3993 if (num_is_integer (x)) 3999 if (is_integer (x))
3994 s_return (x); 4000 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4001
4002 RVALUE r = rvalue_unchecked (x);
4003
4004 if (r == (RVALUE)(IVALUE)r)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4005 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3997 else 4006 else
3998 Error_1 ("inexact->exact: not integral:", x); 4007 Error_1 ("inexact->exact: not integral:", x);
4008 }
3999 4009
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4010 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4011 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4012 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4013 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4014 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4015 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4016 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 4017
4028 case OP_ATAN: 4018 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 4019 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 4021 else
4034 { 4022 {
4035 pointer y = cadr (SCHEME_V->args); 4023 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4024 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 4025 }
4039 4026
4040 case OP_SQRT: 4027 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4028 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 4029
4044 case OP_EXPT: 4030 case OP_EXPT:
4045 { 4031 {
4046 RVALUE result; 4032 RVALUE result;
4047 int real_result = 1; 4033 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 4034 pointer y = cadr (args);
4049 4035
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 4036 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 4037 real_result = 0;
4054 4038
4055 /* This 'if' is an R5RS compatibility fix. */ 4039 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 4040 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 4041 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 4042 result = 0;
4059 else 4043 else
4060 result = pow (rvalue (x), rvalue (y)); 4044 result = pow (rvalue (x), rvalue (y));
4061 4045
4062 /* Before returning integer result make sure we can. */ 4046 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 4047 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 4048 if (!real_result)
4065 { 4049 {
4066 long result_as_long = (long) result; 4050 long result_as_long = result;
4067 4051
4068 if (result != (RVALUE) result_as_long) 4052 if (result != result_as_long)
4069 real_result = 1; 4053 real_result = 1;
4070 } 4054 }
4071 4055
4072 if (real_result) 4056 if (real_result)
4073 s_return (mk_real (SCHEME_A_ result)); 4057 s_return (mk_real (SCHEME_A_ result));
4074 else 4058 else
4075 s_return (mk_integer (SCHEME_A_ result)); 4059 s_return (mk_integer (SCHEME_A_ result));
4076 } 4060 }
4077 4061
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4062 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4063 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 4064
4086 case OP_TRUNCATE: 4065 case OP_TRUNCATE:
4087 { 4066 {
4088 RVALUE rvalue_of_x; 4067 RVALUE n = rvalue (x);
4089
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x);
4092
4093 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4068 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4095 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4069 }
4098 4070
4099 case OP_ROUND: 4071 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4072 if (is_integer (x))
4103 s_return (x); 4073 s_return (x);
4104 4074
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4075 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4076#endif
4107 4077
4108 case OP_ADD: /* + */ 4078 case OP_ADD: /* + */
4109 v = num_zero; 4079 v = num_zero;
4110 4080
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4081 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4082 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4083
4114 s_return (mk_number (SCHEME_A_ v)); 4084 s_return (mk_number (SCHEME_A_ v));
4115 4085
4116 case OP_MUL: /* * */ 4086 case OP_MUL: /* * */
4117 v = num_one; 4087 v = num_one;
4118 4088
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4089 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4090 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4091
4122 s_return (mk_number (SCHEME_A_ v)); 4092 s_return (mk_number (SCHEME_A_ v));
4123 4093
4124 case OP_SUB: /* - */ 4094 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4095 if (cdr (args) == NIL)
4126 { 4096 {
4127 x = SCHEME_V->args; 4097 x = args;
4128 v = num_zero; 4098 v = num_zero;
4129 } 4099 }
4130 else 4100 else
4131 { 4101 {
4132 x = cdr (SCHEME_V->args); 4102 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4103 v = nvalue (car (args));
4134 } 4104 }
4135 4105
4136 for (; x != NIL; x = cdr (x)) 4106 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4107 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4108
4139 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4140 4110
4141 case OP_DIV: /* / */ 4111 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4112 if (cdr (args) == NIL)
4143 { 4113 {
4144 x = SCHEME_V->args; 4114 x = args;
4145 v = num_one; 4115 v = num_one;
4146 } 4116 }
4147 else 4117 else
4148 { 4118 {
4149 x = cdr (SCHEME_V->args); 4119 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4120 v = nvalue (car (args));
4151 } 4121 }
4152 4122
4153 for (; x != NIL; x = cdr (x)) 4123 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4124 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4125 v = num_div (v, nvalue (car (x)));
4157 else 4126 else
4158 Error_0 ("/: division by zero"); 4127 Error_0 ("/: division by zero");
4159 }
4160 4128
4161 s_return (mk_number (SCHEME_A_ v)); 4129 s_return (mk_number (SCHEME_A_ v));
4162 4130
4163 case OP_INTDIV: /* quotient */ 4131 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4132 if (cdr (args) == NIL)
4165 { 4133 {
4166 x = SCHEME_V->args; 4134 x = args;
4167 v = num_one; 4135 v = num_one;
4168 } 4136 }
4169 else 4137 else
4170 { 4138 {
4171 x = cdr (SCHEME_V->args); 4139 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4140 v = nvalue (car (args));
4173 } 4141 }
4174 4142
4175 for (; x != NIL; x = cdr (x)) 4143 for (; x != NIL; x = cdr (x))
4176 { 4144 {
4177 if (ivalue (car (x)) != 0) 4145 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4146 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4147 else
4180 Error_0 ("quotient: division by zero"); 4148 Error_0 ("quotient: division by zero");
4181 } 4149 }
4182 4150
4183 s_return (mk_number (SCHEME_A_ v)); 4151 s_return (mk_number (SCHEME_A_ v));
4184 4152
4185 case OP_REM: /* remainder */ 4153 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4154 v = nvalue (x);
4187 4155
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4156 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4157 v = num_rem (v, nvalue (cadr (args)));
4190 else 4158 else
4191 Error_0 ("remainder: division by zero"); 4159 Error_0 ("remainder: division by zero");
4192 4160
4193 s_return (mk_number (SCHEME_A_ v)); 4161 s_return (mk_number (SCHEME_A_ v));
4194 4162
4195 case OP_MOD: /* modulo */ 4163 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4164 v = nvalue (x);
4197 4165
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4166 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4167 v = num_mod (v, nvalue (cadr (args)));
4200 else 4168 else
4201 Error_0 ("modulo: division by zero"); 4169 Error_0 ("modulo: division by zero");
4202 4170
4203 s_return (mk_number (SCHEME_A_ v)); 4171 s_return (mk_number (SCHEME_A_ v));
4204 4172
4205 case OP_CAR: /* car */ 4173 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4174 s_return (caar (args));
4207 4175
4208 case OP_CDR: /* cdr */ 4176 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4177 s_return (cdar (args));
4210 4178
4211 case OP_CONS: /* cons */ 4179 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4180 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4181 s_return (args);
4214 4182
4215 case OP_SETCAR: /* set-car! */ 4183 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4184 if (!is_immutable (x))
4217 { 4185 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4186 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4187 s_return (car (args));
4220 } 4188 }
4221 else 4189 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4190 Error_0 ("set-car!: unable to alter immutable pair");
4223 4191
4224 case OP_SETCDR: /* set-cdr! */ 4192 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4193 if (!is_immutable (x))
4226 { 4194 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4195 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4196 s_return (car (args));
4229 } 4197 }
4230 else 4198 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4199 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4200
4233 case OP_CHAR2INT: /* char->integer */ 4201 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4202 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4235 4203
4236 case OP_INT2CHAR: /* integer->char */ 4204 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4205 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4238 4206
4239 case OP_CHARUPCASE: 4207 case OP_CHARUPCASE:
4240 { 4208 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4209 unsigned char c = ivalue_unchecked (x);
4242 c = toupper (c); 4210 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4211 s_return (mk_character (SCHEME_A_ c));
4244 } 4212 }
4245 4213
4246 case OP_CHARDNCASE: 4214 case OP_CHARDNCASE:
4247 { 4215 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4216 unsigned char c = ivalue_unchecked (x);
4249 c = tolower (c); 4217 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4218 s_return (mk_character (SCHEME_A_ c));
4251 } 4219 }
4252 4220
4253 case OP_STR2SYM: /* string->symbol */ 4221 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4222 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4223
4256 case OP_STR2ATOM: /* string->atom */ 4224 case OP_STR2ATOM: /* string->atom */
4257 { 4225 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4226 char *s = strvalue (x);
4259 long pf = 0; 4227 long pf = 0;
4260 4228
4261 if (cdr (SCHEME_V->args) != NIL) 4229 if (cdr (args) != NIL)
4262 { 4230 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4231 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4232 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4233 pf = ivalue_unchecked (cadr (args));
4266 4234
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4235 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4236 {
4269 /* base is OK */ 4237 /* base is OK */
4270 } 4238 }
4271 else 4239 else
4272 pf = -1; 4240 pf = -1;
4273 } 4241 }
4274 4242
4275 if (pf < 0) 4243 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4244 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4245 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4246 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4247 else
4280 { 4248 {
4281 if (pf == 0 || pf == 10) 4249 if (pf == 0 || pf == 10)
… …
4292 } 4260 }
4293 } 4261 }
4294 } 4262 }
4295 4263
4296 case OP_SYM2STR: /* symbol->string */ 4264 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4265 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4266 setimmutable (x);
4299 s_return (x); 4267 s_return (x);
4300 4268
4301 case OP_ATOM2STR: /* atom->string */ 4269 case OP_ATOM2STR: /* atom->string */
4302 { 4270 {
4303 long pf = 0; 4271 long pf = 0;
4304 4272
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4273 if (cdr (args) != NIL)
4308 { 4274 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4275 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4276 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4277 pf = ivalue_unchecked (cadr (args));
4312 4278
4313 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))
4314 { 4280 {
4315 /* base is OK */ 4281 /* base is OK */
4316 } 4282 }
4317 else 4283 else
4318 pf = -1; 4284 pf = -1;
4319 } 4285 }
4320 4286
4321 if (pf < 0) 4287 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4288 Error_1 ("atom->string: bad base:", cadr (args));
4323 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))
4324 { 4290 {
4325 char *p; 4291 char *p;
4326 int len; 4292 int len;
4327 4293
… …
4332 Error_1 ("atom->string: not an atom:", x); 4298 Error_1 ("atom->string: not an atom:", x);
4333 } 4299 }
4334 4300
4335 case OP_MKSTRING: /* make-string */ 4301 case OP_MKSTRING: /* make-string */
4336 { 4302 {
4337 int fill = ' '; 4303 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4338 int len; 4304 int len = ivalue_unchecked (x);
4339 4305
4340 len = ivalue (car (SCHEME_V->args));
4341
4342 if (cdr (SCHEME_V->args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args));
4344
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4306 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4307 }
4347 4308
4348 case OP_STRLEN: /* string-length */ 4309 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4310 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4311
4351 case OP_STRREF: /* string-ref */ 4312 case OP_STRREF: /* string-ref */
4352 { 4313 {
4353 char *str; 4314 char *str = strvalue (x);
4354 int index;
4355
4356 str = strvalue (car (SCHEME_V->args));
4357
4358 index = ivalue (cadr (SCHEME_V->args)); 4315 int index = ivalue_unchecked (cadr (args));
4359 4316
4360 if (index >= strlength (car (SCHEME_V->args))) 4317 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4318 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4319
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4320 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4321 }
4365 4322
4366 case OP_STRSET: /* string-set! */ 4323 case OP_STRSET: /* string-set! */
4367 { 4324 {
4368 char *str; 4325 char *str = strvalue (x);
4369 int index; 4326 int index = ivalue_unchecked (cadr (args));
4370 int c; 4327 int c;
4371 4328
4372 if (is_immutable (car (SCHEME_V->args))) 4329 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4330 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4331
4375 str = strvalue (car (SCHEME_V->args));
4376
4377 index = ivalue (cadr (SCHEME_V->args));
4378
4379 if (index >= strlength (car (SCHEME_V->args))) 4332 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4333 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4334
4382 c = charvalue (caddr (SCHEME_V->args)); 4335 c = charvalue (caddr (args));
4383 4336
4384 str[index] = (char) c; 4337 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4338 s_return (car (args));
4386 } 4339 }
4387 4340
4388 case OP_STRAPPEND: /* string-append */ 4341 case OP_STRAPPEND: /* string-append */
4389 { 4342 {
4390 /* 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 */
4391 int len = 0; 4344 int len = 0;
4392 pointer newstr; 4345 pointer newstr;
4393 char *pos; 4346 char *pos;
4394 4347
4395 /* compute needed length for new string */ 4348 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4349 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4350 len += strlength (car (x));
4398 4351
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4352 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4353
4401 /* store the contents of the argument strings into the new string */ 4354 /* store the contents of the argument strings into the new string */
4402 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))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4356 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4357
4405 s_return (newstr); 4358 s_return (newstr);
4406 } 4359 }
4407 4360
4408 case OP_SUBSTR: /* substring */ 4361 case OP_SUBSTR: /* substring */
4409 { 4362 {
4410 char *str; 4363 char *str = strvalue (x);
4411 int index0; 4364 int index0 = ivalue_unchecked (cadr (args));
4412 int index1; 4365 int index1;
4413 int len; 4366 int len;
4414 4367
4415 str = strvalue (car (SCHEME_V->args));
4416
4417 index0 = ivalue (cadr (SCHEME_V->args));
4418
4419 if (index0 > strlength (car (SCHEME_V->args))) 4368 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4369 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4370
4422 if (cddr (SCHEME_V->args) != NIL) 4371 if (cddr (args) != NIL)
4423 { 4372 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4373 index1 = ivalue_unchecked (caddr (args));
4425 4374
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4375 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4376 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4377 }
4429 else 4378 else
4430 index1 = strlength (car (SCHEME_V->args)); 4379 index1 = strlength (x);
4431 4380
4432 len = index1 - index0; 4381 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4382 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4383 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4384 strvalue (x)[len] = 0;
… …
4439 4388
4440 case OP_VECTOR: /* vector */ 4389 case OP_VECTOR: /* vector */
4441 { 4390 {
4442 int i; 4391 int i;
4443 pointer vec; 4392 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4393 int len = list_length (SCHEME_A_ args);
4445 4394
4446 if (len < 0) 4395 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4396 Error_1 ("vector: not a proper list:", args);
4448 4397
4449 vec = mk_vector (SCHEME_A_ len); 4398 vec = mk_vector (SCHEME_A_ len);
4450 4399
4451#if USE_ERROR_CHECKING 4400#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4401 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4402 s_return (S_SINK);
4454#endif 4403#endif
4455 4404
4456 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++)
4457 set_vector_elem (vec, i, car (x)); 4406 set_vector_elem (vec, i, car (x));
4458 4407
4459 s_return (vec); 4408 s_return (vec);
4460 } 4409 }
4461 4410
4462 case OP_MKVECTOR: /* make-vector */ 4411 case OP_MKVECTOR: /* make-vector */
4463 { 4412 {
4464 pointer fill = NIL; 4413 pointer fill = NIL;
4465 int len;
4466 pointer vec; 4414 pointer vec;
4415 int len = ivalue_unchecked (x);
4467 4416
4468 len = ivalue (car (SCHEME_V->args));
4469
4470 if (cdr (SCHEME_V->args) != NIL) 4417 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4418 fill = cadr (args);
4472 4419
4473 vec = mk_vector (SCHEME_A_ len); 4420 vec = mk_vector (SCHEME_A_ len);
4474 4421
4475#if USE_ERROR_CHECKING 4422#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4423 if (SCHEME_V->no_memory)
… …
4482 4429
4483 s_return (vec); 4430 s_return (vec);
4484 } 4431 }
4485 4432
4486 case OP_VECLEN: /* vector-length */ 4433 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4434 s_return (mk_integer (SCHEME_A_ veclength (x)));
4488 4435
4489 case OP_VECREF: /* vector-ref */ 4436 case OP_VECREF: /* vector-ref */
4490 { 4437 {
4491 int index;
4492
4493 index = ivalue (cadr (SCHEME_V->args)); 4438 int index = ivalue_unchecked (cadr (args));
4494 4439
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4440 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4441 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4442
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4443 s_return (vector_elem (x, index));
4499 } 4444 }
4500 4445
4501 case OP_VECSET: /* vector-set! */ 4446 case OP_VECSET: /* vector-set! */
4502 { 4447 {
4503 int index; 4448 int index = ivalue_unchecked (cadr (args));
4504 4449
4505 if (is_immutable (car (SCHEME_V->args))) 4450 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4451 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4452
4508 index = ivalue (cadr (SCHEME_V->args));
4509
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4453 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4454 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4455
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4456 set_vector_elem (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4457 s_return (x);
4515 } 4458 }
4516 } 4459 }
4517 4460
4518 return S_T; 4461 if (USE_ERROR_CHECKING) abort ();
4519} 4462}
4520 4463
4521INTERFACE int 4464static int
4522is_list (SCHEME_P_ pointer a) 4465opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4466{
4524 return list_length (SCHEME_A_ a) >= 0; 4467 pointer x = SCHEME_V->args;
4525}
4526 4468
4527/* Result is: 4469 for (;;)
4528 proper list: length
4529 circular list: -1
4530 not even a pair: -2
4531 dotted list: -2 minus length before dot
4532*/
4533INTERFACE int
4534list_length (SCHEME_P_ pointer a)
4535{
4536 int i = 0;
4537 pointer slow, fast;
4538
4539 slow = fast = a;
4540
4541 while (1)
4542 { 4470 {
4471 num v = nvalue (car (x));
4472 x = cdr (x);
4473
4543 if (fast == NIL) 4474 if (x == NIL)
4544 return i; 4475 break;
4545 4476
4546 if (!is_pair (fast)) 4477 int r = num_cmp (v, nvalue (car (x)));
4547 return -2 - i;
4548 4478
4549 fast = cdr (fast); 4479 switch (op)
4550 ++i;
4551
4552 if (fast == NIL)
4553 return i;
4554
4555 if (!is_pair (fast))
4556 return -2 - i;
4557
4558 ++i;
4559 fast = cdr (fast);
4560
4561 /* Safe because we would have already returned if `fast'
4562 encountered a non-pair. */
4563 slow = cdr (slow);
4564
4565 if (fast == slow)
4566 { 4480 {
4567 /* the fast pointer has looped back around and caught up 4481 case OP_NUMEQ: r = r == 0; break;
4568 with the slow pointer, hence the structure is circular, 4482 case OP_LESS: r = r < 0; break;
4569 not of finite length, and therefore not a list */ 4483 case OP_GRE: r = r > 0; break;
4570 return -1; 4484 case OP_LEQ: r = r <= 0; break;
4485 case OP_GEQ: r = r >= 0; break;
4571 } 4486 }
4572 }
4573}
4574 4487
4488 if (!r)
4489 s_return (S_F);
4490 }
4491
4492 s_return (S_T);
4493}
4494
4575static pointer 4495static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4496opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4497{
4578 pointer x; 4498 pointer args = SCHEME_V->args;
4579 num v; 4499 pointer a = car (args);
4580 int (*comp_func) (num, num); 4500 pointer d = cdr (args);
4501 int r;
4581 4502
4582 switch (op) 4503 switch (op)
4583 { 4504 {
4584 case OP_NOT: /* not */ 4505 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 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;
4586 4515
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4516#if USE_CHAR_CLASSIFIERS
4656 4517 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4657 case OP_CHARAP: /* char-alphabetic? */ 4518 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4519 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4659 4520 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4660 case OP_CHARNP: /* char-numeric? */ 4521 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4522#endif
4523
4672#if USE_PORTS 4524#if USE_PORTS
4673 4525 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4526 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4527 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4528#endif
4683 4529
4684 case OP_PROCP: /* procedure? */ 4530 case OP_PROCP: /* procedure? */
4685 4531
4686 /*-- 4532 /*--
4687 * continuation should be procedure by the example 4533 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4534 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4535 * in R^3 report sec. 6.9
4690 */ 4536 */
4691 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);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4538 break;
4693 4539
4694 case OP_PAIRP: /* pair? */ 4540 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4541 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4542 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4543 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4544 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4545 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4546 }
4712 4547
4713 return S_T; 4548 s_retbool (r);
4714} 4549}
4715 4550
4716static pointer 4551static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4552opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4553{
4554 pointer args = SCHEME_V->args;
4555 pointer a = car (args);
4719 pointer x, y; 4556 pointer x, y;
4720 4557
4721 switch (op) 4558 switch (op)
4722 { 4559 {
4723 case OP_FORCE: /* force */ 4560 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4561 SCHEME_V->code = a;
4725 4562
4726 if (is_promise (SCHEME_V->code)) 4563 if (is_promise (SCHEME_V->code))
4727 { 4564 {
4728 /* Should change type to closure here */ 4565 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4566 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4587 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4588 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4589 }
4753 } 4590 }
4754 4591
4755 SCHEME_V->args = car (SCHEME_V->args); 4592 SCHEME_V->args = a;
4756 4593
4757 if (op == OP_WRITE) 4594 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4595 SCHEME_V->print_flag = 1;
4759 else 4596 else
4760 SCHEME_V->print_flag = 0; 4597 SCHEME_V->print_flag = 0;
4761 4598
4762 s_goto (OP_P0LIST); 4599 s_goto (OP_P0LIST);
4763 4600
4764 case OP_NEWLINE: /* newline */ 4601 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4602 if (is_pair (args))
4766 { 4603 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4604 if (a != SCHEME_V->outport)
4768 { 4605 {
4769 x = cons (SCHEME_V->outport, NIL); 4606 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4607 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4608 SCHEME_V->outport = a;
4772 } 4609 }
4773 } 4610 }
4774 4611
4775 putstr (SCHEME_A_ "\n"); 4612 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4613 s_return (S_T);
4777#endif 4614#endif
4778 4615
4779 case OP_ERR0: /* error */ 4616 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4617 SCHEME_V->retcode = -1;
4781 4618
4782 if (!is_string (car (SCHEME_V->args))) 4619 if (!is_string (a))
4783 { 4620 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4621 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4622 setimmutable (car (args));
4786 } 4623 }
4787 4624
4788 putstr (SCHEME_A_ "Error: "); 4625 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4626 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4627 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4628 s_goto (OP_ERR1);
4792 4629
4793 case OP_ERR1: /* error */ 4630 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4631 putstr (SCHEME_A_ " ");
4795 4632
4796 if (SCHEME_V->args != NIL) 4633 if (args != NIL)
4797 { 4634 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4635 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4636 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4637 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4638 s_goto (OP_P0LIST);
4802 } 4639 }
4803 else 4640 else
4804 { 4641 {
4805 putstr (SCHEME_A_ "\n"); 4642 putstr (SCHEME_A_ "\n");
4806 4643
4807 if (SCHEME_V->interactive_repl) 4644 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4645 s_goto (OP_T0LVL);
4809 else 4646 else
4810 return NIL; 4647 return -1;
4811 } 4648 }
4812 4649
4813 case OP_REVERSE: /* reverse */ 4650 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4651 s_return (reverse (SCHEME_A_ a));
4815 4652
4816 case OP_LIST_STAR: /* list* */ 4653 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4654 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4655
4819 case OP_APPEND: /* append */ 4656 case OP_APPEND: /* append */
4820 x = NIL; 4657 x = NIL;
4821 y = SCHEME_V->args; 4658 y = args;
4822 4659
4823 if (y == x) 4660 if (y == x)
4824 s_return (x); 4661 s_return (x);
4825 4662
4826 /* cdr() in the while condition is not a typo. If car() */ 4663 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4674 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4675
4839#if USE_PLIST 4676#if USE_PLIST
4840 4677
4841 case OP_PUT: /* put */ 4678 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4679 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4680 Error_0 ("illegal use of put");
4844 4681
4845 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))
4846 { 4683 {
4847 if (caar (x) == y) 4684 if (caar (x) == y)
4848 break; 4685 break;
4849 } 4686 }
4850 4687
4851 if (x != NIL) 4688 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4689 cdar (x) = caddr (args);
4853 else 4690 else
4854 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));
4855 4692
4856 s_return (S_T); 4693 s_return (S_T);
4857 4694
4858 case OP_GET: /* get */ 4695 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4696 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4697 Error_0 ("illegal use of get");
4861 4698
4862 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))
4863 if (caar (x) == y) 4700 if (caar (x) == y)
4864 break; 4701 break;
4865 4702
4866 if (x != NIL) 4703 if (x != NIL)
4867 s_return (cdar (x)); 4704 s_return (cdar (x));
… …
4869 s_return (NIL); 4706 s_return (NIL);
4870 4707
4871#endif /* USE_PLIST */ 4708#endif /* USE_PLIST */
4872 4709
4873 case OP_QUIT: /* quit */ 4710 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4711 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4712 SCHEME_V->retcode = ivalue (a);
4876 4713
4714 exit(0);//D
4877 return NIL; 4715 return -1;
4878 4716
4879 case OP_GC: /* gc */ 4717 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4718 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4719 s_return (S_T);
4882 4720
4883 case OP_GCVERB: /* gc-verbose */ 4721 case OP_GCVERB: /* gc-verbose */
4884 { 4722 {
4885 int was = SCHEME_V->gc_verbose; 4723 int was = SCHEME_V->gc_verbose;
4886 4724
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4725 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4726 s_retbool (was);
4889 } 4727 }
4890 4728
4891 case OP_NEWSEGMENT: /* new-segment */ 4729 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4730 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4731 Error_0 ("new-segment: argument must be a number");
4894 4732
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4733 alloc_cellseg (SCHEME_A_ ivalue (a));
4896 4734
4897 s_return (S_T); 4735 s_return (S_T);
4898 4736
4899 case OP_OBLIST: /* oblist */ 4737 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4738 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4765 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4766 prop = port_input | port_output;
4929 break; 4767 break;
4930 } 4768 }
4931 4769
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4770 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4771
4934 if (p == NIL) 4772 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4773 }
4939 4774
4940# if USE_STRING_PORTS 4775# if USE_STRING_PORTS
4941 4776
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4777 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4789 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4790 prop = port_input | port_output;
4956 break; 4791 break;
4957 } 4792 }
4958 4793
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4794 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4795 strvalue (a) + strlength (a), prop);
4961 4796
4962 if (p == NIL) 4797 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4798 }
4967 4799
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4800 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4801 {
4970 pointer p; 4802 pointer p;
4971 4803
4972 if (car (SCHEME_V->args) == NIL) 4804 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4805 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4806 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4807 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4808 strvalue (a) + strlength (a), port_output);
4983 4809
4984 if (p == NIL) 4810 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4811 }
4990 4812
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4813 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4814 {
4993 port *p; 4815 port *p;
4994 4816
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4817 if ((p = a->object.port)->kind & port_string)
4996 { 4818 {
4997 off_t size; 4819 off_t size;
4998 char *str; 4820 char *str;
4999 4821
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4822 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4838 }
5017 4839
5018# endif 4840# endif
5019 4841
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4842 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4843 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4844 s_return (S_T);
5023 4845
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4846 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4847 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4848 s_return (S_T);
5027#endif 4849#endif
5028 4850
5029 case OP_INT_ENV: /* interaction-environment */ 4851 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4852 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4854 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4855 s_return (SCHEME_V->envir);
5034 4856
5035 } 4857 }
5036 4858
5037 return S_T; 4859 if (USE_ERROR_CHECKING) abort ();
5038} 4860}
5039 4861
5040static pointer 4862static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4863opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4864{
4865 pointer args = SCHEME_V->args;
5043 pointer x; 4866 pointer x;
5044 4867
5045 if (SCHEME_V->nesting != 0) 4868 if (SCHEME_V->nesting != 0)
5046 { 4869 {
5047 int n = SCHEME_V->nesting; 4870 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4877 switch (op)
5055 { 4878 {
5056 /* ========== reading part ========== */ 4879 /* ========== reading part ========== */
5057#if USE_PORTS 4880#if USE_PORTS
5058 case OP_READ: 4881 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4882 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4883 s_goto (OP_READ_INTERNAL);
5061 4884
5062 if (!is_inport (car (SCHEME_V->args))) 4885 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4886 Error_1 ("read: not an input port:", car (args));
5064 4887
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4888 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4889 s_goto (OP_READ_INTERNAL);
5067 4890
5068 x = SCHEME_V->inport; 4891 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4892 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4893 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4894 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4895 s_goto (OP_READ_INTERNAL);
5073 4896
5074 case OP_READ_CHAR: /* read-char */ 4897 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4898 case OP_PEEK_CHAR: /* peek-char */
5076 { 4899 {
5077 int c; 4900 int c;
5078 4901
5079 if (is_pair (SCHEME_V->args)) 4902 if (is_pair (args))
5080 { 4903 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4904 if (car (args) != SCHEME_V->inport)
5082 { 4905 {
5083 x = SCHEME_V->inport; 4906 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4907 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4908 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4909 SCHEME_V->inport = car (args);
5087 } 4910 }
5088 } 4911 }
5089 4912
5090 c = inchar (SCHEME_A); 4913 c = inchar (SCHEME_A);
5091 4914
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4924 case OP_CHAR_READY: /* char-ready? */
5102 { 4925 {
5103 pointer p = SCHEME_V->inport; 4926 pointer p = SCHEME_V->inport;
5104 int res; 4927 int res;
5105 4928
5106 if (is_pair (SCHEME_V->args)) 4929 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4930 p = car (args);
5108 4931
5109 res = p->object.port->kind & port_string; 4932 res = p->object.port->kind & port_string;
5110 4933
5111 s_retbool (res); 4934 s_retbool (res);
5112 } 4935 }
5113 4936
5114 case OP_SET_INPORT: /* set-input-port */ 4937 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 4938 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 4939 s_return (SCHEME_V->value);
5117 4940
5118 case OP_SET_OUTPORT: /* set-output-port */ 4941 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 4942 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 4943 s_return (SCHEME_V->value);
5121#endif 4944#endif
5122 4945
5123 case OP_RDSEXPR: 4946 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 4947 switch (SCHEME_V->tok)
… …
5210 } 5033 }
5211 5034
5212 break; 5035 break;
5213 5036
5214 case OP_RDLIST: 5037 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5038 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5039 SCHEME_V->tok = token (SCHEME_A);
5217 5040
5218 switch (SCHEME_V->tok) 5041 switch (SCHEME_V->tok)
5219 { 5042 {
5220 case TOK_EOF: 5043 case TOK_EOF:
… …
5248 case OP_RDDOT: 5071 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5072 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5073 Error_0 ("syntax error: illegal dot expression");
5251 5074
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5075 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5076 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5077
5255 case OP_RDQUOTE: 5078 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5079 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5080
5258 case OP_RDQQUOTE: 5081 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5103 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5104 s_goto (OP_VECTOR);
5282 5105
5283 /* ========== printing part ========== */ 5106 /* ========== printing part ========== */
5284 case OP_P0LIST: 5107 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5108 if (is_vector (args))
5286 { 5109 {
5287 putstr (SCHEME_A_ "#("); 5110 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5111 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5112 s_goto (OP_PVECFROM);
5290 } 5113 }
5291 else if (is_environment (SCHEME_V->args)) 5114 else if (is_environment (args))
5292 { 5115 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5116 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5117 s_return (S_T);
5295 } 5118 }
5296 else if (!is_pair (SCHEME_V->args)) 5119 else if (!is_pair (args))
5297 { 5120 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5121 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5122 s_return (S_T);
5300 } 5123 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5124 else
5302 { 5125 {
5126 pointer a = car (args);
5127 pointer b = cdr (args);
5128 int ok_abbr = ok_abbrev (b);
5129 SCHEME_V->args = car (b);
5130
5131 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5132 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5133 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5134 putstr (SCHEME_A_ "`");
5135 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5136 putstr (SCHEME_A_ ",");
5137 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5138 putstr (SCHEME_A_ ",@");
5139 else
5140 {
5141 putstr (SCHEME_A_ "(");
5142 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5143 SCHEME_V->args = a;
5144 }
5145
5305 s_goto (OP_P0LIST); 5146 s_goto (OP_P0LIST);
5306 } 5147 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5148
5149 case OP_P1LIST:
5150 if (is_pair (args))
5308 { 5151 {
5152 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5153 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5154 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5155 s_goto (OP_P0LIST);
5312 } 5156 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && 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 if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5157 else if (is_vector (args))
5342 { 5158 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5159 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5160 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5161 s_goto (OP_P0LIST);
5346 } 5162 }
5347 else 5163 else
5348 { 5164 {
5349 if (SCHEME_V->args != NIL) 5165 if (args != NIL)
5350 { 5166 {
5351 putstr (SCHEME_A_ " . "); 5167 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5168 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5169 }
5354 5170
5355 putstr (SCHEME_A_ ")"); 5171 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5172 s_return (S_T);
5357 } 5173 }
5358 5174
5359 case OP_PVECFROM: 5175 case OP_PVECFROM:
5360 { 5176 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5177 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5178 pointer vec = car (args);
5363 int len = veclength (vec); 5179 int len = veclength (vec);
5364 5180
5365 if (i == len) 5181 if (i == len)
5366 { 5182 {
5367 putstr (SCHEME_A_ ")"); 5183 putstr (SCHEME_A_ ")");
… …
5369 } 5185 }
5370 else 5186 else
5371 { 5187 {
5372 pointer elem = vector_elem (vec, i); 5188 pointer elem = vector_elem (vec, i);
5373 5189
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5190 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5191 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5192 SCHEME_V->args = elem;
5377 5193
5378 if (i > 0) 5194 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5195 putstr (SCHEME_A_ " ");
5380 5196
5381 s_goto (OP_P0LIST); 5197 s_goto (OP_P0LIST);
5382 } 5198 }
5383 } 5199 }
5384 } 5200 }
5385 5201
5386 return S_T; 5202 if (USE_ERROR_CHECKING) abort ();
5387} 5203}
5388 5204
5389static pointer 5205static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5206opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5207{
5208 pointer args = SCHEME_V->args;
5209 pointer a = car (args);
5392 pointer x, y; 5210 pointer x, y;
5393 5211
5394 switch (op) 5212 switch (op)
5395 { 5213 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5214 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5215 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5216 long v = list_length (SCHEME_A_ a);
5399 5217
5400 if (v < 0) 5218 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5219 Error_1 ("length: not a list:", a);
5402 5220
5403 s_return (mk_integer (SCHEME_A_ v)); 5221 s_return (mk_integer (SCHEME_A_ v));
5404 } 5222 }
5405 5223
5406 case OP_ASSQ: /* assq *//* a.k */ 5224 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5225 x = a;
5408 5226
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5227 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5228 {
5411 if (!is_pair (car (y))) 5229 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5230 Error_0 ("unable to handle non pair element");
5413 5231
5414 if (x == caar (y)) 5232 if (x == caar (y))
… …
5420 else 5238 else
5421 s_return (S_F); 5239 s_return (S_F);
5422 5240
5423 5241
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5242 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5243 SCHEME_V->args = a;
5426 5244
5427 if (SCHEME_V->args == NIL) 5245 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5246 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5247 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5248 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5436 case OP_CLOSUREP: /* closure? */ 5254 case OP_CLOSUREP: /* closure? */
5437 /* 5255 /*
5438 * Note, macro object is also a closure. 5256 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5257 * Therefore, (closure? <#MACRO>) ==> #t
5440 */ 5258 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5259 s_retbool (is_closure (a));
5442 5260
5443 case OP_MACROP: /* macro? */ 5261 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5262 s_retbool (is_macro (a));
5445 } 5263 }
5446 5264
5447 return S_T; /* NOTREACHED */ 5265 if (USE_ERROR_CHECKING) abort ();
5448} 5266}
5449 5267
5268/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5269typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5270
5452typedef int (*test_predicate) (pointer); 5271typedef int (*test_predicate)(pointer);
5453static int 5272static int
5454is_any (pointer p) 5273tst_any (pointer p)
5455{ 5274{
5456 return 1; 5275 return 1;
5457} 5276}
5458 5277
5459static int 5278static int
5460is_nonneg (pointer p) 5279tst_inonneg (pointer p)
5461{ 5280{
5462 return ivalue (p) >= 0 && is_integer (p); 5281 return is_integer (p) && ivalue_unchecked (p) >= 0;
5282}
5283
5284static int
5285tst_is_list (SCHEME_P_ pointer p)
5286{
5287 return p == NIL || is_pair (p);
5463} 5288}
5464 5289
5465/* Correspond carefully with following defines! */ 5290/* Correspond carefully with following defines! */
5466static struct 5291static struct
5467{ 5292{
5468 test_predicate fct; 5293 test_predicate fct;
5469 const char *kind; 5294 const char *kind;
5470} tests[] = 5295} tests[] = {
5471{ 5296 { tst_any , 0 },
5472 { 0, 0}, /* unused */ 5297 { is_string , "string" },
5473 { is_any, 0}, 5298 { is_symbol , "symbol" },
5474 { is_string, "string" }, 5299 { is_port , "port" },
5475 { is_symbol, "symbol" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5300 { is_inport , "input port" },
5478 { is_outport, "output port" }, 5301 { is_outport , "output port" },
5479 { is_environment, "environment" }, 5302 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5303 { is_pair , "pair" },
5481 { 0, "pair or '()" }, 5304 { 0 , "pair or '()" },
5482 { is_character, "character" }, 5305 { is_character , "character" },
5483 { is_vector, "vector" }, 5306 { is_vector , "vector" },
5484 { is_number, "number" }, 5307 { is_number , "number" },
5485 { is_integer, "integer" }, 5308 { is_integer , "integer" },
5486 { is_nonneg, "non-negative integer" } 5309 { tst_inonneg , "non-negative integer" }
5487}; 5310};
5488 5311
5489#define TST_NONE 0 5312#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5313#define TST_ANY "\001"
5491#define TST_STRING "\002" 5314#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5315#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5316#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5317#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5318#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5319#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5320#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5321#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5322#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5323#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5324#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5325#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5326#define TST_NATURAL "\016"
5327
5328#define INF_ARG 0xff
5329#define UNNAMED_OP ""
5330
5331static const char opnames[] =
5332#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5333#include "opdefines.h"
5334#undef OP_DEF
5335;
5336
5337static const char *
5338opname (int idx)
5339{
5340 const char *name = opnames;
5341
5342 /* should do this at compile time, but would require external program, right? */
5343 while (idx--)
5344 name += strlen (name) + 1;
5345
5346 return *name ? name : "ILLEGAL";
5347}
5348
5349static const char *
5350procname (pointer x)
5351{
5352 return opname (procnum (x));
5353}
5504 5354
5505typedef struct 5355typedef struct
5506{ 5356{
5507 dispatch_func func; 5357 uint8_t func;
5508 char *name; 5358 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5359 uint8_t builtin;
5360#if USE_ERROR_CHECKING
5509 int min_arity; 5361 uint8_t min_arity;
5510 int max_arity; 5362 uint8_t max_arity;
5511 char *arg_tests_encoding; 5363 char arg_tests_encoding[3];
5364#endif
5512} op_code_info; 5365} op_code_info;
5513 5366
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5367static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5368#if USE_ERROR_CHECKING
5369#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5370#else
5371#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5372#endif
5518#include "opdefines.h" 5373#include "opdefines.h"
5374#undef OP_DEF
5519 {0} 5375 {0}
5520}; 5376};
5521 5377
5522static const char *
5523procname (pointer x)
5524{
5525 int n = procnum (x);
5526 const char *name = dispatch_table[n].name;
5527
5528 if (name == 0)
5529 name = "ILLEGAL!";
5530
5531 return name;
5532}
5533
5534/* kernel of this interpreter */ 5378/* kernel of this interpreter */
5535static void 5379static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5380Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5381{
5538 SCHEME_V->op = op; 5382 SCHEME_V->op = op;
5539 5383
5540 for (;;) 5384 for (;;)
5541 { 5385 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5386 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5387
5544#if USE_ERROR_CHECKING 5388#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5389 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5390 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5391 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5392 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5393
5551 /* Check number of arguments */ 5394 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5395 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5396 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5397 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5398 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5399 xError_1 (SCHEME_A_ msg, 0);
5400 continue;
5557 } 5401 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5402 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5403 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5404 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5405 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5406 xError_1 (SCHEME_A_ msg, 0);
5407 continue;
5563 } 5408 }
5564 5409 else
5565 if (ecb_expect_false (ok))
5566 { 5410 {
5567 if (pcd->arg_tests_encoding) 5411 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5412 {
5569 int i = 0; 5413 int i = 0;
5570 int j; 5414 int j;
5571 const char *t = pcd->arg_tests_encoding; 5415 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5416 pointer arglist = SCHEME_V->args;
5573 5417
5574 do 5418 do
5575 { 5419 {
5576 pointer arg = car (arglist); 5420 pointer arg = car (arglist);
5577 5421
5578 j = (int) t[0]; 5422 j = t[0];
5579 5423
5424 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5580 if (j == TST_LIST[0]) 5425 if (j == TST_LIST[0])
5581 { 5426 {
5582 if (arg != NIL && !is_pair (arg)) 5427 if (!tst_is_list (SCHEME_A_ arg))
5583 break; 5428 break;
5584 } 5429 }
5585 else 5430 else
5586 { 5431 {
5587 if (!tests[j].fct (arg)) 5432 if (!tests[j - 1].fct (arg))
5588 break; 5433 break;
5589 } 5434 }
5590 5435
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5436 if (t[1]) /* last test is replicated as necessary */
5592 t++; 5437 t++;
5593 5438
5594 arglist = cdr (arglist); 5439 arglist = cdr (arglist);
5595 i++; 5440 i++;
5596 } 5441 }
5597 while (i < n); 5442 while (i < n);
5598 5443
5599 if (i < n) 5444 if (i < n)
5600 { 5445 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5446 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5447 xError_1 (SCHEME_A_ msg, 0);
5448 continue;
5603 } 5449 }
5604 } 5450 }
5605 } 5451 }
5606
5607 if (!ok)
5608 {
5609 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5610 return;
5611
5612 pcd = dispatch_table + SCHEME_V->op;
5613 }
5614 } 5452 }
5615#endif 5453#endif
5616 5454
5617 ok_to_freely_gc (SCHEME_A); 5455 ok_to_freely_gc (SCHEME_A);
5618 5456
5457 static const dispatch_func dispatch_funcs[] = {
5458 opexe_0,
5459 opexe_1,
5460 opexe_2,
5461 opexe_3,
5462 opexe_4,
5463 opexe_5,
5464 opexe_6,
5465 };
5466
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5468 return;
5621 5469
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5471 {
5624 xwrstr ("No memory!\n"); 5472 xwrstr ("No memory!\n");
… …
5648mk_proc (SCHEME_P_ enum scheme_opcodes op) 5496mk_proc (SCHEME_P_ enum scheme_opcodes op)
5649{ 5497{
5650 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5498 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5651 set_typeflag (y, (T_PROC | T_ATOM)); 5499 set_typeflag (y, (T_PROC | T_ATOM));
5652 ivalue_unchecked (y) = op; 5500 ivalue_unchecked (y) = op;
5653 set_num_integer (y);
5654 return y; 5501 return y;
5655} 5502}
5656 5503
5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5504/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5658static int 5505static int
… …
5723 return OP_C0STREAM; /* cons-stream */ 5570 return OP_C0STREAM; /* cons-stream */
5724 } 5571 }
5725} 5572}
5726 5573
5727#if USE_MULTIPLICITY 5574#if USE_MULTIPLICITY
5728scheme * 5575ecb_cold scheme *
5729scheme_init_new () 5576scheme_init_new ()
5730{ 5577{
5731 scheme *sc = malloc (sizeof (scheme)); 5578 scheme *sc = malloc (sizeof (scheme));
5732 5579
5733 if (!scheme_init (SCHEME_A)) 5580 if (!scheme_init (SCHEME_A))
… …
5738 else 5585 else
5739 return sc; 5586 return sc;
5740} 5587}
5741#endif 5588#endif
5742 5589
5743int 5590ecb_cold int
5744scheme_init (SCHEME_P) 5591scheme_init (SCHEME_P)
5745{ 5592{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5593 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5594 pointer x;
5748 5595
… …
5821 5668
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5669 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5670 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5671 }
5825 5672
5673 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5674 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5675 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5676 assign_proc (SCHEME_A_ i, opname (i));
5829 5677
5830 /* initialization of global pointers to special symbols */ 5678 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5679 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5680 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5681 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5720scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5721{
5874 SCHEME_V->ext_data = p; 5722 SCHEME_V->ext_data = p;
5875} 5723}
5876 5724
5877void 5725ecb_cold void
5878scheme_deinit (SCHEME_P) 5726scheme_deinit (SCHEME_P)
5879{ 5727{
5880 int i; 5728 int i;
5881 5729
5882#if SHOW_ERROR_LINE 5730#if SHOW_ERROR_LINE
… …
5974{ 5822{
5975 dump_stack_reset (SCHEME_A); 5823 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5824 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5825 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5826 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5827 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5828 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5829 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5830#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5831 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5832#endif
5985 SCHEME_V->retcode = 0; 5833 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5834 SCHEME_V->interactive_repl = 0;

Diff Legend

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