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

Diff Legend

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