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.9 by root, Wed Nov 25 22:39:19 2015 UTC vs.
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
37#include <string.h> 39#include <string.h>
… …
143 145
144#define toupper(c) xtoupper (c) 146#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 147#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 148#define isdigit(c) xisdigit (c)
147 149
148#if USE_STRLWR 150#if USE_IGNORECASE
149static const char * 151static const char *
150strlwr (char *s) 152xstrlwr (char *s)
151{ 153{
152 const char *p = s; 154 const char *p = s;
153 155
154 while (*s) 156 while (*s)
155 { 157 {
… …
157 s++; 159 s++;
158 } 160 }
159 161
160 return p; 162 return p;
161} 163}
162#endif
163 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
164#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 170# define strlwr(s) (s)
171#endif
166 172
167#ifndef prompt 173#ifndef prompt
168# define prompt "ts> " 174# define prompt "ts> "
169#endif 175#endif
170 176
… …
176# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
177#endif 183#endif
178 184
179enum scheme_types 185enum scheme_types
180{ 186{
187 T_INTEGER,
181 T_FREE, 188 T_REAL,
182 T_STRING, 189 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 190 T_SYMBOL,
185 T_PROC, 191 T_PROC,
186 T_PAIR, 192 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 193 T_CLOSURE,
188 T_CONTINUATION, 194 T_CONTINUATION,
189 T_FOREIGN, 195 T_FOREIGN,
190 T_CHARACTER, 196 T_CHARACTER,
191 T_PORT, 197 T_PORT,
… …
201#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
205 211
206static num num_add (num a, num b); 212/* num, for generic arithmetic */
207static num num_mul (num a, num b); 213struct num
208static num num_div (num a, num b); 214{
215 IVALUE ivalue;
216#if USE_REAL
217 RVALUE rvalue;
218 char is_fixnum;
219#endif
220};
221
222#if USE_REAL
223# define num_is_fixnum(n) (n).is_fixnum
224# define num_set_fixnum(n,f) (n).is_fixnum = (f)
225# define num_ivalue(n) (n).ivalue
226# define num_rvalue(n) (n).rvalue
227# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
228# define num_set_rvalue(n,r) (n).rvalue = (r)
229#else
230# define num_is_fixnum(n) 1
231# define num_set_fixnum(n,f) 0
232# define num_ivalue(n) (n).ivalue
233# define num_rvalue(n) (n).ivalue
234# define num_set_ivalue(n,i) (n).ivalue = (i)
235# define num_set_rvalue(n,r) (n).ivalue = (r)
236#endif
237
238enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
239
240static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 242static num num_rem (num a, num b);
212static num num_mod (num a, num b); 243static num num_mod (num a, num b);
213static int num_eq (num a, num b);
214static int num_gt (num a, num b);
215static int num_ge (num a, num b);
216static int num_lt (num a, num b);
217static int num_le (num a, num b);
218 244
219#if USE_MATH 245#if USE_MATH
220static double round_per_R5RS (double x); 246static double round_per_R5RS (double x);
221#endif 247#endif
222static int is_zero_rvalue (RVALUE x); 248static int is_zero_rvalue (RVALUE x);
223
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 249
230static num num_zero; 250static num num_zero;
231static num num_one; 251static num num_one;
232 252
233/* macros for cell operations */ 253/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 254#define typeflag(p) ((p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 255#define set_typeflag(p,v) ((p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 256#define type(p) (typeflag (p) & T_MASKTYPE)
237 257
238INTERFACE INLINE int 258INTERFACE int
239is_string (pointer p) 259is_string (pointer p)
240{ 260{
241 return type (p) == T_STRING; 261 return type (p) == T_STRING;
242} 262}
243 263
244#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
246 266
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 267INTERFACE int
249is_vector (pointer p) 268is_vector (pointer p)
250{ 269{
251 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
252} 271}
253 272
254#define vecvalue(p) ((p)->object.vector.vvalue) 273#define vecvalue(p) ((p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 274#define veclength(p) ((p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
257INTERFACE uint32_t vector_length (pointer vec);
258INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 276INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 278
261INTERFACE uint32_t 279INTERFACE int
262vector_length (pointer vec) 280is_integer (pointer p)
263{ 281{
264 return vec->object.vector.length; 282 return type (p) == T_INTEGER;
265} 283}
266 284
285/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 286INTERFACE int
287is_real (pointer p)
288{
289 return type (p) == T_REAL;
290}
291
292INTERFACE int
268is_number (pointer p) 293is_number (pointer p)
269{ 294{
270 return type (p) == T_NUMBER; 295 return is_integer (p) || is_real (p);
271} 296}
272 297
273INTERFACE INLINE int 298INTERFACE int
274is_integer (pointer p)
275{
276 if (!is_number (p))
277 return 0;
278
279 if (num_is_integer (p) || ivalue (p) == rvalue (p))
280 return 1;
281
282 return 0;
283}
284
285INTERFACE INLINE int
286is_real (pointer p)
287{
288 return is_number (p) && !num_is_fixnum (p->object.number);
289}
290
291INTERFACE INLINE int
292is_character (pointer p) 299is_character (pointer p)
293{ 300{
294 return type (p) == T_CHARACTER; 301 return type (p) == T_CHARACTER;
295} 302}
296 303
297INTERFACE INLINE char * 304INTERFACE char *
298string_value (pointer p) 305string_value (pointer p)
299{ 306{
300 return strvalue (p); 307 return strvalue (p);
301} 308}
302 309
303INLINE num
304nvalue (pointer p)
305{
306 return (p)->object.number;
307}
308
309static IVALUE
310num_get_ivalue (const num n)
311{
312 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
313}
314
315static RVALUE
316num_get_rvalue (const num n)
317{
318 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
319}
320
321INTERFACE IVALUE
322ivalue (pointer p)
323{
324 return num_get_ivalue (p->object.number);
325}
326
327INTERFACE RVALUE
328rvalue (pointer p)
329{
330 return num_get_rvalue (p->object.number);
331}
332
333#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 310#define ivalue_unchecked(p) (p)->object.ivalue
311#define set_ivalue(p,v) (p)->object.ivalue = (v)
312
334#if USE_REAL 313#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 314#define rvalue_unchecked(p) (p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 315#define set_rvalue(p,v) (p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 316#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 317#define rvalue_unchecked(p) (p)->object.ivalue
340# define set_num_integer(p) 0 318#define set_rvalue(p,v) (p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 319#endif
320
343INTERFACE long 321INTERFACE long
344charvalue (pointer p) 322charvalue (pointer p)
345{ 323{
346 return ivalue_unchecked (p); 324 return ivalue_unchecked (p);
347} 325}
348 326
349INTERFACE INLINE int 327INTERFACE int
350is_port (pointer p) 328is_port (pointer p)
351{ 329{
352 return type (p) == T_PORT; 330 return type (p) == T_PORT;
353} 331}
354 332
355INTERFACE INLINE int 333INTERFACE int
356is_inport (pointer p) 334is_inport (pointer p)
357{ 335{
358 return is_port (p) && p->object.port->kind & port_input; 336 return is_port (p) && p->object.port->kind & port_input;
359} 337}
360 338
361INTERFACE INLINE int 339INTERFACE int
362is_outport (pointer p) 340is_outport (pointer p)
363{ 341{
364 return is_port (p) && p->object.port->kind & port_output; 342 return is_port (p) && p->object.port->kind & port_output;
365} 343}
366 344
367INTERFACE INLINE int 345INTERFACE int
368is_pair (pointer p) 346is_pair (pointer p)
369{ 347{
370 return type (p) == T_PAIR; 348 return type (p) == T_PAIR;
371} 349}
372 350
373#define car(p) ((p)->object.cons.car + 0) 351#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 352#define cdr(p) ((p)->object.cons.cdr + 0)
375 353
376#define caar(p) car (car (p)) 354static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 355static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 356static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 357static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 358
381#define cadar(p) car (cdr (car (p))) 359static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 360static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 361static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 362
385INTERFACE void 363INTERFACE void
386set_car (pointer p, pointer q) 364set_car (pointer p, pointer q)
387{ 365{
388 p->object.cons.car = q; 366 p->object.cons.car = q;
… …
404pair_cdr (pointer p) 382pair_cdr (pointer p)
405{ 383{
406 return cdr (p); 384 return cdr (p);
407} 385}
408 386
409INTERFACE INLINE int 387INTERFACE int
410is_symbol (pointer p) 388is_symbol (pointer p)
411{ 389{
412 return type (p) == T_SYMBOL; 390 return type (p) == T_SYMBOL;
413} 391}
414 392
415INTERFACE INLINE char * 393INTERFACE char *
416symname (pointer p) 394symname (pointer p)
417{ 395{
418 return strvalue (car (p)); 396 return strvalue (car (p));
419} 397}
420 398
421#if USE_PLIST 399#if USE_PLIST
422SCHEME_EXPORT INLINE int 400SCHEME_EXPORT int
423hasprop (pointer p) 401hasprop (pointer p)
424{ 402{
425 return typeflag (p) & T_SYMBOL; 403 return typeflag (p) & T_SYMBOL;
426} 404}
427 405
428# define symprop(p) cdr(p) 406# define symprop(p) cdr(p)
429#endif 407#endif
430 408
431INTERFACE INLINE int 409INTERFACE int
432is_syntax (pointer p) 410is_syntax (pointer p)
433{ 411{
434 return typeflag (p) & T_SYNTAX; 412 return typeflag (p) & T_SYNTAX;
435} 413}
436 414
437INTERFACE INLINE int 415INTERFACE int
438is_proc (pointer p) 416is_proc (pointer p)
439{ 417{
440 return type (p) == T_PROC; 418 return type (p) == T_PROC;
441} 419}
442 420
443INTERFACE INLINE int 421INTERFACE int
444is_foreign (pointer p) 422is_foreign (pointer p)
445{ 423{
446 return type (p) == T_FOREIGN; 424 return type (p) == T_FOREIGN;
447} 425}
448 426
449INTERFACE INLINE char * 427INTERFACE char *
450syntaxname (pointer p) 428syntaxname (pointer p)
451{ 429{
452 return strvalue (car (p)); 430 return strvalue (car (p));
453} 431}
454 432
455#define procnum(p) ivalue (p) 433#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 434static const char *procname (pointer x);
457 435
458INTERFACE INLINE int 436INTERFACE int
459is_closure (pointer p) 437is_closure (pointer p)
460{ 438{
461 return type (p) == T_CLOSURE; 439 return type (p) == T_CLOSURE;
462} 440}
463 441
464INTERFACE INLINE int 442INTERFACE int
465is_macro (pointer p) 443is_macro (pointer p)
466{ 444{
467 return type (p) == T_MACRO; 445 return type (p) == T_MACRO;
468} 446}
469 447
470INTERFACE INLINE pointer 448INTERFACE pointer
471closure_code (pointer p) 449closure_code (pointer p)
472{ 450{
473 return car (p); 451 return car (p);
474} 452}
475 453
476INTERFACE INLINE pointer 454INTERFACE pointer
477closure_env (pointer p) 455closure_env (pointer p)
478{ 456{
479 return cdr (p); 457 return cdr (p);
480} 458}
481 459
482INTERFACE INLINE int 460INTERFACE int
483is_continuation (pointer p) 461is_continuation (pointer p)
484{ 462{
485 return type (p) == T_CONTINUATION; 463 return type (p) == T_CONTINUATION;
486} 464}
487 465
488#define cont_dump(p) cdr (p) 466#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 467#define set_cont_dump(p,v) set_cdr ((p), (v))
490 468
491/* To do: promise should be forced ONCE only */ 469/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 470INTERFACE int
493is_promise (pointer p) 471is_promise (pointer p)
494{ 472{
495 return type (p) == T_PROMISE; 473 return type (p) == T_PROMISE;
496} 474}
497 475
498INTERFACE INLINE int 476INTERFACE int
499is_environment (pointer p) 477is_environment (pointer p)
500{ 478{
501 return type (p) == T_ENVIRONMENT; 479 return type (p) == T_ENVIRONMENT;
502} 480}
503 481
… …
509 487
510#define is_mark(p) (typeflag (p) & T_MARK) 488#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 489#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 490#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 491
514INTERFACE INLINE int 492INTERFACE int
515is_immutable (pointer p) 493is_immutable (pointer p)
516{ 494{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 495 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 496}
519 497
520INTERFACE INLINE void 498INTERFACE void
521setimmutable (pointer p) 499setimmutable (pointer p)
522{ 500{
523#if USE_ERROR_CHECKING 501#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 502 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 503#endif
526} 504}
527 505
506/* Result is:
507 proper list: length
508 circular list: -1
509 not even a pair: -2
510 dotted list: -2 minus length before dot
511*/
512INTERFACE int
513list_length (SCHEME_P_ pointer a)
514{
515 int i = 0;
516 pointer slow, fast;
517
518 slow = fast = a;
519
520 while (1)
521 {
522 if (fast == NIL)
523 return i;
524
525 if (!is_pair (fast))
526 return -2 - i;
527
528 fast = cdr (fast);
529 ++i;
530
531 if (fast == NIL)
532 return i;
533
534 if (!is_pair (fast))
535 return -2 - i;
536
537 ++i;
538 fast = cdr (fast);
539
540 /* Safe because we would have already returned if `fast'
541 encountered a non-pair. */
542 slow = cdr (slow);
543
544 if (fast == slow)
545 {
546 /* the fast pointer has looped back around and caught up
547 with the slow pointer, hence the structure is circular,
548 not of finite length, and therefore not a list */
549 return -1;
550 }
551 }
552}
553
554INTERFACE int
555is_list (SCHEME_P_ pointer a)
556{
557 return list_length (SCHEME_A_ a) >= 0;
558}
559
528#if USE_CHAR_CLASSIFIERS 560#if USE_CHAR_CLASSIFIERS
529static INLINE int 561ecb_inline int
530Cisalpha (int c) 562Cisalpha (int c)
531{ 563{
532 return isascii (c) && isalpha (c); 564 return isascii (c) && isalpha (c);
533} 565}
534 566
535static INLINE int 567ecb_inline int
536Cisdigit (int c) 568Cisdigit (int c)
537{ 569{
538 return isascii (c) && isdigit (c); 570 return isascii (c) && isdigit (c);
539} 571}
540 572
541static INLINE int 573ecb_inline int
542Cisspace (int c) 574Cisspace (int c)
543{ 575{
544 return isascii (c) && isspace (c); 576 return isascii (c) && isspace (c);
545} 577}
546 578
547static INLINE int 579ecb_inline int
548Cisupper (int c) 580Cisupper (int c)
549{ 581{
550 return isascii (c) && isupper (c); 582 return isascii (c) && isupper (c);
551} 583}
552 584
553static INLINE int 585ecb_inline int
554Cislower (int c) 586Cislower (int c)
555{ 587{
556 return isascii (c) && islower (c); 588 return isascii (c) && islower (c);
557} 589}
558#endif 590#endif
… …
619#endif 651#endif
620 652
621static int file_push (SCHEME_P_ const char *fname); 653static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 654static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 655static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 656ecb_inline int is_one_of (char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 657static int alloc_cellseg (SCHEME_P_ int n);
626static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 659static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 660static int count_consecutive_cells (pointer x, int needed);
629static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
630static pointer mk_number (SCHEME_P_ const num n); 662static pointer mk_number (SCHEME_P_ const num n);
631static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
648static int basic_inchar (port *pt); 680static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 681static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 682static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 683static char *readstr_upto (SCHEME_P_ char *delim);
652static pointer readstrexp (SCHEME_P); 684static pointer readstrexp (SCHEME_P);
653static INLINE int skipspace (SCHEME_P); 685ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 686static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 687static void printslashstring (SCHEME_P_ char *s, int len);
656static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
657static void printatom (SCHEME_P_ pointer l, int f); 689static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 694static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 695static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 696static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 697static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 698static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 699static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
700static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 701static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 702static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 703static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 704static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 705static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 706static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 707static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 708static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 709static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 710
711static IVALUE
712ivalue (pointer x)
713{
714 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
715}
716
717static RVALUE
718rvalue (pointer x)
719{
720 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
721}
722
723INTERFACE num
724nvalue (pointer x)
725{
726 num n;
727
728 num_set_fixnum (n, is_integer (x));
729
730 if (num_is_fixnum (n))
731 num_set_ivalue (n, ivalue_unchecked (x));
732 else
733 num_set_rvalue (n, rvalue_unchecked (x));
734
735 return n;
736}
737
678static num 738static num
679num_add (num a, num b) 739num_op (enum num_op op, num a, num b)
680{ 740{
681 num ret; 741 num ret;
682 742
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 744
685 if (num_is_fixnum (ret)) 745 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 746 {
747 switch (op)
748 {
749 case NUM_ADD: a.ivalue += b.ivalue; break;
750 case NUM_SUB: a.ivalue -= b.ivalue; break;
751 case NUM_MUL: a.ivalue *= b.ivalue; break;
752 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
753 }
754
755 num_set_ivalue (ret, a.ivalue);
756 }
757#if USE_REAL
687 else 758 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 759 {
760 switch (op)
761 {
762 case NUM_ADD: a.rvalue += b.rvalue; break;
763 case NUM_SUB: a.rvalue -= b.rvalue; break;
764 case NUM_MUL: a.rvalue *= b.rvalue; break;
765 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
766 }
689 767
690 return ret; 768 num_set_rvalue (ret, a.rvalue);
691} 769 }
692 770#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 771
705 return ret; 772 return ret;
706} 773}
707 774
708static num 775static num
709num_div (num a, num b) 776num_div (num a, num b)
710{ 777{
711 num ret; 778 num ret;
712 779
713 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
714 781
715 if (num_is_fixnum (ret)) 782 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 783 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 784 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 785 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 786
750 return ret; 787 return ret;
751} 788}
752 789
753static num 790static num
… …
755{ 792{
756 num ret; 793 num ret;
757 long e1, e2, res; 794 long e1, e2, res;
758 795
759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
760 e1 = num_get_ivalue (a); 797 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 798 e2 = num_ivalue (b);
762 res = e1 % e2; 799 res = e1 % e2;
763 800
764 /* remainder should have same sign as second operand */ 801 /* remainder should have same sign as second operand */
765 if (res > 0) 802 if (res > 0)
766 { 803 {
… …
782{ 819{
783 num ret; 820 num ret;
784 long e1, e2, res; 821 long e1, e2, res;
785 822
786 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 823 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
787 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
789 res = e1 % e2; 826 res = e1 % e2;
790 827
791 /* modulo should have same sign as second operand */ 828 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 829 if (res * e2 < 0)
793 res += e2; 830 res += e2;
794 831
795 num_set_ivalue (ret, res); 832 num_set_ivalue (ret, res);
796 return ret; 833 return ret;
797} 834}
798 835
836/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 837static int
800num_eq (num a, num b) 838num_cmp (num a, num b)
801{ 839{
840 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 841 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 842
805 if (is_fixnum) 843 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 844 {
845 IVALUE av = num_ivalue (a);
846 IVALUE bv = num_ivalue (b);
847
848 ret = av == bv ? 0 : av < bv ? -1 : +1;
849 }
807 else 850 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 851 {
852 RVALUE av = num_rvalue (a);
853 RVALUE bv = num_rvalue (b);
854
855 ret = av == bv ? 0 : av < bv ? -1 : +1;
856 }
809 857
810 return ret; 858 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 859}
853 860
854#if USE_MATH 861#if USE_MATH
855 862
856/* Round to nearest. Round to even if midway */ 863/* Round to nearest. Round to even if midway */
… …
866 return ce; 873 return ce;
867 else if (dfl < dce) 874 else if (dfl < dce)
868 return fl; 875 return fl;
869 else 876 else
870 { 877 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 878 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 879 return fl;
873 else 880 else
874 return ce; 881 return ce;
875 } 882 }
876} 883}
877#endif 884#endif
878 885
879static int 886static int
880is_zero_rvalue (RVALUE x) 887is_zero_rvalue (RVALUE x)
881{ 888{
889 return x == 0;
890#if 0
882#if USE_REAL 891#if USE_REAL
883 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 892 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
884#else 893#else
885 return x == 0; 894 return x == 0;
895#endif
886#endif 896#endif
887} 897}
888 898
889/* allocate new cell segment */ 899/* allocate new cell segment */
890static int 900static int
… …
911 return k; 921 return k;
912 922
913 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 924 SCHEME_V->alloc_seg[i] = cp;
915 925
916 /* insert new segment in address order */
917 newp = (pointer)cp; 926 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 927 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 928 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 929 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 930 last = newp + segsize - 1;
937 931
938 for (p = newp; p <= last; p++) 932 for (p = newp; p <= last; p++)
939 { 933 {
940 set_typeflag (p, T_FREE); 934 set_typeflag (p, T_PAIR);
941 set_car (p, NIL); 935 set_car (p, NIL);
942 set_cdr (p, p + 1); 936 set_cdr (p, p + 1);
943 } 937 }
944 938
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 939 set_cdr (last, SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 940 SCHEME_V->free_cell = newp;
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 } 941 }
962 942
963 return n; 943 return n;
964} 944}
965 945
966/* get new cell. parameter a, b is marked by gc. */ 946/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 947ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 948get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 949{
970 if (SCHEME_V->free_cell == NIL) 950 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 951 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 953 return S_SINK;
974 954
975 if (SCHEME_V->free_cell == NIL) 955 if (SCHEME_V->free_cell == NIL)
… …
1044 /* Record it as a vector so that gc understands it. */ 1024 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1025 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1026
1047 v->object.vector.vvalue = e; 1027 v->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1028 v->object.vector.length = len;
1049 fill_vector (v, init); 1029 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1030 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1031
1052 return v; 1032 return v;
1053} 1033}
1054 1034
1055static INLINE void 1035ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1036ok_to_freely_gc (SCHEME_P)
1057{ 1037{
1058 set_car (S_SINK, NIL); 1038 set_car (S_SINK, NIL);
1059} 1039}
1060 1040
… …
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x)); 1102 setimmutable (car (x));
1123 1103
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1104 location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1106 return x;
1127} 1107}
1128 1108
1129static INLINE pointer 1109ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1111{
1132 int location; 1112 int location;
1133 pointer x; 1113 pointer x;
1134 char *s; 1114 char *s;
1135 1115
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1117
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1118 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1119 {
1140 s = symname (car (x)); 1120 s = symname (car (x));
1141 1121
1142 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1153 int i; 1133 int i;
1154 pointer x; 1134 pointer x;
1155 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1156 1136
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1160 1140
1161 return ob_list; 1141 return ob_list;
1162} 1142}
1163 1143
… …
1167oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1168{ 1148{
1169 return NIL; 1149 return NIL;
1170} 1150}
1171 1151
1172static INLINE pointer 1152ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1154{
1175 pointer x; 1155 pointer x;
1176 char *s; 1156 char *s;
1177 1157
… …
1236mk_character (SCHEME_P_ int c) 1216mk_character (SCHEME_P_ int c)
1237{ 1217{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1219
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1220 set_typeflag (x, (T_CHARACTER | T_ATOM));
1241 ivalue_unchecked (x) = c & 0xff; 1221 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1222
1243 return x; 1223 return x;
1244} 1224}
1245 1225
1246/* get number atom (integer) */ 1226/* get number atom (integer) */
1247INTERFACE pointer 1227INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1228mk_integer (SCHEME_P_ long n)
1249{ 1229{
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1231
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1232 set_typeflag (x, (T_INTEGER | T_ATOM));
1253 ivalue_unchecked (x) = num; 1233 set_ivalue (x, n);
1254 set_num_integer (x); 1234
1255 return x; 1235 return x;
1256} 1236}
1257 1237
1258INTERFACE pointer 1238INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1239mk_real (SCHEME_P_ RVALUE n)
1260{ 1240{
1241#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1243
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1244 set_typeflag (x, (T_REAL | T_ATOM));
1264 rvalue_unchecked (x) = n; 1245 set_rvalue (x, n);
1265 set_num_real (x); 1246
1266 return x; 1247 return x;
1248#else
1249 return mk_integer (SCHEME_A_ n);
1250#endif
1267} 1251}
1268 1252
1269static pointer 1253static pointer
1270mk_number (SCHEME_P_ const num n) 1254mk_number (SCHEME_P_ const num n)
1271{ 1255{
1256#if USE_REAL
1272 if (num_is_fixnum (n)) 1257 return num_is_fixnum (n)
1258 ? mk_integer (SCHEME_A_ num_ivalue (n))
1259 : mk_real (SCHEME_A_ num_rvalue (n));
1260#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1261 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1262#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1263}
1277 1264
1278/* allocate name to string area */ 1265/* allocate name to string area */
1279static char * 1266static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1267store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1339{ 1326{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1327 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1328}
1342 1329
1343INTERFACE void 1330INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1331fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1332{
1346 int i; 1333 int i;
1347 1334
1348 for (i = 0; i < vec->object.vector.length; i++) 1335 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1336 vecvalue (vec)[i] = obj;
1350} 1337}
1351 1338
1352INTERFACE pointer 1339INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1340vector_get (pointer vec, uint32_t ielem)
1354{ 1341{
1355 return vecvalue(vec)[ielem]; 1342 return vecvalue(vec)[ielem];
1356} 1343}
1357 1344
1358INTERFACE void 1345INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1346vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1347{
1361 vecvalue(vec)[ielem] = a; 1348 vecvalue(vec)[ielem] = a;
1362} 1349}
1363 1350
1364/* get new symbol */ 1351/* get new symbol */
… …
1456 } 1443 }
1457 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1458 { 1445 {
1459 if (!has_fp_exp) 1446 if (!has_fp_exp)
1460 { 1447 {
1461 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1449 p++;
1464 1450
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1452 continue;
1467 } 1453 }
… …
1536 1522
1537/*-- 1523/*--
1538 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1539 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1540 * for marking. 1526 * for marking.
1527 *
1528 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector
1541 */ 1531 */
1542static void 1532static void
1543mark (pointer a) 1533mark (pointer a)
1544{ 1534{
1545 pointer t, q, p; 1535 pointer t, q, p;
… …
1547 t = 0; 1537 t = 0;
1548 p = a; 1538 p = a;
1549E2: 1539E2:
1550 setmark (p); 1540 setmark (p);
1551 1541
1552 if (is_vector (p)) 1542 if (ecb_expect_false (is_vector (p)))
1553 { 1543 {
1554 int i; 1544 int i;
1555 1545
1556 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1557 mark (vecvalue (p)[i]); 1547 mark (vecvalue (p)[i]);
1558 } 1548 }
1559 1549
1560 if (is_atom (p)) 1550 if (is_atom (p))
1561 goto E6; 1551 goto E6;
… …
1659 if (is_mark (p)) 1649 if (is_mark (p))
1660 clrmark (p); 1650 clrmark (p);
1661 else 1651 else
1662 { 1652 {
1663 /* reclaim cell */ 1653 /* reclaim cell */
1664 if (typeflag (p) != T_FREE) 1654 if (typeflag (p) != T_PAIR)
1665 { 1655 {
1666 finalize_cell (SCHEME_A_ p); 1656 finalize_cell (SCHEME_A_ p);
1667 set_typeflag (p, T_FREE); 1657 set_typeflag (p, T_PAIR);
1668 set_car (p, NIL); 1658 set_car (p, NIL);
1669 } 1659 }
1670 1660
1671 ++SCHEME_V->fcells; 1661 ++SCHEME_V->fcells;
1672 set_cdr (p, SCHEME_V->free_cell); 1662 set_cdr (p, SCHEME_V->free_cell);
… …
1674 } 1664 }
1675 } 1665 }
1676 } 1666 }
1677 1667
1678 if (SCHEME_V->gc_verbose) 1668 if (SCHEME_V->gc_verbose)
1669 {
1679 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1680} 1672}
1681 1673
1682static void 1674static void
1683finalize_cell (SCHEME_P_ pointer a) 1675finalize_cell (SCHEME_P_ pointer a)
1684{ 1676{
1677 /* TODO, fast bitmap check? */
1685 if (is_string (a)) 1678 if (is_string (a))
1686 free (strvalue (a)); 1679 free (strvalue (a));
1687 else if (is_vector (a)) 1680 else if (is_vector (a))
1688 free (vecvalue (a)); 1681 free (vecvalue (a));
1689#if USE_PORTS 1682#if USE_PORTS
… …
2270 } 2263 }
2271 } 2264 }
2272} 2265}
2273 2266
2274/* check c is in chars */ 2267/* check c is in chars */
2275static INLINE int 2268ecb_inline int
2276is_one_of (char *s, int c) 2269is_one_of (char *s, int c)
2277{ 2270{
2278 if (c == EOF) 2271 if (c == EOF)
2279 return 1; 2272 return 1;
2280 2273
2281 return !!strchr (s, c); 2274 return !!strchr (s, c);
2282} 2275}
2283 2276
2284/* skip white characters */ 2277/* skip white characters */
2285static INLINE int 2278ecb_inline int
2286skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2287{ 2280{
2288 int c, curr_line = 0; 2281 int c, curr_line = 0;
2289 2282
2290 do 2283 do
… …
2518 { 2511 {
2519 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2520 2513
2521 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2522 { 2515 {
2523 if (num_is_integer (l)) 2516 if (is_integer (l))
2524 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2525#if USE_REAL 2518#if USE_REAL
2526 else 2519 else
2527 { 2520 {
2528 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2783 return 0; 2776 return 0;
2784 } 2777 }
2785 else if (is_number (a)) 2778 else if (is_number (a))
2786 { 2779 {
2787 if (is_number (b)) 2780 if (is_number (b))
2788 if (num_is_integer (a) == num_is_integer (b))
2789 return num_eq (nvalue (a), nvalue (b)); 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2790 2782
2791 return 0; 2783 return 0;
2792 } 2784 }
2793 else if (is_character (a)) 2785 else if (is_character (a))
2794 { 2786 {
… …
2861 2853
2862 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2854 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2863 setenvironment (SCHEME_V->envir); 2855 setenvironment (SCHEME_V->envir);
2864} 2856}
2865 2857
2866static INLINE void 2858ecb_inline void
2867new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2868{ 2860{
2869 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
2870 2862
2871 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
2872 { 2864 {
2873 int location = hash_fn (symname (variable), veclength (car (env))); 2865 int location = hash_fn (symname (variable), veclength (car (env)));
2874 2866
2875 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2876 } 2868 }
2877 else 2869 else
2878 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
2879} 2871}
2880 2872
… …
2887 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
2888 { 2880 {
2889 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
2890 { 2882 {
2891 location = hash_fn (symname (hdl), veclength (car (x))); 2883 location = hash_fn (symname (hdl), veclength (car (x)));
2892 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
2893 } 2885 }
2894 else 2886 else
2895 y = car (x); 2887 y = car (x);
2896 2888
2897 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
2898 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
2899 break; 2891 break;
2900 2892
2901 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
2902 break; 2897 break;
2903
2904 if (!all)
2905 return NIL;
2906 } 2898 }
2907
2908 if (x != NIL)
2909 return car (y);
2910 2899
2911 return NIL; 2900 return NIL;
2912} 2901}
2913 2902
2914#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
2915 2904
2916static INLINE void 2905ecb_inline void
2917new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
2918{ 2907{
2919 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
2920 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
2921} 2910}
2922 2911
2923static INLINE void 2912ecb_inline void
2924new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2925{ 2914{
2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2927} 2916}
2928 2917
… …
2950 return NIL; 2939 return NIL;
2951} 2940}
2952 2941
2953#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
2954 2943
2955static INLINE void 2944ecb_inline void
2956new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2957{ 2946{
2958 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2959} 2948}
2960 2949
2961static INLINE void 2950ecb_inline void
2962set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2963{ 2952{
2964 set_cdr (slot, value); 2953 set_cdr (slot, value);
2965} 2954}
2966 2955
2967static INLINE pointer 2956ecb_inline pointer
2968slot_value_in_env (pointer slot) 2957slot_value_in_env (pointer slot)
2969{ 2958{
2970 return cdr (slot); 2959 return cdr (slot);
2971} 2960}
2972 2961
2973/* ========== Evaluation Cycle ========== */ 2962/* ========== Evaluation Cycle ========== */
2974 2963
2975static pointer 2964static int
2976xError_1 (SCHEME_P_ const char *s, pointer a) 2965xError_1 (SCHEME_P_ const char *s, pointer a)
2977{ 2966{
2978#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
2979 pointer x; 2968 pointer x;
2980 pointer hdl = SCHEME_V->ERROR_HOOK; 2969 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3015 code = cons (mk_string (SCHEME_A_ s), code); 3004 code = cons (mk_string (SCHEME_A_ s), code);
3016 setimmutable (car (code)); 3005 setimmutable (car (code));
3017 SCHEME_V->code = cons (slot_value_in_env (x), code); 3006 SCHEME_V->code = cons (slot_value_in_env (x), code);
3018 SCHEME_V->op = OP_EVAL; 3007 SCHEME_V->op = OP_EVAL;
3019 3008
3020 return S_T; 3009 return 0;
3021 } 3010 }
3022#endif 3011#endif
3023 3012
3024 if (a) 3013 if (a)
3025 SCHEME_V->args = cons (a, NIL); 3014 SCHEME_V->args = cons (a, NIL);
… …
3027 SCHEME_V->args = NIL; 3016 SCHEME_V->args = NIL;
3028 3017
3029 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3018 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3030 setimmutable (car (SCHEME_V->args)); 3019 setimmutable (car (SCHEME_V->args));
3031 SCHEME_V->op = OP_ERR0; 3020 SCHEME_V->op = OP_ERR0;
3021
3032 return S_T; 3022 return 0;
3033} 3023}
3034 3024
3035#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3025#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3036#define Error_0(s) Error_1 (s, 0) 3026#define Error_0(s) Error_1 (s, 0)
3037 3027
3038/* Too small to turn into function */ 3028/* Too small to turn into function */
3039#define BEGIN do { 3029#define BEGIN do {
3040#define END } while (0) 3030#define END } while (0)
3041#define s_goto(a) BEGIN \ 3031#define s_goto(a) BEGIN \
3042 SCHEME_V->op = a; \ 3032 SCHEME_V->op = a; \
3043 return S_T; END 3033 return 0; END
3044 3034
3045#define s_return(a) return xs_return (SCHEME_A_ a) 3035#define s_return(a) return xs_return (SCHEME_A_ a)
3046 3036
3047#ifndef USE_SCHEME_STACK 3037#ifndef USE_SCHEME_STACK
3048 3038
… …
3073 next_frame = SCHEME_V->dump_base + nframes; 3063 next_frame = SCHEME_V->dump_base + nframes;
3074 3064
3075 next_frame->op = op; 3065 next_frame->op = op;
3076 next_frame->args = args; 3066 next_frame->args = args;
3077 next_frame->envir = SCHEME_V->envir; 3067 next_frame->envir = SCHEME_V->envir;
3078 next_frame->code = code; 3068 next_frame->code = code;
3079 3069
3080 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3081} 3071}
3082 3072
3083static pointer 3073static int
3084xs_return (SCHEME_P_ pointer a) 3074xs_return (SCHEME_P_ pointer a)
3085{ 3075{
3086 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3087 struct dump_stack_frame *frame; 3077 struct dump_stack_frame *frame;
3088 3078
3089 SCHEME_V->value = a; 3079 SCHEME_V->value = a;
3090 3080
3091 if (nframes <= 0) 3081 if (nframes <= 0)
3092 return NIL; 3082 return -1;
3093 3083
3094 frame = &SCHEME_V->dump_base[--nframes]; 3084 frame = &SCHEME_V->dump_base[--nframes];
3095 SCHEME_V->op = frame->op; 3085 SCHEME_V->op = frame->op;
3096 SCHEME_V->args = frame->args; 3086 SCHEME_V->args = frame->args;
3097 SCHEME_V->envir = frame->envir; 3087 SCHEME_V->envir = frame->envir;
3098 SCHEME_V->code = frame->code; 3088 SCHEME_V->code = frame->code;
3099 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3100 3090
3101 return S_T; 3091 return 0;
3102} 3092}
3103 3093
3104static INLINE void 3094ecb_inline void
3105dump_stack_reset (SCHEME_P) 3095dump_stack_reset (SCHEME_P)
3106{ 3096{
3107 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3108 SCHEME_V->dump = (pointer)+0; 3098 SCHEME_V->dump = (pointer)+0;
3109} 3099}
3110 3100
3111static INLINE void 3101ecb_inline void
3112dump_stack_initialize (SCHEME_P) 3102dump_stack_initialize (SCHEME_P)
3113{ 3103{
3114 SCHEME_V->dump_size = 0; 3104 SCHEME_V->dump_size = 0;
3115 SCHEME_V->dump_base = 0; 3105 SCHEME_V->dump_base = 0;
3116 dump_stack_reset (SCHEME_A); 3106 dump_stack_reset (SCHEME_A);
… …
3169 int i = 0; 3159 int i = 0;
3170 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3160 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3171 3161
3172 while (cont != NIL) 3162 while (cont != NIL)
3173 { 3163 {
3174 frame->op = ivalue (car (cont)); cont = cdr (cont); 3164 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3175 frame->args = car (cont) ; cont = cdr (cont); 3165 frame->args = car (cont) ; cont = cdr (cont);
3176 frame->envir = car (cont) ; cont = cdr (cont); 3166 frame->envir = car (cont) ; cont = cdr (cont);
3177 frame->code = car (cont) ; cont = cdr (cont); 3167 frame->code = car (cont) ; cont = cdr (cont);
3178 3168
3179 ++frame; 3169 ++frame;
3180 ++i; 3170 ++i;
3181 } 3171 }
3182 3172
3183 SCHEME_V->dump = (pointer)(uintptr_t)i; 3173 SCHEME_V->dump = (pointer)(uintptr_t)i;
3184} 3174}
3185 3175
3186#else 3176#else
3187 3177
3188static INLINE void 3178ecb_inline void
3189dump_stack_reset (SCHEME_P) 3179dump_stack_reset (SCHEME_P)
3190{ 3180{
3191 SCHEME_V->dump = NIL; 3181 SCHEME_V->dump = NIL;
3192} 3182}
3193 3183
3194static INLINE void 3184ecb_inline void
3195dump_stack_initialize (SCHEME_P) 3185dump_stack_initialize (SCHEME_P)
3196{ 3186{
3197 dump_stack_reset (SCHEME_A); 3187 dump_stack_reset (SCHEME_A);
3198} 3188}
3199 3189
… …
3201dump_stack_free (SCHEME_P) 3191dump_stack_free (SCHEME_P)
3202{ 3192{
3203 SCHEME_V->dump = NIL; 3193 SCHEME_V->dump = NIL;
3204} 3194}
3205 3195
3206static pointer 3196static int
3207xs_return (SCHEME_P_ pointer a) 3197xs_return (SCHEME_P_ pointer a)
3208{ 3198{
3209 pointer dump = SCHEME_V->dump; 3199 pointer dump = SCHEME_V->dump;
3210 3200
3211 SCHEME_V->value = a; 3201 SCHEME_V->value = a;
3212 3202
3213 if (dump == NIL) 3203 if (dump == NIL)
3214 return NIL; 3204 return -1;
3215 3205
3216 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3206 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3217 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3218 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3219 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3220 3210
3221 SCHEME_V->dump = dump; 3211 SCHEME_V->dump = dump;
3222 3212
3223 return S_T; 3213 return 0;
3224} 3214}
3225 3215
3226static void 3216static void
3227s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3228{ 3218{
… …
3253 3243
3254#endif 3244#endif
3255 3245
3256#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3257 3247
3258static pointer 3248static int
3259opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3249opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3260{ 3250{
3251 pointer args = SCHEME_V->args;
3261 pointer x, y; 3252 pointer x, y;
3262 3253
3263 switch (op) 3254 switch (op)
3264 { 3255 {
3265 case OP_LOAD: /* load */ 3256 case OP_LOAD: /* load */
3266 if (file_interactive (SCHEME_A)) 3257 if (file_interactive (SCHEME_A))
3267 { 3258 {
3268 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3269 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3270 } 3261 }
3271 3262
3272 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3263 if (!file_push (SCHEME_A_ strvalue (car (args))))
3273 Error_1 ("unable to open", car (SCHEME_V->args)); 3264 Error_1 ("unable to open", car (args));
3274 else 3265 else
3275 { 3266 {
3276 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3277 s_goto (OP_T0LVL); 3268 s_goto (OP_T0LVL);
3278 } 3269 }
… …
3352 case OP_EVAL: /* main part of evaluation */ 3343 case OP_EVAL: /* main part of evaluation */
3353#if USE_TRACING 3344#if USE_TRACING
3354 if (SCHEME_V->tracing) 3345 if (SCHEME_V->tracing)
3355 { 3346 {
3356 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3347 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3357 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3348 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3358 SCHEME_V->args = SCHEME_V->code; 3349 SCHEME_V->args = SCHEME_V->code;
3359 putstr (SCHEME_A_ "\nEval: "); 3350 putstr (SCHEME_A_ "\nEval: ");
3360 s_goto (OP_P0LIST); 3351 s_goto (OP_P0LIST);
3361 } 3352 }
3362 3353
… …
3406 SCHEME_V->code = cdr (SCHEME_V->code); 3397 SCHEME_V->code = cdr (SCHEME_V->code);
3407 s_goto (OP_E1ARGS); 3398 s_goto (OP_E1ARGS);
3408 } 3399 }
3409 3400
3410 case OP_E1ARGS: /* eval arguments */ 3401 case OP_E1ARGS: /* eval arguments */
3411 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3402 args = cons (SCHEME_V->value, args);
3412 3403
3413 if (is_pair (SCHEME_V->code)) /* continue */ 3404 if (is_pair (SCHEME_V->code)) /* continue */
3414 { 3405 {
3415 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3406 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3416 SCHEME_V->code = car (SCHEME_V->code); 3407 SCHEME_V->code = car (SCHEME_V->code);
3417 SCHEME_V->args = NIL; 3408 SCHEME_V->args = NIL;
3418 s_goto (OP_EVAL); 3409 s_goto (OP_EVAL);
3419 } 3410 }
3420 else /* end */ 3411 else /* end */
3421 { 3412 {
3422 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3413 args = reverse_in_place (SCHEME_A_ NIL, args);
3423 SCHEME_V->code = car (SCHEME_V->args); 3414 SCHEME_V->code = car (args);
3424 SCHEME_V->args = cdr (SCHEME_V->args); 3415 SCHEME_V->args = cdr (args);
3425 s_goto (OP_APPLY); 3416 s_goto (OP_APPLY);
3426 } 3417 }
3427 3418
3428#if USE_TRACING 3419#if USE_TRACING
3429 3420
3430 case OP_TRACING: 3421 case OP_TRACING:
3431 { 3422 {
3432 int tr = SCHEME_V->tracing; 3423 int tr = SCHEME_V->tracing;
3433 3424
3434 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3425 SCHEME_V->tracing = ivalue_unchecked (car (args));
3435 s_return (mk_integer (SCHEME_A_ tr)); 3426 s_return (mk_integer (SCHEME_A_ tr));
3436 } 3427 }
3437 3428
3438#endif 3429#endif
3439 3430
3440 case OP_APPLY: /* apply 'code' to 'args' */ 3431 case OP_APPLY: /* apply 'code' to 'args' */
3441#if USE_TRACING 3432#if USE_TRACING
3442 if (SCHEME_V->tracing) 3433 if (SCHEME_V->tracing)
3443 { 3434 {
3444 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3435 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3445 SCHEME_V->print_flag = 1; 3436 SCHEME_V->print_flag = 1;
3446 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3437 /* args=cons(SCHEME_V->code,args); */
3447 putstr (SCHEME_A_ "\nApply to: "); 3438 putstr (SCHEME_A_ "\nApply to: ");
3448 s_goto (OP_P0LIST); 3439 s_goto (OP_P0LIST);
3449 } 3440 }
3450 3441
3451 /* fall through */ 3442 /* fall through */
3452 3443
3453 case OP_REAL_APPLY: 3444 case OP_REAL_APPLY:
3454#endif 3445#endif
3455 if (is_proc (SCHEME_V->code)) 3446 if (is_proc (SCHEME_V->code))
3456 {
3457 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3458 }
3459 else if (is_foreign (SCHEME_V->code)) 3448 else if (is_foreign (SCHEME_V->code))
3460 { 3449 {
3461 /* Keep nested calls from GC'ing the arglist */ 3450 /* Keep nested calls from GC'ing the arglist */
3462 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3451 push_recent_alloc (SCHEME_A_ args, NIL);
3463 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3464 3453
3465 s_return (x); 3454 s_return (x);
3466 } 3455 }
3467 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3468 { 3457 {
3469 /* Should not accept promise */ 3458 /* Should not accept promise */
3470 /* make environment */ 3459 /* make environment */
3471 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3460 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3472 3461
3473 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3462 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3474 { 3463 {
3475 if (y == NIL) 3464 if (y == NIL)
3476 Error_0 ("not enough arguments"); 3465 Error_0 ("not enough arguments");
3477 else 3466 else
3478 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3467 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3496 s_goto (OP_BEGIN); 3485 s_goto (OP_BEGIN);
3497 } 3486 }
3498 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3487 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3499 { 3488 {
3500 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3489 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3501 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3490 s_return (args != NIL ? car (args) : NIL);
3502 } 3491 }
3503 else 3492 else
3504 Error_0 ("illegal function"); 3493 Error_0 ("illegal function");
3505 3494
3506 case OP_DOMACRO: /* do macro */ 3495 case OP_DOMACRO: /* do macro */
… …
3515 { 3504 {
3516 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3517 3506
3518 if (f != NIL) 3507 if (f != NIL)
3519 { 3508 {
3520 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3509 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3521 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3510 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3522 SCHEME_V->code = slot_value_in_env (f); 3511 SCHEME_V->code = slot_value_in_env (f);
3523 s_goto (OP_APPLY); 3512 s_goto (OP_APPLY);
3524 } 3513 }
3525 3514
… …
3536 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3537 3526
3538#endif 3527#endif
3539 3528
3540 case OP_MKCLOSURE: /* make-closure */ 3529 case OP_MKCLOSURE: /* make-closure */
3541 x = car (SCHEME_V->args); 3530 x = car (args);
3542 3531
3543 if (car (x) == SCHEME_V->LAMBDA) 3532 if (car (x) == SCHEME_V->LAMBDA)
3544 x = cdr (x); 3533 x = cdr (x);
3545 3534
3546 if (cdr (SCHEME_V->args) == NIL) 3535 if (cdr (args) == NIL)
3547 y = SCHEME_V->envir; 3536 y = SCHEME_V->envir;
3548 else 3537 else
3549 y = cadr (SCHEME_V->args); 3538 y = cadr (args);
3550 3539
3551 s_return (mk_closure (SCHEME_A_ x, y)); 3540 s_return (mk_closure (SCHEME_A_ x, y));
3552 3541
3553 case OP_QUOTE: /* quote */ 3542 case OP_QUOTE: /* quote */
3554 s_return (car (SCHEME_V->code)); 3543 s_return (car (SCHEME_V->code));
… …
3586 3575
3587 3576
3588 case OP_DEFP: /* defined? */ 3577 case OP_DEFP: /* defined? */
3589 x = SCHEME_V->envir; 3578 x = SCHEME_V->envir;
3590 3579
3591 if (cdr (SCHEME_V->args) != NIL) 3580 if (cdr (args) != NIL)
3592 x = cadr (SCHEME_V->args); 3581 x = cadr (args);
3593 3582
3594 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3583 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3595 3584
3596 case OP_SET0: /* set! */ 3585 case OP_SET0: /* set! */
3597 if (is_immutable (car (SCHEME_V->code))) 3586 if (is_immutable (car (SCHEME_V->code)))
3598 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3587 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3599 3588
… …
3630 3619
3631 case OP_IF1: /* if */ 3620 case OP_IF1: /* if */
3632 if (is_true (SCHEME_V->value)) 3621 if (is_true (SCHEME_V->value))
3633 SCHEME_V->code = car (SCHEME_V->code); 3622 SCHEME_V->code = car (SCHEME_V->code);
3634 else 3623 else
3635 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3624 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3636
3637 * car(NIL) = NIL */
3638 s_goto (OP_EVAL); 3625 s_goto (OP_EVAL);
3639 3626
3640 case OP_LET0: /* let */ 3627 case OP_LET0: /* let */
3641 SCHEME_V->args = NIL; 3628 SCHEME_V->args = NIL;
3642 SCHEME_V->value = SCHEME_V->code; 3629 SCHEME_V->value = SCHEME_V->code;
3643 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3630 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3644 s_goto (OP_LET1); 3631 s_goto (OP_LET1);
3645 3632
3646 case OP_LET1: /* let (calculate parameters) */ 3633 case OP_LET1: /* let (calculate parameters) */
3647 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3634 args = cons (SCHEME_V->value, args);
3648 3635
3649 if (is_pair (SCHEME_V->code)) /* continue */ 3636 if (is_pair (SCHEME_V->code)) /* continue */
3650 { 3637 {
3651 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3638 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3652 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3639 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3653 3640
3654 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3641 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3655 SCHEME_V->code = cadar (SCHEME_V->code); 3642 SCHEME_V->code = cadar (SCHEME_V->code);
3656 SCHEME_V->args = NIL; 3643 SCHEME_V->args = NIL;
3657 s_goto (OP_EVAL); 3644 s_goto (OP_EVAL);
3658 } 3645 }
3659 else /* end */ 3646 else /* end */
3660 { 3647 {
3661 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3648 args = reverse_in_place (SCHEME_A_ NIL, args);
3662 SCHEME_V->code = car (SCHEME_V->args); 3649 SCHEME_V->code = car (args);
3663 SCHEME_V->args = cdr (SCHEME_V->args); 3650 SCHEME_V->args = cdr (args);
3664 s_goto (OP_LET2); 3651 s_goto (OP_LET2);
3665 } 3652 }
3666 3653
3667 case OP_LET2: /* let */ 3654 case OP_LET2: /* let */
3668 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3669 3656
3670 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3657 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3671 y != NIL; x = cdr (x), y = cdr (y)) 3658 y != NIL; x = cdr (x), y = cdr (y))
3672 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3659 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3673 3660
3674 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3661 if (is_symbol (car (SCHEME_V->code))) /* named let */
3675 { 3662 {
3676 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3663 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3677 { 3664 {
3678 if (!is_pair (x)) 3665 if (!is_pair (x))
3679 Error_1 ("Bad syntax of binding in let :", x); 3666 Error_1 ("Bad syntax of binding in let :", x);
3680 3667
3681 if (!is_list (SCHEME_A_ car (x))) 3668 if (!is_list (SCHEME_A_ car (x)))
3682 Error_1 ("Bad syntax of binding in let :", car (x)); 3669 Error_1 ("Bad syntax of binding in let :", car (x));
3683 3670
3684 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3671 args = cons (caar (x), args);
3685 } 3672 }
3686 3673
3687 x =
3688 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3674 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3689 SCHEME_V->envir); 3675 SCHEME_V->envir);
3690 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3676 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3691 SCHEME_V->code = cddr (SCHEME_V->code); 3677 SCHEME_V->code = cddr (SCHEME_V->code);
3692 SCHEME_V->args = NIL;
3693 } 3678 }
3694 else 3679 else
3695 { 3680 {
3696 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3682 }
3683
3697 SCHEME_V->args = NIL; 3684 SCHEME_V->args = NIL;
3698 }
3699
3700 s_goto (OP_BEGIN); 3685 s_goto (OP_BEGIN);
3701 3686
3702 case OP_LET0AST: /* let* */ 3687 case OP_LET0AST: /* let* */
3703 if (car (SCHEME_V->code) == NIL) 3688 if (car (SCHEME_V->code) == NIL)
3704 { 3689 {
… …
3722 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3707 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3723 SCHEME_V->code = cdr (SCHEME_V->code); 3708 SCHEME_V->code = cdr (SCHEME_V->code);
3724 3709
3725 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3726 { 3711 {
3727 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3712 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3728 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3729 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3730 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3731 } 3716 }
3732 else /* end */ 3717 else /* end */
3733 { 3718 {
3734 SCHEME_V->code = SCHEME_V->args; 3719 SCHEME_V->code = args;
3735 SCHEME_V->args = NIL; 3720 SCHEME_V->args = NIL;
3736 s_goto (OP_BEGIN); 3721 s_goto (OP_BEGIN);
3737 } 3722 }
3738 3723
3739 case OP_LET0REC: /* letrec */ 3724 case OP_LET0REC: /* letrec */
… …
3742 SCHEME_V->value = SCHEME_V->code; 3727 SCHEME_V->value = SCHEME_V->code;
3743 SCHEME_V->code = car (SCHEME_V->code); 3728 SCHEME_V->code = car (SCHEME_V->code);
3744 s_goto (OP_LET1REC); 3729 s_goto (OP_LET1REC);
3745 3730
3746 case OP_LET1REC: /* letrec (calculate parameters) */ 3731 case OP_LET1REC: /* letrec (calculate parameters) */
3747 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3732 args = cons (SCHEME_V->value, args);
3748 3733
3749 if (is_pair (SCHEME_V->code)) /* continue */ 3734 if (is_pair (SCHEME_V->code)) /* continue */
3750 { 3735 {
3751 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3736 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3752 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3737 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3753 3738
3754 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3739 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3755 SCHEME_V->code = cadar (SCHEME_V->code); 3740 SCHEME_V->code = cadar (SCHEME_V->code);
3756 SCHEME_V->args = NIL; 3741 SCHEME_V->args = NIL;
3757 s_goto (OP_EVAL); 3742 s_goto (OP_EVAL);
3758 } 3743 }
3759 else /* end */ 3744 else /* end */
3760 { 3745 {
3761 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3746 args = reverse_in_place (SCHEME_A_ NIL, args);
3762 SCHEME_V->code = car (SCHEME_V->args); 3747 SCHEME_V->code = car (args);
3763 SCHEME_V->args = cdr (SCHEME_V->args); 3748 SCHEME_V->args = cdr (args);
3764 s_goto (OP_LET2REC); 3749 s_goto (OP_LET2REC);
3765 } 3750 }
3766 3751
3767 case OP_LET2REC: /* letrec */ 3752 case OP_LET2REC: /* letrec */
3768 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3753 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3769 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3754 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3770 3755
3771 SCHEME_V->code = cdr (SCHEME_V->code); 3756 SCHEME_V->code = cdr (SCHEME_V->code);
3772 SCHEME_V->args = NIL; 3757 SCHEME_V->args = NIL;
3773 s_goto (OP_BEGIN); 3758 s_goto (OP_BEGIN);
… …
3859 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3860 SCHEME_V->code = car (SCHEME_V->code); 3845 SCHEME_V->code = car (SCHEME_V->code);
3861 s_goto (OP_EVAL); 3846 s_goto (OP_EVAL);
3862 3847
3863 case OP_C1STREAM: /* cons-stream */ 3848 case OP_C1STREAM: /* cons-stream */
3864 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3849 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3865 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3850 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3866 set_typeflag (x, T_PROMISE); 3851 set_typeflag (x, T_PROMISE);
3867 s_return (cons (SCHEME_V->args, x)); 3852 s_return (cons (args, x));
3868 3853
3869 case OP_MACRO0: /* macro */ 3854 case OP_MACRO0: /* macro */
3870 if (is_pair (car (SCHEME_V->code))) 3855 if (is_pair (car (SCHEME_V->code)))
3871 { 3856 {
3872 x = caar (SCHEME_V->code); 3857 x = caar (SCHEME_V->code);
… …
3905 { 3890 {
3906 if (!is_pair (y = caar (x))) 3891 if (!is_pair (y = caar (x)))
3907 break; 3892 break;
3908 3893
3909 for (; y != NIL; y = cdr (y)) 3894 for (; y != NIL; y = cdr (y))
3910 {
3911 if (eqv (car (y), SCHEME_V->value)) 3895 if (eqv (car (y), SCHEME_V->value))
3912 break; 3896 break;
3913 }
3914 3897
3915 if (y != NIL) 3898 if (y != NIL)
3916 break; 3899 break;
3917 } 3900 }
3918 3901
… …
3938 s_goto (OP_BEGIN); 3921 s_goto (OP_BEGIN);
3939 else 3922 else
3940 s_return (NIL); 3923 s_return (NIL);
3941 3924
3942 case OP_PAPPLY: /* apply */ 3925 case OP_PAPPLY: /* apply */
3943 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3944 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3945 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3928 /*SCHEME_V->args = cadr(args); */
3946 s_goto (OP_APPLY); 3929 s_goto (OP_APPLY);
3947 3930
3948 case OP_PEVAL: /* eval */ 3931 case OP_PEVAL: /* eval */
3949 if (cdr (SCHEME_V->args) != NIL) 3932 if (cdr (args) != NIL)
3950 SCHEME_V->envir = cadr (SCHEME_V->args); 3933 SCHEME_V->envir = cadr (args);
3951 3934
3952 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
3953 s_goto (OP_EVAL); 3936 s_goto (OP_EVAL);
3954 3937
3955 case OP_CONTINUATION: /* call-with-current-continuation */ 3938 case OP_CONTINUATION: /* call-with-current-continuation */
3956 SCHEME_V->code = car (SCHEME_V->args); 3939 SCHEME_V->code = car (args);
3957 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3940 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3958 s_goto (OP_APPLY); 3941 s_goto (OP_APPLY);
3959 } 3942 }
3960 3943
3961 return S_T; 3944 if (USE_ERROR_CHECKING) abort ();
3962} 3945}
3963 3946
3964static pointer 3947static int
3965opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3948opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3966{ 3949{
3967 pointer x; 3950 pointer args = SCHEME_V->args;
3951 pointer x = car (args);
3968 num v; 3952 num v;
3969 3953
3954 switch (op)
3955 {
3970#if USE_MATH 3956#if USE_MATH
3971 RVALUE dd;
3972#endif
3973
3974 switch (op)
3975 {
3976#if USE_MATH
3977
3978 case OP_INEX2EX: /* inexact->exact */ 3957 case OP_INEX2EX: /* inexact->exact */
3979 x = car (SCHEME_V->args); 3958 {
3980
3981 if (num_is_integer (x)) 3959 if (is_integer (x))
3982 s_return (x); 3960 s_return (x);
3983 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3961
3962 RVALUE r = rvalue_unchecked (x);
3963
3964 if (r == (RVALUE)(IVALUE)r)
3984 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3985 else 3966 else
3986 Error_1 ("inexact->exact: not integral:", x); 3967 Error_1 ("inexact->exact: not integral:", x);
3968 }
3987 3969
3988 case OP_EXP:
3989 x = car (SCHEME_V->args);
3990 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3970 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3991
3992 case OP_LOG:
3993 x = car (SCHEME_V->args);
3994 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3971 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
3995
3996 case OP_SIN:
3997 x = car (SCHEME_V->args);
3998 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3972 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3999
4000 case OP_COS:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3973 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4003
4004 case OP_TAN:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3974 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4007
4008 case OP_ASIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3975 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4011
4012 case OP_ACOS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4015 3977
4016 case OP_ATAN: 3978 case OP_ATAN:
4017 x = car (SCHEME_V->args);
4018
4019 if (cdr (SCHEME_V->args) == NIL) 3979 if (cdr (args) == NIL)
4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4021 else 3981 else
4022 { 3982 {
4023 pointer y = cadr (SCHEME_V->args); 3983 pointer y = cadr (args);
4024
4025 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4026 } 3985 }
4027 3986
4028 case OP_SQRT: 3987 case OP_SQRT:
4029 x = car (SCHEME_V->args);
4030 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4031 3989
4032 case OP_EXPT: 3990 case OP_EXPT:
4033 { 3991 {
4034 RVALUE result; 3992 RVALUE result;
4035 int real_result = 1; 3993 int real_result = 1;
4036 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4037 3995
4038 x = car (SCHEME_V->args);
4039
4040 if (num_is_integer (x) && num_is_integer (y)) 3996 if (is_integer (x) && is_integer (y))
4041 real_result = 0; 3997 real_result = 0;
4042 3998
4043 /* This 'if' is an R5RS compatibility fix. */ 3999 /* This 'if' is an R5RS compatibility fix. */
4044 /* NOTE: Remove this 'if' fix for R6RS. */ 4000 /* NOTE: Remove this 'if' fix for R6RS. */
4045 if (rvalue (x) == 0 && rvalue (y) < 0) 4001 if (rvalue (x) == 0 && rvalue (y) < 0)
4046 result = 0.0; 4002 result = 0;
4047 else 4003 else
4048 result = pow (rvalue (x), rvalue (y)); 4004 result = pow (rvalue (x), rvalue (y));
4049 4005
4050 /* Before returning integer result make sure we can. */ 4006 /* Before returning integer result make sure we can. */
4051 /* If the test fails, result is too big for integer. */ 4007 /* If the test fails, result is too big for integer. */
4052 if (!real_result) 4008 if (!real_result)
4053 { 4009 {
4054 long result_as_long = (long) result; 4010 long result_as_long = result;
4055 4011
4056 if (result != (RVALUE) result_as_long) 4012 if (result != result_as_long)
4057 real_result = 1; 4013 real_result = 1;
4058 } 4014 }
4059 4015
4060 if (real_result) 4016 if (real_result)
4061 s_return (mk_real (SCHEME_A_ result)); 4017 s_return (mk_real (SCHEME_A_ result));
4062 else 4018 else
4063 s_return (mk_integer (SCHEME_A_ result)); 4019 s_return (mk_integer (SCHEME_A_ result));
4064 } 4020 }
4065 4021
4066 case OP_FLOOR:
4067 x = car (SCHEME_V->args);
4068 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4022 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4069
4070 case OP_CEILING:
4071 x = car (SCHEME_V->args);
4072 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4073 4024
4074 case OP_TRUNCATE: 4025 case OP_TRUNCATE:
4075 { 4026 {
4076 RVALUE rvalue_of_x; 4027 RVALUE n = rvalue (x);
4077
4078 x = car (SCHEME_V->args);
4079 rvalue_of_x = rvalue (x);
4080
4081 if (rvalue_of_x > 0)
4082 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4028 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4083 else
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4085 } 4029 }
4086 4030
4087 case OP_ROUND: 4031 case OP_ROUND:
4088 x = car (SCHEME_V->args);
4089
4090 if (num_is_integer (x)) 4032 if (is_integer (x))
4091 s_return (x); 4033 s_return (x);
4092 4034
4093 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4094#endif 4036#endif
4095 4037
4096 case OP_ADD: /* + */ 4038 case OP_ADD: /* + */
4097 v = num_zero; 4039 v = num_zero;
4098 4040
4099 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4041 for (x = args; x != NIL; x = cdr (x))
4100 v = num_add (v, nvalue (car (x))); 4042 v = num_op (NUM_ADD, v, nvalue (car (x)));
4101 4043
4102 s_return (mk_number (SCHEME_A_ v)); 4044 s_return (mk_number (SCHEME_A_ v));
4103 4045
4104 case OP_MUL: /* * */ 4046 case OP_MUL: /* * */
4105 v = num_one; 4047 v = num_one;
4106 4048
4107 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4049 for (x = args; x != NIL; x = cdr (x))
4108 v = num_mul (v, nvalue (car (x))); 4050 v = num_op (NUM_MUL, v, nvalue (car (x)));
4109 4051
4110 s_return (mk_number (SCHEME_A_ v)); 4052 s_return (mk_number (SCHEME_A_ v));
4111 4053
4112 case OP_SUB: /* - */ 4054 case OP_SUB: /* - */
4113 if (cdr (SCHEME_V->args) == NIL) 4055 if (cdr (args) == NIL)
4114 { 4056 {
4115 x = SCHEME_V->args; 4057 x = args;
4116 v = num_zero; 4058 v = num_zero;
4117 } 4059 }
4118 else 4060 else
4119 { 4061 {
4120 x = cdr (SCHEME_V->args); 4062 x = cdr (args);
4121 v = nvalue (car (SCHEME_V->args)); 4063 v = nvalue (car (args));
4122 } 4064 }
4123 4065
4124 for (; x != NIL; x = cdr (x)) 4066 for (; x != NIL; x = cdr (x))
4125 v = num_sub (v, nvalue (car (x))); 4067 v = num_op (NUM_SUB, v, nvalue (car (x)));
4126 4068
4127 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4128 4070
4129 case OP_DIV: /* / */ 4071 case OP_DIV: /* / */
4130 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4131 { 4073 {
4132 x = SCHEME_V->args; 4074 x = args;
4133 v = num_one; 4075 v = num_one;
4134 } 4076 }
4135 else 4077 else
4136 { 4078 {
4137 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4138 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4139 } 4081 }
4140 4082
4141 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4142 {
4143 if (!is_zero_rvalue (rvalue (car (x)))) 4084 if (!is_zero_rvalue (rvalue (car (x))))
4144 v = num_div (v, nvalue (car (x))); 4085 v = num_div (v, nvalue (car (x)));
4145 else 4086 else
4146 Error_0 ("/: division by zero"); 4087 Error_0 ("/: division by zero");
4147 }
4148 4088
4149 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4150 4090
4151 case OP_INTDIV: /* quotient */ 4091 case OP_INTDIV: /* quotient */
4152 if (cdr (SCHEME_V->args) == NIL) 4092 if (cdr (args) == NIL)
4153 { 4093 {
4154 x = SCHEME_V->args; 4094 x = args;
4155 v = num_one; 4095 v = num_one;
4156 } 4096 }
4157 else 4097 else
4158 { 4098 {
4159 x = cdr (SCHEME_V->args); 4099 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4100 v = nvalue (car (args));
4161 } 4101 }
4162 4102
4163 for (; x != NIL; x = cdr (x)) 4103 for (; x != NIL; x = cdr (x))
4164 { 4104 {
4165 if (ivalue (car (x)) != 0) 4105 if (ivalue (car (x)) != 0)
4166 v = num_intdiv (v, nvalue (car (x))); 4106 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4167 else 4107 else
4168 Error_0 ("quotient: division by zero"); 4108 Error_0 ("quotient: division by zero");
4169 } 4109 }
4170 4110
4171 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4172 4112
4173 case OP_REM: /* remainder */ 4113 case OP_REM: /* remainder */
4174 v = nvalue (car (SCHEME_V->args)); 4114 v = nvalue (x);
4175 4115
4176 if (ivalue (cadr (SCHEME_V->args)) != 0) 4116 if (ivalue (cadr (args)) != 0)
4177 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4117 v = num_rem (v, nvalue (cadr (args)));
4178 else 4118 else
4179 Error_0 ("remainder: division by zero"); 4119 Error_0 ("remainder: division by zero");
4180 4120
4181 s_return (mk_number (SCHEME_A_ v)); 4121 s_return (mk_number (SCHEME_A_ v));
4182 4122
4183 case OP_MOD: /* modulo */ 4123 case OP_MOD: /* modulo */
4184 v = nvalue (car (SCHEME_V->args)); 4124 v = nvalue (x);
4185 4125
4186 if (ivalue (cadr (SCHEME_V->args)) != 0) 4126 if (ivalue (cadr (args)) != 0)
4187 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4127 v = num_mod (v, nvalue (cadr (args)));
4188 else 4128 else
4189 Error_0 ("modulo: division by zero"); 4129 Error_0 ("modulo: division by zero");
4190 4130
4191 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4192 4132
4193 case OP_CAR: /* car */ 4133 case OP_CAR: /* car */
4194 s_return (caar (SCHEME_V->args)); 4134 s_return (caar (args));
4195 4135
4196 case OP_CDR: /* cdr */ 4136 case OP_CDR: /* cdr */
4197 s_return (cdar (SCHEME_V->args)); 4137 s_return (cdar (args));
4198 4138
4199 case OP_CONS: /* cons */ 4139 case OP_CONS: /* cons */
4200 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4140 set_cdr (args, cadr (args));
4201 s_return (SCHEME_V->args); 4141 s_return (args);
4202 4142
4203 case OP_SETCAR: /* set-car! */ 4143 case OP_SETCAR: /* set-car! */
4204 if (!is_immutable (car (SCHEME_V->args))) 4144 if (!is_immutable (x))
4205 { 4145 {
4206 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4146 set_car (x, cadr (args));
4207 s_return (car (SCHEME_V->args)); 4147 s_return (car (args));
4208 } 4148 }
4209 else 4149 else
4210 Error_0 ("set-car!: unable to alter immutable pair"); 4150 Error_0 ("set-car!: unable to alter immutable pair");
4211 4151
4212 case OP_SETCDR: /* set-cdr! */ 4152 case OP_SETCDR: /* set-cdr! */
4213 if (!is_immutable (car (SCHEME_V->args))) 4153 if (!is_immutable (x))
4214 { 4154 {
4215 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4155 set_cdr (x, cadr (args));
4216 s_return (car (SCHEME_V->args)); 4156 s_return (car (args));
4217 } 4157 }
4218 else 4158 else
4219 Error_0 ("set-cdr!: unable to alter immutable pair"); 4159 Error_0 ("set-cdr!: unable to alter immutable pair");
4220 4160
4221 case OP_CHAR2INT: /* char->integer */ 4161 case OP_CHAR2INT: /* char->integer */
4222 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4162 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4223 4163
4224 case OP_INT2CHAR: /* integer->char */ 4164 case OP_INT2CHAR: /* integer->char */
4225 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4165 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4226 4166
4227 case OP_CHARUPCASE: 4167 case OP_CHARUPCASE:
4228 { 4168 {
4229 unsigned char c = ivalue (car (SCHEME_V->args)); 4169 unsigned char c = ivalue_unchecked (x);
4230 c = toupper (c); 4170 c = toupper (c);
4231 s_return (mk_character (SCHEME_A_ c)); 4171 s_return (mk_character (SCHEME_A_ c));
4232 } 4172 }
4233 4173
4234 case OP_CHARDNCASE: 4174 case OP_CHARDNCASE:
4235 { 4175 {
4236 unsigned char c = ivalue (car (SCHEME_V->args)); 4176 unsigned char c = ivalue_unchecked (x);
4237 c = tolower (c); 4177 c = tolower (c);
4238 s_return (mk_character (SCHEME_A_ c)); 4178 s_return (mk_character (SCHEME_A_ c));
4239 } 4179 }
4240 4180
4241 case OP_STR2SYM: /* string->symbol */ 4181 case OP_STR2SYM: /* string->symbol */
4242 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4182 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4243 4183
4244 case OP_STR2ATOM: /* string->atom */ 4184 case OP_STR2ATOM: /* string->atom */
4245 { 4185 {
4246 char *s = strvalue (car (SCHEME_V->args)); 4186 char *s = strvalue (x);
4247 long pf = 0; 4187 long pf = 0;
4248 4188
4249 if (cdr (SCHEME_V->args) != NIL) 4189 if (cdr (args) != NIL)
4250 { 4190 {
4251 /* we know cadr(SCHEME_V->args) is a natural number */ 4191 /* we know cadr(args) is a natural number */
4252 /* see if it is 2, 8, 10, or 16, or error */ 4192 /* see if it is 2, 8, 10, or 16, or error */
4253 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4193 pf = ivalue_unchecked (cadr (args));
4254 4194
4255 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4195 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4256 { 4196 {
4257 /* base is OK */ 4197 /* base is OK */
4258 } 4198 }
4259 else 4199 else
4260 pf = -1; 4200 pf = -1;
4261 } 4201 }
4262 4202
4263 if (pf < 0) 4203 if (pf < 0)
4264 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4204 Error_1 ("string->atom: bad base:", cadr (args));
4265 else if (*s == '#') /* no use of base! */ 4205 else if (*s == '#') /* no use of base! */
4266 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4206 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4267 else 4207 else
4268 { 4208 {
4269 if (pf == 0 || pf == 10) 4209 if (pf == 0 || pf == 10)
… …
4280 } 4220 }
4281 } 4221 }
4282 } 4222 }
4283 4223
4284 case OP_SYM2STR: /* symbol->string */ 4224 case OP_SYM2STR: /* symbol->string */
4285 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4225 x = mk_string (SCHEME_A_ symname (x));
4286 setimmutable (x); 4226 setimmutable (x);
4287 s_return (x); 4227 s_return (x);
4288 4228
4289 case OP_ATOM2STR: /* atom->string */ 4229 case OP_ATOM2STR: /* atom->string */
4290 { 4230 {
4291 long pf = 0; 4231 long pf = 0;
4292 4232
4293 x = car (SCHEME_V->args);
4294
4295 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4296 { 4234 {
4297 /* we know cadr(SCHEME_V->args) is a natural number */ 4235 /* we know cadr(args) is a natural number */
4298 /* see if it is 2, 8, 10, or 16, or error */ 4236 /* see if it is 2, 8, 10, or 16, or error */
4299 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4237 pf = ivalue_unchecked (cadr (args));
4300 4238
4301 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4239 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4302 { 4240 {
4303 /* base is OK */ 4241 /* base is OK */
4304 } 4242 }
4305 else 4243 else
4306 pf = -1; 4244 pf = -1;
4307 } 4245 }
4308 4246
4309 if (pf < 0) 4247 if (pf < 0)
4310 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4248 Error_1 ("atom->string: bad base:", cadr (args));
4311 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4249 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4312 { 4250 {
4313 char *p; 4251 char *p;
4314 int len; 4252 int len;
4315 4253
… …
4320 Error_1 ("atom->string: not an atom:", x); 4258 Error_1 ("atom->string: not an atom:", x);
4321 } 4259 }
4322 4260
4323 case OP_MKSTRING: /* make-string */ 4261 case OP_MKSTRING: /* make-string */
4324 { 4262 {
4325 int fill = ' '; 4263 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4326 int len; 4264 int len = ivalue_unchecked (x);
4327 4265
4328 len = ivalue (car (SCHEME_V->args));
4329
4330 if (cdr (SCHEME_V->args) != NIL)
4331 fill = charvalue (cadr (SCHEME_V->args));
4332
4333 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4266 s_return (mk_empty_string (SCHEME_A_ len, fill));
4334 } 4267 }
4335 4268
4336 case OP_STRLEN: /* string-length */ 4269 case OP_STRLEN: /* string-length */
4337 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4270 s_return (mk_integer (SCHEME_A_ strlength (x)));
4338 4271
4339 case OP_STRREF: /* string-ref */ 4272 case OP_STRREF: /* string-ref */
4340 { 4273 {
4341 char *str; 4274 char *str = strvalue (x);
4342 int index;
4343
4344 str = strvalue (car (SCHEME_V->args));
4345
4346 index = ivalue (cadr (SCHEME_V->args)); 4275 int index = ivalue_unchecked (cadr (args));
4347 4276
4348 if (index >= strlength (car (SCHEME_V->args))) 4277 if (index >= strlength (x))
4349 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4278 Error_1 ("string-ref: out of bounds:", cadr (args));
4350 4279
4351 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4280 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4352 } 4281 }
4353 4282
4354 case OP_STRSET: /* string-set! */ 4283 case OP_STRSET: /* string-set! */
4355 { 4284 {
4356 char *str; 4285 char *str = strvalue (x);
4357 int index; 4286 int index = ivalue_unchecked (cadr (args));
4358 int c; 4287 int c;
4359 4288
4360 if (is_immutable (car (SCHEME_V->args))) 4289 if (is_immutable (x))
4361 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4290 Error_1 ("string-set!: unable to alter immutable string:", x);
4362 4291
4363 str = strvalue (car (SCHEME_V->args));
4364
4365 index = ivalue (cadr (SCHEME_V->args));
4366
4367 if (index >= strlength (car (SCHEME_V->args))) 4292 if (index >= strlength (x))
4368 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4293 Error_1 ("string-set!: out of bounds:", cadr (args));
4369 4294
4370 c = charvalue (caddr (SCHEME_V->args)); 4295 c = charvalue (caddr (args));
4371 4296
4372 str[index] = (char) c; 4297 str[index] = c;
4373 s_return (car (SCHEME_V->args)); 4298 s_return (car (args));
4374 } 4299 }
4375 4300
4376 case OP_STRAPPEND: /* string-append */ 4301 case OP_STRAPPEND: /* string-append */
4377 { 4302 {
4378 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4303 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4379 int len = 0; 4304 int len = 0;
4380 pointer newstr; 4305 pointer newstr;
4381 char *pos; 4306 char *pos;
4382 4307
4383 /* compute needed length for new string */ 4308 /* compute needed length for new string */
4384 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4309 for (x = args; x != NIL; x = cdr (x))
4385 len += strlength (car (x)); 4310 len += strlength (car (x));
4386 4311
4387 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4312 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4388 4313
4389 /* store the contents of the argument strings into the new string */ 4314 /* store the contents of the argument strings into the new string */
4390 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4315 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4391 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4316 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4392 4317
4393 s_return (newstr); 4318 s_return (newstr);
4394 } 4319 }
4395 4320
4396 case OP_SUBSTR: /* substring */ 4321 case OP_SUBSTR: /* substring */
4397 { 4322 {
4398 char *str; 4323 char *str = strvalue (x);
4399 int index0; 4324 int index0 = ivalue_unchecked (cadr (args));
4400 int index1; 4325 int index1;
4401 int len; 4326 int len;
4402 4327
4403 str = strvalue (car (SCHEME_V->args));
4404
4405 index0 = ivalue (cadr (SCHEME_V->args));
4406
4407 if (index0 > strlength (car (SCHEME_V->args))) 4328 if (index0 > strlength (x))
4408 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4329 Error_1 ("substring: start out of bounds:", cadr (args));
4409 4330
4410 if (cddr (SCHEME_V->args) != NIL) 4331 if (cddr (args) != NIL)
4411 { 4332 {
4412 index1 = ivalue (caddr (SCHEME_V->args)); 4333 index1 = ivalue_unchecked (caddr (args));
4413 4334
4414 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4335 if (index1 > strlength (x) || index1 < index0)
4415 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4336 Error_1 ("substring: end out of bounds:", caddr (args));
4416 } 4337 }
4417 else 4338 else
4418 index1 = strlength (car (SCHEME_V->args)); 4339 index1 = strlength (x);
4419 4340
4420 len = index1 - index0; 4341 len = index1 - index0;
4421 x = mk_empty_string (SCHEME_A_ len, ' '); 4342 x = mk_empty_string (SCHEME_A_ len, ' ');
4422 memcpy (strvalue (x), str + index0, len); 4343 memcpy (strvalue (x), str + index0, len);
4423 strvalue (x)[len] = 0; 4344 strvalue (x)[len] = 0;
… …
4427 4348
4428 case OP_VECTOR: /* vector */ 4349 case OP_VECTOR: /* vector */
4429 { 4350 {
4430 int i; 4351 int i;
4431 pointer vec; 4352 pointer vec;
4432 int len = list_length (SCHEME_A_ SCHEME_V->args); 4353 int len = list_length (SCHEME_A_ args);
4433 4354
4434 if (len < 0) 4355 if (len < 0)
4435 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4356 Error_1 ("vector: not a proper list:", args);
4436 4357
4437 vec = mk_vector (SCHEME_A_ len); 4358 vec = mk_vector (SCHEME_A_ len);
4438 4359
4439#if USE_ERROR_CHECKING 4360#if USE_ERROR_CHECKING
4440 if (SCHEME_V->no_memory) 4361 if (SCHEME_V->no_memory)
4441 s_return (S_SINK); 4362 s_return (S_SINK);
4442#endif 4363#endif
4443 4364
4444 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4365 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4445 set_vector_elem (vec, i, car (x)); 4366 vector_set (vec, i, car (x));
4446 4367
4447 s_return (vec); 4368 s_return (vec);
4448 } 4369 }
4449 4370
4450 case OP_MKVECTOR: /* make-vector */ 4371 case OP_MKVECTOR: /* make-vector */
4451 { 4372 {
4452 pointer fill = NIL; 4373 pointer fill = NIL;
4453 int len;
4454 pointer vec; 4374 pointer vec;
4375 int len = ivalue_unchecked (x);
4455 4376
4456 len = ivalue (car (SCHEME_V->args));
4457
4458 if (cdr (SCHEME_V->args) != NIL) 4377 if (cdr (args) != NIL)
4459 fill = cadr (SCHEME_V->args); 4378 fill = cadr (args);
4460 4379
4461 vec = mk_vector (SCHEME_A_ len); 4380 vec = mk_vector (SCHEME_A_ len);
4462 4381
4463#if USE_ERROR_CHECKING 4382#if USE_ERROR_CHECKING
4464 if (SCHEME_V->no_memory) 4383 if (SCHEME_V->no_memory)
4465 s_return (S_SINK); 4384 s_return (S_SINK);
4466#endif 4385#endif
4467 4386
4468 if (fill != NIL) 4387 if (fill != NIL)
4469 fill_vector (vec, fill); 4388 fill_vector (vec, 0, fill);
4470 4389
4471 s_return (vec); 4390 s_return (vec);
4472 } 4391 }
4473 4392
4474 case OP_VECLEN: /* vector-length */ 4393 case OP_VECLEN: /* vector-length */
4475 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4394 s_return (mk_integer (SCHEME_A_ veclength (x)));
4476 4395
4477 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4478 { 4397 {
4479 int index;
4480
4481 index = ivalue (cadr (SCHEME_V->args)); 4398 int index = ivalue_unchecked (cadr (args));
4482 4399
4483 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4484 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4485 4402
4486 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_get (x, index));
4487 } 4404 }
4488 4405
4489 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4490 { 4407 {
4491 int index; 4408 int index = ivalue_unchecked (cadr (args));
4492 4409
4493 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4494 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4495 4412
4496 index = ivalue (cadr (SCHEME_V->args));
4497
4498 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4499 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4500 4415
4501 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4416 vector_set (x, index, caddr (args));
4502 s_return (car (SCHEME_V->args)); 4417 s_return (x);
4503 } 4418 }
4504 } 4419 }
4505 4420
4506 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4507} 4422}
4508 4423
4509INTERFACE int 4424static int
4510is_list (SCHEME_P_ pointer a) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4511{ 4426{
4512 return list_length (SCHEME_A_ a) >= 0; 4427 pointer x = SCHEME_V->args;
4513}
4514 4428
4515/* Result is: 4429 for (;;)
4516 proper list: length
4517 circular list: -1
4518 not even a pair: -2
4519 dotted list: -2 minus length before dot
4520*/
4521INTERFACE int
4522list_length (SCHEME_P_ pointer a)
4523{
4524 int i = 0;
4525 pointer slow, fast;
4526
4527 slow = fast = a;
4528
4529 while (1)
4530 { 4430 {
4431 num v = nvalue (car (x));
4432 x = cdr (x);
4433
4531 if (fast == NIL) 4434 if (x == NIL)
4532 return i; 4435 break;
4533 4436
4534 if (!is_pair (fast)) 4437 int r = num_cmp (v, nvalue (car (x)));
4535 return -2 - i;
4536 4438
4537 fast = cdr (fast); 4439 switch (op)
4538 ++i;
4539
4540 if (fast == NIL)
4541 return i;
4542
4543 if (!is_pair (fast))
4544 return -2 - i;
4545
4546 ++i;
4547 fast = cdr (fast);
4548
4549 /* Safe because we would have already returned if `fast'
4550 encountered a non-pair. */
4551 slow = cdr (slow);
4552
4553 if (fast == slow)
4554 { 4440 {
4555 /* the fast pointer has looped back around and caught up 4441 case OP_NUMEQ: r = r == 0; break;
4556 with the slow pointer, hence the structure is circular, 4442 case OP_LESS: r = r < 0; break;
4557 not of finite length, and therefore not a list */ 4443 case OP_GRE: r = r > 0; break;
4558 return -1; 4444 case OP_LEQ: r = r <= 0; break;
4445 case OP_GEQ: r = r >= 0; break;
4559 } 4446 }
4560 }
4561}
4562 4447
4448 if (!r)
4449 s_return (S_F);
4450 }
4451
4452 s_return (S_T);
4453}
4454
4563static pointer 4455static int
4564opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4565{ 4457{
4566 pointer x; 4458 pointer args = SCHEME_V->args;
4567 num v; 4459 pointer a = car (args);
4568 int (*comp_func) (num, num); 4460 pointer d = cdr (args);
4461 int r;
4569 4462
4570 switch (op) 4463 switch (op)
4571 { 4464 {
4572 case OP_NOT: /* not */ 4465 case OP_NOT: /* not */ r = is_false (a) ; break;
4573 s_retbool (is_false (car (SCHEME_V->args))); 4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4574 4475
4575 case OP_BOOLP: /* boolean? */
4576 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4577
4578 case OP_EOFOBJP: /* boolean? */
4579 s_retbool (car (SCHEME_V->args) == S_EOF);
4580
4581 case OP_NULLP: /* null? */
4582 s_retbool (car (SCHEME_V->args) == NIL);
4583
4584 case OP_NUMEQ: /* = */
4585 case OP_LESS: /* < */
4586 case OP_GRE: /* > */
4587 case OP_LEQ: /* <= */
4588 case OP_GEQ: /* >= */
4589 switch (op)
4590 {
4591 case OP_NUMEQ:
4592 comp_func = num_eq;
4593 break;
4594
4595 case OP_LESS:
4596 comp_func = num_lt;
4597 break;
4598
4599 case OP_GRE:
4600 comp_func = num_gt;
4601 break;
4602
4603 case OP_LEQ:
4604 comp_func = num_le;
4605 break;
4606
4607 case OP_GEQ:
4608 comp_func = num_ge;
4609 break;
4610 }
4611
4612 x = SCHEME_V->args;
4613 v = nvalue (car (x));
4614 x = cdr (x);
4615
4616 for (; x != NIL; x = cdr (x))
4617 {
4618 if (!comp_func (v, nvalue (car (x))))
4619 s_retbool (0);
4620
4621 v = nvalue (car (x));
4622 }
4623
4624 s_retbool (1);
4625
4626 case OP_SYMBOLP: /* symbol? */
4627 s_retbool (is_symbol (car (SCHEME_V->args)));
4628
4629 case OP_NUMBERP: /* number? */
4630 s_retbool (is_number (car (SCHEME_V->args)));
4631
4632 case OP_STRINGP: /* string? */
4633 s_retbool (is_string (car (SCHEME_V->args)));
4634
4635 case OP_INTEGERP: /* integer? */
4636 s_retbool (is_integer (car (SCHEME_V->args)));
4637
4638 case OP_REALP: /* real? */
4639 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4640
4641 case OP_CHARP: /* char? */
4642 s_retbool (is_character (car (SCHEME_V->args)));
4643#if USE_CHAR_CLASSIFIERS 4476#if USE_CHAR_CLASSIFIERS
4644 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4645 case OP_CHARAP: /* char-alphabetic? */ 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4646 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4647 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4648 case OP_CHARNP: /* char-numeric? */ 4481 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4649 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4650
4651 case OP_CHARWP: /* char-whitespace? */
4652 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4653
4654 case OP_CHARUP: /* char-upper-case? */
4655 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARLP: /* char-lower-case? */
4658 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4659#endif 4482#endif
4483
4660#if USE_PORTS 4484#if USE_PORTS
4661 4485 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4662 case OP_PORTP: /* port? */
4663 s_retbool (is_port (car (SCHEME_V->args)));
4664
4665 case OP_INPORTP: /* input-port? */ 4486 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4666 s_retbool (is_inport (car (SCHEME_V->args)));
4667
4668 case OP_OUTPORTP: /* output-port? */ 4487 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4669 s_retbool (is_outport (car (SCHEME_V->args)));
4670#endif 4488#endif
4671 4489
4672 case OP_PROCP: /* procedure? */ 4490 case OP_PROCP: /* procedure? */
4673 4491
4674 /*-- 4492 /*--
4675 * continuation should be procedure by the example 4493 * continuation should be procedure by the example
4676 * (call-with-current-continuation procedure?) ==> #t 4494 * (call-with-current-continuation procedure?) ==> #t
4677 * in R^3 report sec. 6.9 4495 * in R^3 report sec. 6.9
4678 */ 4496 */
4679 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4497 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4680 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4498 break;
4681 4499
4682 case OP_PAIRP: /* pair? */ 4500 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4683 s_retbool (is_pair (car (SCHEME_V->args))); 4501 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4684 4502 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4685 case OP_LISTP: /* list? */ 4503 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4686 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4504 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4687 4505 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4688 case OP_ENVP: /* environment? */
4689 s_retbool (is_environment (car (SCHEME_V->args)));
4690
4691 case OP_VECTORP: /* vector? */
4692 s_retbool (is_vector (car (SCHEME_V->args)));
4693
4694 case OP_EQ: /* eq? */
4695 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4696
4697 case OP_EQV: /* eqv? */
4698 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4699 } 4506 }
4700 4507
4701 return S_T; 4508 s_retbool (r);
4702} 4509}
4703 4510
4704static pointer 4511static int
4705opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4706{ 4513{
4514 pointer args = SCHEME_V->args;
4515 pointer a = car (args);
4707 pointer x, y; 4516 pointer x, y;
4708 4517
4709 switch (op) 4518 switch (op)
4710 { 4519 {
4711 case OP_FORCE: /* force */ 4520 case OP_FORCE: /* force */
4712 SCHEME_V->code = car (SCHEME_V->args); 4521 SCHEME_V->code = a;
4713 4522
4714 if (is_promise (SCHEME_V->code)) 4523 if (is_promise (SCHEME_V->code))
4715 { 4524 {
4716 /* Should change type to closure here */ 4525 /* Should change type to closure here */
4717 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4526 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4738 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4547 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4739 SCHEME_V->outport = cadr (SCHEME_V->args); 4548 SCHEME_V->outport = cadr (SCHEME_V->args);
4740 } 4549 }
4741 } 4550 }
4742 4551
4743 SCHEME_V->args = car (SCHEME_V->args); 4552 SCHEME_V->args = a;
4744 4553
4745 if (op == OP_WRITE) 4554 if (op == OP_WRITE)
4746 SCHEME_V->print_flag = 1; 4555 SCHEME_V->print_flag = 1;
4747 else 4556 else
4748 SCHEME_V->print_flag = 0; 4557 SCHEME_V->print_flag = 0;
4749 4558
4750 s_goto (OP_P0LIST); 4559 s_goto (OP_P0LIST);
4751 4560
4752 case OP_NEWLINE: /* newline */ 4561 case OP_NEWLINE: /* newline */
4753 if (is_pair (SCHEME_V->args)) 4562 if (is_pair (args))
4754 { 4563 {
4755 if (car (SCHEME_V->args) != SCHEME_V->outport) 4564 if (a != SCHEME_V->outport)
4756 { 4565 {
4757 x = cons (SCHEME_V->outport, NIL); 4566 x = cons (SCHEME_V->outport, NIL);
4758 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4759 SCHEME_V->outport = car (SCHEME_V->args); 4568 SCHEME_V->outport = a;
4760 } 4569 }
4761 } 4570 }
4762 4571
4763 putstr (SCHEME_A_ "\n"); 4572 putstr (SCHEME_A_ "\n");
4764 s_return (S_T); 4573 s_return (S_T);
4765#endif 4574#endif
4766 4575
4767 case OP_ERR0: /* error */ 4576 case OP_ERR0: /* error */
4768 SCHEME_V->retcode = -1; 4577 SCHEME_V->retcode = -1;
4769 4578
4770 if (!is_string (car (SCHEME_V->args))) 4579 if (!is_string (a))
4771 { 4580 {
4772 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4581 args = cons (mk_string (SCHEME_A_ " -- "), args);
4773 setimmutable (car (SCHEME_V->args)); 4582 setimmutable (car (args));
4774 } 4583 }
4775 4584
4776 putstr (SCHEME_A_ "Error: "); 4585 putstr (SCHEME_A_ "Error: ");
4777 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4586 putstr (SCHEME_A_ strvalue (car (args)));
4778 SCHEME_V->args = cdr (SCHEME_V->args); 4587 SCHEME_V->args = cdr (args);
4779 s_goto (OP_ERR1); 4588 s_goto (OP_ERR1);
4780 4589
4781 case OP_ERR1: /* error */ 4590 case OP_ERR1: /* error */
4782 putstr (SCHEME_A_ " "); 4591 putstr (SCHEME_A_ " ");
4783 4592
4784 if (SCHEME_V->args != NIL) 4593 if (args != NIL)
4785 { 4594 {
4786 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4787 SCHEME_V->args = car (SCHEME_V->args); 4596 SCHEME_V->args = a;
4788 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4789 s_goto (OP_P0LIST); 4598 s_goto (OP_P0LIST);
4790 } 4599 }
4791 else 4600 else
4792 { 4601 {
4793 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4794 4603
4795 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4796 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4797 else 4606 else
4798 return NIL; 4607 return -1;
4799 } 4608 }
4800 4609
4801 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4802 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4611 s_return (reverse (SCHEME_A_ a));
4803 4612
4804 case OP_LIST_STAR: /* list* */ 4613 case OP_LIST_STAR: /* list* */
4805 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4614 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4806 4615
4807 case OP_APPEND: /* append */ 4616 case OP_APPEND: /* append */
4808 x = NIL; 4617 x = NIL;
4809 y = SCHEME_V->args; 4618 y = args;
4810 4619
4811 if (y == x) 4620 if (y == x)
4812 s_return (x); 4621 s_return (x);
4813 4622
4814 /* cdr() in the while condition is not a typo. If car() */ 4623 /* cdr() in the while condition is not a typo. If car() */
… …
4825 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4634 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4826 4635
4827#if USE_PLIST 4636#if USE_PLIST
4828 4637
4829 case OP_PUT: /* put */ 4638 case OP_PUT: /* put */
4830 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4639 if (!hasprop (a) || !hasprop (cadr (args)))
4831 Error_0 ("illegal use of put"); 4640 Error_0 ("illegal use of put");
4832 4641
4833 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4642 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4834 { 4643 {
4835 if (caar (x) == y) 4644 if (caar (x) == y)
4836 break; 4645 break;
4837 } 4646 }
4838 4647
4839 if (x != NIL) 4648 if (x != NIL)
4840 cdar (x) = caddr (SCHEME_V->args); 4649 cdar (x) = caddr (args);
4841 else 4650 else
4842 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4651 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4843 4652
4844 s_return (S_T); 4653 s_return (S_T);
4845 4654
4846 case OP_GET: /* get */ 4655 case OP_GET: /* get */
4847 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4656 if (!hasprop (a) || !hasprop (cadr (args)))
4848 Error_0 ("illegal use of get"); 4657 Error_0 ("illegal use of get");
4849 4658
4850 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4659 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4851 if (caar (x) == y) 4660 if (caar (x) == y)
4852 break; 4661 break;
4853 4662
4854 if (x != NIL) 4663 if (x != NIL)
4855 s_return (cdar (x)); 4664 s_return (cdar (x));
… …
4857 s_return (NIL); 4666 s_return (NIL);
4858 4667
4859#endif /* USE_PLIST */ 4668#endif /* USE_PLIST */
4860 4669
4861 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
4862 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
4863 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4672 SCHEME_V->retcode = ivalue (a);
4864 4673
4865 return NIL; 4674 return -1;
4866 4675
4867 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
4868 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
4869 s_return (S_T); 4678 s_return (S_T);
4870 4679
4871 case OP_GCVERB: /* gc-verbose */ 4680 case OP_GCVERB: /* gc-verbose */
4872 { 4681 {
4873 int was = SCHEME_V->gc_verbose; 4682 int was = SCHEME_V->gc_verbose;
4874 4683
4875 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4684 SCHEME_V->gc_verbose = (a != S_F);
4876 s_retbool (was); 4685 s_retbool (was);
4877 } 4686 }
4878 4687
4879 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
4880 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4689 if (!is_pair (args) || !is_number (a))
4881 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
4882 4691
4883 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
4884 4693
4885 s_return (S_T); 4694 s_return (S_T);
4886 4695
4887 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
4888 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
4915 case OP_OPEN_INOUTFILE: 4724 case OP_OPEN_INOUTFILE:
4916 prop = port_input | port_output; 4725 prop = port_input | port_output;
4917 break; 4726 break;
4918 } 4727 }
4919 4728
4920 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4921 4730
4922 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
4923 s_return (S_F);
4924
4925 s_return (p);
4926 } 4732 }
4927 4733
4928# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
4929 4735
4930 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
4942 case OP_OPEN_INOUTSTRING: 4748 case OP_OPEN_INOUTSTRING:
4943 prop = port_input | port_output; 4749 prop = port_input | port_output;
4944 break; 4750 break;
4945 } 4751 }
4946 4752
4947 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4948 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4754 strvalue (a) + strlength (a), prop);
4949 4755
4950 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4951 s_return (S_F);
4952
4953 s_return (p);
4954 } 4757 }
4955 4758
4956 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
4957 { 4760 {
4958 pointer p; 4761 pointer p;
4959 4762
4960 if (car (SCHEME_V->args) == NIL) 4763 if (a == NIL)
4961 {
4962 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
4963
4964 if (p == NIL)
4965 s_return (S_F);
4966 }
4967 else 4765 else
4968 {
4969 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
4970 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4767 strvalue (a) + strlength (a), port_output);
4971 4768
4972 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
4973 s_return (S_F);
4974 }
4975
4976 s_return (p);
4977 } 4770 }
4978 4771
4979 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
4980 { 4773 {
4981 port *p; 4774 port *p;
4982 4775
4983 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4776 if ((p = a->object.port)->kind & port_string)
4984 { 4777 {
4985 off_t size; 4778 off_t size;
4986 char *str; 4779 char *str;
4987 4780
4988 size = p->rep.string.curr - p->rep.string.start + 1; 4781 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5004 } 4797 }
5005 4798
5006# endif 4799# endif
5007 4800
5008 case OP_CLOSE_INPORT: /* close-input-port */ 4801 case OP_CLOSE_INPORT: /* close-input-port */
5009 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4802 port_close (SCHEME_A_ a, port_input);
5010 s_return (S_T); 4803 s_return (S_T);
5011 4804
5012 case OP_CLOSE_OUTPORT: /* close-output-port */ 4805 case OP_CLOSE_OUTPORT: /* close-output-port */
5013 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4806 port_close (SCHEME_A_ a, port_output);
5014 s_return (S_T); 4807 s_return (S_T);
5015#endif 4808#endif
5016 4809
5017 case OP_INT_ENV: /* interaction-environment */ 4810 case OP_INT_ENV: /* interaction-environment */
5018 s_return (SCHEME_V->global_env); 4811 s_return (SCHEME_V->global_env);
… …
5020 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
5021 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
5022 4815
5023 } 4816 }
5024 4817
5025 return S_T; 4818 if (USE_ERROR_CHECKING) abort ();
5026} 4819}
5027 4820
5028static pointer 4821static int
5029opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5030{ 4823{
4824 pointer args = SCHEME_V->args;
5031 pointer x; 4825 pointer x;
5032 4826
5033 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
5034 { 4828 {
5035 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
5042 switch (op) 4836 switch (op)
5043 { 4837 {
5044 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
5045#if USE_PORTS 4839#if USE_PORTS
5046 case OP_READ: 4840 case OP_READ:
5047 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
5048 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
5049 4843
5050 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
5051 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
5052 4846
5053 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
5054 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
5055 4849
5056 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
5057 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
5058 x = cons (x, NIL); 4852 x = cons (x, NIL);
5059 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5060 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
5061 4855
5062 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
5063 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
5064 { 4858 {
5065 int c; 4859 int c;
5066 4860
5067 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
5068 { 4862 {
5069 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
5070 { 4864 {
5071 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
5072 x = cons (x, NIL); 4866 x = cons (x, NIL);
5073 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5074 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
5075 } 4869 }
5076 } 4870 }
5077 4871
5078 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
5079 4873
… …
5089 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
5090 { 4884 {
5091 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
5092 int res; 4886 int res;
5093 4887
5094 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
5095 p = car (SCHEME_V->args); 4889 p = car (args);
5096 4890
5097 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
5098 4892
5099 s_retbool (res); 4893 s_retbool (res);
5100 } 4894 }
5101 4895
5102 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
5103 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
5104 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
5105 4899
5106 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
5107 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
5108 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
5109#endif 4903#endif
5110 4904
5111 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
5112 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5198 } 4992 }
5199 4993
5200 break; 4994 break;
5201 4995
5202 case OP_RDLIST: 4996 case OP_RDLIST:
5203 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4997 SCHEME_V->args = cons (SCHEME_V->value, args);
5204 SCHEME_V->tok = token (SCHEME_A); 4998 SCHEME_V->tok = token (SCHEME_A);
5205 4999
5206 switch (SCHEME_V->tok) 5000 switch (SCHEME_V->tok)
5207 { 5001 {
5208 case TOK_EOF: 5002 case TOK_EOF:
… …
5236 case OP_RDDOT: 5030 case OP_RDDOT:
5237 if (token (SCHEME_A) != TOK_RPAREN) 5031 if (token (SCHEME_A) != TOK_RPAREN)
5238 Error_0 ("syntax error: illegal dot expression"); 5032 Error_0 ("syntax error: illegal dot expression");
5239 5033
5240 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5034 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5241 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5035 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5242 5036
5243 case OP_RDQUOTE: 5037 case OP_RDQUOTE:
5244 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5038 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5245 5039
5246 case OP_RDQQUOTE: 5040 case OP_RDQQUOTE:
… …
5268 SCHEME_V->args = SCHEME_V->value; 5062 SCHEME_V->args = SCHEME_V->value;
5269 s_goto (OP_VECTOR); 5063 s_goto (OP_VECTOR);
5270 5064
5271 /* ========== printing part ========== */ 5065 /* ========== printing part ========== */
5272 case OP_P0LIST: 5066 case OP_P0LIST:
5273 if (is_vector (SCHEME_V->args)) 5067 if (is_vector (args))
5274 { 5068 {
5275 putstr (SCHEME_A_ "#("); 5069 putstr (SCHEME_A_ "#(");
5276 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5070 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5277 s_goto (OP_PVECFROM); 5071 s_goto (OP_PVECFROM);
5278 } 5072 }
5279 else if (is_environment (SCHEME_V->args)) 5073 else if (is_environment (args))
5280 { 5074 {
5281 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5075 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5282 s_return (S_T); 5076 s_return (S_T);
5283 } 5077 }
5284 else if (!is_pair (SCHEME_V->args)) 5078 else if (!is_pair (args))
5285 { 5079 {
5286 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5080 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5287 s_return (S_T); 5081 s_return (S_T);
5288 } 5082 }
5289 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5083 else
5290 { 5084 {
5085 pointer a = car (args);
5086 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b);
5089
5090 if (a == SCHEME_V->QUOTE && ok_abbr)
5291 putstr (SCHEME_A_ "'"); 5091 putstr (SCHEME_A_ "'");
5292 SCHEME_V->args = cadr (SCHEME_V->args); 5092 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`");
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ",");
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@");
5098 else
5099 {
5100 putstr (SCHEME_A_ "(");
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a;
5103 }
5104
5293 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5294 } 5106 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5107
5108 case OP_P1LIST:
5109 if (is_pair (args))
5296 { 5110 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5297 putstr (SCHEME_A_ "`"); 5112 putstr (SCHEME_A_ " ");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5113 SCHEME_V->args = car (args);
5299 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5300 } 5115 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5302 {
5303 putstr (SCHEME_A_ ",");
5304 SCHEME_V->args = cadr (SCHEME_V->args);
5305 s_goto (OP_P0LIST);
5306 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",@");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else
5314 {
5315 putstr (SCHEME_A_ "(");
5316 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5317 SCHEME_V->args = car (SCHEME_V->args);
5318 s_goto (OP_P0LIST);
5319 }
5320
5321 case OP_P1LIST:
5322 if (is_pair (SCHEME_V->args))
5323 {
5324 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5325 putstr (SCHEME_A_ " ");
5326 SCHEME_V->args = car (SCHEME_V->args);
5327 s_goto (OP_P0LIST);
5328 }
5329 else if (is_vector (SCHEME_V->args)) 5116 else if (is_vector (args))
5330 { 5117 {
5331 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5118 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5332 putstr (SCHEME_A_ " . "); 5119 putstr (SCHEME_A_ " . ");
5333 s_goto (OP_P0LIST); 5120 s_goto (OP_P0LIST);
5334 } 5121 }
5335 else 5122 else
5336 { 5123 {
5337 if (SCHEME_V->args != NIL) 5124 if (args != NIL)
5338 { 5125 {
5339 putstr (SCHEME_A_ " . "); 5126 putstr (SCHEME_A_ " . ");
5340 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5341 } 5128 }
5342 5129
5343 putstr (SCHEME_A_ ")"); 5130 putstr (SCHEME_A_ ")");
5344 s_return (S_T); 5131 s_return (S_T);
5345 } 5132 }
5346 5133
5347 case OP_PVECFROM: 5134 case OP_PVECFROM:
5348 { 5135 {
5349 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5136 int i = ivalue_unchecked (cdr (args));
5350 pointer vec = car (SCHEME_V->args); 5137 pointer vec = car (args);
5351 int len = veclength (vec); 5138 int len = veclength (vec);
5352 5139
5353 if (i == len) 5140 if (i == len)
5354 { 5141 {
5355 putstr (SCHEME_A_ ")"); 5142 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5143 s_return (S_T);
5357 } 5144 }
5358 else 5145 else
5359 { 5146 {
5360 pointer elem = vector_elem (vec, i); 5147 pointer elem = vector_get (vec, i);
5361 5148
5362 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5149 ivalue_unchecked (cdr (args)) = i + 1;
5363 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5364 SCHEME_V->args = elem; 5151 SCHEME_V->args = elem;
5365 5152
5366 if (i > 0) 5153 if (i > 0)
5367 putstr (SCHEME_A_ " "); 5154 putstr (SCHEME_A_ " ");
5368 5155
5369 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5370 } 5157 }
5371 } 5158 }
5372 } 5159 }
5373 5160
5374 return S_T; 5161 if (USE_ERROR_CHECKING) abort ();
5375} 5162}
5376 5163
5377static pointer 5164static int
5378opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5165opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5379{ 5166{
5167 pointer args = SCHEME_V->args;
5168 pointer a = car (args);
5380 pointer x, y; 5169 pointer x, y;
5381 5170
5382 switch (op) 5171 switch (op)
5383 { 5172 {
5384 case OP_LIST_LENGTH: /* length *//* a.k */ 5173 case OP_LIST_LENGTH: /* length *//* a.k */
5385 { 5174 {
5386 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5175 long v = list_length (SCHEME_A_ a);
5387 5176
5388 if (v < 0) 5177 if (v < 0)
5389 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5178 Error_1 ("length: not a list:", a);
5390 5179
5391 s_return (mk_integer (SCHEME_A_ v)); 5180 s_return (mk_integer (SCHEME_A_ v));
5392 } 5181 }
5393 5182
5394 case OP_ASSQ: /* assq *//* a.k */ 5183 case OP_ASSQ: /* assq *//* a.k */
5395 x = car (SCHEME_V->args); 5184 x = a;
5396 5185
5397 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5186 for (y = cadr (args); is_pair (y); y = cdr (y))
5398 { 5187 {
5399 if (!is_pair (car (y))) 5188 if (!is_pair (car (y)))
5400 Error_0 ("unable to handle non pair element"); 5189 Error_0 ("unable to handle non pair element");
5401 5190
5402 if (x == caar (y)) 5191 if (x == caar (y))
… …
5408 else 5197 else
5409 s_return (S_F); 5198 s_return (S_F);
5410 5199
5411 5200
5412 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5201 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5413 SCHEME_V->args = car (SCHEME_V->args); 5202 SCHEME_V->args = a;
5414 5203
5415 if (SCHEME_V->args == NIL) 5204 if (SCHEME_V->args == NIL)
5416 s_return (S_F); 5205 s_return (S_F);
5417 else if (is_closure (SCHEME_V->args)) 5206 else if (is_closure (SCHEME_V->args))
5418 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5207 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5424 case OP_CLOSUREP: /* closure? */ 5213 case OP_CLOSUREP: /* closure? */
5425 /* 5214 /*
5426 * Note, macro object is also a closure. 5215 * Note, macro object is also a closure.
5427 * Therefore, (closure? <#MACRO>) ==> #t 5216 * Therefore, (closure? <#MACRO>) ==> #t
5428 */ 5217 */
5429 s_retbool (is_closure (car (SCHEME_V->args))); 5218 s_retbool (is_closure (a));
5430 5219
5431 case OP_MACROP: /* macro? */ 5220 case OP_MACROP: /* macro? */
5432 s_retbool (is_macro (car (SCHEME_V->args))); 5221 s_retbool (is_macro (a));
5433 } 5222 }
5434 5223
5435 return S_T; /* NOTREACHED */ 5224 if (USE_ERROR_CHECKING) abort ();
5436} 5225}
5437 5226
5227/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5438typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5439 5229
5440typedef int (*test_predicate) (pointer); 5230typedef int (*test_predicate)(pointer);
5441static int 5231static int
5442is_any (pointer p) 5232tst_any (pointer p)
5443{ 5233{
5444 return 1; 5234 return 1;
5445} 5235}
5446 5236
5447static int 5237static int
5448is_nonneg (pointer p) 5238tst_inonneg (pointer p)
5449{ 5239{
5450 return ivalue (p) >= 0 && is_integer (p); 5240 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241}
5242
5243static int
5244tst_is_list (SCHEME_P_ pointer p)
5245{
5246 return p == NIL || is_pair (p);
5451} 5247}
5452 5248
5453/* Correspond carefully with following defines! */ 5249/* Correspond carefully with following defines! */
5454static struct 5250static struct
5455{ 5251{
5456 test_predicate fct; 5252 test_predicate fct;
5457 const char *kind; 5253 const char *kind;
5458} tests[] = 5254} tests[] = {
5459{ 5255 { tst_any , 0 },
5460 { 0, 0}, /* unused */ 5256 { is_string , "string" },
5461 { is_any, 0}, 5257 { is_symbol , "symbol" },
5462 { is_string, "string" }, 5258 { is_port , "port" },
5463 { is_symbol, "symbol" },
5464 { is_port, "port" },
5465 { is_inport, "input port" }, 5259 { is_inport , "input port" },
5466 { is_outport, "output port" }, 5260 { is_outport , "output port" },
5467 { is_environment, "environment" }, 5261 { is_environment, "environment" },
5468 { is_pair, "pair" }, 5262 { is_pair , "pair" },
5469 { 0, "pair or '()" }, 5263 { 0 , "pair or '()" },
5470 { is_character, "character" }, 5264 { is_character , "character" },
5471 { is_vector, "vector" }, 5265 { is_vector , "vector" },
5472 { is_number, "number" }, 5266 { is_number , "number" },
5473 { is_integer, "integer" }, 5267 { is_integer , "integer" },
5474 { is_nonneg, "non-negative integer" } 5268 { tst_inonneg , "non-negative integer" }
5475}; 5269};
5476 5270
5477#define TST_NONE 0 5271#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5478#define TST_ANY "\001" 5272#define TST_ANY "\001"
5479#define TST_STRING "\002" 5273#define TST_STRING "\002"
5480#define TST_SYMBOL "\003" 5274#define TST_SYMBOL "\003"
5481#define TST_PORT "\004" 5275#define TST_PORT "\004"
5482#define TST_INPORT "\005" 5276#define TST_INPORT "\005"
5483#define TST_OUTPORT "\006" 5277#define TST_OUTPORT "\006"
5484#define TST_ENVIRONMENT "\007" 5278#define TST_ENVIRONMENT "\007"
5485#define TST_PAIR "\010" 5279#define TST_PAIR "\010"
5486#define TST_LIST "\011" 5280#define TST_LIST "\011"
5487#define TST_CHAR "\012" 5281#define TST_CHAR "\012"
5488#define TST_VECTOR "\013" 5282#define TST_VECTOR "\013"
5489#define TST_NUMBER "\014" 5283#define TST_NUMBER "\014"
5490#define TST_INTEGER "\015" 5284#define TST_INTEGER "\015"
5491#define TST_NATURAL "\016" 5285#define TST_NATURAL "\016"
5286
5287#define INF_ARG 0xff
5288#define UNNAMED_OP ""
5289
5290static const char opnames[] =
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h"
5293#undef OP_DEF
5294;
5295
5296static const char *
5297opname (int idx)
5298{
5299 const char *name = opnames;
5300
5301 /* should do this at compile time, but would require external program, right? */
5302 while (idx--)
5303 name += strlen (name) + 1;
5304
5305 return *name ? name : "ILLEGAL";
5306}
5307
5308static const char *
5309procname (pointer x)
5310{
5311 return opname (procnum (x));
5312}
5492 5313
5493typedef struct 5314typedef struct
5494{ 5315{
5495 dispatch_func func; 5316 uint8_t func;
5496 char *name; 5317 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5318 uint8_t builtin;
5319#if USE_ERROR_CHECKING
5497 int min_arity; 5320 uint8_t min_arity;
5498 int max_arity; 5321 uint8_t max_arity;
5499 char *arg_tests_encoding; 5322 char arg_tests_encoding[3];
5323#endif
5500} op_code_info; 5324} op_code_info;
5501 5325
5502#define INF_ARG 0xffff
5503
5504static op_code_info dispatch_table[] = { 5326static const op_code_info dispatch_table[] = {
5505#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5327#if USE_ERROR_CHECKING
5328#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5329#else
5330#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5331#endif
5506#include "opdefines.h" 5332#include "opdefines.h"
5333#undef OP_DEF
5507 {0} 5334 {0}
5508}; 5335};
5509 5336
5510static const char *
5511procname (pointer x)
5512{
5513 int n = procnum (x);
5514 const char *name = dispatch_table[n].name;
5515
5516 if (name == 0)
5517 name = "ILLEGAL!";
5518
5519 return name;
5520}
5521
5522/* kernel of this interpreter */ 5337/* kernel of this interpreter */
5523static void 5338static void ecb_hot
5524Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5525{ 5340{
5526 SCHEME_V->op = op; 5341 SCHEME_V->op = op;
5527 5342
5528 for (;;) 5343 for (;;)
5529 { 5344 {
5530 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5345 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5531 5346
5532#if USE_ERROR_CHECKING 5347#if USE_ERROR_CHECKING
5533 if (pcd->name) /* if built-in function, check arguments */ 5348 if (pcd->builtin) /* if built-in function, check arguments */
5534 { 5349 {
5535 int ok = 1;
5536 char msg[STRBUFFSIZE]; 5350 char msg[STRBUFFSIZE];
5537 int n = list_length (SCHEME_A_ SCHEME_V->args); 5351 int n = list_length (SCHEME_A_ SCHEME_V->args);
5538 5352
5539 /* Check number of arguments */ 5353 /* Check number of arguments */
5540 if (n < pcd->min_arity) 5354 if (ecb_expect_false (n < pcd->min_arity))
5541 { 5355 {
5542 ok = 0;
5543 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5356 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5544 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5357 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5358 xError_1 (SCHEME_A_ msg, 0);
5359 continue;
5545 } 5360 }
5546 5361 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5547 if (ok && n > pcd->max_arity)
5548 { 5362 {
5549 ok = 0;
5550 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5363 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5551 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5364 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5365 xError_1 (SCHEME_A_ msg, 0);
5366 continue;
5552 } 5367 }
5553 5368 else
5554 if (ok)
5555 { 5369 {
5556 if (pcd->arg_tests_encoding) 5370 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5557 { 5371 {
5558 int i = 0; 5372 int i = 0;
5559 int j; 5373 int j;
5560 const char *t = pcd->arg_tests_encoding; 5374 const char *t = pcd->arg_tests_encoding;
5561 pointer arglist = SCHEME_V->args; 5375 pointer arglist = SCHEME_V->args;
5562 5376
5563 do 5377 do
5564 { 5378 {
5565 pointer arg = car (arglist); 5379 pointer arg = car (arglist);
5566 5380
5567 j = (int) t[0]; 5381 j = t[0];
5568 5382
5383 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5569 if (j == TST_LIST[0]) 5384 if (j == TST_LIST[0])
5570 { 5385 {
5571 if (arg != NIL && !is_pair (arg)) 5386 if (!tst_is_list (SCHEME_A_ arg))
5572 break; 5387 break;
5573 } 5388 }
5574 else 5389 else
5575 { 5390 {
5576 if (!tests[j].fct (arg)) 5391 if (!tests[j - 1].fct (arg))
5577 break; 5392 break;
5578 } 5393 }
5579 5394
5580 if (t[1] != 0) /* last test is replicated as necessary */ 5395 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5581 t++; 5396 t++;
5582 5397
5583 arglist = cdr (arglist); 5398 arglist = cdr (arglist);
5584 i++; 5399 i++;
5585 } 5400 }
5586 while (i < n); 5401 while (i < n);
5587 5402
5588 if (i < n) 5403 if (i < n)
5589 { 5404 {
5590 ok = 0;
5591 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5405 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5406 xError_1 (SCHEME_A_ msg, 0);
5407 continue;
5592 } 5408 }
5593 } 5409 }
5594 } 5410 }
5595
5596 if (!ok)
5597 {
5598 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5599 return;
5600
5601 pcd = dispatch_table + SCHEME_V->op;
5602 }
5603 } 5411 }
5604#endif 5412#endif
5605 5413
5606 ok_to_freely_gc (SCHEME_A); 5414 ok_to_freely_gc (SCHEME_A);
5607 5415
5608 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5416 static const dispatch_func dispatch_funcs[] = {
5417 opexe_0,
5418 opexe_1,
5419 opexe_2,
5420 opexe_3,
5421 opexe_4,
5422 opexe_5,
5423 opexe_6,
5424 };
5425
5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5609 return; 5427 return;
5610 5428
5611 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5612 { 5430 {
5613 xwrstr ("No memory!\n"); 5431 xwrstr ("No memory!\n");
… …
5637mk_proc (SCHEME_P_ enum scheme_opcodes op) 5455mk_proc (SCHEME_P_ enum scheme_opcodes op)
5638{ 5456{
5639 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5457 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5640 set_typeflag (y, (T_PROC | T_ATOM)); 5458 set_typeflag (y, (T_PROC | T_ATOM));
5641 ivalue_unchecked (y) = op; 5459 ivalue_unchecked (y) = op;
5642 set_num_integer (y);
5643 return y; 5460 return y;
5644} 5461}
5645 5462
5646/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5647static int 5464static int
… …
5671 5488
5672 case 'd': 5489 case 'd':
5673 return OP_COND0; /* cond */ 5490 return OP_COND0; /* cond */
5674 5491
5675 case '*': 5492 case '*':
5676 return OP_LET0AST; /* let* */ 5493 return OP_LET0AST;/* let* */
5677 5494
5678 default: 5495 default:
5679 return OP_SET0; /* set! */ 5496 return OP_SET0; /* set! */
5680 } 5497 }
5681 5498
… …
5703 5520
5704 case 'f': 5521 case 'f':
5705 return OP_DEF0; /* define */ 5522 return OP_DEF0; /* define */
5706 5523
5707 default: 5524 default:
5708 return OP_LET0REC; /* letrec */ 5525 return OP_LET0REC;/* letrec */
5709 } 5526 }
5710 5527
5711 default: 5528 default:
5712 return OP_C0STREAM; /* cons-stream */ 5529 return OP_C0STREAM; /* cons-stream */
5713 } 5530 }
5714} 5531}
5715 5532
5716#if USE_MULTIPLICITY 5533#if USE_MULTIPLICITY
5717scheme * 5534ecb_cold scheme *
5718scheme_init_new () 5535scheme_init_new ()
5719{ 5536{
5720 scheme *sc = malloc (sizeof (scheme)); 5537 scheme *sc = malloc (sizeof (scheme));
5721 5538
5722 if (!scheme_init (SCHEME_A)) 5539 if (!scheme_init (SCHEME_A))
… …
5727 else 5544 else
5728 return sc; 5545 return sc;
5729} 5546}
5730#endif 5547#endif
5731 5548
5732int 5549ecb_cold int
5733scheme_init (SCHEME_P) 5550scheme_init (SCHEME_P)
5734{ 5551{
5735 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5736 pointer x; 5553 pointer x;
5737 5554
… …
5810 5627
5811 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5628 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5812 assign_syntax (SCHEME_A_ syntax_names[i]); 5629 assign_syntax (SCHEME_A_ syntax_names[i]);
5813 } 5630 }
5814 5631
5632 // TODO: should iterate via strlen, to avoid n² complexity
5815 for (i = 0; i < n; i++) 5633 for (i = 0; i < n; i++)
5816 if (dispatch_table[i].name != 0) 5634 if (dispatch_table[i].builtin)
5817 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5635 assign_proc (SCHEME_A_ i, opname (i));
5818 5636
5819 /* initialization of global pointers to special symbols */ 5637 /* initialization of global pointers to special symbols */
5820 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5638 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5821 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5639 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5822 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5640 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5861scheme_set_external_data (SCHEME_P_ void *p) 5679scheme_set_external_data (SCHEME_P_ void *p)
5862{ 5680{
5863 SCHEME_V->ext_data = p; 5681 SCHEME_V->ext_data = p;
5864} 5682}
5865 5683
5866void 5684ecb_cold void
5867scheme_deinit (SCHEME_P) 5685scheme_deinit (SCHEME_P)
5868{ 5686{
5869 int i; 5687 int i;
5870 5688
5871#if SHOW_ERROR_LINE 5689#if SHOW_ERROR_LINE
… …
5963{ 5781{
5964 dump_stack_reset (SCHEME_A); 5782 dump_stack_reset (SCHEME_A);
5965 SCHEME_V->envir = SCHEME_V->global_env; 5783 SCHEME_V->envir = SCHEME_V->global_env;
5966 SCHEME_V->file_i = 0; 5784 SCHEME_V->file_i = 0;
5967 SCHEME_V->load_stack[0].kind = port_input | port_string; 5785 SCHEME_V->load_stack[0].kind = port_input | port_string;
5968 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5786 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5969 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5787 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5970 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5971#if USE_PORTS 5789#if USE_PORTS
5972 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5973#endif 5791#endif
5974 SCHEME_V->retcode = 0; 5792 SCHEME_V->retcode = 0;
5975 SCHEME_V->interactive_repl = 0; 5793 SCHEME_V->interactive_repl = 0;

Diff Legend

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