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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.31 by root, Sat Nov 28 10:54:41 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 long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 659static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 660static int count_consecutive_cells (pointer x, int needed);
630static 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);
631static pointer mk_number (SCHEME_P_ const num n); 662static pointer mk_number (SCHEME_P_ const num n);
632static 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);
… …
649static int basic_inchar (port *pt); 680static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 681static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 682static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 683static char *readstr_upto (SCHEME_P_ char *delim);
653static pointer readstrexp (SCHEME_P); 684static pointer readstrexp (SCHEME_P);
654static INLINE int skipspace (SCHEME_P); 685ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 686static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 687static void printslashstring (SCHEME_P_ char *s, int len);
657static 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);
658static void printatom (SCHEME_P_ pointer l, int f); 689static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 694static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 695static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 696static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 697static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 698static void dump_stack_mark (SCHEME_P);
668static 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);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 701static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 702static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 703static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 704static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 705static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 706static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 707static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 708static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 709static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 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
679static num 738static num
680num_add (num a, num b) 739num_op (enum num_op op, num a, num b)
681{ 740{
682 num ret; 741 num ret;
683 742
684 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));
685 744
686 if (num_is_fixnum (ret)) 745 if (num_is_fixnum (ret))
687 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
688 else 758 else
689 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 }
690 767
691 return ret; 768 num_set_rvalue (ret, a.rvalue);
692} 769 }
693 770#endif
694static num
695num_mul (num a, num b)
696{
697 num ret;
698
699 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
700
701 if (num_is_fixnum (ret))
702 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
703 else
704 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
705 771
706 return ret; 772 return ret;
707} 773}
708 774
709static num 775static num
710num_div (num a, num b) 776num_div (num a, num b)
711{ 777{
712 num ret; 778 num ret;
713 779
714 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);
715 781
716 if (num_is_fixnum (ret)) 782 if (num_is_fixnum (ret))
717 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 783 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
718 else 784 else
719 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 785 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
720
721 return ret;
722}
723
724static num
725num_intdiv (num a, num b)
726{
727 num ret;
728
729 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
730
731 if (num_is_fixnum (ret))
732 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
733 else
734 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
735
736 return ret;
737}
738
739static num
740num_sub (num a, num b)
741{
742 num ret;
743
744 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
745
746 if (num_is_fixnum (ret))
747 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
748 else
749 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
750 786
751 return ret; 787 return ret;
752} 788}
753 789
754static num 790static num
… …
756{ 792{
757 num ret; 793 num ret;
758 long e1, e2, res; 794 long e1, e2, res;
759 795
760 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));
761 e1 = num_get_ivalue (a); 797 e1 = num_ivalue (a);
762 e2 = num_get_ivalue (b); 798 e2 = num_ivalue (b);
763 res = e1 % e2; 799 res = e1 % e2;
764 800
765 /* remainder should have same sign as second operand */ 801 /* remainder should have same sign as second operand */
766 if (res > 0) 802 if (res > 0)
767 { 803 {
… …
783{ 819{
784 num ret; 820 num ret;
785 long e1, e2, res; 821 long e1, e2, res;
786 822
787 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));
788 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
789 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
790 res = e1 % e2; 826 res = e1 % e2;
791 827
792 /* modulo should have same sign as second operand */ 828 /* modulo should have same sign as second operand */
793 if (res * e2 < 0) 829 if (res * e2 < 0)
794 res += e2; 830 res += e2;
795 831
796 num_set_ivalue (ret, res); 832 num_set_ivalue (ret, res);
797 return ret; 833 return ret;
798} 834}
799 835
836/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 837static int
801num_eq (num a, num b) 838num_cmp (num a, num b)
802{ 839{
840 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 841 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 842
806 if (is_fixnum) 843 if (is_fixnum)
807 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 }
808 else 850 else
809 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 }
810 857
811 return ret; 858 return ret;
812}
813
814
815static int
816num_gt (num a, num b)
817{
818 int ret;
819 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
820
821 if (is_fixnum)
822 ret = num_get_ivalue (a) > num_get_ivalue (b);
823 else
824 ret = num_get_rvalue (a) > num_get_rvalue (b);
825
826 return ret;
827}
828
829static int
830num_ge (num a, num b)
831{
832 return !num_lt (a, b);
833}
834
835static int
836num_lt (num a, num b)
837{
838 int ret;
839 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
840
841 if (is_fixnum)
842 ret = num_get_ivalue (a) < num_get_ivalue (b);
843 else
844 ret = num_get_rvalue (a) < num_get_rvalue (b);
845
846 return ret;
847}
848
849static int
850num_le (num a, num b)
851{
852 return !num_gt (a, b);
853} 859}
854 860
855#if USE_MATH 861#if USE_MATH
856 862
857/* Round to nearest. Round to even if midway */ 863/* Round to nearest. Round to even if midway */
… …
867 return ce; 873 return ce;
868 else if (dfl < dce) 874 else if (dfl < dce)
869 return fl; 875 return fl;
870 else 876 else
871 { 877 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 878 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 879 return fl;
874 else 880 else
875 return ce; 881 return ce;
876 } 882 }
877} 883}
878#endif 884#endif
879 885
880static int 886static int
881is_zero_rvalue (RVALUE x) 887is_zero_rvalue (RVALUE x)
882{ 888{
889 return x == 0;
890#if 0
883#if USE_REAL 891#if USE_REAL
884 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. */
885#else 893#else
886 return x == 0; 894 return x == 0;
887#endif 895#endif
888} 896#endif
889
890static long
891binary_decode (const char *s)
892{
893 long x = 0;
894
895 while (*s != 0 && (*s == '1' || *s == '0'))
896 {
897 x <<= 1;
898 x += *s - '0';
899 s++;
900 }
901
902 return x;
903} 897}
904 898
905/* allocate new cell segment */ 899/* allocate new cell segment */
906static int 900static int
907alloc_cellseg (SCHEME_P_ int n) 901alloc_cellseg (SCHEME_P_ int n)
… …
927 return k; 921 return k;
928 922
929 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
930 SCHEME_V->alloc_seg[i] = cp; 924 SCHEME_V->alloc_seg[i] = cp;
931 925
932 /* insert new segment in address order */
933 newp = (pointer)cp; 926 newp = (pointer)cp;
934 SCHEME_V->cell_seg[i] = newp; 927 SCHEME_V->cell_seg[i] = newp;
935 SCHEME_V->cell_segsize[i] = segsize; 928 SCHEME_V->cell_segsize[i] = segsize;
936
937 //TODO: insert, not swap
938 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
939 {
940 p = SCHEME_V->cell_seg[i];
941 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
942 SCHEME_V->cell_seg[i - 1] = p;
943
944 k = SCHEME_V->cell_segsize[i];
945 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
946 SCHEME_V->cell_segsize[i - 1] = k;
947
948 --i;
949 }
950
951 SCHEME_V->fcells += segsize; 929 SCHEME_V->fcells += segsize;
952 last = newp + segsize - 1; 930 last = newp + segsize - 1;
953 931
954 for (p = newp; p <= last; p++) 932 for (p = newp; p <= last; p++)
955 { 933 {
956 set_typeflag (p, T_FREE); 934 set_typeflag (p, T_PAIR);
957 set_car (p, NIL); 935 set_car (p, NIL);
958 set_cdr (p, p + 1); 936 set_cdr (p, p + 1);
959 } 937 }
960 938
961 /* insert new cells in address order on free list */
962 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
963 {
964 set_cdr (last, SCHEME_V->free_cell); 939 set_cdr (last, SCHEME_V->free_cell);
965 SCHEME_V->free_cell = newp; 940 SCHEME_V->free_cell = newp;
966 }
967 else
968 {
969 p = SCHEME_V->free_cell;
970
971 while (cdr (p) != NIL && newp > cdr (p))
972 p = cdr (p);
973
974 set_cdr (last, cdr (p));
975 set_cdr (p, newp);
976 }
977 } 941 }
978 942
979 return n; 943 return n;
980} 944}
981 945
982/* get new cell. parameter a, b is marked by gc. */ 946/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 947ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 948get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 949{
986 if (SCHEME_V->free_cell == NIL) 950 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 951 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 953 return S_SINK;
990 954
991 if (SCHEME_V->free_cell == NIL) 955 if (SCHEME_V->free_cell == NIL)
… …
1060 /* Record it as a vector so that gc understands it. */ 1024 /* Record it as a vector so that gc understands it. */
1061 set_typeflag (v, T_VECTOR | T_ATOM); 1025 set_typeflag (v, T_VECTOR | T_ATOM);
1062 1026
1063 v->object.vector.vvalue = e; 1027 v->object.vector.vvalue = e;
1064 v->object.vector.length = len; 1028 v->object.vector.length = len;
1065 fill_vector (v, init); 1029 fill_vector (v, 0, init);
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1030 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1031
1068 return v; 1032 return v;
1069} 1033}
1070 1034
1071static INLINE void 1035ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1036ok_to_freely_gc (SCHEME_P)
1073{ 1037{
1074 set_car (S_SINK, NIL); 1038 set_car (S_SINK, NIL);
1075} 1039}
1076 1040
… …
1136 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1137 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1138 setimmutable (car (x)); 1102 setimmutable (car (x));
1139 1103
1140 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1104 location = hash_fn (name, veclength (SCHEME_V->oblist));
1141 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1142 return x; 1106 return x;
1143} 1107}
1144 1108
1145static INLINE pointer 1109ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1111{
1148 int location; 1112 int location;
1149 pointer x; 1113 pointer x;
1150 char *s; 1114 char *s;
1151 1115
1152 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1153 1117
1154 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))
1155 { 1119 {
1156 s = symname (car (x)); 1120 s = symname (car (x));
1157 1121
1158 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1159 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1169 int i; 1133 int i;
1170 pointer x; 1134 pointer x;
1171 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1172 1136
1173 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1174 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))
1175 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1176 1140
1177 return ob_list; 1141 return ob_list;
1178} 1142}
1179 1143
… …
1183oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1184{ 1148{
1185 return NIL; 1149 return NIL;
1186} 1150}
1187 1151
1188static INLINE pointer 1152ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1154{
1191 pointer x; 1155 pointer x;
1192 char *s; 1156 char *s;
1193 1157
… …
1205 1169
1206/* returns the new symbol */ 1170/* returns the new symbol */
1207static pointer 1171static pointer
1208oblist_add_by_name (SCHEME_P_ const char *name) 1172oblist_add_by_name (SCHEME_P_ const char *name)
1209{ 1173{
1210 pointer x; 1174 pointer x = mk_string (SCHEME_A_ name);
1211
1212 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1213 set_typeflag (x, T_SYMBOL); 1175 set_typeflag (x, T_SYMBOL);
1214 setimmutable (car (x)); 1176 setimmutable (x);
1215 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1177 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1216 return x; 1178 return x;
1217} 1179}
1218 1180
1219static pointer 1181static pointer
… …
1252mk_character (SCHEME_P_ int c) 1214mk_character (SCHEME_P_ int c)
1253{ 1215{
1254 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1216 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1255 1217
1256 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1218 set_typeflag (x, (T_CHARACTER | T_ATOM));
1257 ivalue_unchecked (x) = c & 0xff; 1219 set_ivalue (x, c & 0xff);
1258 set_num_integer (x); 1220
1259 return x; 1221 return x;
1260} 1222}
1261 1223
1262/* get number atom (integer) */ 1224/* get number atom (integer) */
1263INTERFACE pointer 1225INTERFACE pointer
1264mk_integer (SCHEME_P_ long num) 1226mk_integer (SCHEME_P_ long n)
1265{ 1227{
1266 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1267 1229
1268 set_typeflag (x, (T_NUMBER | T_ATOM)); 1230 set_typeflag (x, (T_INTEGER | T_ATOM));
1269 ivalue_unchecked (x) = num; 1231 set_ivalue (x, n);
1270 set_num_integer (x); 1232
1271 return x; 1233 return x;
1272} 1234}
1273 1235
1274INTERFACE pointer 1236INTERFACE pointer
1275mk_real (SCHEME_P_ RVALUE n) 1237mk_real (SCHEME_P_ RVALUE n)
1276{ 1238{
1239#if USE_REAL
1277 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1240 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1278 1241
1279 set_typeflag (x, (T_NUMBER | T_ATOM)); 1242 set_typeflag (x, (T_REAL | T_ATOM));
1280 rvalue_unchecked (x) = n; 1243 set_rvalue (x, n);
1281 set_num_real (x); 1244
1282 return x; 1245 return x;
1246#else
1247 return mk_integer (SCHEME_A_ n);
1248#endif
1283} 1249}
1284 1250
1285static pointer 1251static pointer
1286mk_number (SCHEME_P_ const num n) 1252mk_number (SCHEME_P_ const num n)
1287{ 1253{
1254#if USE_REAL
1288 if (num_is_fixnum (n)) 1255 return num_is_fixnum (n)
1256 ? mk_integer (SCHEME_A_ num_ivalue (n))
1257 : mk_real (SCHEME_A_ num_rvalue (n));
1258#else
1289 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1259 return mk_integer (SCHEME_A_ num_ivalue (n));
1290 else 1260#endif
1291 return mk_real (SCHEME_A_ num_get_rvalue (n));
1292} 1261}
1293 1262
1294/* allocate name to string area */ 1263/* allocate name to string area */
1295static char * 1264static char *
1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1265store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1320 } 1289 }
1321 1290
1322 return q; 1291 return q;
1323} 1292}
1324 1293
1325/* get new string */
1326INTERFACE pointer 1294INTERFACE pointer
1327mk_string (SCHEME_P_ const char *str) 1295mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1328{ 1296{
1329 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1297 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1298
1299 set_typeflag (x, T_STRING | T_ATOM);
1300 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1301 strlength (x) = len;
1302 return x;
1330} 1303}
1331 1304
1332INTERFACE pointer 1305INTERFACE pointer
1333mk_counted_string (SCHEME_P_ const char *str, uint32_t len) 1306mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1334{ 1307{
… …
1339 strlength (x) = len; 1312 strlength (x) = len;
1340 return x; 1313 return x;
1341} 1314}
1342 1315
1343INTERFACE pointer 1316INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1317mk_string (SCHEME_P_ const char *str)
1345{ 1318{
1346 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1319 return mk_counted_string (SCHEME_A_ str, strlen (str));
1347
1348 set_typeflag (x, T_STRING | T_ATOM);
1349 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1350 strlength (x) = len;
1351 return x;
1352} 1320}
1353 1321
1354INTERFACE pointer 1322INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1323mk_vector (SCHEME_P_ uint32_t len)
1356{ 1324{
1357 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1358} 1326}
1359 1327
1360INTERFACE void 1328INTERFACE void
1361fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1362{ 1330{
1363 int i; 1331 int i;
1364 1332
1365 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1366 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1367} 1335}
1368 1336
1369INTERFACE pointer 1337INTERFACE pointer
1370vector_elem (pointer vec, uint32_t ielem) 1338vector_get (pointer vec, uint32_t ielem)
1371{ 1339{
1372 return vecvalue(vec)[ielem]; 1340 return vecvalue(vec)[ielem];
1373} 1341}
1374 1342
1375INTERFACE void 1343INTERFACE void
1376set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1344vector_set (pointer vec, uint32_t ielem, pointer a)
1377{ 1345{
1378 vecvalue(vec)[ielem] = a; 1346 vecvalue(vec)[ielem] = a;
1379} 1347}
1380 1348
1381/* get new symbol */ 1349/* get new symbol */
… …
1393 1361
1394INTERFACE pointer 1362INTERFACE pointer
1395gensym (SCHEME_P) 1363gensym (SCHEME_P)
1396{ 1364{
1397 pointer x; 1365 pointer x;
1398 char name[40];
1399 1366
1400 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1401 { 1368 {
1402 strcpy (name, "gensym-"); 1369 char name[40] = "gensym-";
1403 xnum (name + 7, SCHEME_V->gensym_cnt); 1370 xnum (name + 7, SCHEME_V->gensym_cnt);
1404 1371
1405 /* first check oblist */ 1372 /* first check oblist */
1406 x = oblist_find_by_name (SCHEME_A_ name); 1373 x = oblist_find_by_name (SCHEME_A_ name);
1407 1374
1408 if (x != NIL) 1375 if (x == NIL)
1409 continue;
1410 else
1411 { 1376 {
1412 x = oblist_add_by_name (SCHEME_A_ name); 1377 x = oblist_add_by_name (SCHEME_A_ name);
1413 return x; 1378 return x;
1414 } 1379 }
1415 } 1380 }
… …
1424 char c, *p; 1389 char c, *p;
1425 int has_dec_point = 0; 1390 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1391 int has_fp_exp = 0;
1427 1392
1428#if USE_COLON_HOOK 1393#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1394 if ((p = strstr (q, "::")) != 0)
1431 { 1395 {
1432 *p = 0; 1396 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1397 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1398 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1399 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1400 }
1437
1438#endif 1401#endif
1439 1402
1440 p = q; 1403 p = q;
1441 c = *p++; 1404 c = *p++;
1442 1405
… …
1478 } 1441 }
1479 else if ((c == 'e') || (c == 'E')) 1442 else if ((c == 'e') || (c == 'E'))
1480 { 1443 {
1481 if (!has_fp_exp) 1444 if (!has_fp_exp)
1482 { 1445 {
1483 has_dec_point = 1; /* decimal point illegal 1446 has_dec_point = 1; /* decimal point illegal from now on */
1484 from now on */
1485 p++; 1447 p++;
1486 1448
1487 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1449 if ((*p == '-') || (*p == '+') || isdigit (*p))
1488 continue; 1450 continue;
1489 } 1451 }
… …
1503 1465
1504/* make constant */ 1466/* make constant */
1505static pointer 1467static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1468mk_sharp_const (SCHEME_P_ char *name)
1507{ 1469{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1470 if (!strcmp (name, "t"))
1512 return S_T; 1471 return S_T;
1513 else if (!strcmp (name, "f")) 1472 else if (!strcmp (name, "f"))
1514 return S_F; 1473 return S_F;
1515 else if (*name == 'o') /* #o (octal) */
1516 {
1517 x = strtol (name + 1, 0, 8);
1518 return mk_integer (SCHEME_A_ x);
1519 }
1520 else if (*name == 'd') /* #d (decimal) */
1521 {
1522 x = strtol (name + 1, 0, 10);
1523 return mk_integer (SCHEME_A_ x);
1524 }
1525 else if (*name == 'x') /* #x (hex) */
1526 {
1527 x = strtol (name + 1, 0, 16);
1528 return mk_integer (SCHEME_A_ x);
1529 }
1530 else if (*name == 'b') /* #b (binary) */
1531 {
1532 x = binary_decode (name + 1);
1533 return mk_integer (SCHEME_A_ x);
1534 }
1535 else if (*name == '\\') /* #\w (character) */ 1474 else if (*name == '\\') /* #\w (character) */
1536 { 1475 {
1537 int c = 0; 1476 int c;
1538 1477
1539 if (stricmp (name + 1, "space") == 0) 1478 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1479 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1480 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1481 c = '\n';
… …
1544 c = '\r'; 1483 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1484 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1485 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1486 else if (name[1] == 'x' && name[2] != 0)
1548 { 1487 {
1549 int c1 = strtol (name + 2, 0, 16); 1488 long c1 = strtol (name + 2, 0, 16);
1550 1489
1551 if (c1 <= UCHAR_MAX) 1490 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1491 c = c1;
1553 else 1492 else
1554 return NIL; 1493 return NIL;
1555 1494 }
1556#if USE_ASCII_NAMES 1495#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1496 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1497 /* nothing */;
1561#endif 1498#endif
1562 }
1563 else if (name[2] == 0) 1499 else if (name[2] == 0)
1564 c = name[1]; 1500 c = name[1];
1565 else 1501 else
1566 return NIL; 1502 return NIL;
1567 1503
1568 return mk_character (SCHEME_A_ c); 1504 return mk_character (SCHEME_A_ c);
1569 } 1505 }
1570 else 1506 else
1507 {
1508 /* identify base by string index */
1509 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1510 char *base = strchr (baseidx, *name);
1511
1512 if (base)
1513 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1514
1571 return NIL; 1515 return NIL;
1516 }
1572} 1517}
1573 1518
1574/* ========== garbage collector ========== */ 1519/* ========== garbage collector ========== */
1575 1520
1576/*-- 1521/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1522 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1523 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1524 * for marking.
1525 *
1526 * The exception is vectors - vectors are currently marked recursively,
1527 * which is inherited form tinyscheme and could be fixed by having another
1528 * word of context in the vector
1580 */ 1529 */
1581static void 1530static void
1582mark (pointer a) 1531mark (pointer a)
1583{ 1532{
1584 pointer t, q, p; 1533 pointer t, q, p;
… …
1586 t = 0; 1535 t = 0;
1587 p = a; 1536 p = a;
1588E2: 1537E2:
1589 setmark (p); 1538 setmark (p);
1590 1539
1591 if (is_vector (p)) 1540 if (ecb_expect_false (is_vector (p)))
1592 { 1541 {
1593 int i; 1542 int i;
1594 1543
1595 for (i = 0; i < p->object.vector.length; i++) 1544 for (i = 0; i < veclength (p); i++)
1596 mark (vecvalue (p)[i]); 1545 mark (vecvalue (p)[i]);
1597 } 1546 }
1598 1547
1599 if (is_atom (p)) 1548 if (is_atom (p))
1600 goto E6; 1549 goto E6;
… …
1698 if (is_mark (p)) 1647 if (is_mark (p))
1699 clrmark (p); 1648 clrmark (p);
1700 else 1649 else
1701 { 1650 {
1702 /* reclaim cell */ 1651 /* reclaim cell */
1703 if (typeflag (p) != T_FREE) 1652 if (typeflag (p) != T_PAIR)
1704 { 1653 {
1705 finalize_cell (SCHEME_A_ p); 1654 finalize_cell (SCHEME_A_ p);
1706 set_typeflag (p, T_FREE); 1655 set_typeflag (p, T_PAIR);
1707 set_car (p, NIL); 1656 set_car (p, NIL);
1708 } 1657 }
1709 1658
1710 ++SCHEME_V->fcells; 1659 ++SCHEME_V->fcells;
1711 set_cdr (p, SCHEME_V->free_cell); 1660 set_cdr (p, SCHEME_V->free_cell);
… …
1713 } 1662 }
1714 } 1663 }
1715 } 1664 }
1716 1665
1717 if (SCHEME_V->gc_verbose) 1666 if (SCHEME_V->gc_verbose)
1667 {
1718 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1669 }
1719} 1670}
1720 1671
1721static void 1672static void
1722finalize_cell (SCHEME_P_ pointer a) 1673finalize_cell (SCHEME_P_ pointer a)
1723{ 1674{
1675 /* TODO, fast bitmap check? */
1724 if (is_string (a)) 1676 if (is_string (a))
1725 free (strvalue (a)); 1677 free (strvalue (a));
1726 else if (is_vector (a)) 1678 else if (is_vector (a))
1727 free (vecvalue (a)); 1679 free (vecvalue (a));
1728#if USE_PORTS 1680#if USE_PORTS
… …
2309 } 2261 }
2310 } 2262 }
2311} 2263}
2312 2264
2313/* check c is in chars */ 2265/* check c is in chars */
2314static INLINE int 2266ecb_inline int
2315is_one_of (char *s, int c) 2267is_one_of (char *s, int c)
2316{ 2268{
2317 if (c == EOF) 2269 if (c == EOF)
2318 return 1; 2270 return 1;
2319 2271
2320 return !!strchr (s, c); 2272 return !!strchr (s, c);
2321} 2273}
2322 2274
2323/* skip white characters */ 2275/* skip white characters */
2324static INLINE int 2276ecb_inline int
2325skipspace (SCHEME_P) 2277skipspace (SCHEME_P)
2326{ 2278{
2327 int c, curr_line = 0; 2279 int c, curr_line = 0;
2328 2280
2329 do 2281 do
… …
2557 { 2509 {
2558 p = SCHEME_V->strbuff; 2510 p = SCHEME_V->strbuff;
2559 2511
2560 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2512 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2561 { 2513 {
2562 if (num_is_integer (l)) 2514 if (is_integer (l))
2563 xnum (p, ivalue_unchecked (l)); 2515 xnum (p, ivalue_unchecked (l));
2564#if USE_REAL 2516#if USE_REAL
2565 else 2517 else
2566 { 2518 {
2567 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2519 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2822 return 0; 2774 return 0;
2823 } 2775 }
2824 else if (is_number (a)) 2776 else if (is_number (a))
2825 { 2777 {
2826 if (is_number (b)) 2778 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2779 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2780
2830 return 0; 2781 return 0;
2831 } 2782 }
2832 else if (is_character (a)) 2783 else if (is_character (a))
2833 { 2784 {
… …
2900 2851
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2852 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2853 setenvironment (SCHEME_V->envir);
2903} 2854}
2904 2855
2905static INLINE void 2856static uint32_t
2857sym_hash (pointer sym, uint32_t size)
2858{
2859 uintptr_t ptr = (uintptr_t)sym;
2860
2861#if 0
2862 /* tqable size is prime, so why mix */
2863 ptr += ptr >> 32;
2864 ptr += ptr >> 16;
2865 ptr += ptr >> 8;
2866#endif
2867
2868 return ptr % size;
2869}
2870
2871ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2872new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2873{
2908 pointer slot = immutable_cons (variable, value); 2874 pointer slot = immutable_cons (variable, value);
2909 2875
2910 if (is_vector (car (env))) 2876 if (is_vector (car (env)))
2911 { 2877 {
2912 int location = hash_fn (symname (variable), veclength (car (env))); 2878 int location = sym_hash (variable, veclength (car (env)));
2913
2914 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2879 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2915 } 2880 }
2916 else 2881 else
2917 set_car (env, immutable_cons (slot, car (env))); 2882 set_car (env, immutable_cons (slot, car (env)));
2918} 2883}
2919 2884
2920static pointer 2885static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2886find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2887{
2923 pointer x, y; 2888 pointer x, y;
2924 int location;
2925 2889
2926 for (x = env; x != NIL; x = cdr (x)) 2890 for (x = env; x != NIL; x = cdr (x))
2927 { 2891 {
2928 if (is_vector (car (x))) 2892 if (is_vector (car (x)))
2929 { 2893 {
2930 location = hash_fn (symname (hdl), veclength (car (x))); 2894 int location = sym_hash (hdl, veclength (car (x)));
2931 y = vector_elem (car (x), location); 2895 y = vector_get (car (x), location);
2932 } 2896 }
2933 else 2897 else
2934 y = car (x); 2898 y = car (x);
2935 2899
2936 for (; y != NIL; y = cdr (y)) 2900 for (; y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2901 if (caar (y) == hdl)
2938 break; 2902 break;
2939 2903
2940 if (y != NIL) 2904 if (y != NIL)
2905 return car (y);
2906
2907 if (!all)
2941 break; 2908 break;
2942
2943 if (!all)
2944 return NIL;
2945 } 2909 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2910
2950 return NIL; 2911 return NIL;
2951} 2912}
2952 2913
2953#else /* USE_ALIST_ENV */ 2914#else /* USE_ALIST_ENV */
2954 2915
2955static INLINE void 2916ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2917new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2918{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2919 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2920 setenvironment (SCHEME_V->envir);
2960} 2921}
2961 2922
2962static INLINE void 2923ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2924new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2925{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2927}
2967 2928
… …
2989 return NIL; 2950 return NIL;
2990} 2951}
2991 2952
2992#endif /* USE_ALIST_ENV else */ 2953#endif /* USE_ALIST_ENV else */
2993 2954
2994static INLINE void 2955ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2956new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2957{
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2958 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2959}
2999 2960
3000static INLINE void 2961ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2962set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2963{
3003 set_cdr (slot, value); 2964 set_cdr (slot, value);
3004} 2965}
3005 2966
3006static INLINE pointer 2967ecb_inline pointer
3007slot_value_in_env (pointer slot) 2968slot_value_in_env (pointer slot)
3008{ 2969{
3009 return cdr (slot); 2970 return cdr (slot);
3010} 2971}
3011 2972
3012/* ========== Evaluation Cycle ========== */ 2973/* ========== Evaluation Cycle ========== */
3013 2974
3014static pointer 2975static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2976xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2977{
3017#if USE_ERROR_HOOK 2978#if USE_ERROR_HOOK
3018 pointer x; 2979 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2980 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 3015 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 3016 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 3017 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 3018 SCHEME_V->op = OP_EVAL;
3058 3019
3059 return S_T; 3020 return 0;
3060 } 3021 }
3061#endif 3022#endif
3062 3023
3063 if (a) 3024 if (a)
3064 SCHEME_V->args = cons (a, NIL); 3025 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 3027 SCHEME_V->args = NIL;
3067 3028
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3029 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 3030 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 3031 SCHEME_V->op = OP_ERR0;
3032
3071 return S_T; 3033 return 0;
3072} 3034}
3073 3035
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3036#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 3037#define Error_0(s) Error_1 (s, 0)
3076 3038
3077/* Too small to turn into function */ 3039/* Too small to turn into function */
3078#define BEGIN do { 3040#define BEGIN do {
3079#define END } while (0) 3041#define END } while (0)
3080#define s_goto(a) BEGIN \ 3042#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3043 SCHEME_V->op = a; \
3082 return S_T; END 3044 return 0; END
3083 3045
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3046#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3047
3086#ifndef USE_SCHEME_STACK 3048#ifndef USE_SCHEME_STACK
3087 3049
… …
3112 next_frame = SCHEME_V->dump_base + nframes; 3074 next_frame = SCHEME_V->dump_base + nframes;
3113 3075
3114 next_frame->op = op; 3076 next_frame->op = op;
3115 next_frame->args = args; 3077 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3078 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3079 next_frame->code = code;
3118 3080
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3081 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3082}
3121 3083
3122static pointer 3084static int
3123xs_return (SCHEME_P_ pointer a) 3085xs_return (SCHEME_P_ pointer a)
3124{ 3086{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3087 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3088 struct dump_stack_frame *frame;
3127 3089
3128 SCHEME_V->value = a; 3090 SCHEME_V->value = a;
3129 3091
3130 if (nframes <= 0) 3092 if (nframes <= 0)
3131 return NIL; 3093 return -1;
3132 3094
3133 frame = &SCHEME_V->dump_base[--nframes]; 3095 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3096 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3097 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3098 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3099 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3100 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3101
3140 return S_T; 3102 return 0;
3141} 3103}
3142 3104
3143static INLINE void 3105ecb_inline void
3144dump_stack_reset (SCHEME_P) 3106dump_stack_reset (SCHEME_P)
3145{ 3107{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3108 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3109 SCHEME_V->dump = (pointer)+0;
3148} 3110}
3149 3111
3150static INLINE void 3112ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3113dump_stack_initialize (SCHEME_P)
3152{ 3114{
3153 SCHEME_V->dump_size = 0; 3115 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3116 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3117 dump_stack_reset (SCHEME_A);
… …
3208 int i = 0; 3170 int i = 0;
3209 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3171 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3210 3172
3211 while (cont != NIL) 3173 while (cont != NIL)
3212 { 3174 {
3213 frame->op = ivalue (car (cont)); cont = cdr (cont); 3175 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3214 frame->args = car (cont) ; cont = cdr (cont); 3176 frame->args = car (cont) ; cont = cdr (cont);
3215 frame->envir = car (cont) ; cont = cdr (cont); 3177 frame->envir = car (cont) ; cont = cdr (cont);
3216 frame->code = car (cont) ; cont = cdr (cont); 3178 frame->code = car (cont) ; cont = cdr (cont);
3217 3179
3218 ++frame; 3180 ++frame;
3219 ++i; 3181 ++i;
3220 } 3182 }
3221 3183
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3184 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3185}
3224 3186
3225#else 3187#else
3226 3188
3227static INLINE void 3189ecb_inline void
3228dump_stack_reset (SCHEME_P) 3190dump_stack_reset (SCHEME_P)
3229{ 3191{
3230 SCHEME_V->dump = NIL; 3192 SCHEME_V->dump = NIL;
3231} 3193}
3232 3194
3233static INLINE void 3195ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3196dump_stack_initialize (SCHEME_P)
3235{ 3197{
3236 dump_stack_reset (SCHEME_A); 3198 dump_stack_reset (SCHEME_A);
3237} 3199}
3238 3200
… …
3240dump_stack_free (SCHEME_P) 3202dump_stack_free (SCHEME_P)
3241{ 3203{
3242 SCHEME_V->dump = NIL; 3204 SCHEME_V->dump = NIL;
3243} 3205}
3244 3206
3245static pointer 3207static int
3246xs_return (SCHEME_P_ pointer a) 3208xs_return (SCHEME_P_ pointer a)
3247{ 3209{
3248 pointer dump = SCHEME_V->dump; 3210 pointer dump = SCHEME_V->dump;
3249 3211
3250 SCHEME_V->value = a; 3212 SCHEME_V->value = a;
3251 3213
3252 if (dump == NIL) 3214 if (dump == NIL)
3253 return NIL; 3215 return -1;
3254 3216
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3217 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3218 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3219 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3220 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3221
3260 SCHEME_V->dump = dump; 3222 SCHEME_V->dump = dump;
3261 3223
3262 return S_T; 3224 return 0;
3263} 3225}
3264 3226
3265static void 3227static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3228s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3229{
… …
3292 3254
3293#endif 3255#endif
3294 3256
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3257#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3258
3297static pointer 3259static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3260opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3261{
3262 pointer args = SCHEME_V->args;
3300 pointer x, y; 3263 pointer x, y;
3301 3264
3302 switch (op) 3265 switch (op)
3303 { 3266 {
3304 case OP_LOAD: /* load */ 3267 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3268 if (file_interactive (SCHEME_A))
3306 { 3269 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3270 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3308 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3271 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3272 }
3310 3273
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3274 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3275 Error_1 ("unable to open", car (args));
3313 else 3276 else
3314 { 3277 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3278 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3279 s_goto (OP_T0LVL);
3317 } 3280 }
… …
3391 case OP_EVAL: /* main part of evaluation */ 3354 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3355#if USE_TRACING
3393 if (SCHEME_V->tracing) 3356 if (SCHEME_V->tracing)
3394 { 3357 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3358 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3359 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3360 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3361 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3362 s_goto (OP_P0LIST);
3400 } 3363 }
3401 3364
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3408 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3409 s_goto (OP_E1ARGS);
3447 } 3410 }
3448 3411
3449 case OP_E1ARGS: /* eval arguments */ 3412 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3413 args = cons (SCHEME_V->value, args);
3451 3414
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3415 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3416 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3417 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3418 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3419 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3420 s_goto (OP_EVAL);
3458 } 3421 }
3459 else /* end */ 3422 else /* end */
3460 { 3423 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3424 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3425 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3426 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3427 s_goto (OP_APPLY);
3465 } 3428 }
3466 3429
3467#if USE_TRACING 3430#if USE_TRACING
3468 3431
3469 case OP_TRACING: 3432 case OP_TRACING:
3470 { 3433 {
3471 int tr = SCHEME_V->tracing; 3434 int tr = SCHEME_V->tracing;
3472 3435
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3436 SCHEME_V->tracing = ivalue_unchecked (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3437 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3438 }
3476 3439
3477#endif 3440#endif
3478 3441
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3442 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3443#if USE_TRACING
3481 if (SCHEME_V->tracing) 3444 if (SCHEME_V->tracing)
3482 { 3445 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3446 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3447 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3448 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3449 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3450 s_goto (OP_P0LIST);
3488 } 3451 }
3489 3452
3490 /* fall through */ 3453 /* fall through */
3491 3454
3492 case OP_REAL_APPLY: 3455 case OP_REAL_APPLY:
3493#endif 3456#endif
3494 if (is_proc (SCHEME_V->code)) 3457 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3458 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3459 else if (is_foreign (SCHEME_V->code))
3499 { 3460 {
3500 /* Keep nested calls from GC'ing the arglist */ 3461 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3462 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3463 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3503 3464
3504 s_return (x); 3465 s_return (x);
3505 } 3466 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3467 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3468 {
3508 /* Should not accept promise */ 3469 /* Should not accept promise */
3509 /* make environment */ 3470 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3471 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3472
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3473 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3474 {
3514 if (y == NIL) 3475 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3476 Error_0 ("not enough arguments");
3516 else 3477 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3478 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3496 s_goto (OP_BEGIN);
3536 } 3497 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3498 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3499 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3500 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3501 s_return (args != NIL ? car (args) : NIL);
3541 } 3502 }
3542 else 3503 else
3543 Error_0 ("illegal function"); 3504 Error_0 ("illegal function");
3544 3505
3545 case OP_DOMACRO: /* do macro */ 3506 case OP_DOMACRO: /* do macro */
… …
3554 { 3515 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3516 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3517
3557 if (f != NIL) 3518 if (f != NIL)
3558 { 3519 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3520 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3521 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3522 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3523 s_goto (OP_APPLY);
3563 } 3524 }
3564 3525
… …
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3536 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576 3537
3577#endif 3538#endif
3578 3539
3579 case OP_MKCLOSURE: /* make-closure */ 3540 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3541 x = car (args);
3581 3542
3582 if (car (x) == SCHEME_V->LAMBDA) 3543 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3544 x = cdr (x);
3584 3545
3585 if (cdr (SCHEME_V->args) == NIL) 3546 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3547 y = SCHEME_V->envir;
3587 else 3548 else
3588 y = cadr (SCHEME_V->args); 3549 y = cadr (args);
3589 3550
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3551 s_return (mk_closure (SCHEME_A_ x, y));
3591 3552
3592 case OP_QUOTE: /* quote */ 3553 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3554 s_return (car (SCHEME_V->code));
… …
3625 3586
3626 3587
3627 case OP_DEFP: /* defined? */ 3588 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3589 x = SCHEME_V->envir;
3629 3590
3630 if (cdr (SCHEME_V->args) != NIL) 3591 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3592 x = cadr (args);
3632 3593
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3594 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3595
3635 case OP_SET0: /* set! */ 3596 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3597 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3598 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3599
… …
3669 3630
3670 case OP_IF1: /* if */ 3631 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3632 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3633 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3634 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3635 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3636 s_goto (OP_EVAL);
3678 3637
3679 case OP_LET0: /* let */ 3638 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3639 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3640 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3641 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3642 s_goto (OP_LET1);
3684 3643
3685 case OP_LET1: /* let (calculate parameters) */ 3644 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3645 args = cons (SCHEME_V->value, args);
3687 3646
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3647 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3648 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3649 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3691 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3650 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3651
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3652 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3653 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3654 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3655 s_goto (OP_EVAL);
3697 } 3656 }
3698 else /* end */ 3657 else /* end */
3699 { 3658 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3659 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3660 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3661 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3662 s_goto (OP_LET2);
3704 } 3663 }
3705 3664
3706 case OP_LET2: /* let */ 3665 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3666 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3667
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3668 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3710 y != NIL; x = cdr (x), y = cdr (y)) 3669 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3670 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3671
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3672 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3673 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3674 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3675 {
3717 if (!is_pair (x)) 3676 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3677 Error_1 ("Bad syntax of binding in let :", x);
3719 3678
3720 if (!is_list (SCHEME_A_ car (x))) 3679 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3680 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3681
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3682 args = cons (caar (x), args);
3724 } 3683 }
3725 3684
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3685 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3686 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3687 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3688 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3689 }
3733 else 3690 else
3734 { 3691 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3692 SCHEME_V->code = cdr (SCHEME_V->code);
3693 }
3694
3736 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3740 3697
3741 case OP_LET0AST: /* let* */ 3698 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3699 if (car (SCHEME_V->code) == NIL)
3743 { 3700 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3718 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3719 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3720
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3721 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3722 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3723 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3724 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3725 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3726 s_goto (OP_EVAL);
3770 } 3727 }
3771 else /* end */ 3728 else /* end */
3772 { 3729 {
3773 SCHEME_V->code = SCHEME_V->args; 3730 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3731 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3732 s_goto (OP_BEGIN);
3776 } 3733 }
3777 3734
3778 case OP_LET0REC: /* letrec */ 3735 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3738 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3739 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3740 s_goto (OP_LET1REC);
3784 3741
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3742 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3743 args = cons (SCHEME_V->value, args);
3787 3744
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3745 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3746 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3747 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3791 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3748 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3749
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3750 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3751 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3752 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3753 s_goto (OP_EVAL);
3797 } 3754 }
3798 else /* end */ 3755 else /* end */
3799 { 3756 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3757 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3758 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3759 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3760 s_goto (OP_LET2REC);
3804 } 3761 }
3805 3762
3806 case OP_LET2REC: /* letrec */ 3763 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3764 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3808 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3765 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3766
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3767 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3768 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3769 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3855 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3856 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3857 s_goto (OP_EVAL);
3901 3858
3902 case OP_C1STREAM: /* cons-stream */ 3859 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3860 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3904 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3861 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3862 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3863 s_return (cons (args, x));
3907 3864
3908 case OP_MACRO0: /* macro */ 3865 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3866 if (is_pair (car (SCHEME_V->code)))
3910 { 3867 {
3911 x = caar (SCHEME_V->code); 3868 x = caar (SCHEME_V->code);
… …
3944 { 3901 {
3945 if (!is_pair (y = caar (x))) 3902 if (!is_pair (y = caar (x)))
3946 break; 3903 break;
3947 3904
3948 for (; y != NIL; y = cdr (y)) 3905 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3906 if (eqv (car (y), SCHEME_V->value))
3951 break; 3907 break;
3952 }
3953 3908
3954 if (y != NIL) 3909 if (y != NIL)
3955 break; 3910 break;
3956 } 3911 }
3957 3912
… …
3977 s_goto (OP_BEGIN); 3932 s_goto (OP_BEGIN);
3978 else 3933 else
3979 s_return (NIL); 3934 s_return (NIL);
3980 3935
3981 case OP_PAPPLY: /* apply */ 3936 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 3937 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3938 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3939 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 3940 s_goto (OP_APPLY);
3986 3941
3987 case OP_PEVAL: /* eval */ 3942 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 3943 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 3944 SCHEME_V->envir = cadr (args);
3990 3945
3991 SCHEME_V->code = car (SCHEME_V->args); 3946 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 3947 s_goto (OP_EVAL);
3993 3948
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 3949 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 3950 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3951 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 3952 s_goto (OP_APPLY);
3998 } 3953 }
3999 3954
4000 return S_T; 3955 if (USE_ERROR_CHECKING) abort ();
4001} 3956}
4002 3957
4003static pointer 3958static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3959opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 3960{
4006 pointer x; 3961 pointer args = SCHEME_V->args;
3962 pointer x = car (args);
4007 num v; 3963 num v;
4008 3964
3965 switch (op)
3966 {
4009#if USE_MATH 3967#if USE_MATH
4010 RVALUE dd;
4011#endif
4012
4013 switch (op)
4014 {
4015#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 3968 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args); 3969 {
4019
4020 if (num_is_integer (x)) 3970 if (is_integer (x))
4021 s_return (x); 3971 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3972
3973 RVALUE r = rvalue_unchecked (x);
3974
3975 if (r == (RVALUE)(IVALUE)r)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3976 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4024 else 3977 else
4025 Error_1 ("inexact->exact: not integral:", x); 3978 Error_1 ("inexact->exact: not integral:", x);
3979 }
4026 3980
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3981 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4030
4031 case OP_LOG:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3982 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4034
4035 case OP_SIN:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3983 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4038
4039 case OP_COS:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3984 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042
4043 case OP_TAN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3985 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4046
4047 case OP_ASIN:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3986 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4050
4051 case OP_ACOS:
4052 x = car (SCHEME_V->args);
4053 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3987 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 3988
4055 case OP_ATAN: 3989 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 3990 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3991 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 3992 else
4061 { 3993 {
4062 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3995 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 3996 }
4066 3997
4067 case OP_SQRT: 3998 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3999 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 4000
4071 case OP_EXPT: 4001 case OP_EXPT:
4072 { 4002 {
4073 RVALUE result; 4003 RVALUE result;
4074 int real_result = 1; 4004 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 4005 pointer y = cadr (args);
4076 4006
4077 x = car (SCHEME_V->args);
4078
4079 if (num_is_integer (x) && num_is_integer (y)) 4007 if (is_integer (x) && is_integer (y))
4080 real_result = 0; 4008 real_result = 0;
4081 4009
4082 /* This 'if' is an R5RS compatibility fix. */ 4010 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 4011 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 4012 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 4013 result = 0;
4086 else 4014 else
4087 result = pow (rvalue (x), rvalue (y)); 4015 result = pow (rvalue (x), rvalue (y));
4088 4016
4089 /* Before returning integer result make sure we can. */ 4017 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 4018 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 4019 if (!real_result)
4092 { 4020 {
4093 long result_as_long = (long) result; 4021 long result_as_long = result;
4094 4022
4095 if (result != (RVALUE) result_as_long) 4023 if (result != result_as_long)
4096 real_result = 1; 4024 real_result = 1;
4097 } 4025 }
4098 4026
4099 if (real_result) 4027 if (real_result)
4100 s_return (mk_real (SCHEME_A_ result)); 4028 s_return (mk_real (SCHEME_A_ result));
4101 else 4029 else
4102 s_return (mk_integer (SCHEME_A_ result)); 4030 s_return (mk_integer (SCHEME_A_ result));
4103 } 4031 }
4104 4032
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4033 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4108
4109 case OP_CEILING:
4110 x = car (SCHEME_V->args);
4111 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4034 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 4035
4113 case OP_TRUNCATE: 4036 case OP_TRUNCATE:
4114 { 4037 {
4115 RVALUE rvalue_of_x; 4038 RVALUE n = rvalue (x);
4116
4117 x = car (SCHEME_V->args);
4118 rvalue_of_x = rvalue (x);
4119
4120 if (rvalue_of_x > 0)
4121 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4039 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4122 else
4123 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4124 } 4040 }
4125 4041
4126 case OP_ROUND: 4042 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4043 if (is_integer (x))
4130 s_return (x); 4044 s_return (x);
4131 4045
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4046 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4047#endif
4134 4048
4135 case OP_ADD: /* + */ 4049 case OP_ADD: /* + */
4136 v = num_zero; 4050 v = num_zero;
4137 4051
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4052 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4053 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4054
4141 s_return (mk_number (SCHEME_A_ v)); 4055 s_return (mk_number (SCHEME_A_ v));
4142 4056
4143 case OP_MUL: /* * */ 4057 case OP_MUL: /* * */
4144 v = num_one; 4058 v = num_one;
4145 4059
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4060 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4061 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4062
4149 s_return (mk_number (SCHEME_A_ v)); 4063 s_return (mk_number (SCHEME_A_ v));
4150 4064
4151 case OP_SUB: /* - */ 4065 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4066 if (cdr (args) == NIL)
4153 { 4067 {
4154 x = SCHEME_V->args; 4068 x = args;
4155 v = num_zero; 4069 v = num_zero;
4156 } 4070 }
4157 else 4071 else
4158 { 4072 {
4159 x = cdr (SCHEME_V->args); 4073 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4074 v = nvalue (car (args));
4161 } 4075 }
4162 4076
4163 for (; x != NIL; x = cdr (x)) 4077 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4078 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4079
4166 s_return (mk_number (SCHEME_A_ v)); 4080 s_return (mk_number (SCHEME_A_ v));
4167 4081
4168 case OP_DIV: /* / */ 4082 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4083 if (cdr (args) == NIL)
4170 { 4084 {
4171 x = SCHEME_V->args; 4085 x = args;
4172 v = num_one; 4086 v = num_one;
4173 } 4087 }
4174 else 4088 else
4175 { 4089 {
4176 x = cdr (SCHEME_V->args); 4090 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4091 v = nvalue (car (args));
4178 } 4092 }
4179 4093
4180 for (; x != NIL; x = cdr (x)) 4094 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4095 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4096 v = num_div (v, nvalue (car (x)));
4184 else 4097 else
4185 Error_0 ("/: division by zero"); 4098 Error_0 ("/: division by zero");
4186 }
4187 4099
4188 s_return (mk_number (SCHEME_A_ v)); 4100 s_return (mk_number (SCHEME_A_ v));
4189 4101
4190 case OP_INTDIV: /* quotient */ 4102 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4103 if (cdr (args) == NIL)
4192 { 4104 {
4193 x = SCHEME_V->args; 4105 x = args;
4194 v = num_one; 4106 v = num_one;
4195 } 4107 }
4196 else 4108 else
4197 { 4109 {
4198 x = cdr (SCHEME_V->args); 4110 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4111 v = nvalue (car (args));
4200 } 4112 }
4201 4113
4202 for (; x != NIL; x = cdr (x)) 4114 for (; x != NIL; x = cdr (x))
4203 { 4115 {
4204 if (ivalue (car (x)) != 0) 4116 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4117 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4118 else
4207 Error_0 ("quotient: division by zero"); 4119 Error_0 ("quotient: division by zero");
4208 } 4120 }
4209 4121
4210 s_return (mk_number (SCHEME_A_ v)); 4122 s_return (mk_number (SCHEME_A_ v));
4211 4123
4212 case OP_REM: /* remainder */ 4124 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4125 v = nvalue (x);
4214 4126
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4127 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4128 v = num_rem (v, nvalue (cadr (args)));
4217 else 4129 else
4218 Error_0 ("remainder: division by zero"); 4130 Error_0 ("remainder: division by zero");
4219 4131
4220 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4221 4133
4222 case OP_MOD: /* modulo */ 4134 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4135 v = nvalue (x);
4224 4136
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4137 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4138 v = num_mod (v, nvalue (cadr (args)));
4227 else 4139 else
4228 Error_0 ("modulo: division by zero"); 4140 Error_0 ("modulo: division by zero");
4229 4141
4230 s_return (mk_number (SCHEME_A_ v)); 4142 s_return (mk_number (SCHEME_A_ v));
4231 4143
4232 case OP_CAR: /* car */ 4144 case OP_CAR: /* car */
4233 s_return (caar (SCHEME_V->args)); 4145 s_return (caar (args));
4234 4146
4235 case OP_CDR: /* cdr */ 4147 case OP_CDR: /* cdr */
4236 s_return (cdar (SCHEME_V->args)); 4148 s_return (cdar (args));
4237 4149
4238 case OP_CONS: /* cons */ 4150 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4151 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4152 s_return (args);
4241 4153
4242 case OP_SETCAR: /* set-car! */ 4154 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4155 if (!is_immutable (x))
4244 { 4156 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4157 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4158 s_return (car (args));
4247 } 4159 }
4248 else 4160 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4161 Error_0 ("set-car!: unable to alter immutable pair");
4250 4162
4251 case OP_SETCDR: /* set-cdr! */ 4163 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4164 if (!is_immutable (x))
4253 { 4165 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4166 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4167 s_return (car (args));
4256 } 4168 }
4257 else 4169 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4170 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4171
4260 case OP_CHAR2INT: /* char->integer */ 4172 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4173 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4262 4174
4263 case OP_INT2CHAR: /* integer->char */ 4175 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4176 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4265 4177
4266 case OP_CHARUPCASE: 4178 case OP_CHARUPCASE:
4267 { 4179 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4180 unsigned char c = ivalue_unchecked (x);
4269 c = toupper (c); 4181 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4182 s_return (mk_character (SCHEME_A_ c));
4271 } 4183 }
4272 4184
4273 case OP_CHARDNCASE: 4185 case OP_CHARDNCASE:
4274 { 4186 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4187 unsigned char c = ivalue_unchecked (x);
4276 c = tolower (c); 4188 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4189 s_return (mk_character (SCHEME_A_ c));
4278 } 4190 }
4279 4191
4280 case OP_STR2SYM: /* string->symbol */ 4192 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4193 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4194
4283 case OP_STR2ATOM: /* string->atom */ 4195 case OP_STR2ATOM: /* string->atom */
4284 { 4196 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4197 char *s = strvalue (x);
4286 long pf = 0; 4198 long pf = 0;
4287 4199
4288 if (cdr (SCHEME_V->args) != NIL) 4200 if (cdr (args) != NIL)
4289 { 4201 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4202 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4203 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4204 pf = ivalue_unchecked (cadr (args));
4293 4205
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4206 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4207 {
4296 /* base is OK */ 4208 /* base is OK */
4297 } 4209 }
4298 else 4210 else
4299 pf = -1; 4211 pf = -1;
4300 } 4212 }
4301 4213
4302 if (pf < 0) 4214 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4215 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4216 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4217 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4218 else
4307 { 4219 {
4308 if (pf == 0 || pf == 10) 4220 if (pf == 0 || pf == 10)
… …
4319 } 4231 }
4320 } 4232 }
4321 } 4233 }
4322 4234
4323 case OP_SYM2STR: /* symbol->string */ 4235 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4236 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4237 setimmutable (x);
4326 s_return (x); 4238 s_return (x);
4327 4239
4328 case OP_ATOM2STR: /* atom->string */ 4240 case OP_ATOM2STR: /* atom->string */
4329 { 4241 {
4330 long pf = 0; 4242 long pf = 0;
4331 4243
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4244 if (cdr (args) != NIL)
4335 { 4245 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4246 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4247 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4248 pf = ivalue_unchecked (cadr (args));
4339 4249
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4250 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4251 {
4342 /* base is OK */ 4252 /* base is OK */
4343 } 4253 }
4344 else 4254 else
4345 pf = -1; 4255 pf = -1;
4346 } 4256 }
4347 4257
4348 if (pf < 0) 4258 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4259 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4260 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4261 {
4352 char *p; 4262 char *p;
4353 int len; 4263 int len;
4354 4264
… …
4359 Error_1 ("atom->string: not an atom:", x); 4269 Error_1 ("atom->string: not an atom:", x);
4360 } 4270 }
4361 4271
4362 case OP_MKSTRING: /* make-string */ 4272 case OP_MKSTRING: /* make-string */
4363 { 4273 {
4364 int fill = ' '; 4274 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4365 int len; 4275 int len = ivalue_unchecked (x);
4366 4276
4367 len = ivalue (car (SCHEME_V->args));
4368
4369 if (cdr (SCHEME_V->args) != NIL)
4370 fill = charvalue (cadr (SCHEME_V->args));
4371
4372 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4277 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4278 }
4374 4279
4375 case OP_STRLEN: /* string-length */ 4280 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4281 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4282
4378 case OP_STRREF: /* string-ref */ 4283 case OP_STRREF: /* string-ref */
4379 { 4284 {
4380 char *str; 4285 char *str = strvalue (x);
4381 int index;
4382
4383 str = strvalue (car (SCHEME_V->args));
4384
4385 index = ivalue (cadr (SCHEME_V->args)); 4286 int index = ivalue_unchecked (cadr (args));
4386 4287
4387 if (index >= strlength (car (SCHEME_V->args))) 4288 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4289 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4290
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4291 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4292 }
4392 4293
4393 case OP_STRSET: /* string-set! */ 4294 case OP_STRSET: /* string-set! */
4394 { 4295 {
4395 char *str; 4296 char *str = strvalue (x);
4396 int index; 4297 int index = ivalue_unchecked (cadr (args));
4397 int c; 4298 int c;
4398 4299
4399 if (is_immutable (car (SCHEME_V->args))) 4300 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4301 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4302
4402 str = strvalue (car (SCHEME_V->args));
4403
4404 index = ivalue (cadr (SCHEME_V->args));
4405
4406 if (index >= strlength (car (SCHEME_V->args))) 4303 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4304 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4305
4409 c = charvalue (caddr (SCHEME_V->args)); 4306 c = charvalue (caddr (args));
4410 4307
4411 str[index] = (char) c; 4308 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4309 s_return (car (args));
4413 } 4310 }
4414 4311
4415 case OP_STRAPPEND: /* string-append */ 4312 case OP_STRAPPEND: /* string-append */
4416 { 4313 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4314 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4315 int len = 0;
4419 pointer newstr; 4316 pointer newstr;
4420 char *pos; 4317 char *pos;
4421 4318
4422 /* compute needed length for new string */ 4319 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4320 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4321 len += strlength (car (x));
4425 4322
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4323 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4324
4428 /* store the contents of the argument strings into the new string */ 4325 /* store the contents of the argument strings into the new string */
4429 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4326 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4327 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4328
4432 s_return (newstr); 4329 s_return (newstr);
4433 } 4330 }
4434 4331
4435 case OP_SUBSTR: /* substring */ 4332 case OP_SUBSTR: /* substring */
4436 { 4333 {
4437 char *str; 4334 char *str = strvalue (x);
4438 int index0; 4335 int index0 = ivalue_unchecked (cadr (args));
4439 int index1; 4336 int index1;
4440 int len; 4337 int len;
4441 4338
4442 str = strvalue (car (SCHEME_V->args));
4443
4444 index0 = ivalue (cadr (SCHEME_V->args));
4445
4446 if (index0 > strlength (car (SCHEME_V->args))) 4339 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4341
4449 if (cddr (SCHEME_V->args) != NIL) 4342 if (cddr (args) != NIL)
4450 { 4343 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4344 index1 = ivalue_unchecked (caddr (args));
4452 4345
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4346 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4347 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4348 }
4456 else 4349 else
4457 index1 = strlength (car (SCHEME_V->args)); 4350 index1 = strlength (x);
4458 4351
4459 len = index1 - index0; 4352 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4353 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4354 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4355 strvalue (x)[len] = 0;
… …
4466 4359
4467 case OP_VECTOR: /* vector */ 4360 case OP_VECTOR: /* vector */
4468 { 4361 {
4469 int i; 4362 int i;
4470 pointer vec; 4363 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4364 int len = list_length (SCHEME_A_ args);
4472 4365
4473 if (len < 0) 4366 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4367 Error_1 ("vector: not a proper list:", args);
4475 4368
4476 vec = mk_vector (SCHEME_A_ len); 4369 vec = mk_vector (SCHEME_A_ len);
4477 4370
4478#if USE_ERROR_CHECKING 4371#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4372 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4373 s_return (S_SINK);
4481#endif 4374#endif
4482 4375
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4376 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4377 vector_set (vec, i, car (x));
4485 4378
4486 s_return (vec); 4379 s_return (vec);
4487 } 4380 }
4488 4381
4489 case OP_MKVECTOR: /* make-vector */ 4382 case OP_MKVECTOR: /* make-vector */
4490 { 4383 {
4491 pointer fill = NIL; 4384 pointer fill = NIL;
4492 int len;
4493 pointer vec; 4385 pointer vec;
4386 int len = ivalue_unchecked (x);
4494 4387
4495 len = ivalue (car (SCHEME_V->args));
4496
4497 if (cdr (SCHEME_V->args) != NIL) 4388 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4389 fill = cadr (args);
4499 4390
4500 vec = mk_vector (SCHEME_A_ len); 4391 vec = mk_vector (SCHEME_A_ len);
4501 4392
4502#if USE_ERROR_CHECKING 4393#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4394 if (SCHEME_V->no_memory)
4504 s_return (S_SINK); 4395 s_return (S_SINK);
4505#endif 4396#endif
4506 4397
4507 if (fill != NIL) 4398 if (fill != NIL)
4508 fill_vector (vec, fill); 4399 fill_vector (vec, 0, fill);
4509 4400
4510 s_return (vec); 4401 s_return (vec);
4511 } 4402 }
4512 4403
4513 case OP_VECLEN: /* vector-length */ 4404 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4405 s_return (mk_integer (SCHEME_A_ veclength (x)));
4515 4406
4516 case OP_VECREF: /* vector-ref */ 4407 case OP_VECREF: /* vector-ref */
4517 { 4408 {
4518 int index;
4519
4520 index = ivalue (cadr (SCHEME_V->args)); 4409 int index = ivalue_unchecked (cadr (args));
4521 4410
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4411 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4412 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4413
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4414 s_return (vector_get (x, index));
4526 } 4415 }
4527 4416
4528 case OP_VECSET: /* vector-set! */ 4417 case OP_VECSET: /* vector-set! */
4529 { 4418 {
4530 int index; 4419 int index = ivalue_unchecked (cadr (args));
4531 4420
4532 if (is_immutable (car (SCHEME_V->args))) 4421 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4422 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4423
4535 index = ivalue (cadr (SCHEME_V->args));
4536
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4424 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4425 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4426
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4427 vector_set (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4428 s_return (x);
4542 } 4429 }
4543 } 4430 }
4544 4431
4545 return S_T; 4432 if (USE_ERROR_CHECKING) abort ();
4546} 4433}
4547 4434
4548INTERFACE int 4435static int
4549is_list (SCHEME_P_ pointer a) 4436opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4550{ 4437{
4551 return list_length (SCHEME_A_ a) >= 0; 4438 pointer x = SCHEME_V->args;
4552}
4553 4439
4554/* Result is: 4440 for (;;)
4555 proper list: length
4556 circular list: -1
4557 not even a pair: -2
4558 dotted list: -2 minus length before dot
4559*/
4560INTERFACE int
4561list_length (SCHEME_P_ pointer a)
4562{
4563 int i = 0;
4564 pointer slow, fast;
4565
4566 slow = fast = a;
4567
4568 while (1)
4569 { 4441 {
4442 num v = nvalue (car (x));
4443 x = cdr (x);
4444
4570 if (fast == NIL) 4445 if (x == NIL)
4571 return i; 4446 break;
4572 4447
4573 if (!is_pair (fast)) 4448 int r = num_cmp (v, nvalue (car (x)));
4574 return -2 - i;
4575 4449
4576 fast = cdr (fast); 4450 switch (op)
4577 ++i;
4578
4579 if (fast == NIL)
4580 return i;
4581
4582 if (!is_pair (fast))
4583 return -2 - i;
4584
4585 ++i;
4586 fast = cdr (fast);
4587
4588 /* Safe because we would have already returned if `fast'
4589 encountered a non-pair. */
4590 slow = cdr (slow);
4591
4592 if (fast == slow)
4593 { 4451 {
4594 /* the fast pointer has looped back around and caught up 4452 case OP_NUMEQ: r = r == 0; break;
4595 with the slow pointer, hence the structure is circular, 4453 case OP_LESS: r = r < 0; break;
4596 not of finite length, and therefore not a list */ 4454 case OP_GRE: r = r > 0; break;
4597 return -1; 4455 case OP_LEQ: r = r <= 0; break;
4456 case OP_GEQ: r = r >= 0; break;
4598 } 4457 }
4599 }
4600}
4601 4458
4459 if (!r)
4460 s_return (S_F);
4461 }
4462
4463 s_return (S_T);
4464}
4465
4602static pointer 4466static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4467opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4468{
4605 pointer x; 4469 pointer args = SCHEME_V->args;
4606 num v; 4470 pointer a = car (args);
4607 int (*comp_func) (num, num); 4471 pointer d = cdr (args);
4472 int r;
4608 4473
4609 switch (op) 4474 switch (op)
4610 { 4475 {
4611 case OP_NOT: /* not */ 4476 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4477 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4478 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4479 case OP_NULLP: /* null? */ r = a == NIL ; break;
4480 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4481 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4482 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4483 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4484 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4485 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4486
4614 case OP_BOOLP: /* boolean? */
4615 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4616
4617 case OP_EOFOBJP: /* boolean? */
4618 s_retbool (car (SCHEME_V->args) == S_EOF);
4619
4620 case OP_NULLP: /* null? */
4621 s_retbool (car (SCHEME_V->args) == NIL);
4622
4623 case OP_NUMEQ: /* = */
4624 case OP_LESS: /* < */
4625 case OP_GRE: /* > */
4626 case OP_LEQ: /* <= */
4627 case OP_GEQ: /* >= */
4628 switch (op)
4629 {
4630 case OP_NUMEQ:
4631 comp_func = num_eq;
4632 break;
4633
4634 case OP_LESS:
4635 comp_func = num_lt;
4636 break;
4637
4638 case OP_GRE:
4639 comp_func = num_gt;
4640 break;
4641
4642 case OP_LEQ:
4643 comp_func = num_le;
4644 break;
4645
4646 case OP_GEQ:
4647 comp_func = num_ge;
4648 break;
4649 }
4650
4651 x = SCHEME_V->args;
4652 v = nvalue (car (x));
4653 x = cdr (x);
4654
4655 for (; x != NIL; x = cdr (x))
4656 {
4657 if (!comp_func (v, nvalue (car (x))))
4658 s_retbool (0);
4659
4660 v = nvalue (car (x));
4661 }
4662
4663 s_retbool (1);
4664
4665 case OP_SYMBOLP: /* symbol? */
4666 s_retbool (is_symbol (car (SCHEME_V->args)));
4667
4668 case OP_NUMBERP: /* number? */
4669 s_retbool (is_number (car (SCHEME_V->args)));
4670
4671 case OP_STRINGP: /* string? */
4672 s_retbool (is_string (car (SCHEME_V->args)));
4673
4674 case OP_INTEGERP: /* integer? */
4675 s_retbool (is_integer (car (SCHEME_V->args)));
4676
4677 case OP_REALP: /* real? */
4678 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4679
4680 case OP_CHARP: /* char? */
4681 s_retbool (is_character (car (SCHEME_V->args)));
4682#if USE_CHAR_CLASSIFIERS 4487#if USE_CHAR_CLASSIFIERS
4683 4488 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4684 case OP_CHARAP: /* char-alphabetic? */ 4489 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4490 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4686 4491 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4687 case OP_CHARNP: /* char-numeric? */ 4492 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4688 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4689
4690 case OP_CHARWP: /* char-whitespace? */
4691 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4692
4693 case OP_CHARUP: /* char-upper-case? */
4694 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4695
4696 case OP_CHARLP: /* char-lower-case? */
4697 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4698#endif 4493#endif
4494
4699#if USE_PORTS 4495#if USE_PORTS
4700 4496 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4701 case OP_PORTP: /* port? */
4702 s_retbool (is_port (car (SCHEME_V->args)));
4703
4704 case OP_INPORTP: /* input-port? */ 4497 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4705 s_retbool (is_inport (car (SCHEME_V->args)));
4706
4707 case OP_OUTPORTP: /* output-port? */ 4498 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4499#endif
4710 4500
4711 case OP_PROCP: /* procedure? */ 4501 case OP_PROCP: /* procedure? */
4712 4502
4713 /*-- 4503 /*--
4714 * continuation should be procedure by the example 4504 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4505 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4506 * in R^3 report sec. 6.9
4717 */ 4507 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4508 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4719 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4509 break;
4720 4510
4721 case OP_PAIRP: /* pair? */ 4511 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4512 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4513 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4514 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4515 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4516 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4727 case OP_ENVP: /* environment? */
4728 s_retbool (is_environment (car (SCHEME_V->args)));
4729
4730 case OP_VECTORP: /* vector? */
4731 s_retbool (is_vector (car (SCHEME_V->args)));
4732
4733 case OP_EQ: /* eq? */
4734 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4735
4736 case OP_EQV: /* eqv? */
4737 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4738 } 4517 }
4739 4518
4740 return S_T; 4519 s_retbool (r);
4741} 4520}
4742 4521
4743static pointer 4522static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4523opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4524{
4525 pointer args = SCHEME_V->args;
4526 pointer a = car (args);
4746 pointer x, y; 4527 pointer x, y;
4747 4528
4748 switch (op) 4529 switch (op)
4749 { 4530 {
4750 case OP_FORCE: /* force */ 4531 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4532 SCHEME_V->code = a;
4752 4533
4753 if (is_promise (SCHEME_V->code)) 4534 if (is_promise (SCHEME_V->code))
4754 { 4535 {
4755 /* Should change type to closure here */ 4536 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4537 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4558 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4559 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4560 }
4780 } 4561 }
4781 4562
4782 SCHEME_V->args = car (SCHEME_V->args); 4563 SCHEME_V->args = a;
4783 4564
4784 if (op == OP_WRITE) 4565 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4566 SCHEME_V->print_flag = 1;
4786 else 4567 else
4787 SCHEME_V->print_flag = 0; 4568 SCHEME_V->print_flag = 0;
4788 4569
4789 s_goto (OP_P0LIST); 4570 s_goto (OP_P0LIST);
4790 4571
4791 case OP_NEWLINE: /* newline */ 4572 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4573 if (is_pair (args))
4793 { 4574 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4575 if (a != SCHEME_V->outport)
4795 { 4576 {
4796 x = cons (SCHEME_V->outport, NIL); 4577 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4578 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4579 SCHEME_V->outport = a;
4799 } 4580 }
4800 } 4581 }
4801 4582
4802 putstr (SCHEME_A_ "\n"); 4583 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4584 s_return (S_T);
4804#endif 4585#endif
4805 4586
4806 case OP_ERR0: /* error */ 4587 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4588 SCHEME_V->retcode = -1;
4808 4589
4809 if (!is_string (car (SCHEME_V->args))) 4590 if (!is_string (a))
4810 { 4591 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4592 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4593 setimmutable (car (args));
4813 } 4594 }
4814 4595
4815 putstr (SCHEME_A_ "Error: "); 4596 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4597 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4598 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4599 s_goto (OP_ERR1);
4819 4600
4820 case OP_ERR1: /* error */ 4601 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4602 putstr (SCHEME_A_ " ");
4822 4603
4823 if (SCHEME_V->args != NIL) 4604 if (args != NIL)
4824 { 4605 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4606 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4607 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4608 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4609 s_goto (OP_P0LIST);
4829 } 4610 }
4830 else 4611 else
4831 { 4612 {
4832 putstr (SCHEME_A_ "\n"); 4613 putstr (SCHEME_A_ "\n");
4833 4614
4834 if (SCHEME_V->interactive_repl) 4615 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4616 s_goto (OP_T0LVL);
4836 else 4617 else
4837 return NIL; 4618 return -1;
4838 } 4619 }
4839 4620
4840 case OP_REVERSE: /* reverse */ 4621 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4622 s_return (reverse (SCHEME_A_ a));
4842 4623
4843 case OP_LIST_STAR: /* list* */ 4624 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4625 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4626
4846 case OP_APPEND: /* append */ 4627 case OP_APPEND: /* append */
4847 x = NIL; 4628 x = NIL;
4848 y = SCHEME_V->args; 4629 y = args;
4849 4630
4850 if (y == x) 4631 if (y == x)
4851 s_return (x); 4632 s_return (x);
4852 4633
4853 /* cdr() in the while condition is not a typo. If car() */ 4634 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4645 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4646
4866#if USE_PLIST 4647#if USE_PLIST
4867 4648
4868 case OP_PUT: /* put */ 4649 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4650 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4651 Error_0 ("illegal use of put");
4871 4652
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4653 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4654 {
4874 if (caar (x) == y) 4655 if (caar (x) == y)
4875 break; 4656 break;
4876 } 4657 }
4877 4658
4878 if (x != NIL) 4659 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4660 cdar (x) = caddr (args);
4880 else 4661 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4662 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4663
4883 s_return (S_T); 4664 s_return (S_T);
4884 4665
4885 case OP_GET: /* get */ 4666 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4667 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4668 Error_0 ("illegal use of get");
4888 4669
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4670 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4671 if (caar (x) == y)
4891 break; 4672 break;
4892 4673
4893 if (x != NIL) 4674 if (x != NIL)
4894 s_return (cdar (x)); 4675 s_return (cdar (x));
… …
4896 s_return (NIL); 4677 s_return (NIL);
4897 4678
4898#endif /* USE_PLIST */ 4679#endif /* USE_PLIST */
4899 4680
4900 case OP_QUIT: /* quit */ 4681 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4682 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4683 SCHEME_V->retcode = ivalue (a);
4903 4684
4904 return NIL; 4685 return -1;
4905 4686
4906 case OP_GC: /* gc */ 4687 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4688 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4689 s_return (S_T);
4909 4690
4910 case OP_GCVERB: /* gc-verbose */ 4691 case OP_GCVERB: /* gc-verbose */
4911 { 4692 {
4912 int was = SCHEME_V->gc_verbose; 4693 int was = SCHEME_V->gc_verbose;
4913 4694
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4695 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4696 s_retbool (was);
4916 } 4697 }
4917 4698
4918 case OP_NEWSEGMENT: /* new-segment */ 4699 case OP_NEWSEGMENT: /* new-segment */
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4700 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4701 Error_0 ("new-segment: argument must be a number");
4921 4702
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4703 alloc_cellseg (SCHEME_A_ ivalue (a));
4923 4704
4924 s_return (S_T); 4705 s_return (S_T);
4925 4706
4926 case OP_OBLIST: /* oblist */ 4707 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4708 s_return (oblist_all_symbols (SCHEME_A));
… …
4954 case OP_OPEN_INOUTFILE: 4735 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4736 prop = port_input | port_output;
4956 break; 4737 break;
4957 } 4738 }
4958 4739
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4740 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4741
4961 if (p == NIL) 4742 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4743 }
4966 4744
4967# if USE_STRING_PORTS 4745# if USE_STRING_PORTS
4968 4746
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4747 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4759 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4760 prop = port_input | port_output;
4983 break; 4761 break;
4984 } 4762 }
4985 4763
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4764 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4765 strvalue (a) + strlength (a), prop);
4988 4766
4989 if (p == NIL) 4767 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4768 }
4994 4769
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4770 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4771 {
4997 pointer p; 4772 pointer p;
4998 4773
4999 if (car (SCHEME_V->args) == NIL) 4774 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4775 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4776 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4777 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4778 strvalue (a) + strlength (a), port_output);
5010 4779
5011 if (p == NIL) 4780 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4781 }
5017 4782
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4783 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4784 {
5020 port *p; 4785 port *p;
5021 4786
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4787 if ((p = a->object.port)->kind & port_string)
5023 { 4788 {
5024 off_t size; 4789 off_t size;
5025 char *str; 4790 char *str;
5026 4791
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4792 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4808 }
5044 4809
5045# endif 4810# endif
5046 4811
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4812 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4813 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4814 s_return (S_T);
5050 4815
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4816 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4817 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4818 s_return (S_T);
5054#endif 4819#endif
5055 4820
5056 case OP_INT_ENV: /* interaction-environment */ 4821 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4822 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4824 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4825 s_return (SCHEME_V->envir);
5061 4826
5062 } 4827 }
5063 4828
5064 return S_T; 4829 if (USE_ERROR_CHECKING) abort ();
5065} 4830}
5066 4831
5067static pointer 4832static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4833opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4834{
4835 pointer args = SCHEME_V->args;
5070 pointer x; 4836 pointer x;
5071 4837
5072 if (SCHEME_V->nesting != 0) 4838 if (SCHEME_V->nesting != 0)
5073 { 4839 {
5074 int n = SCHEME_V->nesting; 4840 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4847 switch (op)
5082 { 4848 {
5083 /* ========== reading part ========== */ 4849 /* ========== reading part ========== */
5084#if USE_PORTS 4850#if USE_PORTS
5085 case OP_READ: 4851 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4852 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4853 s_goto (OP_READ_INTERNAL);
5088 4854
5089 if (!is_inport (car (SCHEME_V->args))) 4855 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4856 Error_1 ("read: not an input port:", car (args));
5091 4857
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4858 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4859 s_goto (OP_READ_INTERNAL);
5094 4860
5095 x = SCHEME_V->inport; 4861 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4862 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4863 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4864 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4865 s_goto (OP_READ_INTERNAL);
5100 4866
5101 case OP_READ_CHAR: /* read-char */ 4867 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4868 case OP_PEEK_CHAR: /* peek-char */
5103 { 4869 {
5104 int c; 4870 int c;
5105 4871
5106 if (is_pair (SCHEME_V->args)) 4872 if (is_pair (args))
5107 { 4873 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4874 if (car (args) != SCHEME_V->inport)
5109 { 4875 {
5110 x = SCHEME_V->inport; 4876 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4877 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4878 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4879 SCHEME_V->inport = car (args);
5114 } 4880 }
5115 } 4881 }
5116 4882
5117 c = inchar (SCHEME_A); 4883 c = inchar (SCHEME_A);
5118 4884
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4894 case OP_CHAR_READY: /* char-ready? */
5129 { 4895 {
5130 pointer p = SCHEME_V->inport; 4896 pointer p = SCHEME_V->inport;
5131 int res; 4897 int res;
5132 4898
5133 if (is_pair (SCHEME_V->args)) 4899 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4900 p = car (args);
5135 4901
5136 res = p->object.port->kind & port_string; 4902 res = p->object.port->kind & port_string;
5137 4903
5138 s_retbool (res); 4904 s_retbool (res);
5139 } 4905 }
5140 4906
5141 case OP_SET_INPORT: /* set-input-port */ 4907 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 4908 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 4909 s_return (SCHEME_V->value);
5144 4910
5145 case OP_SET_OUTPORT: /* set-output-port */ 4911 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 4912 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 4913 s_return (SCHEME_V->value);
5148#endif 4914#endif
5149 4915
5150 case OP_RDSEXPR: 4916 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 4917 switch (SCHEME_V->tok)
… …
5237 } 5003 }
5238 5004
5239 break; 5005 break;
5240 5006
5241 case OP_RDLIST: 5007 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5008 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5009 SCHEME_V->tok = token (SCHEME_A);
5244 5010
5245 switch (SCHEME_V->tok) 5011 switch (SCHEME_V->tok)
5246 { 5012 {
5247 case TOK_EOF: 5013 case TOK_EOF:
… …
5275 case OP_RDDOT: 5041 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5042 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5043 Error_0 ("syntax error: illegal dot expression");
5278 5044
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5045 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5046 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5047
5282 case OP_RDQUOTE: 5048 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5049 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5050
5285 case OP_RDQQUOTE: 5051 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5073 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5074 s_goto (OP_VECTOR);
5309 5075
5310 /* ========== printing part ========== */ 5076 /* ========== printing part ========== */
5311 case OP_P0LIST: 5077 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5078 if (is_vector (args))
5313 { 5079 {
5314 putstr (SCHEME_A_ "#("); 5080 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5081 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5082 s_goto (OP_PVECFROM);
5317 } 5083 }
5318 else if (is_environment (SCHEME_V->args)) 5084 else if (is_environment (args))
5319 { 5085 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5086 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5087 s_return (S_T);
5322 } 5088 }
5323 else if (!is_pair (SCHEME_V->args)) 5089 else if (!is_pair (args))
5324 { 5090 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5091 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5092 s_return (S_T);
5327 } 5093 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5094 else
5329 { 5095 {
5096 pointer a = car (args);
5097 pointer b = cdr (args);
5098 int ok_abbr = ok_abbrev (b);
5099 SCHEME_V->args = car (b);
5100
5101 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5102 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5103 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ "`");
5105 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5106 putstr (SCHEME_A_ ",");
5107 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5108 putstr (SCHEME_A_ ",@");
5109 else
5110 {
5111 putstr (SCHEME_A_ "(");
5112 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5113 SCHEME_V->args = a;
5114 }
5115
5332 s_goto (OP_P0LIST); 5116 s_goto (OP_P0LIST);
5333 } 5117 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5118
5119 case OP_P1LIST:
5120 if (is_pair (args))
5335 { 5121 {
5122 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5123 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5124 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5125 s_goto (OP_P0LIST);
5339 } 5126 }
5340 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5341 {
5342 putstr (SCHEME_A_ ",");
5343 SCHEME_V->args = cadr (SCHEME_V->args);
5344 s_goto (OP_P0LIST);
5345 }
5346 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5347 {
5348 putstr (SCHEME_A_ ",@");
5349 SCHEME_V->args = cadr (SCHEME_V->args);
5350 s_goto (OP_P0LIST);
5351 }
5352 else
5353 {
5354 putstr (SCHEME_A_ "(");
5355 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5356 SCHEME_V->args = car (SCHEME_V->args);
5357 s_goto (OP_P0LIST);
5358 }
5359
5360 case OP_P1LIST:
5361 if (is_pair (SCHEME_V->args))
5362 {
5363 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5364 putstr (SCHEME_A_ " ");
5365 SCHEME_V->args = car (SCHEME_V->args);
5366 s_goto (OP_P0LIST);
5367 }
5368 else if (is_vector (SCHEME_V->args)) 5127 else if (is_vector (args))
5369 { 5128 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5129 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5130 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5131 s_goto (OP_P0LIST);
5373 } 5132 }
5374 else 5133 else
5375 { 5134 {
5376 if (SCHEME_V->args != NIL) 5135 if (args != NIL)
5377 { 5136 {
5378 putstr (SCHEME_A_ " . "); 5137 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5138 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5139 }
5381 5140
5382 putstr (SCHEME_A_ ")"); 5141 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5142 s_return (S_T);
5384 } 5143 }
5385 5144
5386 case OP_PVECFROM: 5145 case OP_PVECFROM:
5387 { 5146 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5147 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5148 pointer vec = car (args);
5390 int len = veclength (vec); 5149 int len = veclength (vec);
5391 5150
5392 if (i == len) 5151 if (i == len)
5393 { 5152 {
5394 putstr (SCHEME_A_ ")"); 5153 putstr (SCHEME_A_ ")");
5395 s_return (S_T); 5154 s_return (S_T);
5396 } 5155 }
5397 else 5156 else
5398 { 5157 {
5399 pointer elem = vector_elem (vec, i); 5158 pointer elem = vector_get (vec, i);
5400 5159
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5160 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5161 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5162 SCHEME_V->args = elem;
5404 5163
5405 if (i > 0) 5164 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5165 putstr (SCHEME_A_ " ");
5407 5166
5408 s_goto (OP_P0LIST); 5167 s_goto (OP_P0LIST);
5409 } 5168 }
5410 } 5169 }
5411 } 5170 }
5412 5171
5413 return S_T; 5172 if (USE_ERROR_CHECKING) abort ();
5414} 5173}
5415 5174
5416static pointer 5175static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5176opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5177{
5178 pointer args = SCHEME_V->args;
5179 pointer a = car (args);
5419 pointer x, y; 5180 pointer x, y;
5420 5181
5421 switch (op) 5182 switch (op)
5422 { 5183 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5184 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5185 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5186 long v = list_length (SCHEME_A_ a);
5426 5187
5427 if (v < 0) 5188 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5189 Error_1 ("length: not a list:", a);
5429 5190
5430 s_return (mk_integer (SCHEME_A_ v)); 5191 s_return (mk_integer (SCHEME_A_ v));
5431 } 5192 }
5432 5193
5433 case OP_ASSQ: /* assq *//* a.k */ 5194 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5195 x = a;
5435 5196
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5197 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5198 {
5438 if (!is_pair (car (y))) 5199 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5200 Error_0 ("unable to handle non pair element");
5440 5201
5441 if (x == caar (y)) 5202 if (x == caar (y))
… …
5447 else 5208 else
5448 s_return (S_F); 5209 s_return (S_F);
5449 5210
5450 5211
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5212 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5213 SCHEME_V->args = a;
5453 5214
5454 if (SCHEME_V->args == NIL) 5215 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5216 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5217 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5218 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5463 case OP_CLOSUREP: /* closure? */ 5224 case OP_CLOSUREP: /* closure? */
5464 /* 5225 /*
5465 * Note, macro object is also a closure. 5226 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5227 * Therefore, (closure? <#MACRO>) ==> #t
5467 */ 5228 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5229 s_retbool (is_closure (a));
5469 5230
5470 case OP_MACROP: /* macro? */ 5231 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5232 s_retbool (is_macro (a));
5472 } 5233 }
5473 5234
5474 return S_T; /* NOTREACHED */ 5235 if (USE_ERROR_CHECKING) abort ();
5475} 5236}
5476 5237
5238/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5477typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5239typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5240
5479typedef int (*test_predicate) (pointer); 5241typedef int (*test_predicate)(pointer);
5480static int 5242static int
5481is_any (pointer p) 5243tst_any (pointer p)
5482{ 5244{
5483 return 1; 5245 return 1;
5484} 5246}
5485 5247
5486static int 5248static int
5487is_nonneg (pointer p) 5249tst_inonneg (pointer p)
5488{ 5250{
5489 return ivalue (p) >= 0 && is_integer (p); 5251 return is_integer (p) && ivalue_unchecked (p) >= 0;
5252}
5253
5254static int
5255tst_is_list (SCHEME_P_ pointer p)
5256{
5257 return p == NIL || is_pair (p);
5490} 5258}
5491 5259
5492/* Correspond carefully with following defines! */ 5260/* Correspond carefully with following defines! */
5493static struct 5261static struct
5494{ 5262{
5495 test_predicate fct; 5263 test_predicate fct;
5496 const char *kind; 5264 const char *kind;
5497} tests[] = 5265} tests[] = {
5498{ 5266 { tst_any , 0 },
5499 { 0, 0}, /* unused */ 5267 { is_string , "string" },
5500 { is_any, 0}, 5268 { is_symbol , "symbol" },
5501 { is_string, "string" }, 5269 { is_port , "port" },
5502 { is_symbol, "symbol" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5270 { is_inport , "input port" },
5505 { is_outport, "output port" }, 5271 { is_outport , "output port" },
5506 { is_environment, "environment" }, 5272 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5273 { is_pair , "pair" },
5508 { 0, "pair or '()" }, 5274 { 0 , "pair or '()" },
5509 { is_character, "character" }, 5275 { is_character , "character" },
5510 { is_vector, "vector" }, 5276 { is_vector , "vector" },
5511 { is_number, "number" }, 5277 { is_number , "number" },
5512 { is_integer, "integer" }, 5278 { is_integer , "integer" },
5513 { is_nonneg, "non-negative integer" } 5279 { tst_inonneg , "non-negative integer" }
5514}; 5280};
5515 5281
5516#define TST_NONE 0 5282#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5283#define TST_ANY "\001"
5518#define TST_STRING "\002" 5284#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5285#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5286#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5287#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5288#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5289#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5290#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5291#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5292#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5293#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5294#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5295#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5296#define TST_NATURAL "\016"
5297
5298#define INF_ARG 0xff
5299#define UNNAMED_OP ""
5300
5301static const char opnames[] =
5302#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5303#include "opdefines.h"
5304#undef OP_DEF
5305;
5306
5307static const char *
5308opname (int idx)
5309{
5310 const char *name = opnames;
5311
5312 /* should do this at compile time, but would require external program, right? */
5313 while (idx--)
5314 name += strlen (name) + 1;
5315
5316 return *name ? name : "ILLEGAL";
5317}
5318
5319static const char *
5320procname (pointer x)
5321{
5322 return opname (procnum (x));
5323}
5531 5324
5532typedef struct 5325typedef struct
5533{ 5326{
5534 dispatch_func func; 5327 uint8_t func;
5535 char *name; 5328 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5329 uint8_t builtin;
5330#if USE_ERROR_CHECKING
5536 int min_arity; 5331 uint8_t min_arity;
5537 int max_arity; 5332 uint8_t max_arity;
5538 char *arg_tests_encoding; 5333 char arg_tests_encoding[3];
5334#endif
5539} op_code_info; 5335} op_code_info;
5540 5336
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5337static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5338#if USE_ERROR_CHECKING
5339#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5340#else
5341#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5342#endif
5545#include "opdefines.h" 5343#include "opdefines.h"
5344#undef OP_DEF
5546 {0} 5345 {0}
5547}; 5346};
5548 5347
5549static const char *
5550procname (pointer x)
5551{
5552 int n = procnum (x);
5553 const char *name = dispatch_table[n].name;
5554
5555 if (name == 0)
5556 name = "ILLEGAL!";
5557
5558 return name;
5559}
5560
5561/* kernel of this interpreter */ 5348/* kernel of this interpreter */
5562static void 5349static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5350Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5351{
5565 SCHEME_V->op = op; 5352 SCHEME_V->op = op;
5566 5353
5567 for (;;) 5354 for (;;)
5568 { 5355 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5356 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5357
5571#if USE_ERROR_CHECKING 5358#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5359 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5360 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5361 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5362 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5363
5578 /* Check number of arguments */ 5364 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5365 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5366 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5367 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5368 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5369 xError_1 (SCHEME_A_ msg, 0);
5370 continue;
5584 } 5371 }
5585 5372 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5373 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5374 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5375 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5376 xError_1 (SCHEME_A_ msg, 0);
5377 continue;
5591 } 5378 }
5592 5379 else
5593 if (ok)
5594 { 5380 {
5595 if (pcd->arg_tests_encoding) 5381 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5382 {
5597 int i = 0; 5383 int i = 0;
5598 int j; 5384 int j;
5599 const char *t = pcd->arg_tests_encoding; 5385 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5386 pointer arglist = SCHEME_V->args;
5601 5387
5602 do 5388 do
5603 { 5389 {
5604 pointer arg = car (arglist); 5390 pointer arg = car (arglist);
5605 5391
5606 j = (int) t[0]; 5392 j = t[0];
5607 5393
5394 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5608 if (j == TST_LIST[0]) 5395 if (j == TST_LIST[0])
5609 { 5396 {
5610 if (arg != NIL && !is_pair (arg)) 5397 if (!tst_is_list (SCHEME_A_ arg))
5611 break; 5398 break;
5612 } 5399 }
5613 else 5400 else
5614 { 5401 {
5615 if (!tests[j].fct (arg)) 5402 if (!tests[j - 1].fct (arg))
5616 break; 5403 break;
5617 } 5404 }
5618 5405
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5406 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5620 t++; 5407 t++;
5621 5408
5622 arglist = cdr (arglist); 5409 arglist = cdr (arglist);
5623 i++; 5410 i++;
5624 } 5411 }
5625 while (i < n); 5412 while (i < n);
5626 5413
5627 if (i < n) 5414 if (i < n)
5628 { 5415 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5416 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5417 xError_1 (SCHEME_A_ msg, 0);
5418 continue;
5631 } 5419 }
5632 } 5420 }
5633 } 5421 }
5634
5635 if (!ok)
5636 {
5637 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5638 return;
5639
5640 pcd = dispatch_table + SCHEME_V->op;
5641 }
5642 } 5422 }
5643#endif 5423#endif
5644 5424
5645 ok_to_freely_gc (SCHEME_A); 5425 ok_to_freely_gc (SCHEME_A);
5646 5426
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5427 static const dispatch_func dispatch_funcs[] = {
5428 opexe_0,
5429 opexe_1,
5430 opexe_2,
5431 opexe_3,
5432 opexe_4,
5433 opexe_5,
5434 opexe_6,
5435 };
5436
5437 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5438 return;
5649 5439
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5440 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5441 {
5652 xwrstr ("No memory!\n"); 5442 xwrstr ("No memory!\n");
… …
5676mk_proc (SCHEME_P_ enum scheme_opcodes op) 5466mk_proc (SCHEME_P_ enum scheme_opcodes op)
5677{ 5467{
5678 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5468 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5679 set_typeflag (y, (T_PROC | T_ATOM)); 5469 set_typeflag (y, (T_PROC | T_ATOM));
5680 ivalue_unchecked (y) = op; 5470 ivalue_unchecked (y) = op;
5681 set_num_integer (y);
5682 return y; 5471 return y;
5683} 5472}
5684 5473
5685/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5474/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5686static int 5475static int
… …
5710 5499
5711 case 'd': 5500 case 'd':
5712 return OP_COND0; /* cond */ 5501 return OP_COND0; /* cond */
5713 5502
5714 case '*': 5503 case '*':
5715 return OP_LET0AST; /* let* */ 5504 return OP_LET0AST;/* let* */
5716 5505
5717 default: 5506 default:
5718 return OP_SET0; /* set! */ 5507 return OP_SET0; /* set! */
5719 } 5508 }
5720 5509
… …
5742 5531
5743 case 'f': 5532 case 'f':
5744 return OP_DEF0; /* define */ 5533 return OP_DEF0; /* define */
5745 5534
5746 default: 5535 default:
5747 return OP_LET0REC; /* letrec */ 5536 return OP_LET0REC;/* letrec */
5748 } 5537 }
5749 5538
5750 default: 5539 default:
5751 return OP_C0STREAM; /* cons-stream */ 5540 return OP_C0STREAM; /* cons-stream */
5752 } 5541 }
5753} 5542}
5754 5543
5755#if USE_MULTIPLICITY 5544#if USE_MULTIPLICITY
5756scheme * 5545ecb_cold scheme *
5757scheme_init_new () 5546scheme_init_new ()
5758{ 5547{
5759 scheme *sc = malloc (sizeof (scheme)); 5548 scheme *sc = malloc (sizeof (scheme));
5760 5549
5761 if (!scheme_init (SCHEME_A)) 5550 if (!scheme_init (SCHEME_A))
… …
5766 else 5555 else
5767 return sc; 5556 return sc;
5768} 5557}
5769#endif 5558#endif
5770 5559
5771int 5560ecb_cold int
5772scheme_init (SCHEME_P) 5561scheme_init (SCHEME_P)
5773{ 5562{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5563 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5564 pointer x;
5776 5565
… …
5849 5638
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5639 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5640 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5641 }
5853 5642
5643 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5644 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5645 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5646 assign_proc (SCHEME_A_ i, opname (i));
5857 5647
5858 /* initialization of global pointers to special symbols */ 5648 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5649 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5650 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5651 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5690scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5691{
5902 SCHEME_V->ext_data = p; 5692 SCHEME_V->ext_data = p;
5903} 5693}
5904 5694
5905void 5695ecb_cold void
5906scheme_deinit (SCHEME_P) 5696scheme_deinit (SCHEME_P)
5907{ 5697{
5908 int i; 5698 int i;
5909 5699
5910#if SHOW_ERROR_LINE 5700#if SHOW_ERROR_LINE
… …
6002{ 5792{
6003 dump_stack_reset (SCHEME_A); 5793 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5794 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5795 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5796 SCHEME_V->load_stack[0].kind = port_input | port_string;
6007 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5797 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6008 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5798 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6009 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5799 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5800#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5801 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5802#endif
6013 SCHEME_V->retcode = 0; 5803 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5804 SCHEME_V->interactive_repl = 0;

Diff Legend

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