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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.36 by root, Sun Nov 29 05:04:29 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
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
143 160
144#define toupper(c) xtoupper (c) 161#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 162#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 163#define isdigit(c) xisdigit (c)
147 164
148#if USE_STRLWR 165#if USE_IGNORECASE
149static const char * 166static const char *
150strlwr (char *s) 167xstrlwr (char *s)
151{ 168{
152 const char *p = s; 169 const char *p = s;
153 170
154 while (*s) 171 while (*s)
155 { 172 {
… …
157 s++; 174 s++;
158 } 175 }
159 176
160 return p; 177 return p;
161} 178}
162#endif
163 179
180#define stricmp(a,b) strcasecmp (a, b)
181#define strlwr(s) xstrlwr (s)
182
183#else
164#define stricmp(a,b) strcmp (a, b) 184# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 185# define strlwr(s) (s)
186#endif
166 187
167#ifndef prompt 188#ifndef prompt
168# define prompt "ts> " 189# define prompt "ts> "
169#endif 190#endif
170 191
… …
176# define FIRST_CELLSEGS 3 197# define FIRST_CELLSEGS 3
177#endif 198#endif
178 199
179enum scheme_types 200enum scheme_types
180{ 201{
202 T_INTEGER,
181 T_FREE, 203 T_REAL,
182 T_STRING, 204 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 205 T_SYMBOL,
185 T_PROC, 206 T_PROC,
186 T_PAIR, 207 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 208 T_CLOSURE,
188 T_CONTINUATION, 209 T_CONTINUATION,
189 T_FOREIGN, 210 T_FOREIGN,
190 T_CHARACTER, 211 T_CHARACTER,
191 T_PORT, 212 T_PORT,
… …
201#define T_SYNTAX 0x0010 222#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 223#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 224#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 225#define T_MARK 0x0080 /* only for gc */
205 226
206static num num_add (num a, num b); 227/* num, for generic arithmetic */
207static num num_mul (num a, num b); 228struct num
208static num num_div (num a, num b); 229{
230 IVALUE ivalue;
231#if USE_REAL
232 RVALUE rvalue;
233 char is_fixnum;
234#endif
235};
236
237#if USE_REAL
238# define num_is_fixnum(n) (n).is_fixnum
239# define num_set_fixnum(n,f) (n).is_fixnum = (f)
240# define num_ivalue(n) (n).ivalue
241# define num_rvalue(n) (n).rvalue
242# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
243# define num_set_rvalue(n,r) (n).rvalue = (r)
244#else
245# define num_is_fixnum(n) 1
246# define num_set_fixnum(n,f) 0
247# define num_ivalue(n) (n).ivalue
248# define num_rvalue(n) (n).ivalue
249# define num_set_ivalue(n,i) (n).ivalue = (i)
250# define num_set_rvalue(n,r) (n).ivalue = (r)
251#endif
252
253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
254
255static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 257static num num_rem (num a, num b);
212static num num_mod (num a, num b); 258static 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 259
219#if USE_MATH 260#if USE_MATH
220static double round_per_R5RS (double x); 261static double round_per_R5RS (double x);
221#endif 262#endif
222static int is_zero_rvalue (RVALUE x); 263static 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 264
230static num num_zero; 265static num num_zero;
231static num num_one; 266static num num_one;
232 267
233/* macros for cell operations */ 268/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 269#define typeflag(p) ((p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 270#define set_typeflag(p,v) ((p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 271#define type(p) (typeflag (p) & T_MASKTYPE)
237 272
238INTERFACE INLINE int 273INTERFACE int
239is_string (pointer p) 274is_string (pointer p)
240{ 275{
241 return type (p) == T_STRING; 276 return type (p) == T_STRING;
242} 277}
243 278
244#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
246 281
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 282INTERFACE int
249is_vector (pointer p) 283is_vector (pointer p)
250{ 284{
251 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
252} 286}
253 287
254#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE 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); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 293
261INTERFACE uint32_t 294INTERFACE int
262vector_length (pointer vec) 295is_integer (pointer p)
263{ 296{
264 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
265} 298}
266 299
300/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
305}
306
307INTERFACE int
268is_number (pointer p) 308is_number (pointer p)
269{ 309{
270 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
271} 311}
272 312
273INTERFACE INLINE int 313INTERFACE 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) 314is_character (pointer p)
293{ 315{
294 return type (p) == T_CHARACTER; 316 return type (p) == T_CHARACTER;
295} 317}
296 318
297INTERFACE INLINE char * 319INTERFACE char *
298string_value (pointer p) 320string_value (pointer p)
299{ 321{
300 return strvalue (p); 322 return strvalue (p);
301} 323}
302 324
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) 325#define ivalue_unchecked(p) (p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v)
327
334#if USE_REAL 328#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 331#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
340# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 334#endif
335
343INTERFACE long 336INTERFACE long
344charvalue (pointer p) 337charvalue (pointer p)
345{ 338{
346 return ivalue_unchecked (p); 339 return ivalue_unchecked (p);
347} 340}
348 341
349INTERFACE INLINE int 342INTERFACE int
350is_port (pointer p) 343is_port (pointer p)
351{ 344{
352 return type (p) == T_PORT; 345 return type (p) == T_PORT;
353} 346}
354 347
355INTERFACE INLINE int 348INTERFACE int
356is_inport (pointer p) 349is_inport (pointer p)
357{ 350{
358 return is_port (p) && p->object.port->kind & port_input; 351 return is_port (p) && p->object.port->kind & port_input;
359} 352}
360 353
361INTERFACE INLINE int 354INTERFACE int
362is_outport (pointer p) 355is_outport (pointer p)
363{ 356{
364 return is_port (p) && p->object.port->kind & port_output; 357 return is_port (p) && p->object.port->kind & port_output;
365} 358}
366 359
367INTERFACE INLINE int 360INTERFACE int
368is_pair (pointer p) 361is_pair (pointer p)
369{ 362{
370 return type (p) == T_PAIR; 363 return type (p) == T_PAIR;
371} 364}
372 365
373#define car(p) ((p)->object.cons.car + 0) 366#define car(p) ((p)->object.cons.car + 0)
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 367#define cdr(p) ((p)->object.cons.cdr + 0)
375 368
376#define caar(p) car (car (p)) 369static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 370static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 371static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 372static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 373
381#define cadar(p) car (cdr (car (p))) 374static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 375static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 376static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 377
385INTERFACE void 378INTERFACE void
386set_car (pointer p, pointer q) 379set_car (pointer p, pointer q)
387{ 380{
388 p->object.cons.car = q; 381 p->object.cons.car = q;
… …
404pair_cdr (pointer p) 397pair_cdr (pointer p)
405{ 398{
406 return cdr (p); 399 return cdr (p);
407} 400}
408 401
409INTERFACE INLINE int 402INTERFACE int
410is_symbol (pointer p) 403is_symbol (pointer p)
411{ 404{
412 return type (p) == T_SYMBOL; 405 return type (p) == T_SYMBOL;
413} 406}
414 407
415INTERFACE INLINE char * 408INTERFACE char *
416symname (pointer p) 409symname (pointer p)
417{ 410{
418 return strvalue (car (p)); 411 return strvalue (car (p));
419} 412}
420 413
421#if USE_PLIST 414#if USE_PLIST
422SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
423hasprop (pointer p) 416hasprop (pointer p)
424{ 417{
425 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
426} 419}
427 420
428# define symprop(p) cdr(p) 421# define symprop(p) cdr(p)
429#endif 422#endif
430 423
431INTERFACE INLINE int 424INTERFACE int
432is_syntax (pointer p) 425is_syntax (pointer p)
433{ 426{
434 return typeflag (p) & T_SYNTAX; 427 return typeflag (p) & T_SYNTAX;
435} 428}
436 429
437INTERFACE INLINE int 430INTERFACE int
438is_proc (pointer p) 431is_proc (pointer p)
439{ 432{
440 return type (p) == T_PROC; 433 return type (p) == T_PROC;
441} 434}
442 435
443INTERFACE INLINE int 436INTERFACE int
444is_foreign (pointer p) 437is_foreign (pointer p)
445{ 438{
446 return type (p) == T_FOREIGN; 439 return type (p) == T_FOREIGN;
447} 440}
448 441
449INTERFACE INLINE char * 442INTERFACE char *
450syntaxname (pointer p) 443syntaxname (pointer p)
451{ 444{
452 return strvalue (car (p)); 445 return strvalue (car (p));
453} 446}
454 447
455#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 449static const char *procname (pointer x);
457 450
458INTERFACE INLINE int 451INTERFACE int
459is_closure (pointer p) 452is_closure (pointer p)
460{ 453{
461 return type (p) == T_CLOSURE; 454 return type (p) == T_CLOSURE;
462} 455}
463 456
464INTERFACE INLINE int 457INTERFACE int
465is_macro (pointer p) 458is_macro (pointer p)
466{ 459{
467 return type (p) == T_MACRO; 460 return type (p) == T_MACRO;
468} 461}
469 462
470INTERFACE INLINE pointer 463INTERFACE pointer
471closure_code (pointer p) 464closure_code (pointer p)
472{ 465{
473 return car (p); 466 return car (p);
474} 467}
475 468
476INTERFACE INLINE pointer 469INTERFACE pointer
477closure_env (pointer p) 470closure_env (pointer p)
478{ 471{
479 return cdr (p); 472 return cdr (p);
480} 473}
481 474
482INTERFACE INLINE int 475INTERFACE int
483is_continuation (pointer p) 476is_continuation (pointer p)
484{ 477{
485 return type (p) == T_CONTINUATION; 478 return type (p) == T_CONTINUATION;
486} 479}
487 480
488#define cont_dump(p) cdr (p) 481#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 482#define set_cont_dump(p,v) set_cdr ((p), (v))
490 483
491/* To do: promise should be forced ONCE only */ 484/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 485INTERFACE int
493is_promise (pointer p) 486is_promise (pointer p)
494{ 487{
495 return type (p) == T_PROMISE; 488 return type (p) == T_PROMISE;
496} 489}
497 490
498INTERFACE INLINE int 491INTERFACE int
499is_environment (pointer p) 492is_environment (pointer p)
500{ 493{
501 return type (p) == T_ENVIRONMENT; 494 return type (p) == T_ENVIRONMENT;
502} 495}
503 496
… …
509 502
510#define is_mark(p) (typeflag (p) & T_MARK) 503#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 506
514INTERFACE INLINE int 507INTERFACE int
515is_immutable (pointer p) 508is_immutable (pointer p)
516{ 509{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 511}
519 512
520INTERFACE INLINE void 513INTERFACE void
521setimmutable (pointer p) 514setimmutable (pointer p)
522{ 515{
523#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 518#endif
526} 519}
527 520
521/* Result is:
522 proper list: length
523 circular list: -1
524 not even a pair: -2
525 dotted list: -2 minus length before dot
526*/
527INTERFACE int
528list_length (SCHEME_P_ pointer a)
529{
530 int i = 0;
531 pointer slow, fast;
532
533 slow = fast = a;
534
535 while (1)
536 {
537 if (fast == NIL)
538 return i;
539
540 if (!is_pair (fast))
541 return -2 - i;
542
543 fast = cdr (fast);
544 ++i;
545
546 if (fast == NIL)
547 return i;
548
549 if (!is_pair (fast))
550 return -2 - i;
551
552 ++i;
553 fast = cdr (fast);
554
555 /* Safe because we would have already returned if `fast'
556 encountered a non-pair. */
557 slow = cdr (slow);
558
559 if (fast == slow)
560 {
561 /* the fast pointer has looped back around and caught up
562 with the slow pointer, hence the structure is circular,
563 not of finite length, and therefore not a list */
564 return -1;
565 }
566 }
567}
568
569INTERFACE int
570is_list (SCHEME_P_ pointer a)
571{
572 return list_length (SCHEME_A_ a) >= 0;
573}
574
528#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
529static INLINE int 576ecb_inline int
530Cisalpha (int c) 577Cisalpha (int c)
531{ 578{
532 return isascii (c) && isalpha (c); 579 return isascii (c) && isalpha (c);
533} 580}
534 581
535static INLINE int 582ecb_inline int
536Cisdigit (int c) 583Cisdigit (int c)
537{ 584{
538 return isascii (c) && isdigit (c); 585 return isascii (c) && isdigit (c);
539} 586}
540 587
541static INLINE int 588ecb_inline int
542Cisspace (int c) 589Cisspace (int c)
543{ 590{
544 return isascii (c) && isspace (c); 591 return isascii (c) && isspace (c);
545} 592}
546 593
547static INLINE int 594ecb_inline int
548Cisupper (int c) 595Cisupper (int c)
549{ 596{
550 return isascii (c) && isupper (c); 597 return isascii (c) && isupper (c);
551} 598}
552 599
553static INLINE int 600ecb_inline int
554Cislower (int c) 601Cislower (int c)
555{ 602{
556 return isascii (c) && islower (c); 603 return isascii (c) && islower (c);
557} 604}
558#endif 605#endif
… …
619#endif 666#endif
620 667
621static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
626static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
627static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
628static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
629static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
630static pointer mk_number (SCHEME_P_ const num n); 677static pointer mk_number (SCHEME_P_ const num n);
631static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 678static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
646static void mark (pointer a); 693static void mark (pointer a);
647static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
648static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
649static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
650static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
651static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
652static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
653static INLINE int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
654static int token (SCHEME_P); 701static int token (SCHEME_P);
655static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
656static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
657static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
658static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
662static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 709static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
663static pointer revappend (SCHEME_P_ pointer a, pointer b); 710static pointer revappend (SCHEME_P_ pointer a, pointer b);
664static pointer ss_get_cont (SCHEME_P); 711static pointer ss_get_cont (SCHEME_P);
665static void ss_set_cont (SCHEME_P_ pointer cont); 712static void ss_set_cont (SCHEME_P_ pointer cont);
666static void dump_stack_mark (SCHEME_P); 713static void dump_stack_mark (SCHEME_P);
667static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
715static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
673static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
674static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
675static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
676static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
677 725
726static IVALUE
727ivalue (pointer x)
728{
729 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
730}
731
732static RVALUE
733rvalue (pointer x)
734{
735 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
736}
737
738INTERFACE num
739nvalue (pointer x)
740{
741 num n;
742
743 num_set_fixnum (n, is_integer (x));
744
745 if (num_is_fixnum (n))
746 num_set_ivalue (n, ivalue_unchecked (x));
747 else
748 num_set_rvalue (n, rvalue_unchecked (x));
749
750 return n;
751}
752
678static num 753static num
679num_add (num a, num b) 754num_op (enum num_op op, num a, num b)
680{ 755{
681 num ret; 756 num ret;
682 757
683 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
684 759
685 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
686 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 761 {
762 switch (op)
763 {
764 case NUM_ADD: a.ivalue += b.ivalue; break;
765 case NUM_SUB: a.ivalue -= b.ivalue; break;
766 case NUM_MUL: a.ivalue *= b.ivalue; break;
767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
768 }
769
770 num_set_ivalue (ret, a.ivalue);
771 }
772#if USE_REAL
687 else 773 else
688 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 774 {
775 switch (op)
776 {
777 case NUM_ADD: a.rvalue += b.rvalue; break;
778 case NUM_SUB: a.rvalue -= b.rvalue; break;
779 case NUM_MUL: a.rvalue *= b.rvalue; break;
780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
781 }
689 782
690 return ret; 783 num_set_rvalue (ret, a.rvalue);
691} 784 }
692 785#endif
693static num
694num_mul (num a, num b)
695{
696 num ret;
697
698 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
699
700 if (num_is_fixnum (ret))
701 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
702 else
703 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
704 786
705 return ret; 787 return ret;
706} 788}
707 789
708static num 790static num
709num_div (num a, num b) 791num_div (num a, num b)
710{ 792{
711 num ret; 793 num ret;
712 794
713 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 795 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
714 796
715 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
716 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
717 else 799 else
718 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
719
720 return ret;
721}
722
723static num
724num_intdiv (num a, num b)
725{
726 num ret;
727
728 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
729
730 if (num_is_fixnum (ret))
731 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
732 else
733 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
734
735 return ret;
736}
737
738static num
739num_sub (num a, num b)
740{
741 num ret;
742
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744
745 if (num_is_fixnum (ret))
746 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
747 else
748 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
749 801
750 return ret; 802 return ret;
751} 803}
752 804
753static num 805static num
… …
755{ 807{
756 num ret; 808 num ret;
757 long e1, e2, res; 809 long e1, e2, res;
758 810
759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 811 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
760 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
761 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
762 res = e1 % e2; 814 res = e1 % e2;
763 815
764 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
765 if (res > 0) 817 if (res > 0)
766 { 818 {
… …
782{ 834{
783 num ret; 835 num ret;
784 long e1, e2, res; 836 long e1, e2, res;
785 837
786 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 838 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
787 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
788 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
789 res = e1 % e2; 841 res = e1 % e2;
790 842
791 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
792 if (res * e2 < 0) 844 if (res * e2 < 0)
793 res += e2; 845 res += e2;
794 846
795 num_set_ivalue (ret, res); 847 num_set_ivalue (ret, res);
796 return ret; 848 return ret;
797} 849}
798 850
851/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
799static int 852static int
800num_eq (num a, num b) 853num_cmp (num a, num b)
801{ 854{
855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 int ret; 856 int ret;
803 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
804 857
805 if (is_fixnum) 858 if (is_fixnum)
806 ret = num_get_ivalue (a) == num_get_ivalue (b); 859 {
860 IVALUE av = num_ivalue (a);
861 IVALUE bv = num_ivalue (b);
862
863 ret = av == bv ? 0 : av < bv ? -1 : +1;
864 }
807 else 865 else
808 ret = num_get_rvalue (a) == num_get_rvalue (b); 866 {
867 RVALUE av = num_rvalue (a);
868 RVALUE bv = num_rvalue (b);
869
870 ret = av == bv ? 0 : av < bv ? -1 : +1;
871 }
809 872
810 return ret; 873 return ret;
811}
812
813
814static int
815num_gt (num a, num b)
816{
817 int ret;
818 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
819
820 if (is_fixnum)
821 ret = num_get_ivalue (a) > num_get_ivalue (b);
822 else
823 ret = num_get_rvalue (a) > num_get_rvalue (b);
824
825 return ret;
826}
827
828static int
829num_ge (num a, num b)
830{
831 return !num_lt (a, b);
832}
833
834static int
835num_lt (num a, num b)
836{
837 int ret;
838 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
839
840 if (is_fixnum)
841 ret = num_get_ivalue (a) < num_get_ivalue (b);
842 else
843 ret = num_get_rvalue (a) < num_get_rvalue (b);
844
845 return ret;
846}
847
848static int
849num_le (num a, num b)
850{
851 return !num_gt (a, b);
852} 874}
853 875
854#if USE_MATH 876#if USE_MATH
855 877
856/* Round to nearest. Round to even if midway */ 878/* Round to nearest. Round to even if midway */
… …
866 return ce; 888 return ce;
867 else if (dfl < dce) 889 else if (dfl < dce)
868 return fl; 890 return fl;
869 else 891 else
870 { 892 {
871 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 893 if (fmod (fl, 2) == 0) /* I imagine this holds */
872 return fl; 894 return fl;
873 else 895 else
874 return ce; 896 return ce;
875 } 897 }
876} 898}
877#endif 899#endif
878 900
879static int 901static int
880is_zero_rvalue (RVALUE x) 902is_zero_rvalue (RVALUE x)
881{ 903{
904 return x == 0;
905#if 0
882#if USE_REAL 906#if USE_REAL
883 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 907 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
884#else 908#else
885 return x == 0; 909 return x == 0;
910#endif
886#endif 911#endif
887} 912}
888 913
889/* allocate new cell segment */ 914/* allocate new cell segment */
890static int 915static int
… …
911 return k; 936 return k;
912 937
913 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
914 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
915 940
916 /* insert new segment in address order */
917 newp = (pointer)cp; 941 newp = (pointer)cp;
918 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
919 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
920
921 //TODO: insert, not swap
922 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
923 {
924 p = SCHEME_V->cell_seg[i];
925 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
926 SCHEME_V->cell_seg[i - 1] = p;
927
928 k = SCHEME_V->cell_segsize[i];
929 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
930 SCHEME_V->cell_segsize[i - 1] = k;
931
932 --i;
933 }
934
935 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
936 last = newp + segsize - 1; 945 last = newp + segsize - 1;
937 946
938 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
939 { 948 {
940 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
941 set_car (p, NIL); 950 set_car (p, NIL);
942 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
943 } 952 }
944 953
945 /* insert new cells in address order on free list */
946 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
947 {
948 set_cdr (last, SCHEME_V->free_cell); 954 set_cdr (last, SCHEME_V->free_cell);
949 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
950 }
951 else
952 {
953 p = SCHEME_V->free_cell;
954
955 while (cdr (p) != NIL && newp > cdr (p))
956 p = cdr (p);
957
958 set_cdr (last, cdr (p));
959 set_cdr (p, newp);
960 }
961 } 956 }
962 957
963 return n; 958 return n;
964} 959}
965 960
966/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
967static INLINE pointer 962ecb_inline pointer
968get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
969{ 964{
970 if (SCHEME_V->free_cell == NIL) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
971 { 966 {
972 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
973 return S_SINK; 968 return S_SINK;
974 969
975 if (SCHEME_V->free_cell == NIL) 970 if (SCHEME_V->free_cell == NIL)
… …
1044 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
1045 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
1046 1041
1047 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
1048 v->object.vector.length = len; 1043 v->object.vector.length = len;
1049 fill_vector (v, init); 1044 fill_vector (v, 0, init);
1050 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
1051 1046
1052 return v; 1047 return v;
1053} 1048}
1054 1049
1055static INLINE void 1050ecb_inline void
1056ok_to_freely_gc (SCHEME_P) 1051ok_to_freely_gc (SCHEME_P)
1057{ 1052{
1058 set_car (S_SINK, NIL); 1053 set_car (S_SINK, NIL);
1059} 1054}
1060 1055
… …
1099 return x; 1094 return x;
1100} 1095}
1101 1096
1102/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1103 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL);
1106 return x;
1107}
1108
1104#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1105 1110
1111static int
1106static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1107 1122
1108static pointer 1123static pointer
1109oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1110{ 1125{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1128
1114/* returns the new symbol */ 1129/* returns the new symbol */
1115static pointer 1130static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1132{
1118 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1119
1120 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1121 set_typeflag (x, T_SYMBOL);
1122 setimmutable (car (x));
1123
1124 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1125 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1136 return x;
1127} 1137}
1128 1138
1129static INLINE pointer 1139ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1141{
1132 int location; 1142 int location;
1133 pointer x; 1143 pointer x;
1134 char *s; 1144 char *s;
1135 1145
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1147
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1149 {
1140 s = symname (car (x)); 1150 s = symname (car (x));
1141 1151
1142 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1153 int i; 1163 int i;
1154 pointer x; 1164 pointer x;
1155 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1156 1166
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1160 1170
1161 return ob_list; 1171 return ob_list;
1162} 1172}
1163 1173
… …
1167oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1168{ 1178{
1169 return NIL; 1179 return NIL;
1170} 1180}
1171 1181
1172static INLINE pointer 1182ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1184{
1175 pointer x; 1185 pointer x;
1176 char *s; 1186 char *s;
1177 1187
… …
1189 1199
1190/* returns the new symbol */ 1200/* returns the new symbol */
1191static pointer 1201static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1203{
1194 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x)); 1206 setimmutable (x);
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1208 return x;
1201} 1209}
1202 1210
1203static pointer 1211static pointer
… …
1236mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1237{ 1245{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1247
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1241 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1250
1243 return x; 1251 return x;
1244} 1252}
1245 1253
1246/* get number atom (integer) */ 1254/* get number atom (integer) */
1247INTERFACE pointer 1255INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1249{ 1257{
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1259
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1253 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1254 set_num_integer (x); 1262
1255 return x; 1263 return x;
1256} 1264}
1257 1265
1258INTERFACE pointer 1266INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1260{ 1268{
1269#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1271
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1264 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1265 set_num_real (x); 1274
1266 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1267} 1279}
1268 1280
1269static pointer 1281static pointer
1270mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1271{ 1283{
1284#if USE_REAL
1272 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1290#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1291}
1277 1292
1278/* allocate name to string area */ 1293/* allocate name to string area */
1279static char * 1294static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1286 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1288 } 1303 }
1289 1304
1290 if (str) 1305 if (str)
1291 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1307 else
1301 {
1302 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1303 q[len_str] = 0; 1310 q[len_str] = 0;
1304 }
1305 1311
1306 return q; 1312 return q;
1307} 1313}
1308 1314
1309INTERFACE pointer 1315INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1330
1325 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1333 strlength (x) = len;
1334
1328 return x; 1335 return x;
1329} 1336}
1330 1337
1331INTERFACE pointer 1338INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1339{ 1346{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1348}
1342 1349
1343INTERFACE void 1350INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1352{
1346 int i; 1353 int i;
1347 1354
1348 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1350} 1357}
1351 1358
1352INTERFACE pointer 1359INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1360vector_get (pointer vec, uint32_t ielem)
1354{ 1361{
1355 return vecvalue(vec)[ielem]; 1362 return vecvalue(vec)[ielem];
1356} 1363}
1357 1364
1358INTERFACE void 1365INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1366vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1367{
1361 vecvalue(vec)[ielem] = a; 1368 vecvalue(vec)[ielem] = a;
1362} 1369}
1363 1370
1364/* get new symbol */ 1371/* get new symbol */
… …
1376 1383
1377INTERFACE pointer 1384INTERFACE pointer
1378gensym (SCHEME_P) 1385gensym (SCHEME_P)
1379{ 1386{
1380 pointer x; 1387 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1388 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1389 xnum (name + 7, SCHEME_V->gensym_cnt);
1386 1390
1387 /* first check oblist */ 1391 return generate_symbol (SCHEME_A_ name);
1388 x = oblist_find_by_name (SCHEME_A_ name);
1389
1390 if (x == NIL)
1391 {
1392 x = oblist_add_by_name (SCHEME_A_ name);
1393 return x;
1394 }
1395 }
1396
1397 return NIL;
1398} 1392}
1399 1393
1400/* make symbol or number atom from string */ 1394/* make symbol or number atom from string */
1401static pointer 1395static pointer
1402mk_atom (SCHEME_P_ char *q) 1396mk_atom (SCHEME_P_ char *q)
… …
1456 } 1450 }
1457 else if ((c == 'e') || (c == 'E')) 1451 else if ((c == 'e') || (c == 'E'))
1458 { 1452 {
1459 if (!has_fp_exp) 1453 if (!has_fp_exp)
1460 { 1454 {
1461 has_dec_point = 1; /* decimal point illegal 1455 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1456 p++;
1464 1457
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1458 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1459 continue;
1467 } 1460 }
… …
1481 1474
1482/* make constant */ 1475/* make constant */
1483static pointer 1476static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1477mk_sharp_const (SCHEME_P_ char *name)
1485{ 1478{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1479 if (!strcmp (name, "t"))
1490 return S_T; 1480 return S_T;
1491 else if (!strcmp (name, "f")) 1481 else if (!strcmp (name, "f"))
1492 return S_F; 1482 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1483 else if (*name == '\\') /* #\w (character) */
1494 { 1484 {
1495 int c = 0; 1485 int c;
1496 1486
1497 if (stricmp (name + 1, "space") == 0) 1487 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1488 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1489 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1490 c = '\n';
… …
1502 c = '\r'; 1492 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1493 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1494 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1495 else if (name[1] == 'x' && name[2] != 0)
1506 { 1496 {
1507 int c1 = strtol (name + 2, 0, 16); 1497 long c1 = strtol (name + 2, 0, 16);
1508 1498
1509 if (c1 <= UCHAR_MAX) 1499 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1500 c = c1;
1511 else 1501 else
1512 return NIL; 1502 return NIL;
1513 1503 }
1514#if USE_ASCII_NAMES 1504#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1505 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1506 /* nothing */;
1519#endif 1507#endif
1520 }
1521 else if (name[2] == 0) 1508 else if (name[2] == 0)
1522 c = name[1]; 1509 c = name[1];
1523 else 1510 else
1524 return NIL; 1511 return NIL;
1525 1512
… …
1542 1529
1543/*-- 1530/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1531 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1532 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1533 * for marking.
1534 *
1535 * The exception is vectors - vectors are currently marked recursively,
1536 * which is inherited form tinyscheme and could be fixed by having another
1537 * word of context in the vector
1547 */ 1538 */
1548static void 1539static void
1549mark (pointer a) 1540mark (pointer a)
1550{ 1541{
1551 pointer t, q, p; 1542 pointer t, q, p;
… …
1553 t = 0; 1544 t = 0;
1554 p = a; 1545 p = a;
1555E2: 1546E2:
1556 setmark (p); 1547 setmark (p);
1557 1548
1558 if (is_vector (p)) 1549 if (ecb_expect_false (is_vector (p)))
1559 { 1550 {
1560 int i; 1551 int i;
1561 1552
1562 for (i = 0; i < p->object.vector.length; i++) 1553 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1554 mark (vecvalue (p)[i]);
1564 } 1555 }
1565 1556
1566 if (is_atom (p)) 1557 if (is_atom (p))
1567 goto E6; 1558 goto E6;
… …
1665 if (is_mark (p)) 1656 if (is_mark (p))
1666 clrmark (p); 1657 clrmark (p);
1667 else 1658 else
1668 { 1659 {
1669 /* reclaim cell */ 1660 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1661 if (typeflag (p) != T_PAIR)
1671 { 1662 {
1672 finalize_cell (SCHEME_A_ p); 1663 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_FREE); 1664 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL); 1665 set_car (p, NIL);
1675 } 1666 }
1676 1667
1677 ++SCHEME_V->fcells; 1668 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1669 set_cdr (p, SCHEME_V->free_cell);
… …
1680 } 1671 }
1681 } 1672 }
1682 } 1673 }
1683 1674
1684 if (SCHEME_V->gc_verbose) 1675 if (SCHEME_V->gc_verbose)
1676 {
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1678 }
1686} 1679}
1687 1680
1688static void 1681static void
1689finalize_cell (SCHEME_P_ pointer a) 1682finalize_cell (SCHEME_P_ pointer a)
1690{ 1683{
1684 /* TODO, fast bitmap check? */
1691 if (is_string (a)) 1685 if (is_string (a))
1692 free (strvalue (a)); 1686 free (strvalue (a));
1693 else if (is_vector (a)) 1687 else if (is_vector (a))
1694 free (vecvalue (a)); 1688 free (vecvalue (a));
1695#if USE_PORTS 1689#if USE_PORTS
… …
2118#endif 2112#endif
2119} 2113}
2120 2114
2121/* read characters up to delimiter, but cater to character constants */ 2115/* read characters up to delimiter, but cater to character constants */
2122static char * 2116static char *
2123readstr_upto (SCHEME_P_ char *delim) 2117readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2118{
2125 char *p = SCHEME_V->strbuff; 2119 char *p = SCHEME_V->strbuff + skip;
2126 2120
2127 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2121 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2128 2122
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2124 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2131 return SCHEME_V->strbuff;
2138} 2132}
2139 2133
2140/* read string expression "xxx...xxx" */ 2134/* read string expression "xxx...xxx" */
2141static pointer 2135static pointer
2142readstrexp (SCHEME_P) 2136readstrexp (SCHEME_P_ char delim)
2143{ 2137{
2144 char *p = SCHEME_V->strbuff; 2138 char *p = SCHEME_V->strbuff;
2145 int c; 2139 int c;
2146 int c1 = 0; 2140 int c1 = 0;
2147 enum
2148 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2141 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2149 2142
2150 for (;;) 2143 for (;;)
2151 { 2144 {
2152 c = inchar (SCHEME_A); 2145 c = inchar (SCHEME_A);
2153 2146
… …
2155 return S_F; 2148 return S_F;
2156 2149
2157 switch (state) 2150 switch (state)
2158 { 2151 {
2159 case st_ok: 2152 case st_ok:
2160 switch (c) 2153 if (ecb_expect_false (c == delim))
2161 {
2162 case '\\':
2163 state = st_bsl;
2164 break;
2165
2166 case '"':
2167 *p = 0;
2168 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2154 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2169 2155
2170 default: 2156 if (ecb_expect_false (c == '\\'))
2157 state = st_bsl;
2158 else
2171 *p++ = c; 2159 *p++ = c;
2172 break;
2173 }
2174 2160
2175 break; 2161 break;
2176 2162
2177 case st_bsl: 2163 case st_bsl:
2178 switch (c) 2164 switch (c)
… …
2208 case 'r': 2194 case 'r':
2209 *p++ = '\r'; 2195 *p++ = '\r';
2210 state = st_ok; 2196 state = st_ok;
2211 break; 2197 break;
2212 2198
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2199 default:
2219 *p++ = c; 2200 *p++ = c;
2220 state = st_ok; 2201 state = st_ok;
2221 break; 2202 break;
2222 } 2203 }
2223 2204
2224 break; 2205 break;
2225 2206
2226 case st_x1: 2207 case st_x1:
2227 case st_x2: 2208 case st_x2:
2228 c = toupper (c); 2209 c = tolower (c);
2229 2210
2230 if (c >= '0' && c <= 'F') 2211 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2212 c1 = (c1 << 4) + c - '0';
2234 else 2213 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2214 c1 = (c1 << 4) + c - 'a' + 10;
2236
2237 if (state == st_x1)
2238 state = st_x2;
2239 else
2240 {
2241 *p++ = c1;
2242 state = st_ok;
2243 }
2244 }
2245 else 2215 else
2246 return S_F; 2216 return S_F;
2217
2218 if (state == st_x1)
2219 state = st_x2;
2220 else
2221 {
2222 *p++ = c1;
2223 state = st_ok;
2224 }
2247 2225
2248 break; 2226 break;
2249 2227
2250 case st_oct1: 2228 case st_oct1:
2251 case st_oct2: 2229 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2233 backchar (SCHEME_A_ c);
2256 state = st_ok; 2234 state = st_ok;
2257 } 2235 }
2258 else 2236 else
2259 { 2237 {
2260 if (state == st_oct2 && c1 >= 32) 2238 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2239 return S_F;
2262 2240
2263 c1 = (c1 << 3) + (c - '0'); 2241 c1 = (c1 << 3) + (c - '0');
2264 2242
2265 if (state == st_oct1) 2243 if (state == st_oct1)
… …
2270 state = st_ok; 2248 state = st_ok;
2271 } 2249 }
2272 } 2250 }
2273 2251
2274 break; 2252 break;
2275
2276 } 2253 }
2277 } 2254 }
2278} 2255}
2279 2256
2280/* check c is in chars */ 2257/* check c is in chars */
2281static INLINE int 2258ecb_inline int
2282is_one_of (char *s, int c) 2259is_one_of (const char *s, int c)
2283{ 2260{
2284 if (c == EOF) 2261 if (c == EOF)
2285 return 1; 2262 return 1;
2286 2263
2287 return !!strchr (s, c); 2264 return !!strchr (s, c);
2288} 2265}
2289 2266
2290/* skip white characters */ 2267/* skip white characters */
2291static INLINE int 2268ecb_inline int
2292skipspace (SCHEME_P) 2269skipspace (SCHEME_P)
2293{ 2270{
2294 int c, curr_line = 0; 2271 int c, curr_line = 0;
2295 2272
2296 do 2273 do
… …
2343 2320
2344 if (is_one_of (" \n\t", c)) 2321 if (is_one_of (" \n\t", c))
2345 return TOK_DOT; 2322 return TOK_DOT;
2346 else 2323 else
2347 { 2324 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2325 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2326 return TOK_DOTATOM;
2352 } 2327 }
2328
2329 case '|':
2330 return TOK_STRATOM;
2353 2331
2354 case '\'': 2332 case '\'':
2355 return TOK_QUOTE; 2333 return TOK_QUOTE;
2356 2334
2357 case ';': 2335 case ';':
… …
2524 { 2502 {
2525 p = SCHEME_V->strbuff; 2503 p = SCHEME_V->strbuff;
2526 2504
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2505 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2506 {
2529 if (num_is_integer (l)) 2507 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2508 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2509#if USE_REAL
2532 else 2510 else
2533 { 2511 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2512 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2789 return 0; 2767 return 0;
2790 } 2768 }
2791 else if (is_number (a)) 2769 else if (is_number (a))
2792 { 2770 {
2793 if (is_number (b)) 2771 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2772 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2773
2797 return 0; 2774 return 0;
2798 } 2775 }
2799 else if (is_character (a)) 2776 else if (is_character (a))
2800 { 2777 {
… …
2826/* () is #t in R5RS */ 2803/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2804#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2805#define is_false(p) ((p) == S_F)
2829 2806
2830/* ========== Environment implementation ========== */ 2807/* ========== Environment implementation ========== */
2831
2832#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2833
2834static int
2835hash_fn (const char *key, int table_size)
2836{
2837 const unsigned char *p = key;
2838 uint32_t hash = 2166136261;
2839
2840 while (*p)
2841 hash = (hash ^ *p++) * 16777619;
2842
2843 return hash % table_size;
2844}
2845#endif
2846 2808
2847#ifndef USE_ALIST_ENV 2809#ifndef USE_ALIST_ENV
2848 2810
2849/* 2811/*
2850 * In this implementation, each frame of the environment may be 2812 * In this implementation, each frame of the environment may be
… …
2867 2829
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2830 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2831 setenvironment (SCHEME_V->envir);
2870} 2832}
2871 2833
2872static INLINE void 2834static uint32_t
2835sym_hash (pointer sym, uint32_t size)
2836{
2837 uintptr_t ptr = (uintptr_t)sym;
2838
2839#if 0
2840 /* table size is prime, so why mix */
2841 ptr += ptr >> 32;
2842 ptr += ptr >> 16;
2843 ptr += ptr >> 8;
2844#endif
2845
2846 return ptr % size;
2847}
2848
2849ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2850new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2851{
2875 pointer slot = immutable_cons (variable, value); 2852 pointer slot = immutable_cons (variable, value);
2876 2853
2877 if (is_vector (car (env))) 2854 if (is_vector (car (env)))
2878 { 2855 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2856 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2857 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2858 }
2883 else 2859 else
2884 set_car (env, immutable_cons (slot, car (env))); 2860 set_car (env, immutable_cons (slot, car (env)));
2885} 2861}
2886 2862
2887static pointer 2863static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2865{
2890 pointer x, y; 2866 pointer x, y;
2891 int location;
2892 2867
2893 for (x = env; x != NIL; x = cdr (x)) 2868 for (x = env; x != NIL; x = cdr (x))
2894 { 2869 {
2895 if (is_vector (car (x))) 2870 if (is_vector (car (x)))
2896 { 2871 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2872 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2873 y = vector_get (car (x), location);
2899 } 2874 }
2900 else 2875 else
2901 y = car (x); 2876 y = car (x);
2902 2877
2903 for (; y != NIL; y = cdr (y)) 2878 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2879 if (caar (y) == hdl)
2905 break; 2880 break;
2906 2881
2907 if (y != NIL) 2882 if (y != NIL)
2883 return car (y);
2884
2885 if (!all)
2908 break; 2886 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2887 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2888
2917 return NIL; 2889 return NIL;
2918} 2890}
2919 2891
2920#else /* USE_ALIST_ENV */ 2892#else /* USE_ALIST_ENV */
2921 2893
2922static INLINE void 2894ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2895new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2896{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2897 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2898 setenvironment (SCHEME_V->envir);
2927} 2899}
2928 2900
2929static INLINE void 2901ecb_inline void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2902new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2903{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2905}
2934 2906
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2914 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2915 if (caar (y) == hdl)
2944 break; 2916 break;
2945 2917
2946 if (y != NIL) 2918 if (y != NIL)
2919 return car (y);
2947 break; 2920 break;
2948 2921
2949 if (!all) 2922 if (!all)
2950 return NIL; 2923 break;
2951 } 2924 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2925
2956 return NIL; 2926 return NIL;
2957} 2927}
2958 2928
2959#endif /* USE_ALIST_ENV else */ 2929#endif /* USE_ALIST_ENV else */
2960 2930
2961static INLINE void 2931ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2933{
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2935}
2966 2936
2967static INLINE void 2937ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2939{
2970 set_cdr (slot, value); 2940 set_cdr (slot, value);
2971} 2941}
2972 2942
2973static INLINE pointer 2943ecb_inline pointer
2974slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2975{ 2945{
2976 return cdr (slot); 2946 return cdr (slot);
2977} 2947}
2978 2948
2979/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2980 2950
2981static pointer 2951static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2953{
2984#if USE_ERROR_HOOK 2954#if USE_ERROR_HOOK
2985 pointer x; 2955 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2956 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 2991 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 2992 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 2993 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 2994 SCHEME_V->op = OP_EVAL;
3025 2995
3026 return S_T; 2996 return 0;
3027 } 2997 }
3028#endif 2998#endif
3029 2999
3030 if (a) 3000 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3001 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3003 SCHEME_V->args = NIL;
3034 3004
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3005 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3006 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3007 SCHEME_V->op = OP_ERR0;
3008
3038 return S_T; 3009 return 0;
3039} 3010}
3040 3011
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3012#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3013#define Error_0(s) Error_1 (s, 0)
3043 3014
3044/* Too small to turn into function */ 3015/* Too small to turn into function */
3045#define BEGIN do { 3016#define BEGIN do {
3046#define END } while (0) 3017#define END } while (0)
3047#define s_goto(a) BEGIN \ 3018#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3019 SCHEME_V->op = a; \
3049 return S_T; END 3020 return 0; END
3050 3021
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3022#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3023
3053#ifndef USE_SCHEME_STACK 3024#ifndef USE_SCHEME_STACK
3054 3025
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3050 next_frame = SCHEME_V->dump_base + nframes;
3080 3051
3081 next_frame->op = op; 3052 next_frame->op = op;
3082 next_frame->args = args; 3053 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3054 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3055 next_frame->code = code;
3085 3056
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3058}
3088 3059
3089static pointer 3060static int
3090xs_return (SCHEME_P_ pointer a) 3061xs_return (SCHEME_P_ pointer a)
3091{ 3062{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3063 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3064 struct dump_stack_frame *frame;
3094 3065
3095 SCHEME_V->value = a; 3066 SCHEME_V->value = a;
3096 3067
3097 if (nframes <= 0) 3068 if (nframes <= 0)
3098 return NIL; 3069 return -1;
3099 3070
3100 frame = &SCHEME_V->dump_base[--nframes]; 3071 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3072 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3073 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3074 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3075 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3077
3107 return S_T; 3078 return 0;
3108} 3079}
3109 3080
3110static INLINE void 3081ecb_inline void
3111dump_stack_reset (SCHEME_P) 3082dump_stack_reset (SCHEME_P)
3112{ 3083{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3084 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3085 SCHEME_V->dump = (pointer)+0;
3115} 3086}
3116 3087
3117static INLINE void 3088ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3089dump_stack_initialize (SCHEME_P)
3119{ 3090{
3120 SCHEME_V->dump_size = 0; 3091 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3093 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3146 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3147 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3148
3178 while (cont != NIL) 3149 while (cont != NIL)
3179 { 3150 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3151 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3152 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3153 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3154 frame->code = car (cont) ; cont = cdr (cont);
3184 3155
3185 ++frame; 3156 ++frame;
3186 ++i; 3157 ++i;
3187 } 3158 }
3188 3159
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3160 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3161}
3191 3162
3192#else 3163#else
3193 3164
3194static INLINE void 3165ecb_inline void
3195dump_stack_reset (SCHEME_P) 3166dump_stack_reset (SCHEME_P)
3196{ 3167{
3197 SCHEME_V->dump = NIL; 3168 SCHEME_V->dump = NIL;
3198} 3169}
3199 3170
3200static INLINE void 3171ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3172dump_stack_initialize (SCHEME_P)
3202{ 3173{
3203 dump_stack_reset (SCHEME_A); 3174 dump_stack_reset (SCHEME_A);
3204} 3175}
3205 3176
… …
3207dump_stack_free (SCHEME_P) 3178dump_stack_free (SCHEME_P)
3208{ 3179{
3209 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3210} 3181}
3211 3182
3212static pointer 3183static int
3213xs_return (SCHEME_P_ pointer a) 3184xs_return (SCHEME_P_ pointer a)
3214{ 3185{
3215 pointer dump = SCHEME_V->dump; 3186 pointer dump = SCHEME_V->dump;
3216 3187
3217 SCHEME_V->value = a; 3188 SCHEME_V->value = a;
3218 3189
3219 if (dump == NIL) 3190 if (dump == NIL)
3220 return NIL; 3191 return -1;
3221 3192
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3193 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3194 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3195 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3196 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3197
3227 SCHEME_V->dump = dump; 3198 SCHEME_V->dump = dump;
3228 3199
3229 return S_T; 3200 return 0;
3230} 3201}
3231 3202
3232static void 3203static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3205{
… …
3259 3230
3260#endif 3231#endif
3261 3232
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3234
3264static pointer 3235static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3236opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3237{
3238 pointer args = SCHEME_V->args;
3267 pointer x, y; 3239 pointer x, y;
3268 3240
3269 switch (op) 3241 switch (op)
3270 { 3242 {
3271 case OP_LOAD: /* load */ 3243 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3244 if (file_interactive (SCHEME_A))
3273 { 3245 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3275 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3247 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3248 }
3277 3249
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3250 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3251 Error_1 ("unable to open", car (args));
3280 else 3252 else
3281 { 3253 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3254 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3255 s_goto (OP_T0LVL);
3284 } 3256 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3330 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3331#if USE_TRACING
3360 if (SCHEME_V->tracing) 3332 if (SCHEME_V->tracing)
3361 { 3333 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3334 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3335 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3336 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3337 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3338 s_goto (OP_P0LIST);
3367 } 3339 }
3368 3340
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3384 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3385 s_goto (OP_E1ARGS);
3414 } 3386 }
3415 3387
3416 case OP_E1ARGS: /* eval arguments */ 3388 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3389 args = cons (SCHEME_V->value, args);
3418 3390
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3391 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3392 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3393 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3394 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3395 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3396 s_goto (OP_EVAL);
3425 } 3397 }
3426 else /* end */ 3398 else /* end */
3427 { 3399 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3400 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3401 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3402 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3403 s_goto (OP_APPLY);
3432 } 3404 }
3433 3405
3434#if USE_TRACING 3406#if USE_TRACING
3435 3407
3436 case OP_TRACING: 3408 case OP_TRACING:
3437 { 3409 {
3438 int tr = SCHEME_V->tracing; 3410 int tr = SCHEME_V->tracing;
3439 3411
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3412 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3413 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3414 }
3443 3415
3444#endif 3416#endif
3445 3417
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3418 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3419#if USE_TRACING
3448 if (SCHEME_V->tracing) 3420 if (SCHEME_V->tracing)
3449 { 3421 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3422 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3423 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3424 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3425 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3426 s_goto (OP_P0LIST);
3455 } 3427 }
3456 3428
3457 /* fall through */ 3429 /* fall through */
3458 3430
3459 case OP_REAL_APPLY: 3431 case OP_REAL_APPLY:
3460#endif 3432#endif
3461 if (is_proc (SCHEME_V->code)) 3433 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3435 else if (is_foreign (SCHEME_V->code))
3466 { 3436 {
3467 /* Keep nested calls from GC'ing the arglist */ 3437 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3438 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3440
3471 s_return (x); 3441 s_return (x);
3472 } 3442 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3443 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3444 {
3475 /* Should not accept promise */ 3445 /* Should not accept promise */
3476 /* make environment */ 3446 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3447 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3448
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3449 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3450 {
3481 if (y == NIL) 3451 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3452 Error_0 ("not enough arguments");
3483 else 3453 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3454 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3472 s_goto (OP_BEGIN);
3503 } 3473 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3474 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3475 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3476 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3477 s_return (args != NIL ? car (args) : NIL);
3508 } 3478 }
3509 else 3479 else
3510 Error_0 ("illegal function"); 3480 Error_0 ("illegal function");
3511 3481
3512 case OP_DOMACRO: /* do macro */ 3482 case OP_DOMACRO: /* do macro */
… …
3521 { 3491 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3492 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3493
3524 if (f != NIL) 3494 if (f != NIL)
3525 { 3495 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3496 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3497 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3498 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3499 s_goto (OP_APPLY);
3530 } 3500 }
3531 3501
… …
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3512 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543 3513
3544#endif 3514#endif
3545 3515
3546 case OP_MKCLOSURE: /* make-closure */ 3516 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3517 x = car (args);
3548 3518
3549 if (car (x) == SCHEME_V->LAMBDA) 3519 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3520 x = cdr (x);
3551 3521
3552 if (cdr (SCHEME_V->args) == NIL) 3522 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3523 y = SCHEME_V->envir;
3554 else 3524 else
3555 y = cadr (SCHEME_V->args); 3525 y = cadr (args);
3556 3526
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3527 s_return (mk_closure (SCHEME_A_ x, y));
3558 3528
3559 case OP_QUOTE: /* quote */ 3529 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3530 s_return (car (SCHEME_V->code));
… …
3592 3562
3593 3563
3594 case OP_DEFP: /* defined? */ 3564 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3565 x = SCHEME_V->envir;
3596 3566
3597 if (cdr (SCHEME_V->args) != NIL) 3567 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3568 x = cadr (args);
3599 3569
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3570 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3571
3602 case OP_SET0: /* set! */ 3572 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3573 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3574 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3575
… …
3636 3606
3637 case OP_IF1: /* if */ 3607 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3608 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3609 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3610 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3611 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3612 s_goto (OP_EVAL);
3645 3613
3646 case OP_LET0: /* let */ 3614 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3615 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3616 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3617 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 3618 s_goto (OP_LET1);
3651 3619
3652 case OP_LET1: /* let (calculate parameters) */ 3620 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3621 args = cons (SCHEME_V->value, args);
3654 3622
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3623 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3624 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3625 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3658 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3626 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3659 3627
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3628 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3629 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3630 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3631 s_goto (OP_EVAL);
3664 } 3632 }
3665 else /* end */ 3633 else /* end */
3666 { 3634 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3635 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3636 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3637 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3638 s_goto (OP_LET2);
3671 } 3639 }
3672 3640
3673 case OP_LET2: /* let */ 3641 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3642 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3643
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3644 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3677 y != NIL; x = cdr (x), y = cdr (y)) 3645 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3646 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3647
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3648 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3649 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3650 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 3651 {
3684 if (!is_pair (x)) 3652 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3653 Error_1 ("Bad syntax of binding in let :", x);
3686 3654
3687 if (!is_list (SCHEME_A_ car (x))) 3655 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3656 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3657
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3658 args = cons (caar (x), args);
3691 } 3659 }
3692 3660
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3661 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 3662 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3663 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3664 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3665 }
3700 else 3666 else
3701 { 3667 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3669 }
3670
3703 SCHEME_V->args = NIL; 3671 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3672 s_goto (OP_BEGIN);
3707 3673
3708 case OP_LET0AST: /* let* */ 3674 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3675 if (car (SCHEME_V->code) == NIL)
3710 { 3676 {
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3694 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3695 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3696
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3697 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3698 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3699 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3737 } 3703 }
3738 else /* end */ 3704 else /* end */
3739 { 3705 {
3740 SCHEME_V->code = SCHEME_V->args; 3706 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3707 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3708 s_goto (OP_BEGIN);
3743 } 3709 }
3744 3710
3745 case OP_LET0REC: /* letrec */ 3711 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3714 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3715 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3716 s_goto (OP_LET1REC);
3751 3717
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3718 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3719 args = cons (SCHEME_V->value, args);
3754 3720
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3721 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3722 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3723 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3758 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3724 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759 3725
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3726 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3727 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3728 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3729 s_goto (OP_EVAL);
3764 } 3730 }
3765 else /* end */ 3731 else /* end */
3766 { 3732 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3733 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3734 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3735 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3736 s_goto (OP_LET2REC);
3771 } 3737 }
3772 3738
3773 case OP_LET2REC: /* letrec */ 3739 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3740 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3775 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3741 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3742
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3743 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3744 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3745 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3831 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3832 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3833 s_goto (OP_EVAL);
3868 3834
3869 case OP_C1STREAM: /* cons-stream */ 3835 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3836 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3871 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3837 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 3838 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3839 s_return (cons (args, x));
3874 3840
3875 case OP_MACRO0: /* macro */ 3841 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3842 if (is_pair (car (SCHEME_V->code)))
3877 { 3843 {
3878 x = caar (SCHEME_V->code); 3844 x = caar (SCHEME_V->code);
… …
3911 { 3877 {
3912 if (!is_pair (y = caar (x))) 3878 if (!is_pair (y = caar (x)))
3913 break; 3879 break;
3914 3880
3915 for (; y != NIL; y = cdr (y)) 3881 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3882 if (eqv (car (y), SCHEME_V->value))
3918 break; 3883 break;
3919 }
3920 3884
3921 if (y != NIL) 3885 if (y != NIL)
3922 break; 3886 break;
3923 } 3887 }
3924 3888
… …
3944 s_goto (OP_BEGIN); 3908 s_goto (OP_BEGIN);
3945 else 3909 else
3946 s_return (NIL); 3910 s_return (NIL);
3947 3911
3948 case OP_PAPPLY: /* apply */ 3912 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3913 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3914 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3915 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3916 s_goto (OP_APPLY);
3953 3917
3954 case OP_PEVAL: /* eval */ 3918 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3919 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3920 SCHEME_V->envir = cadr (args);
3957 3921
3958 SCHEME_V->code = car (SCHEME_V->args); 3922 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 3923 s_goto (OP_EVAL);
3960 3924
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 3925 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3927 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 3928 s_goto (OP_APPLY);
3965 } 3929 }
3966 3930
3967 return S_T; 3931 if (USE_ERROR_CHECKING) abort ();
3968} 3932}
3969 3933
3970static pointer 3934static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3935opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 3936{
3973 pointer x; 3937 pointer args = SCHEME_V->args;
3938 pointer x = car (args);
3974 num v; 3939 num v;
3975 3940
3941 switch (op)
3942 {
3976#if USE_MATH 3943#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 3944 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 3945 {
3986
3987 if (num_is_integer (x)) 3946 if (is_integer (x))
3988 s_return (x); 3947 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3948
3949 RVALUE r = rvalue_unchecked (x);
3950
3951 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 3953 else
3992 Error_1 ("inexact->exact: not integral:", x); 3954 Error_1 ("inexact->exact: not integral:", x);
3955 }
3993 3956
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3957 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3997
3998 case OP_LOG:
3999 x = car (SCHEME_V->args);
4000 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3958 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4001
4002 case OP_SIN:
4003 x = car (SCHEME_V->args);
4004 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3959 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4005
4006 case OP_COS:
4007 x = car (SCHEME_V->args);
4008 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3960 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4009
4010 case OP_TAN:
4011 x = car (SCHEME_V->args);
4012 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3961 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4013
4014 case OP_ASIN:
4015 x = car (SCHEME_V->args);
4016 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3962 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4017
4018 case OP_ACOS:
4019 x = car (SCHEME_V->args);
4020 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3963 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 3964
4022 case OP_ATAN: 3965 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 3966 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3967 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 3968 else
4028 { 3969 {
4029 pointer y = cadr (SCHEME_V->args); 3970 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3971 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 3972 }
4033 3973
4034 case OP_SQRT: 3974 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3975 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 3976
4038 case OP_EXPT: 3977 case OP_EXPT:
4039 { 3978 {
4040 RVALUE result; 3979 RVALUE result;
4041 int real_result = 1; 3980 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 3981 pointer y = cadr (args);
4043 3982
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 3983 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 3984 real_result = 0;
4048 3985
4049 /* This 'if' is an R5RS compatibility fix. */ 3986 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 3987 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 3988 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 3989 result = 0;
4053 else 3990 else
4054 result = pow (rvalue (x), rvalue (y)); 3991 result = pow (rvalue (x), rvalue (y));
4055 3992
4056 /* Before returning integer result make sure we can. */ 3993 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 3994 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 3995 if (!real_result)
4059 { 3996 {
4060 long result_as_long = (long) result; 3997 long result_as_long = result;
4061 3998
4062 if (result != (RVALUE) result_as_long) 3999 if (result != result_as_long)
4063 real_result = 1; 4000 real_result = 1;
4064 } 4001 }
4065 4002
4066 if (real_result) 4003 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4004 s_return (mk_real (SCHEME_A_ result));
4068 else 4005 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4006 s_return (mk_integer (SCHEME_A_ result));
4070 } 4007 }
4071 4008
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4009 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4075
4076 case OP_CEILING:
4077 x = car (SCHEME_V->args);
4078 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4010 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4011
4080 case OP_TRUNCATE: 4012 case OP_TRUNCATE:
4081 { 4013 {
4082 RVALUE rvalue_of_x; 4014 RVALUE n = rvalue (x);
4083
4084 x = car (SCHEME_V->args);
4085 rvalue_of_x = rvalue (x);
4086
4087 if (rvalue_of_x > 0)
4088 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4015 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4089 else
4090 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4091 } 4016 }
4092 4017
4093 case OP_ROUND: 4018 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4019 if (is_integer (x))
4097 s_return (x); 4020 s_return (x);
4098 4021
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4022 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4023#endif
4101 4024
4102 case OP_ADD: /* + */ 4025 case OP_ADD: /* + */
4103 v = num_zero; 4026 v = num_zero;
4104 4027
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4028 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4029 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4030
4108 s_return (mk_number (SCHEME_A_ v)); 4031 s_return (mk_number (SCHEME_A_ v));
4109 4032
4110 case OP_MUL: /* * */ 4033 case OP_MUL: /* * */
4111 v = num_one; 4034 v = num_one;
4112 4035
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4036 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4037 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4038
4116 s_return (mk_number (SCHEME_A_ v)); 4039 s_return (mk_number (SCHEME_A_ v));
4117 4040
4118 case OP_SUB: /* - */ 4041 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4042 if (cdr (args) == NIL)
4120 { 4043 {
4121 x = SCHEME_V->args; 4044 x = args;
4122 v = num_zero; 4045 v = num_zero;
4123 } 4046 }
4124 else 4047 else
4125 { 4048 {
4126 x = cdr (SCHEME_V->args); 4049 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4050 v = nvalue (car (args));
4128 } 4051 }
4129 4052
4130 for (; x != NIL; x = cdr (x)) 4053 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4054 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4055
4133 s_return (mk_number (SCHEME_A_ v)); 4056 s_return (mk_number (SCHEME_A_ v));
4134 4057
4135 case OP_DIV: /* / */ 4058 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4059 if (cdr (args) == NIL)
4137 { 4060 {
4138 x = SCHEME_V->args; 4061 x = args;
4139 v = num_one; 4062 v = num_one;
4140 } 4063 }
4141 else 4064 else
4142 { 4065 {
4143 x = cdr (SCHEME_V->args); 4066 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4067 v = nvalue (car (args));
4145 } 4068 }
4146 4069
4147 for (; x != NIL; x = cdr (x)) 4070 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4071 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4072 v = num_div (v, nvalue (car (x)));
4151 else 4073 else
4152 Error_0 ("/: division by zero"); 4074 Error_0 ("/: division by zero");
4153 }
4154 4075
4155 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4156 4077
4157 case OP_INTDIV: /* quotient */ 4078 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4079 if (cdr (args) == NIL)
4159 { 4080 {
4160 x = SCHEME_V->args; 4081 x = args;
4161 v = num_one; 4082 v = num_one;
4162 } 4083 }
4163 else 4084 else
4164 { 4085 {
4165 x = cdr (SCHEME_V->args); 4086 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4087 v = nvalue (car (args));
4167 } 4088 }
4168 4089
4169 for (; x != NIL; x = cdr (x)) 4090 for (; x != NIL; x = cdr (x))
4170 { 4091 {
4171 if (ivalue (car (x)) != 0) 4092 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4093 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4094 else
4174 Error_0 ("quotient: division by zero"); 4095 Error_0 ("quotient: division by zero");
4175 } 4096 }
4176 4097
4177 s_return (mk_number (SCHEME_A_ v)); 4098 s_return (mk_number (SCHEME_A_ v));
4178 4099
4179 case OP_REM: /* remainder */ 4100 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4101 v = nvalue (x);
4181 4102
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4103 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4104 v = num_rem (v, nvalue (cadr (args)));
4184 else 4105 else
4185 Error_0 ("remainder: division by zero"); 4106 Error_0 ("remainder: division by zero");
4186 4107
4187 s_return (mk_number (SCHEME_A_ v)); 4108 s_return (mk_number (SCHEME_A_ v));
4188 4109
4189 case OP_MOD: /* modulo */ 4110 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4111 v = nvalue (x);
4191 4112
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4113 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4114 v = num_mod (v, nvalue (cadr (args)));
4194 else 4115 else
4195 Error_0 ("modulo: division by zero"); 4116 Error_0 ("modulo: division by zero");
4196 4117
4197 s_return (mk_number (SCHEME_A_ v)); 4118 s_return (mk_number (SCHEME_A_ v));
4198 4119
4199 case OP_CAR: /* car */ 4120 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4121 s_return (caar (args));
4201 4122
4202 case OP_CDR: /* cdr */ 4123 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4124 s_return (cdar (args));
4204 4125
4205 case OP_CONS: /* cons */ 4126 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4127 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4128 s_return (args);
4208 4129
4209 case OP_SETCAR: /* set-car! */ 4130 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4131 if (!is_immutable (x))
4211 { 4132 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4133 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4134 s_return (car (args));
4214 } 4135 }
4215 else 4136 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4137 Error_0 ("set-car!: unable to alter immutable pair");
4217 4138
4218 case OP_SETCDR: /* set-cdr! */ 4139 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4140 if (!is_immutable (x))
4220 { 4141 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4142 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4143 s_return (car (args));
4223 } 4144 }
4224 else 4145 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4146 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4147
4227 case OP_CHAR2INT: /* char->integer */ 4148 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4149 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4150
4230 case OP_INT2CHAR: /* integer->char */ 4151 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4152 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4153
4233 case OP_CHARUPCASE: 4154 case OP_CHARUPCASE:
4234 { 4155 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4156 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4157 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4158 s_return (mk_character (SCHEME_A_ c));
4238 } 4159 }
4239 4160
4240 case OP_CHARDNCASE: 4161 case OP_CHARDNCASE:
4241 { 4162 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4163 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4164 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4165 s_return (mk_character (SCHEME_A_ c));
4245 } 4166 }
4246 4167
4247 case OP_STR2SYM: /* string->symbol */ 4168 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4169 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4170
4250 case OP_STR2ATOM: /* string->atom */ 4171 case OP_STR2ATOM: /* string->atom */
4251 { 4172 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4173 char *s = strvalue (x);
4253 long pf = 0; 4174 long pf = 0;
4254 4175
4255 if (cdr (SCHEME_V->args) != NIL) 4176 if (cdr (args) != NIL)
4256 { 4177 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4178 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4179 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4180 pf = ivalue_unchecked (cadr (args));
4260 4181
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4182 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4183 {
4263 /* base is OK */ 4184 /* base is OK */
4264 } 4185 }
4265 else 4186 else
4266 pf = -1; 4187 pf = -1;
4267 } 4188 }
4268 4189
4269 if (pf < 0) 4190 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4191 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4192 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4193 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4194 else
4274 { 4195 {
4275 if (pf == 0 || pf == 10) 4196 if (pf == 0 || pf == 10)
… …
4286 } 4207 }
4287 } 4208 }
4288 } 4209 }
4289 4210
4290 case OP_SYM2STR: /* symbol->string */ 4211 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4212 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4213 setimmutable (x);
4293 s_return (x); 4214 s_return (x);
4294 4215
4295 case OP_ATOM2STR: /* atom->string */ 4216 case OP_ATOM2STR: /* atom->string */
4296 { 4217 {
4297 long pf = 0; 4218 long pf = 0;
4298 4219
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4220 if (cdr (args) != NIL)
4302 { 4221 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4222 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4223 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4224 pf = ivalue_unchecked (cadr (args));
4306 4225
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4226 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4227 {
4309 /* base is OK */ 4228 /* base is OK */
4310 } 4229 }
4311 else 4230 else
4312 pf = -1; 4231 pf = -1;
4313 } 4232 }
4314 4233
4315 if (pf < 0) 4234 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4235 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4236 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4237 {
4319 char *p; 4238 char *p;
4320 int len; 4239 int len;
4321 4240
… …
4326 Error_1 ("atom->string: not an atom:", x); 4245 Error_1 ("atom->string: not an atom:", x);
4327 } 4246 }
4328 4247
4329 case OP_MKSTRING: /* make-string */ 4248 case OP_MKSTRING: /* make-string */
4330 { 4249 {
4331 int fill = ' '; 4250 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4251 int len = ivalue_unchecked (x);
4333 4252
4334 len = ivalue (car (SCHEME_V->args));
4335
4336 if (cdr (SCHEME_V->args) != NIL)
4337 fill = charvalue (cadr (SCHEME_V->args));
4338
4339 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4253 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4254 }
4341 4255
4342 case OP_STRLEN: /* string-length */ 4256 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4257 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4258
4345 case OP_STRREF: /* string-ref */ 4259 case OP_STRREF: /* string-ref */
4346 { 4260 {
4347 char *str; 4261 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4262 int index = ivalue_unchecked (cadr (args));
4353 4263
4354 if (index >= strlength (car (SCHEME_V->args))) 4264 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4265 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4266
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4268 }
4359 4269
4360 case OP_STRSET: /* string-set! */ 4270 case OP_STRSET: /* string-set! */
4361 { 4271 {
4362 char *str; 4272 char *str = strvalue (x);
4363 int index; 4273 int index = ivalue_unchecked (cadr (args));
4364 int c; 4274 int c;
4365 4275
4366 if (is_immutable (car (SCHEME_V->args))) 4276 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4277 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4278
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4279 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4280 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4281
4376 c = charvalue (caddr (SCHEME_V->args)); 4282 c = charvalue (caddr (args));
4377 4283
4378 str[index] = (char) c; 4284 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4285 s_return (car (args));
4380 } 4286 }
4381 4287
4382 case OP_STRAPPEND: /* string-append */ 4288 case OP_STRAPPEND: /* string-append */
4383 { 4289 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4290 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4291 int len = 0;
4386 pointer newstr; 4292 pointer newstr;
4387 char *pos; 4293 char *pos;
4388 4294
4389 /* compute needed length for new string */ 4295 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4296 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4297 len += strlength (car (x));
4392 4298
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4299 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4300
4395 /* store the contents of the argument strings into the new string */ 4301 /* store the contents of the argument strings into the new string */
4396 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4302 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4303 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4304
4399 s_return (newstr); 4305 s_return (newstr);
4400 } 4306 }
4401 4307
4402 case OP_SUBSTR: /* substring */ 4308 case OP_SUBSTR: /* substring */
4403 { 4309 {
4404 char *str; 4310 char *str = strvalue (x);
4405 int index0; 4311 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4312 int index1;
4407 int len; 4313 int len;
4408 4314
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4315 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4316 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4317
4416 if (cddr (SCHEME_V->args) != NIL) 4318 if (cddr (args) != NIL)
4417 { 4319 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4320 index1 = ivalue_unchecked (caddr (args));
4419 4321
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4322 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4323 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4324 }
4423 else 4325 else
4424 index1 = strlength (car (SCHEME_V->args)); 4326 index1 = strlength (x);
4425 4327
4426 len = index1 - index0; 4328 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4329 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4330 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4331 strvalue (x)[len] = 0;
… …
4433 4335
4434 case OP_VECTOR: /* vector */ 4336 case OP_VECTOR: /* vector */
4435 { 4337 {
4436 int i; 4338 int i;
4437 pointer vec; 4339 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4340 int len = list_length (SCHEME_A_ args);
4439 4341
4440 if (len < 0) 4342 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4343 Error_1 ("vector: not a proper list:", args);
4442 4344
4443 vec = mk_vector (SCHEME_A_ len); 4345 vec = mk_vector (SCHEME_A_ len);
4444 4346
4445#if USE_ERROR_CHECKING 4347#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4348 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4349 s_return (S_SINK);
4448#endif 4350#endif
4449 4351
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4352 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4353 vector_set (vec, i, car (x));
4452 4354
4453 s_return (vec); 4355 s_return (vec);
4454 } 4356 }
4455 4357
4456 case OP_MKVECTOR: /* make-vector */ 4358 case OP_MKVECTOR: /* make-vector */
4457 { 4359 {
4458 pointer fill = NIL; 4360 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4361 pointer vec;
4362 int len = ivalue_unchecked (x);
4461 4363
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4364 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4365 fill = cadr (args);
4466 4366
4467 vec = mk_vector (SCHEME_A_ len); 4367 vec = mk_vector (SCHEME_A_ len);
4468 4368
4469#if USE_ERROR_CHECKING 4369#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4370 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4371 s_return (S_SINK);
4472#endif 4372#endif
4473 4373
4474 if (fill != NIL) 4374 if (fill != NIL)
4475 fill_vector (vec, fill); 4375 fill_vector (vec, 0, fill);
4476 4376
4477 s_return (vec); 4377 s_return (vec);
4478 } 4378 }
4479 4379
4480 case OP_VECLEN: /* vector-length */ 4380 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4381 s_return (mk_integer (SCHEME_A_ veclength (x)));
4482 4382
4483 case OP_VECREF: /* vector-ref */ 4383 case OP_VECREF: /* vector-ref */
4484 { 4384 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4385 int index = ivalue_unchecked (cadr (args));
4488 4386
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4388 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4389
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4390 s_return (vector_get (x, index));
4493 } 4391 }
4494 4392
4495 case OP_VECSET: /* vector-set! */ 4393 case OP_VECSET: /* vector-set! */
4496 { 4394 {
4497 int index; 4395 int index = ivalue_unchecked (cadr (args));
4498 4396
4499 if (is_immutable (car (SCHEME_V->args))) 4397 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4398 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4399
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4402
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4403 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4404 s_return (x);
4509 } 4405 }
4510 } 4406 }
4511 4407
4512 return S_T; 4408 if (USE_ERROR_CHECKING) abort ();
4513} 4409}
4514 4410
4515INTERFACE int 4411static int
4516is_list (SCHEME_P_ pointer a) 4412opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4413{
4518 return list_length (SCHEME_A_ a) >= 0; 4414 pointer x = SCHEME_V->args;
4519}
4520 4415
4521/* Result is: 4416 for (;;)
4522 proper list: length
4523 circular list: -1
4524 not even a pair: -2
4525 dotted list: -2 minus length before dot
4526*/
4527INTERFACE int
4528list_length (SCHEME_P_ pointer a)
4529{
4530 int i = 0;
4531 pointer slow, fast;
4532
4533 slow = fast = a;
4534
4535 while (1)
4536 { 4417 {
4418 num v = nvalue (car (x));
4419 x = cdr (x);
4420
4537 if (fast == NIL) 4421 if (x == NIL)
4538 return i; 4422 break;
4539 4423
4540 if (!is_pair (fast)) 4424 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4425
4543 fast = cdr (fast); 4426 switch (op)
4544 ++i;
4545
4546 if (fast == NIL)
4547 return i;
4548
4549 if (!is_pair (fast))
4550 return -2 - i;
4551
4552 ++i;
4553 fast = cdr (fast);
4554
4555 /* Safe because we would have already returned if `fast'
4556 encountered a non-pair. */
4557 slow = cdr (slow);
4558
4559 if (fast == slow)
4560 { 4427 {
4561 /* the fast pointer has looped back around and caught up 4428 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4429 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4430 case OP_GRE: r = r > 0; break;
4564 return -1; 4431 case OP_LEQ: r = r <= 0; break;
4432 case OP_GEQ: r = r >= 0; break;
4565 } 4433 }
4566 }
4567}
4568 4434
4435 if (!r)
4436 s_return (S_F);
4437 }
4438
4439 s_return (S_T);
4440}
4441
4569static pointer 4442static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4443opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4444{
4572 pointer x; 4445 pointer args = SCHEME_V->args;
4573 num v; 4446 pointer a = car (args);
4574 int (*comp_func) (num, num); 4447 pointer d = cdr (args);
4448 int r;
4575 4449
4576 switch (op) 4450 switch (op)
4577 { 4451 {
4578 case OP_NOT: /* not */ 4452 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4453 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4462
4581 case OP_BOOLP: /* boolean? */
4582 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4583
4584 case OP_EOFOBJP: /* boolean? */
4585 s_retbool (car (SCHEME_V->args) == S_EOF);
4586
4587 case OP_NULLP: /* null? */
4588 s_retbool (car (SCHEME_V->args) == NIL);
4589
4590 case OP_NUMEQ: /* = */
4591 case OP_LESS: /* < */
4592 case OP_GRE: /* > */
4593 case OP_LEQ: /* <= */
4594 case OP_GEQ: /* >= */
4595 switch (op)
4596 {
4597 case OP_NUMEQ:
4598 comp_func = num_eq;
4599 break;
4600
4601 case OP_LESS:
4602 comp_func = num_lt;
4603 break;
4604
4605 case OP_GRE:
4606 comp_func = num_gt;
4607 break;
4608
4609 case OP_LEQ:
4610 comp_func = num_le;
4611 break;
4612
4613 case OP_GEQ:
4614 comp_func = num_ge;
4615 break;
4616 }
4617
4618 x = SCHEME_V->args;
4619 v = nvalue (car (x));
4620 x = cdr (x);
4621
4622 for (; x != NIL; x = cdr (x))
4623 {
4624 if (!comp_func (v, nvalue (car (x))))
4625 s_retbool (0);
4626
4627 v = nvalue (car (x));
4628 }
4629
4630 s_retbool (1);
4631
4632 case OP_SYMBOLP: /* symbol? */
4633 s_retbool (is_symbol (car (SCHEME_V->args)));
4634
4635 case OP_NUMBERP: /* number? */
4636 s_retbool (is_number (car (SCHEME_V->args)));
4637
4638 case OP_STRINGP: /* string? */
4639 s_retbool (is_string (car (SCHEME_V->args)));
4640
4641 case OP_INTEGERP: /* integer? */
4642 s_retbool (is_integer (car (SCHEME_V->args)));
4643
4644 case OP_REALP: /* real? */
4645 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4646
4647 case OP_CHARP: /* char? */
4648 s_retbool (is_character (car (SCHEME_V->args)));
4649#if USE_CHAR_CLASSIFIERS 4463#if USE_CHAR_CLASSIFIERS
4650 4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4467 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4468 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4655 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4656
4657 case OP_CHARWP: /* char-whitespace? */
4658 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4659
4660 case OP_CHARUP: /* char-upper-case? */
4661 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARLP: /* char-lower-case? */
4664 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4665#endif 4469#endif
4470
4666#if USE_PORTS 4471#if USE_PORTS
4667 4472 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4668 case OP_PORTP: /* port? */
4669 s_retbool (is_port (car (SCHEME_V->args)));
4670
4671 case OP_INPORTP: /* input-port? */ 4473 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4672 s_retbool (is_inport (car (SCHEME_V->args)));
4673
4674 case OP_OUTPORTP: /* output-port? */ 4474 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4475#endif
4677 4476
4678 case OP_PROCP: /* procedure? */ 4477 case OP_PROCP: /* procedure? */
4679 4478
4680 /*-- 4479 /*--
4681 * continuation should be procedure by the example 4480 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4481 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4482 * in R^3 report sec. 6.9
4684 */ 4483 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4484 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4686 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4485 break;
4687 4486
4688 case OP_PAIRP: /* pair? */ 4487 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4488 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4489 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4490 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4491 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4492 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4694 case OP_ENVP: /* environment? */
4695 s_retbool (is_environment (car (SCHEME_V->args)));
4696
4697 case OP_VECTORP: /* vector? */
4698 s_retbool (is_vector (car (SCHEME_V->args)));
4699
4700 case OP_EQ: /* eq? */
4701 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4702
4703 case OP_EQV: /* eqv? */
4704 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4705 } 4493 }
4706 4494
4707 return S_T; 4495 s_retbool (r);
4708} 4496}
4709 4497
4710static pointer 4498static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4500{
4501 pointer args = SCHEME_V->args;
4502 pointer a = car (args);
4713 pointer x, y; 4503 pointer x, y;
4714 4504
4715 switch (op) 4505 switch (op)
4716 { 4506 {
4717 case OP_FORCE: /* force */ 4507 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4508 SCHEME_V->code = a;
4719 4509
4720 if (is_promise (SCHEME_V->code)) 4510 if (is_promise (SCHEME_V->code))
4721 { 4511 {
4722 /* Should change type to closure here */ 4512 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4513 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4534 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4535 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4536 }
4747 } 4537 }
4748 4538
4749 SCHEME_V->args = car (SCHEME_V->args); 4539 SCHEME_V->args = a;
4750 4540
4751 if (op == OP_WRITE) 4541 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4542 SCHEME_V->print_flag = 1;
4753 else 4543 else
4754 SCHEME_V->print_flag = 0; 4544 SCHEME_V->print_flag = 0;
4755 4545
4756 s_goto (OP_P0LIST); 4546 s_goto (OP_P0LIST);
4757 4547
4758 case OP_NEWLINE: /* newline */ 4548 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4549 if (is_pair (args))
4760 { 4550 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4551 if (a != SCHEME_V->outport)
4762 { 4552 {
4763 x = cons (SCHEME_V->outport, NIL); 4553 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4554 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4555 SCHEME_V->outport = a;
4766 } 4556 }
4767 } 4557 }
4768 4558
4769 putstr (SCHEME_A_ "\n"); 4559 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4560 s_return (S_T);
4771#endif 4561#endif
4772 4562
4773 case OP_ERR0: /* error */ 4563 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4564 SCHEME_V->retcode = -1;
4775 4565
4776 if (!is_string (car (SCHEME_V->args))) 4566 if (!is_string (a))
4777 { 4567 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4568 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4569 setimmutable (car (args));
4780 } 4570 }
4781 4571
4782 putstr (SCHEME_A_ "Error: "); 4572 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4573 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4574 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4575 s_goto (OP_ERR1);
4786 4576
4787 case OP_ERR1: /* error */ 4577 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4578 putstr (SCHEME_A_ " ");
4789 4579
4790 if (SCHEME_V->args != NIL) 4580 if (args != NIL)
4791 { 4581 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4582 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4583 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4584 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4585 s_goto (OP_P0LIST);
4796 } 4586 }
4797 else 4587 else
4798 { 4588 {
4799 putstr (SCHEME_A_ "\n"); 4589 putstr (SCHEME_A_ "\n");
4800 4590
4801 if (SCHEME_V->interactive_repl) 4591 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4592 s_goto (OP_T0LVL);
4803 else 4593 else
4804 return NIL; 4594 return -1;
4805 } 4595 }
4806 4596
4807 case OP_REVERSE: /* reverse */ 4597 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4598 s_return (reverse (SCHEME_A_ a));
4809 4599
4810 case OP_LIST_STAR: /* list* */ 4600 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4601 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4602
4813 case OP_APPEND: /* append */ 4603 case OP_APPEND: /* append */
4814 x = NIL; 4604 x = NIL;
4815 y = SCHEME_V->args; 4605 y = args;
4816 4606
4817 if (y == x) 4607 if (y == x)
4818 s_return (x); 4608 s_return (x);
4819 4609
4820 /* cdr() in the while condition is not a typo. If car() */ 4610 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4621 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4622
4833#if USE_PLIST 4623#if USE_PLIST
4834 4624
4835 case OP_PUT: /* put */ 4625 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4626 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4627 Error_0 ("illegal use of put");
4838 4628
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4629 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4630 {
4841 if (caar (x) == y) 4631 if (caar (x) == y)
4842 break; 4632 break;
4843 } 4633 }
4844 4634
4845 if (x != NIL) 4635 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4636 cdar (x) = caddr (args);
4847 else 4637 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4638 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4639
4850 s_return (S_T); 4640 s_return (S_T);
4851 4641
4852 case OP_GET: /* get */ 4642 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4643 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4644 Error_0 ("illegal use of get");
4855 4645
4856 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))
4857 if (caar (x) == y) 4647 if (caar (x) == y)
4858 break; 4648 break;
4859 4649
4860 if (x != NIL) 4650 if (x != NIL)
4861 s_return (cdar (x)); 4651 s_return (cdar (x));
… …
4863 s_return (NIL); 4653 s_return (NIL);
4864 4654
4865#endif /* USE_PLIST */ 4655#endif /* USE_PLIST */
4866 4656
4867 case OP_QUIT: /* quit */ 4657 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4658 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4659 SCHEME_V->retcode = ivalue (a);
4870 4660
4871 return NIL; 4661 return -1;
4872 4662
4873 case OP_GC: /* gc */ 4663 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4664 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4665 s_return (S_T);
4876 4666
4877 case OP_GCVERB: /* gc-verbose */ 4667 case OP_GCVERB: /* gc-verbose */
4878 { 4668 {
4879 int was = SCHEME_V->gc_verbose; 4669 int was = SCHEME_V->gc_verbose;
4880 4670
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4671 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4672 s_retbool (was);
4883 } 4673 }
4884 4674
4885 case OP_NEWSEGMENT: /* new-segment */ 4675 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4676 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4677 Error_0 ("new-segment: argument must be a number");
4888 4678
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4679 alloc_cellseg (SCHEME_A_ ivalue (a));
4890 4680
4891 s_return (S_T); 4681 s_return (S_T);
4892 4682
4893 case OP_OBLIST: /* oblist */ 4683 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4684 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4711 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4712 prop = port_input | port_output;
4923 break; 4713 break;
4924 } 4714 }
4925 4715
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4716 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4717
4928 if (p == NIL) 4718 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4719 }
4933 4720
4934# if USE_STRING_PORTS 4721# if USE_STRING_PORTS
4935 4722
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4723 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4735 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4736 prop = port_input | port_output;
4950 break; 4737 break;
4951 } 4738 }
4952 4739
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4740 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4741 strvalue (a) + strlength (a), prop);
4955 4742
4956 if (p == NIL) 4743 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4744 }
4961 4745
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4746 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4747 {
4964 pointer p; 4748 pointer p;
4965 4749
4966 if (car (SCHEME_V->args) == NIL) 4750 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4751 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4752 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4754 strvalue (a) + strlength (a), port_output);
4977 4755
4978 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4757 }
4984 4758
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4759 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4760 {
4987 port *p; 4761 port *p;
4988 4762
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4763 if ((p = a->object.port)->kind & port_string)
4990 { 4764 {
4991 off_t size; 4765 off_t size;
4992 char *str; 4766 char *str;
4993 4767
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4768 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4784 }
5011 4785
5012# endif 4786# endif
5013 4787
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4788 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4789 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4790 s_return (S_T);
5017 4791
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4792 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4793 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4794 s_return (S_T);
5021#endif 4795#endif
5022 4796
5023 case OP_INT_ENV: /* interaction-environment */ 4797 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4798 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4800 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4801 s_return (SCHEME_V->envir);
5028 4802
5029 } 4803 }
5030 4804
5031 return S_T; 4805 if (USE_ERROR_CHECKING) abort ();
5032} 4806}
5033 4807
5034static pointer 4808static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4809opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4810{
4811 pointer args = SCHEME_V->args;
5037 pointer x; 4812 pointer x;
5038 4813
5039 if (SCHEME_V->nesting != 0) 4814 if (SCHEME_V->nesting != 0)
5040 { 4815 {
5041 int n = SCHEME_V->nesting; 4816 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4823 switch (op)
5049 { 4824 {
5050 /* ========== reading part ========== */ 4825 /* ========== reading part ========== */
5051#if USE_PORTS 4826#if USE_PORTS
5052 case OP_READ: 4827 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4828 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4829 s_goto (OP_READ_INTERNAL);
5055 4830
5056 if (!is_inport (car (SCHEME_V->args))) 4831 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4832 Error_1 ("read: not an input port:", car (args));
5058 4833
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4834 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4835 s_goto (OP_READ_INTERNAL);
5061 4836
5062 x = SCHEME_V->inport; 4837 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4838 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4839 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4840 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4841 s_goto (OP_READ_INTERNAL);
5067 4842
5068 case OP_READ_CHAR: /* read-char */ 4843 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4844 case OP_PEEK_CHAR: /* peek-char */
5070 { 4845 {
5071 int c; 4846 int c;
5072 4847
5073 if (is_pair (SCHEME_V->args)) 4848 if (is_pair (args))
5074 { 4849 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4850 if (car (args) != SCHEME_V->inport)
5076 { 4851 {
5077 x = SCHEME_V->inport; 4852 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4853 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4854 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4855 SCHEME_V->inport = car (args);
5081 } 4856 }
5082 } 4857 }
5083 4858
5084 c = inchar (SCHEME_A); 4859 c = inchar (SCHEME_A);
5085 4860
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4870 case OP_CHAR_READY: /* char-ready? */
5096 { 4871 {
5097 pointer p = SCHEME_V->inport; 4872 pointer p = SCHEME_V->inport;
5098 int res; 4873 int res;
5099 4874
5100 if (is_pair (SCHEME_V->args)) 4875 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4876 p = car (args);
5102 4877
5103 res = p->object.port->kind & port_string; 4878 res = p->object.port->kind & port_string;
5104 4879
5105 s_retbool (res); 4880 s_retbool (res);
5106 } 4881 }
5107 4882
5108 case OP_SET_INPORT: /* set-input-port */ 4883 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4884 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4885 s_return (SCHEME_V->value);
5111 4886
5112 case OP_SET_OUTPORT: /* set-output-port */ 4887 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4888 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4889 s_return (SCHEME_V->value);
5115#endif 4890#endif
5116 4891
5117 case OP_RDSEXPR: 4892 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4893 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4942 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 4943 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 4944 s_goto (OP_RDSEXPR);
5170 4945
5171 case TOK_ATOM: 4946 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948
4949 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4952
4953 case TOK_STRATOM:
4954 x = readstrexp (SCHEME_A_ '|');
4955 //TODO: haven't checked whether the garbage collector could interfere
4956 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 4957
5174 case TOK_DQUOTE: 4958 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 4959 x = readstrexp (SCHEME_A_ '"');
5176 4960
5177 if (x == S_F) 4961 if (x == S_F)
5178 Error_0 ("Error reading string"); 4962 Error_0 ("Error reading string");
5179 4963
5180 setimmutable (x); 4964 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 4976 s_goto (OP_EVAL);
5193 } 4977 }
5194 } 4978 }
5195 4979
5196 case TOK_SHARP_CONST: 4980 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4981 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 4982 Error_0 ("undefined sharp expression");
5199 else 4983 else
5200 s_return (x); 4984 s_return (x);
5201 4985
5202 default: 4986 default:
… …
5204 } 4988 }
5205 4989
5206 break; 4990 break;
5207 4991
5208 case OP_RDLIST: 4992 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4993 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 4994 SCHEME_V->tok = token (SCHEME_A);
5211 4995
5212 switch (SCHEME_V->tok) 4996 switch (SCHEME_V->tok)
5213 { 4997 {
5214 case TOK_EOF: 4998 case TOK_EOF:
… …
5242 case OP_RDDOT: 5026 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5027 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5028 Error_0 ("syntax error: illegal dot expression");
5245 5029
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5030 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5031 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5032
5249 case OP_RDQUOTE: 5033 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5034 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5035
5252 case OP_RDQQUOTE: 5036 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5058 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5059 s_goto (OP_VECTOR);
5276 5060
5277 /* ========== printing part ========== */ 5061 /* ========== printing part ========== */
5278 case OP_P0LIST: 5062 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5063 if (is_vector (args))
5280 { 5064 {
5281 putstr (SCHEME_A_ "#("); 5065 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5066 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5067 s_goto (OP_PVECFROM);
5284 } 5068 }
5285 else if (is_environment (SCHEME_V->args)) 5069 else if (is_environment (args))
5286 { 5070 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5071 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5072 s_return (S_T);
5289 } 5073 }
5290 else if (!is_pair (SCHEME_V->args)) 5074 else if (!is_pair (args))
5291 { 5075 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5076 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5077 s_return (S_T);
5294 } 5078 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5079 else
5296 { 5080 {
5081 pointer a = car (args);
5082 pointer b = cdr (args);
5083 int ok_abbr = ok_abbrev (b);
5084 SCHEME_V->args = car (b);
5085
5086 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5087 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5088 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5089 putstr (SCHEME_A_ "`");
5090 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5091 putstr (SCHEME_A_ ",");
5092 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5093 putstr (SCHEME_A_ ",@");
5094 else
5095 {
5096 putstr (SCHEME_A_ "(");
5097 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5098 SCHEME_V->args = a;
5099 }
5100
5299 s_goto (OP_P0LIST); 5101 s_goto (OP_P0LIST);
5300 } 5102 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5103
5104 case OP_P1LIST:
5105 if (is_pair (args))
5302 { 5106 {
5107 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5108 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5109 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5110 s_goto (OP_P0LIST);
5306 } 5111 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5308 {
5309 putstr (SCHEME_A_ ",");
5310 SCHEME_V->args = cadr (SCHEME_V->args);
5311 s_goto (OP_P0LIST);
5312 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",@");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else
5320 {
5321 putstr (SCHEME_A_ "(");
5322 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5323 SCHEME_V->args = car (SCHEME_V->args);
5324 s_goto (OP_P0LIST);
5325 }
5326
5327 case OP_P1LIST:
5328 if (is_pair (SCHEME_V->args))
5329 {
5330 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5331 putstr (SCHEME_A_ " ");
5332 SCHEME_V->args = car (SCHEME_V->args);
5333 s_goto (OP_P0LIST);
5334 }
5335 else if (is_vector (SCHEME_V->args)) 5112 else if (is_vector (args))
5336 { 5113 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5114 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5115 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5116 s_goto (OP_P0LIST);
5340 } 5117 }
5341 else 5118 else
5342 { 5119 {
5343 if (SCHEME_V->args != NIL) 5120 if (args != NIL)
5344 { 5121 {
5345 putstr (SCHEME_A_ " . "); 5122 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5123 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5124 }
5348 5125
5349 putstr (SCHEME_A_ ")"); 5126 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5127 s_return (S_T);
5351 } 5128 }
5352 5129
5353 case OP_PVECFROM: 5130 case OP_PVECFROM:
5354 { 5131 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5132 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5133 pointer vec = car (args);
5357 int len = veclength (vec); 5134 int len = veclength (vec);
5358 5135
5359 if (i == len) 5136 if (i == len)
5360 { 5137 {
5361 putstr (SCHEME_A_ ")"); 5138 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5139 s_return (S_T);
5363 } 5140 }
5364 else 5141 else
5365 { 5142 {
5366 pointer elem = vector_elem (vec, i); 5143 pointer elem = vector_get (vec, i);
5367 5144
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5145 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5146 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5147 SCHEME_V->args = elem;
5371 5148
5372 if (i > 0) 5149 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5150 putstr (SCHEME_A_ " ");
5374 5151
5375 s_goto (OP_P0LIST); 5152 s_goto (OP_P0LIST);
5376 } 5153 }
5377 } 5154 }
5378 } 5155 }
5379 5156
5380 return S_T; 5157 if (USE_ERROR_CHECKING) abort ();
5381} 5158}
5382 5159
5383static pointer 5160static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5161opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5162{
5163 pointer args = SCHEME_V->args;
5164 pointer a = car (args);
5386 pointer x, y; 5165 pointer x, y;
5387 5166
5388 switch (op) 5167 switch (op)
5389 { 5168 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5169 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5170 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5171 long v = list_length (SCHEME_A_ a);
5393 5172
5394 if (v < 0) 5173 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5174 Error_1 ("length: not a list:", a);
5396 5175
5397 s_return (mk_integer (SCHEME_A_ v)); 5176 s_return (mk_integer (SCHEME_A_ v));
5398 } 5177 }
5399 5178
5400 case OP_ASSQ: /* assq *//* a.k */ 5179 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5180 x = a;
5402 5181
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5182 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5183 {
5405 if (!is_pair (car (y))) 5184 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5185 Error_0 ("unable to handle non pair element");
5407 5186
5408 if (x == caar (y)) 5187 if (x == caar (y))
… …
5414 else 5193 else
5415 s_return (S_F); 5194 s_return (S_F);
5416 5195
5417 5196
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5197 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5198 SCHEME_V->args = a;
5420 5199
5421 if (SCHEME_V->args == NIL) 5200 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5201 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5202 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5203 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5430 case OP_CLOSUREP: /* closure? */ 5209 case OP_CLOSUREP: /* closure? */
5431 /* 5210 /*
5432 * Note, macro object is also a closure. 5211 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5212 * Therefore, (closure? <#MACRO>) ==> #t
5434 */ 5213 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5214 s_retbool (is_closure (a));
5436 5215
5437 case OP_MACROP: /* macro? */ 5216 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5217 s_retbool (is_macro (a));
5439 } 5218 }
5440 5219
5441 return S_T; /* NOTREACHED */ 5220 if (USE_ERROR_CHECKING) abort ();
5442} 5221}
5443 5222
5223/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5444typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5224typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5225
5446typedef int (*test_predicate) (pointer); 5226typedef int (*test_predicate)(pointer);
5447static int 5227static int
5448is_any (pointer p) 5228tst_any (pointer p)
5449{ 5229{
5450 return 1; 5230 return 1;
5451} 5231}
5452 5232
5453static int 5233static int
5454is_nonneg (pointer p) 5234tst_inonneg (pointer p)
5455{ 5235{
5456 return ivalue (p) >= 0 && is_integer (p); 5236 return is_integer (p) && ivalue_unchecked (p) >= 0;
5237}
5238
5239static int
5240tst_is_list (SCHEME_P_ pointer p)
5241{
5242 return p == NIL || is_pair (p);
5457} 5243}
5458 5244
5459/* Correspond carefully with following defines! */ 5245/* Correspond carefully with following defines! */
5460static struct 5246static struct
5461{ 5247{
5462 test_predicate fct; 5248 test_predicate fct;
5463 const char *kind; 5249 const char *kind;
5464} tests[] = 5250} tests[] = {
5465{ 5251 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5252 { is_string , "string" },
5467 { is_any, 0}, 5253 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5254 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5255 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5256 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5257 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5258 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5259 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5260 { is_character , "character" },
5477 { is_vector, "vector" }, 5261 { is_vector , "vector" },
5478 { is_number, "number" }, 5262 { is_number , "number" },
5479 { is_integer, "integer" }, 5263 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5264 { tst_inonneg , "non-negative integer" }
5481}; 5265};
5482 5266
5483#define TST_NONE 0 5267#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5268#define TST_ANY "\001"
5485#define TST_STRING "\002" 5269#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5270#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5271#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5272#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5273#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5274#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5275#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5276#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5277#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5278#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5279#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5280#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5281#define TST_NATURAL "\016"
5282
5283#define INF_ARG 0xff
5284#define UNNAMED_OP ""
5285
5286static const char opnames[] =
5287#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5288#include "opdefines.h"
5289#undef OP_DEF
5290;
5291
5292static const char *
5293opname (int idx)
5294{
5295 const char *name = opnames;
5296
5297 /* should do this at compile time, but would require external program, right? */
5298 while (idx--)
5299 name += strlen (name) + 1;
5300
5301 return *name ? name : "ILLEGAL";
5302}
5303
5304static const char *
5305procname (pointer x)
5306{
5307 return opname (procnum (x));
5308}
5498 5309
5499typedef struct 5310typedef struct
5500{ 5311{
5501 dispatch_func func; 5312 uint8_t func;
5502 char *name; 5313 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5314 uint8_t builtin;
5315#if USE_ERROR_CHECKING
5503 int min_arity; 5316 uint8_t min_arity;
5504 int max_arity; 5317 uint8_t max_arity;
5505 char *arg_tests_encoding; 5318 char arg_tests_encoding[3];
5319#endif
5506} op_code_info; 5320} op_code_info;
5507 5321
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5322static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5323#if USE_ERROR_CHECKING
5324#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5325#else
5326#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5327#endif
5512#include "opdefines.h" 5328#include "opdefines.h"
5329#undef OP_DEF
5513 {0} 5330 {0}
5514}; 5331};
5515 5332
5516static const char *
5517procname (pointer x)
5518{
5519 int n = procnum (x);
5520 const char *name = dispatch_table[n].name;
5521
5522 if (name == 0)
5523 name = "ILLEGAL!";
5524
5525 return name;
5526}
5527
5528/* kernel of this interpreter */ 5333/* kernel of this interpreter */
5529static void 5334static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5335Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5336{
5532 SCHEME_V->op = op; 5337 SCHEME_V->op = op;
5533 5338
5534 for (;;) 5339 for (;;)
5535 { 5340 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5341 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5342
5538#if USE_ERROR_CHECKING 5343#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5344 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5345 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5346 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5347 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5348
5545 /* Check number of arguments */ 5349 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5350 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5351 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5352 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5353 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5354 xError_1 (SCHEME_A_ msg, 0);
5355 continue;
5551 } 5356 }
5552 5357 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5358 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5359 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5360 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5361 xError_1 (SCHEME_A_ msg, 0);
5362 continue;
5558 } 5363 }
5559 5364 else
5560 if (ok)
5561 { 5365 {
5562 if (pcd->arg_tests_encoding) 5366 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5367 {
5564 int i = 0; 5368 int i = 0;
5565 int j; 5369 int j;
5566 const char *t = pcd->arg_tests_encoding; 5370 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5371 pointer arglist = SCHEME_V->args;
5568 5372
5569 do 5373 do
5570 { 5374 {
5571 pointer arg = car (arglist); 5375 pointer arg = car (arglist);
5572 5376
5573 j = (int) t[0]; 5377 j = t[0];
5574 5378
5379 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5380 if (j == TST_LIST[0])
5576 { 5381 {
5577 if (arg != NIL && !is_pair (arg)) 5382 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5383 break;
5579 } 5384 }
5580 else 5385 else
5581 { 5386 {
5582 if (!tests[j].fct (arg)) 5387 if (!tests[j - 1].fct (arg))
5583 break; 5388 break;
5584 } 5389 }
5585 5390
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5391 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5392 t++;
5588 5393
5589 arglist = cdr (arglist); 5394 arglist = cdr (arglist);
5590 i++; 5395 i++;
5591 } 5396 }
5592 while (i < n); 5397 while (i < n);
5593 5398
5594 if (i < n) 5399 if (i < n)
5595 { 5400 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5401 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5402 xError_1 (SCHEME_A_ msg, 0);
5403 continue;
5598 } 5404 }
5599 } 5405 }
5600 } 5406 }
5601
5602 if (!ok)
5603 {
5604 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5605 return;
5606
5607 pcd = dispatch_table + SCHEME_V->op;
5608 }
5609 } 5407 }
5610#endif 5408#endif
5611 5409
5612 ok_to_freely_gc (SCHEME_A); 5410 ok_to_freely_gc (SCHEME_A);
5613 5411
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5412 static const dispatch_func dispatch_funcs[] = {
5413 opexe_0,
5414 opexe_1,
5415 opexe_2,
5416 opexe_3,
5417 opexe_4,
5418 opexe_5,
5419 opexe_6,
5420 };
5421
5422 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5423 return;
5616 5424
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5425 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5426 {
5619 xwrstr ("No memory!\n"); 5427 xwrstr ("No memory!\n");
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5451mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5452{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5453 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5454 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5455 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5456 return y;
5650} 5457}
5651 5458
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5459/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5460static int
… …
5677 5484
5678 case 'd': 5485 case 'd':
5679 return OP_COND0; /* cond */ 5486 return OP_COND0; /* cond */
5680 5487
5681 case '*': 5488 case '*':
5682 return OP_LET0AST; /* let* */ 5489 return OP_LET0AST;/* let* */
5683 5490
5684 default: 5491 default:
5685 return OP_SET0; /* set! */ 5492 return OP_SET0; /* set! */
5686 } 5493 }
5687 5494
… …
5709 5516
5710 case 'f': 5517 case 'f':
5711 return OP_DEF0; /* define */ 5518 return OP_DEF0; /* define */
5712 5519
5713 default: 5520 default:
5714 return OP_LET0REC; /* letrec */ 5521 return OP_LET0REC;/* letrec */
5715 } 5522 }
5716 5523
5717 default: 5524 default:
5718 return OP_C0STREAM; /* cons-stream */ 5525 return OP_C0STREAM; /* cons-stream */
5719 } 5526 }
5720} 5527}
5721 5528
5722#if USE_MULTIPLICITY 5529#if USE_MULTIPLICITY
5723scheme * 5530ecb_cold scheme *
5724scheme_init_new () 5531scheme_init_new ()
5725{ 5532{
5726 scheme *sc = malloc (sizeof (scheme)); 5533 scheme *sc = malloc (sizeof (scheme));
5727 5534
5728 if (!scheme_init (SCHEME_A)) 5535 if (!scheme_init (SCHEME_A))
… …
5733 else 5540 else
5734 return sc; 5541 return sc;
5735} 5542}
5736#endif 5543#endif
5737 5544
5738int 5545ecb_cold int
5739scheme_init (SCHEME_P) 5546scheme_init (SCHEME_P)
5740{ 5547{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5548 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5549 pointer x;
5743 5550
… …
5816 5623
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5624 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5625 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5626 }
5820 5627
5628 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5629 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5630 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5631 assign_proc (SCHEME_A_ i, opname (i));
5824 5632
5825 /* initialization of global pointers to special symbols */ 5633 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5634 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5635 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5636 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5675scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5676{
5869 SCHEME_V->ext_data = p; 5677 SCHEME_V->ext_data = p;
5870} 5678}
5871 5679
5872void 5680ecb_cold void
5873scheme_deinit (SCHEME_P) 5681scheme_deinit (SCHEME_P)
5874{ 5682{
5875 int i; 5683 int i;
5876 5684
5877#if SHOW_ERROR_LINE 5685#if SHOW_ERROR_LINE
… …
5969{ 5777{
5970 dump_stack_reset (SCHEME_A); 5778 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5779 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5780 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5781 SCHEME_V->load_stack[0].kind = port_input | port_string;
5974 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5782 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5975 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5783 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5976 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5784 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5785#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5786 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5787#endif
5980 SCHEME_V->retcode = 0; 5788 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5789 SCHEME_V->interactive_repl = 0;

Diff Legend

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