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.39 by root, Sun Nov 29 14:22:30 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 (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 (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 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x;
1106}
1107
1104#ifndef USE_OBJECT_LIST 1108#ifndef USE_OBJECT_LIST
1105 1109
1110static int
1106static int hash_fn (const char *key, int table_size); 1111hash_fn (const char *key, int table_size)
1112{
1113 const unsigned char *p = key;
1114 uint32_t hash = 2166136261;
1115
1116 while (*p)
1117 hash = (hash ^ *p++) * 16777619;
1118
1119 return hash % table_size;
1120}
1107 1121
1108static pointer 1122static pointer
1109oblist_initial_value (SCHEME_P) 1123oblist_initial_value (SCHEME_P)
1110{ 1124{
1111 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1125 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1113 1127
1114/* returns the new symbol */ 1128/* returns the new symbol */
1115static pointer 1129static pointer
1116oblist_add_by_name (SCHEME_P_ const char *name) 1130oblist_add_by_name (SCHEME_P_ const char *name)
1117{ 1131{
1118 int location; 1132 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)); 1133 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))); 1134 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1126 return x; 1135 return x;
1127} 1136}
1128 1137
1129static INLINE pointer 1138ecb_inline pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1139oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1140{
1132 int location; 1141 int location;
1133 pointer x; 1142 pointer x;
1134 char *s; 1143 char *s;
1135 1144
1136 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1145 location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 1146
1138 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1147 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1139 { 1148 {
1140 s = symname (car (x)); 1149 s = symname (car (x));
1141 1150
1142 /* case-insensitive, per R5RS section 2 */ 1151 /* case-insensitive, per R5RS section 2 */
1143 if (stricmp (name, s) == 0) 1152 if (stricmp (name, s) == 0)
… …
1153 int i; 1162 int i;
1154 pointer x; 1163 pointer x;
1155 pointer ob_list = NIL; 1164 pointer ob_list = NIL;
1156 1165
1157 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1166 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1158 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1167 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1159 ob_list = cons (x, ob_list); 1168 ob_list = cons (x, ob_list);
1160 1169
1161 return ob_list; 1170 return ob_list;
1162} 1171}
1163 1172
… …
1167oblist_initial_value (SCHEME_P) 1176oblist_initial_value (SCHEME_P)
1168{ 1177{
1169 return NIL; 1178 return NIL;
1170} 1179}
1171 1180
1172static INLINE pointer 1181ecb_inline pointer
1173oblist_find_by_name (SCHEME_P_ const char *name) 1182oblist_find_by_name (SCHEME_P_ const char *name)
1174{ 1183{
1175 pointer x; 1184 pointer x;
1176 char *s; 1185 char *s;
1177 1186
… …
1189 1198
1190/* returns the new symbol */ 1199/* returns the new symbol */
1191static pointer 1200static pointer
1192oblist_add_by_name (SCHEME_P_ const char *name) 1201oblist_add_by_name (SCHEME_P_ const char *name)
1193{ 1202{
1194 pointer x; 1203 pointer x = mk_string (SCHEME_A_ name);
1195
1196 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1197 set_typeflag (x, T_SYMBOL); 1204 set_typeflag (x, T_SYMBOL);
1198 setimmutable (car (x)); 1205 setimmutable (x);
1199 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1200 return x; 1207 return x;
1201} 1208}
1202 1209
1203static pointer 1210static pointer
… …
1236mk_character (SCHEME_P_ int c) 1243mk_character (SCHEME_P_ int c)
1237{ 1244{
1238 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1245 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1239 1246
1240 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1247 set_typeflag (x, (T_CHARACTER | T_ATOM));
1241 ivalue_unchecked (x) = c & 0xff; 1248 set_ivalue (x, c & 0xff);
1242 set_num_integer (x); 1249
1243 return x; 1250 return x;
1244} 1251}
1245 1252
1246/* get number atom (integer) */ 1253/* get number atom (integer) */
1247INTERFACE pointer 1254INTERFACE pointer
1248mk_integer (SCHEME_P_ long num) 1255mk_integer (SCHEME_P_ long n)
1249{ 1256{
1250 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1257 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1251 1258
1252 set_typeflag (x, (T_NUMBER | T_ATOM)); 1259 set_typeflag (x, (T_INTEGER | T_ATOM));
1253 ivalue_unchecked (x) = num; 1260 set_ivalue (x, n);
1254 set_num_integer (x); 1261
1255 return x; 1262 return x;
1256} 1263}
1257 1264
1258INTERFACE pointer 1265INTERFACE pointer
1259mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1260{ 1267{
1268#if USE_REAL
1261 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1262 1270
1263 set_typeflag (x, (T_NUMBER | T_ATOM)); 1271 set_typeflag (x, (T_REAL | T_ATOM));
1264 rvalue_unchecked (x) = n; 1272 set_rvalue (x, n);
1265 set_num_real (x); 1273
1266 return x; 1274 return x;
1275#else
1276 return mk_integer (SCHEME_A_ n);
1277#endif
1267} 1278}
1268 1279
1269static pointer 1280static pointer
1270mk_number (SCHEME_P_ const num n) 1281mk_number (SCHEME_P_ const num n)
1271{ 1282{
1283#if USE_REAL
1272 if (num_is_fixnum (n)) 1284 return num_is_fixnum (n)
1285 ? mk_integer (SCHEME_A_ num_ivalue (n))
1286 : mk_real (SCHEME_A_ num_rvalue (n));
1287#else
1273 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1288 return mk_integer (SCHEME_A_ num_ivalue (n));
1274 else 1289#endif
1275 return mk_real (SCHEME_A_ num_get_rvalue (n));
1276} 1290}
1277 1291
1278/* allocate name to string area */ 1292/* allocate name to string area */
1279static char * 1293static char *
1280store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1294store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1286 SCHEME_V->no_memory = 1; 1300 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1301 return SCHEME_V->strbuff;
1288 } 1302 }
1289 1303
1290 if (str) 1304 if (str)
1291 { 1305 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 1306 else
1301 {
1302 memset (q, fill, len_str); 1307 memset (q, fill, len_str);
1308
1303 q[len_str] = 0; 1309 q[len_str] = 0;
1304 }
1305 1310
1306 return q; 1311 return q;
1307} 1312}
1308 1313
1309INTERFACE pointer 1314INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1328 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1329
1325 set_typeflag (x, T_STRING | T_ATOM); 1330 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1331 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1332 strlength (x) = len;
1333
1328 return x; 1334 return x;
1329} 1335}
1330 1336
1331INTERFACE pointer 1337INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1338mk_string (SCHEME_P_ const char *str)
… …
1339{ 1345{
1340 return get_vector_object (SCHEME_A_ len, NIL); 1346 return get_vector_object (SCHEME_A_ len, NIL);
1341} 1347}
1342 1348
1343INTERFACE void 1349INTERFACE void
1344fill_vector (pointer vec, pointer obj) 1350fill_vector (pointer vec, uint32_t start, pointer obj)
1345{ 1351{
1346 int i; 1352 int i;
1347 1353
1348 for (i = 0; i < vec->object.vector.length; i++) 1354 for (i = start; i < veclength (vec); i++)
1349 vecvalue (vec)[i] = obj; 1355 vecvalue (vec)[i] = obj;
1350} 1356}
1351 1357
1358INTERFACE void
1359vector_resize (pointer vec, uint32_t newsize, pointer fill)
1360{
1361 uint32_t oldsize = veclength (vec);
1362 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1363 veclength (vec) = newsize;
1364 fill_vector (vec, oldsize, fill);
1365}
1366
1352INTERFACE pointer 1367INTERFACE pointer
1353vector_elem (pointer vec, uint32_t ielem) 1368vector_get (pointer vec, uint32_t ielem)
1354{ 1369{
1355 return vecvalue(vec)[ielem]; 1370 return vecvalue(vec)[ielem];
1356} 1371}
1357 1372
1358INTERFACE void 1373INTERFACE void
1359set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1374vector_set (pointer vec, uint32_t ielem, pointer a)
1360{ 1375{
1361 vecvalue(vec)[ielem] = a; 1376 vecvalue(vec)[ielem] = a;
1362} 1377}
1363 1378
1364/* get new symbol */ 1379/* get new symbol */
… …
1376 1391
1377INTERFACE pointer 1392INTERFACE pointer
1378gensym (SCHEME_P) 1393gensym (SCHEME_P)
1379{ 1394{
1380 pointer x; 1395 pointer x;
1381
1382 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1383 {
1384 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1385 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, SCHEME_V->gensym_cnt);
1386 1398
1387 /* first check oblist */ 1399 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} 1400}
1399 1401
1400/* make symbol or number atom from string */ 1402/* make symbol or number atom from string */
1401static pointer 1403static pointer
1402mk_atom (SCHEME_P_ char *q) 1404mk_atom (SCHEME_P_ char *q)
… …
1456 } 1458 }
1457 else if ((c == 'e') || (c == 'E')) 1459 else if ((c == 'e') || (c == 'E'))
1458 { 1460 {
1459 if (!has_fp_exp) 1461 if (!has_fp_exp)
1460 { 1462 {
1461 has_dec_point = 1; /* decimal point illegal 1463 has_dec_point = 1; /* decimal point illegal from now on */
1462 from now on */
1463 p++; 1464 p++;
1464 1465
1465 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1466 if ((*p == '-') || (*p == '+') || isdigit (*p))
1466 continue; 1467 continue;
1467 } 1468 }
… …
1481 1482
1482/* make constant */ 1483/* make constant */
1483static pointer 1484static pointer
1484mk_sharp_const (SCHEME_P_ char *name) 1485mk_sharp_const (SCHEME_P_ char *name)
1485{ 1486{
1486 long x;
1487 char tmp[STRBUFFSIZE];
1488
1489 if (!strcmp (name, "t")) 1487 if (!strcmp (name, "t"))
1490 return S_T; 1488 return S_T;
1491 else if (!strcmp (name, "f")) 1489 else if (!strcmp (name, "f"))
1492 return S_F; 1490 return S_F;
1493 else if (*name == '\\') /* #\w (character) */ 1491 else if (*name == '\\') /* #\w (character) */
1494 { 1492 {
1495 int c = 0; 1493 int c;
1496 1494
1497 if (stricmp (name + 1, "space") == 0) 1495 if (stricmp (name + 1, "space") == 0)
1498 c = ' '; 1496 c = ' ';
1499 else if (stricmp (name + 1, "newline") == 0) 1497 else if (stricmp (name + 1, "newline") == 0)
1500 c = '\n'; 1498 c = '\n';
… …
1502 c = '\r'; 1500 c = '\r';
1503 else if (stricmp (name + 1, "tab") == 0) 1501 else if (stricmp (name + 1, "tab") == 0)
1504 c = '\t'; 1502 c = '\t';
1505 else if (name[1] == 'x' && name[2] != 0) 1503 else if (name[1] == 'x' && name[2] != 0)
1506 { 1504 {
1507 int c1 = strtol (name + 2, 0, 16); 1505 long c1 = strtol (name + 2, 0, 16);
1508 1506
1509 if (c1 <= UCHAR_MAX) 1507 if (0 <= c1 && c1 <= UCHAR_MAX)
1510 c = c1; 1508 c = c1;
1511 else 1509 else
1512 return NIL; 1510 return NIL;
1513 1511 }
1514#if USE_ASCII_NAMES 1512#if USE_ASCII_NAMES
1515 }
1516 else if (is_ascii_name (name + 1, &c)) 1513 else if (is_ascii_name (name + 1, &c))
1517 {
1518 /* nothing */ 1514 /* nothing */;
1519#endif 1515#endif
1520 }
1521 else if (name[2] == 0) 1516 else if (name[2] == 0)
1522 c = name[1]; 1517 c = name[1];
1523 else 1518 else
1524 return NIL; 1519 return NIL;
1525 1520
… …
1542 1537
1543/*-- 1538/*--
1544 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1539 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1545 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1540 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1546 * for marking. 1541 * for marking.
1542 *
1543 * The exception is vectors - vectors are currently marked recursively,
1544 * which is inherited form tinyscheme and could be fixed by having another
1545 * word of context in the vector
1547 */ 1546 */
1548static void 1547static void
1549mark (pointer a) 1548mark (pointer a)
1550{ 1549{
1551 pointer t, q, p; 1550 pointer t, q, p;
… …
1553 t = 0; 1552 t = 0;
1554 p = a; 1553 p = a;
1555E2: 1554E2:
1556 setmark (p); 1555 setmark (p);
1557 1556
1558 if (is_vector (p)) 1557 if (ecb_expect_false (is_vector (p)))
1559 { 1558 {
1560 int i; 1559 int i;
1561 1560
1562 for (i = 0; i < p->object.vector.length; i++) 1561 for (i = 0; i < veclength (p); i++)
1563 mark (vecvalue (p)[i]); 1562 mark (vecvalue (p)[i]);
1564 } 1563 }
1565 1564
1566 if (is_atom (p)) 1565 if (is_atom (p))
1567 goto E6; 1566 goto E6;
… …
1665 if (is_mark (p)) 1664 if (is_mark (p))
1666 clrmark (p); 1665 clrmark (p);
1667 else 1666 else
1668 { 1667 {
1669 /* reclaim cell */ 1668 /* reclaim cell */
1670 if (typeflag (p) != T_FREE) 1669 if (typeflag (p) != T_PAIR)
1671 { 1670 {
1672 finalize_cell (SCHEME_A_ p); 1671 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_FREE); 1672 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL); 1673 set_car (p, NIL);
1675 } 1674 }
1676 1675
1677 ++SCHEME_V->fcells; 1676 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell); 1677 set_cdr (p, SCHEME_V->free_cell);
… …
1680 } 1679 }
1681 } 1680 }
1682 } 1681 }
1683 1682
1684 if (SCHEME_V->gc_verbose) 1683 if (SCHEME_V->gc_verbose)
1684 {
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1686 }
1686} 1687}
1687 1688
1688static void 1689static void
1689finalize_cell (SCHEME_P_ pointer a) 1690finalize_cell (SCHEME_P_ pointer a)
1690{ 1691{
1692 /* TODO, fast bitmap check? */
1691 if (is_string (a)) 1693 if (is_string (a))
1692 free (strvalue (a)); 1694 free (strvalue (a));
1693 else if (is_vector (a)) 1695 else if (is_vector (a))
1694 free (vecvalue (a)); 1696 free (vecvalue (a));
1695#if USE_PORTS 1697#if USE_PORTS
… …
2118#endif 2120#endif
2119} 2121}
2120 2122
2121/* read characters up to delimiter, but cater to character constants */ 2123/* read characters up to delimiter, but cater to character constants */
2122static char * 2124static char *
2123readstr_upto (SCHEME_P_ char *delim) 2125readstr_upto (SCHEME_P_ int skip, const char *delim)
2124{ 2126{
2125 char *p = SCHEME_V->strbuff; 2127 char *p = SCHEME_V->strbuff + skip;
2126 2128
2127 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2129 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2128 2130
2129 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2131 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2130 *p = 0; 2132 *p = 0;
… …
2137 return SCHEME_V->strbuff; 2139 return SCHEME_V->strbuff;
2138} 2140}
2139 2141
2140/* read string expression "xxx...xxx" */ 2142/* read string expression "xxx...xxx" */
2141static pointer 2143static pointer
2142readstrexp (SCHEME_P) 2144readstrexp (SCHEME_P_ char delim)
2143{ 2145{
2144 char *p = SCHEME_V->strbuff; 2146 char *p = SCHEME_V->strbuff;
2145 int c; 2147 int c;
2146 int c1 = 0; 2148 int c1 = 0;
2147 enum
2148 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2149 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2149 2150
2150 for (;;) 2151 for (;;)
2151 { 2152 {
2152 c = inchar (SCHEME_A); 2153 c = inchar (SCHEME_A);
2153 2154
… …
2155 return S_F; 2156 return S_F;
2156 2157
2157 switch (state) 2158 switch (state)
2158 { 2159 {
2159 case st_ok: 2160 case st_ok:
2160 switch (c) 2161 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); 2162 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2169 2163
2170 default: 2164 if (ecb_expect_false (c == '\\'))
2165 state = st_bsl;
2166 else
2171 *p++ = c; 2167 *p++ = c;
2172 break;
2173 }
2174 2168
2175 break; 2169 break;
2176 2170
2177 case st_bsl: 2171 case st_bsl:
2178 switch (c) 2172 switch (c)
… …
2208 case 'r': 2202 case 'r':
2209 *p++ = '\r'; 2203 *p++ = '\r';
2210 state = st_ok; 2204 state = st_ok;
2211 break; 2205 break;
2212 2206
2213 case '"':
2214 *p++ = '"';
2215 state = st_ok;
2216 break;
2217
2218 default: 2207 default:
2219 *p++ = c; 2208 *p++ = c;
2220 state = st_ok; 2209 state = st_ok;
2221 break; 2210 break;
2222 } 2211 }
2223 2212
2224 break; 2213 break;
2225 2214
2226 case st_x1: 2215 case st_x1:
2227 case st_x2: 2216 case st_x2:
2228 c = toupper (c); 2217 c = tolower (c);
2229 2218
2230 if (c >= '0' && c <= 'F') 2219 if (c >= '0' && c <= '9')
2231 {
2232 if (c <= '9')
2233 c1 = (c1 << 4) + c - '0'; 2220 c1 = (c1 << 4) + c - '0';
2234 else 2221 else if (c >= 'a' && c <= 'f')
2235 c1 = (c1 << 4) + c - 'A' + 10; 2222 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 2223 else
2246 return S_F; 2224 return S_F;
2225
2226 if (state == st_x1)
2227 state = st_x2;
2228 else
2229 {
2230 *p++ = c1;
2231 state = st_ok;
2232 }
2247 2233
2248 break; 2234 break;
2249 2235
2250 case st_oct1: 2236 case st_oct1:
2251 case st_oct2: 2237 case st_oct2:
… …
2255 backchar (SCHEME_A_ c); 2241 backchar (SCHEME_A_ c);
2256 state = st_ok; 2242 state = st_ok;
2257 } 2243 }
2258 else 2244 else
2259 { 2245 {
2260 if (state == st_oct2 && c1 >= 32) 2246 if (state == st_oct2 && c1 >= ' ')
2261 return S_F; 2247 return S_F;
2262 2248
2263 c1 = (c1 << 3) + (c - '0'); 2249 c1 = (c1 << 3) + (c - '0');
2264 2250
2265 if (state == st_oct1) 2251 if (state == st_oct1)
… …
2270 state = st_ok; 2256 state = st_ok;
2271 } 2257 }
2272 } 2258 }
2273 2259
2274 break; 2260 break;
2275
2276 } 2261 }
2277 } 2262 }
2278} 2263}
2279 2264
2280/* check c is in chars */ 2265/* check c is in chars */
2281static INLINE int 2266ecb_inline int
2282is_one_of (char *s, int c) 2267is_one_of (const char *s, int c)
2283{ 2268{
2284 if (c == EOF) 2269 if (c == EOF)
2285 return 1; 2270 return 1;
2286 2271
2287 return !!strchr (s, c); 2272 return !!strchr (s, c);
2288} 2273}
2289 2274
2290/* skip white characters */ 2275/* skip white characters */
2291static INLINE int 2276ecb_inline int
2292skipspace (SCHEME_P) 2277skipspace (SCHEME_P)
2293{ 2278{
2294 int c, curr_line = 0; 2279 int c, curr_line = 0;
2295 2280
2296 do 2281 do
… …
2343 2328
2344 if (is_one_of (" \n\t", c)) 2329 if (is_one_of (" \n\t", c))
2345 return TOK_DOT; 2330 return TOK_DOT;
2346 else 2331 else
2347 { 2332 {
2348 //TODO: ungetc twice in a row is not supported in C
2349 backchar (SCHEME_A_ c); 2333 backchar (SCHEME_A_ c);
2350 backchar (SCHEME_A_ '.');
2351 return TOK_ATOM; 2334 return TOK_DOTATOM;
2352 } 2335 }
2336
2337 case '|':
2338 return TOK_STRATOM;
2353 2339
2354 case '\'': 2340 case '\'':
2355 return TOK_QUOTE; 2341 return TOK_QUOTE;
2356 2342
2357 case ';': 2343 case ';':
… …
2489 } 2475 }
2490 2476
2491 putcharacter (SCHEME_A_ '"'); 2477 putcharacter (SCHEME_A_ '"');
2492} 2478}
2493 2479
2494
2495/* print atoms */ 2480/* print atoms */
2496static void 2481static void
2497printatom (SCHEME_P_ pointer l, int f) 2482printatom (SCHEME_P_ pointer l, int f)
2498{ 2483{
2499 char *p; 2484 char *p;
2500 int len; 2485 int len;
2501 2486
2502 atom2str (SCHEME_A_ l, f, &p, &len); 2487 atom2str (SCHEME_A_ l, f, &p, &len);
2503 putchars (SCHEME_A_ p, len); 2488 putchars (SCHEME_A_ p, len);
2504} 2489}
2505
2506 2490
2507/* Uses internal buffer unless string pointer is already available */ 2491/* Uses internal buffer unless string pointer is already available */
2508static void 2492static void
2509atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2510{ 2494{
… …
2524 { 2508 {
2525 p = SCHEME_V->strbuff; 2509 p = SCHEME_V->strbuff;
2526 2510
2527 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2511 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2528 { 2512 {
2529 if (num_is_integer (l)) 2513 if (is_integer (l))
2530 xnum (p, ivalue_unchecked (l)); 2514 xnum (p, ivalue_unchecked (l));
2531#if USE_REAL 2515#if USE_REAL
2532 else 2516 else
2533 { 2517 {
2534 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2518 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2671#endif 2655#endif
2672 } 2656 }
2673 else if (is_continuation (l)) 2657 else if (is_continuation (l))
2674 p = "#<CONTINUATION>"; 2658 p = "#<CONTINUATION>";
2675 else 2659 else
2660 {
2661#if USE_PRINTF
2662 p = SCHEME_V->strbuff;
2663 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2664#else
2676 p = "#<ERROR>"; 2665 p = "#<ERROR>";
2666#endif
2667 }
2677 2668
2678 *pp = p; 2669 *pp = p;
2679 *plen = strlen (p); 2670 *plen = strlen (p);
2680} 2671}
2681 2672
… …
2789 return 0; 2780 return 0;
2790 } 2781 }
2791 else if (is_number (a)) 2782 else if (is_number (a))
2792 { 2783 {
2793 if (is_number (b)) 2784 if (is_number (b))
2794 if (num_is_integer (a) == num_is_integer (b))
2795 return num_eq (nvalue (a), nvalue (b)); 2785 return num_cmp (nvalue (a), nvalue (b)) == 0;
2796 2786
2797 return 0; 2787 return 0;
2798 } 2788 }
2799 else if (is_character (a)) 2789 else if (is_character (a))
2800 { 2790 {
… …
2826/* () is #t in R5RS */ 2816/* () is #t in R5RS */
2827#define is_true(p) ((p) != S_F) 2817#define is_true(p) ((p) != S_F)
2828#define is_false(p) ((p) == S_F) 2818#define is_false(p) ((p) == S_F)
2829 2819
2830/* ========== Environment implementation ========== */ 2820/* ========== 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 2821
2847#ifndef USE_ALIST_ENV 2822#ifndef USE_ALIST_ENV
2848 2823
2849/* 2824/*
2850 * In this implementation, each frame of the environment may be 2825 * In this implementation, each frame of the environment may be
… …
2867 2842
2868 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2843 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2869 setenvironment (SCHEME_V->envir); 2844 setenvironment (SCHEME_V->envir);
2870} 2845}
2871 2846
2872static INLINE void 2847static uint32_t
2848sym_hash (pointer sym, uint32_t size)
2849{
2850 uintptr_t ptr = (uintptr_t)sym;
2851
2852#if 0
2853 /* table size is prime, so why mix */
2854 ptr += ptr >> 32;
2855 ptr += ptr >> 16;
2856 ptr += ptr >> 8;
2857#endif
2858
2859 return ptr % size;
2860}
2861
2862ecb_inline void
2873new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2863new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2874{ 2864{
2875 pointer slot = immutable_cons (variable, value); 2865 pointer slot = immutable_cons (variable, value);
2876 2866
2877 if (is_vector (car (env))) 2867 if (is_vector (car (env)))
2878 { 2868 {
2879 int location = hash_fn (symname (variable), veclength (car (env))); 2869 int location = sym_hash (variable, veclength (car (env)));
2880
2881 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2870 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2882 } 2871 }
2883 else 2872 else
2884 set_car (env, immutable_cons (slot, car (env))); 2873 set_car (env, immutable_cons (slot, car (env)));
2885} 2874}
2886 2875
2887static pointer 2876static pointer
2888find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2877find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2889{ 2878{
2890 pointer x, y; 2879 pointer x, y;
2891 int location;
2892 2880
2893 for (x = env; x != NIL; x = cdr (x)) 2881 for (x = env; x != NIL; x = cdr (x))
2894 { 2882 {
2895 if (is_vector (car (x))) 2883 if (is_vector (car (x)))
2896 { 2884 {
2897 location = hash_fn (symname (hdl), veclength (car (x))); 2885 int location = sym_hash (hdl, veclength (car (x)));
2898 y = vector_elem (car (x), location); 2886 y = vector_get (car (x), location);
2899 } 2887 }
2900 else 2888 else
2901 y = car (x); 2889 y = car (x);
2902 2890
2903 for (; y != NIL; y = cdr (y)) 2891 for (; y != NIL; y = cdr (y))
2904 if (caar (y) == hdl) 2892 if (caar (y) == hdl)
2905 break; 2893 break;
2906 2894
2907 if (y != NIL) 2895 if (y != NIL)
2896 return car (y);
2897
2898 if (!all)
2908 break; 2899 break;
2909
2910 if (!all)
2911 return NIL;
2912 } 2900 }
2913
2914 if (x != NIL)
2915 return car (y);
2916 2901
2917 return NIL; 2902 return NIL;
2918} 2903}
2919 2904
2920#else /* USE_ALIST_ENV */ 2905#else /* USE_ALIST_ENV */
2921 2906
2922static INLINE void 2907ecb_inline void
2923new_frame_in_env (SCHEME_P_ pointer old_env) 2908new_frame_in_env (SCHEME_P_ pointer old_env)
2924{ 2909{
2925 SCHEME_V->envir = immutable_cons (NIL, old_env); 2910 SCHEME_V->envir = immutable_cons (NIL, old_env);
2926 setenvironment (SCHEME_V->envir); 2911 setenvironment (SCHEME_V->envir);
2927} 2912}
2928 2913
2929static INLINE void 2914ecb_inline void
2930new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2915new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2931{ 2916{
2932 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2917 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2933} 2918}
2934 2919
… …
2942 for (y = car (x); y != NIL; y = cdr (y)) 2927 for (y = car (x); y != NIL; y = cdr (y))
2943 if (caar (y) == hdl) 2928 if (caar (y) == hdl)
2944 break; 2929 break;
2945 2930
2946 if (y != NIL) 2931 if (y != NIL)
2932 return car (y);
2947 break; 2933 break;
2948 2934
2949 if (!all) 2935 if (!all)
2950 return NIL; 2936 break;
2951 } 2937 }
2952
2953 if (x != NIL)
2954 return car (y);
2955 2938
2956 return NIL; 2939 return NIL;
2957} 2940}
2958 2941
2959#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
2960 2943
2961static INLINE void 2944ecb_inline void
2962new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2963{ 2946{
2947 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2964 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2948 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2965} 2949}
2966 2950
2967static INLINE void 2951ecb_inline void
2968set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2952set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2969{ 2953{
2970 set_cdr (slot, value); 2954 set_cdr (slot, value);
2971} 2955}
2972 2956
2973static INLINE pointer 2957ecb_inline pointer
2974slot_value_in_env (pointer slot) 2958slot_value_in_env (pointer slot)
2975{ 2959{
2976 return cdr (slot); 2960 return cdr (slot);
2977} 2961}
2978 2962
2979/* ========== Evaluation Cycle ========== */ 2963/* ========== Evaluation Cycle ========== */
2980 2964
2981static pointer 2965static int
2982xError_1 (SCHEME_P_ const char *s, pointer a) 2966xError_1 (SCHEME_P_ const char *s, pointer a)
2983{ 2967{
2984#if USE_ERROR_HOOK 2968#if USE_ERROR_HOOK
2985 pointer x; 2969 pointer x;
2986 pointer hdl = SCHEME_V->ERROR_HOOK; 2970 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3021 code = cons (mk_string (SCHEME_A_ s), code); 3005 code = cons (mk_string (SCHEME_A_ s), code);
3022 setimmutable (car (code)); 3006 setimmutable (car (code));
3023 SCHEME_V->code = cons (slot_value_in_env (x), code); 3007 SCHEME_V->code = cons (slot_value_in_env (x), code);
3024 SCHEME_V->op = OP_EVAL; 3008 SCHEME_V->op = OP_EVAL;
3025 3009
3026 return S_T; 3010 return 0;
3027 } 3011 }
3028#endif 3012#endif
3029 3013
3030 if (a) 3014 if (a)
3031 SCHEME_V->args = cons (a, NIL); 3015 SCHEME_V->args = cons (a, NIL);
… …
3033 SCHEME_V->args = NIL; 3017 SCHEME_V->args = NIL;
3034 3018
3035 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3019 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3036 setimmutable (car (SCHEME_V->args)); 3020 setimmutable (car (SCHEME_V->args));
3037 SCHEME_V->op = OP_ERR0; 3021 SCHEME_V->op = OP_ERR0;
3022
3038 return S_T; 3023 return 0;
3039} 3024}
3040 3025
3041#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3026#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3042#define Error_0(s) Error_1 (s, 0) 3027#define Error_0(s) Error_1 (s, 0)
3043 3028
3044/* Too small to turn into function */ 3029/* Too small to turn into function */
3045#define BEGIN do { 3030#define BEGIN do {
3046#define END } while (0) 3031#define END } while (0)
3047#define s_goto(a) BEGIN \ 3032#define s_goto(a) BEGIN \
3048 SCHEME_V->op = a; \ 3033 SCHEME_V->op = a; \
3049 return S_T; END 3034 return 0; END
3050 3035
3051#define s_return(a) return xs_return (SCHEME_A_ a) 3036#define s_return(a) return xs_return (SCHEME_A_ a)
3052 3037
3053#ifndef USE_SCHEME_STACK 3038#ifndef USE_SCHEME_STACK
3054 3039
… …
3079 next_frame = SCHEME_V->dump_base + nframes; 3064 next_frame = SCHEME_V->dump_base + nframes;
3080 3065
3081 next_frame->op = op; 3066 next_frame->op = op;
3082 next_frame->args = args; 3067 next_frame->args = args;
3083 next_frame->envir = SCHEME_V->envir; 3068 next_frame->envir = SCHEME_V->envir;
3084 next_frame->code = code; 3069 next_frame->code = code;
3085 3070
3086 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3071 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3087} 3072}
3088 3073
3089static pointer 3074static int
3090xs_return (SCHEME_P_ pointer a) 3075xs_return (SCHEME_P_ pointer a)
3091{ 3076{
3092 int nframes = (uintptr_t)SCHEME_V->dump; 3077 int nframes = (uintptr_t)SCHEME_V->dump;
3093 struct dump_stack_frame *frame; 3078 struct dump_stack_frame *frame;
3094 3079
3095 SCHEME_V->value = a; 3080 SCHEME_V->value = a;
3096 3081
3097 if (nframes <= 0) 3082 if (nframes <= 0)
3098 return NIL; 3083 return -1;
3099 3084
3100 frame = &SCHEME_V->dump_base[--nframes]; 3085 frame = &SCHEME_V->dump_base[--nframes];
3101 SCHEME_V->op = frame->op; 3086 SCHEME_V->op = frame->op;
3102 SCHEME_V->args = frame->args; 3087 SCHEME_V->args = frame->args;
3103 SCHEME_V->envir = frame->envir; 3088 SCHEME_V->envir = frame->envir;
3104 SCHEME_V->code = frame->code; 3089 SCHEME_V->code = frame->code;
3105 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3090 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3106 3091
3107 return S_T; 3092 return 0;
3108} 3093}
3109 3094
3110static INLINE void 3095ecb_inline void
3111dump_stack_reset (SCHEME_P) 3096dump_stack_reset (SCHEME_P)
3112{ 3097{
3113 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3098 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3114 SCHEME_V->dump = (pointer)+0; 3099 SCHEME_V->dump = (pointer)+0;
3115} 3100}
3116 3101
3117static INLINE void 3102ecb_inline void
3118dump_stack_initialize (SCHEME_P) 3103dump_stack_initialize (SCHEME_P)
3119{ 3104{
3120 SCHEME_V->dump_size = 0; 3105 SCHEME_V->dump_size = 0;
3121 SCHEME_V->dump_base = 0; 3106 SCHEME_V->dump_base = 0;
3122 dump_stack_reset (SCHEME_A); 3107 dump_stack_reset (SCHEME_A);
… …
3175 int i = 0; 3160 int i = 0;
3176 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3161 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3177 3162
3178 while (cont != NIL) 3163 while (cont != NIL)
3179 { 3164 {
3180 frame->op = ivalue (car (cont)); cont = cdr (cont); 3165 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3181 frame->args = car (cont) ; cont = cdr (cont); 3166 frame->args = car (cont) ; cont = cdr (cont);
3182 frame->envir = car (cont) ; cont = cdr (cont); 3167 frame->envir = car (cont) ; cont = cdr (cont);
3183 frame->code = car (cont) ; cont = cdr (cont); 3168 frame->code = car (cont) ; cont = cdr (cont);
3184 3169
3185 ++frame; 3170 ++frame;
3186 ++i; 3171 ++i;
3187 } 3172 }
3188 3173
3189 SCHEME_V->dump = (pointer)(uintptr_t)i; 3174 SCHEME_V->dump = (pointer)(uintptr_t)i;
3190} 3175}
3191 3176
3192#else 3177#else
3193 3178
3194static INLINE void 3179ecb_inline void
3195dump_stack_reset (SCHEME_P) 3180dump_stack_reset (SCHEME_P)
3196{ 3181{
3197 SCHEME_V->dump = NIL; 3182 SCHEME_V->dump = NIL;
3198} 3183}
3199 3184
3200static INLINE void 3185ecb_inline void
3201dump_stack_initialize (SCHEME_P) 3186dump_stack_initialize (SCHEME_P)
3202{ 3187{
3203 dump_stack_reset (SCHEME_A); 3188 dump_stack_reset (SCHEME_A);
3204} 3189}
3205 3190
… …
3207dump_stack_free (SCHEME_P) 3192dump_stack_free (SCHEME_P)
3208{ 3193{
3209 SCHEME_V->dump = NIL; 3194 SCHEME_V->dump = NIL;
3210} 3195}
3211 3196
3212static pointer 3197static int
3213xs_return (SCHEME_P_ pointer a) 3198xs_return (SCHEME_P_ pointer a)
3214{ 3199{
3215 pointer dump = SCHEME_V->dump; 3200 pointer dump = SCHEME_V->dump;
3216 3201
3217 SCHEME_V->value = a; 3202 SCHEME_V->value = a;
3218 3203
3219 if (dump == NIL) 3204 if (dump == NIL)
3220 return NIL; 3205 return -1;
3221 3206
3222 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3207 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3223 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3224 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3225 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3210 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3226 3211
3227 SCHEME_V->dump = dump; 3212 SCHEME_V->dump = dump;
3228 3213
3229 return S_T; 3214 return 0;
3230} 3215}
3231 3216
3232static void 3217static void
3233s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3218s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3234{ 3219{
… …
3259 3244
3260#endif 3245#endif
3261 3246
3262#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3247#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3263 3248
3249#if 1
3264static pointer 3250static int
3251debug (SCHEME_P_ int indent, pointer x)
3252{
3253 int c;
3254
3255 if (is_syntax (x))
3256 {
3257 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3258 return 8 + 8;
3259 }
3260
3261 if (x == NIL)
3262 {
3263 printf ("%*sNIL\n", indent, "");
3264 return 3;
3265 }
3266
3267 switch (type (x))
3268 {
3269 case T_INTEGER:
3270 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3271 return 32+8;
3272
3273 case T_SYMBOL:
3274 printf ("%*sS<%s>\n", indent, "", symname (x));
3275 return 24+8;
3276
3277 case T_CLOSURE:
3278 printf ("%*sS<%s>\n", indent, "", "closure");
3279 debug (SCHEME_A_ indent + 3, cdr(x));
3280 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3281
3282 case T_PAIR:
3283 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3284 c = debug (SCHEME_A_ indent + 3, car (x));
3285 c += debug (SCHEME_A_ indent + 3, cdr (x));
3286 return c + 1;
3287
3288 case T_PORT:
3289 printf ("%*sS<%s>\n", indent, "", "port");
3290 return 24+8;
3291
3292 case T_VECTOR:
3293 printf ("%*sS<%s>\n", indent, "", "vector");
3294 return 24+8;
3295
3296 case T_ENVIRONMENT:
3297 printf ("%*sS<%s>\n", indent, "", "environment");
3298 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3299
3300 default:
3301 printf ("unhandled type %d\n", type (x));
3302 break;
3303 }
3304}
3305#endif
3306
3307static int
3265opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3308opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3266{ 3309{
3310 pointer args = SCHEME_V->args;
3267 pointer x, y; 3311 pointer x, y;
3268 3312
3269 switch (op) 3313 switch (op)
3270 { 3314 {
3315#if 1 //D
3316 case OP_DEBUG:
3317 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3318 printf ("\n");
3319 s_return (S_T);
3320#endif
3271 case OP_LOAD: /* load */ 3321 case OP_LOAD: /* load */
3272 if (file_interactive (SCHEME_A)) 3322 if (file_interactive (SCHEME_A))
3273 { 3323 {
3274 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3324 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))); 3325 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3276 } 3326 }
3277 3327
3278 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3328 if (!file_push (SCHEME_A_ strvalue (car (args))))
3279 Error_1 ("unable to open", car (SCHEME_V->args)); 3329 Error_1 ("unable to open", car (args));
3280 else 3330 else
3281 { 3331 {
3282 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3332 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3283 s_goto (OP_T0LVL); 3333 s_goto (OP_T0LVL);
3284 } 3334 }
… …
3358 case OP_EVAL: /* main part of evaluation */ 3408 case OP_EVAL: /* main part of evaluation */
3359#if USE_TRACING 3409#if USE_TRACING
3360 if (SCHEME_V->tracing) 3410 if (SCHEME_V->tracing)
3361 { 3411 {
3362 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3412 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3363 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3413 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3364 SCHEME_V->args = SCHEME_V->code; 3414 SCHEME_V->args = SCHEME_V->code;
3365 putstr (SCHEME_A_ "\nEval: "); 3415 putstr (SCHEME_A_ "\nEval: ");
3366 s_goto (OP_P0LIST); 3416 s_goto (OP_P0LIST);
3367 } 3417 }
3368 3418
… …
3398 } 3448 }
3399 else 3449 else
3400 s_return (SCHEME_V->code); 3450 s_return (SCHEME_V->code);
3401 3451
3402 case OP_E0ARGS: /* eval arguments */ 3452 case OP_E0ARGS: /* eval arguments */
3403 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3453 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3404 { 3454 {
3405 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3455 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3406 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3456 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3407 SCHEME_V->code = SCHEME_V->value; 3457 SCHEME_V->code = SCHEME_V->value;
3408 s_goto (OP_APPLY); 3458 s_goto (OP_APPLY);
… …
3412 SCHEME_V->code = cdr (SCHEME_V->code); 3462 SCHEME_V->code = cdr (SCHEME_V->code);
3413 s_goto (OP_E1ARGS); 3463 s_goto (OP_E1ARGS);
3414 } 3464 }
3415 3465
3416 case OP_E1ARGS: /* eval arguments */ 3466 case OP_E1ARGS: /* eval arguments */
3417 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3467 args = cons (SCHEME_V->value, args);
3418 3468
3419 if (is_pair (SCHEME_V->code)) /* continue */ 3469 if (is_pair (SCHEME_V->code)) /* continue */
3420 { 3470 {
3421 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3471 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3422 SCHEME_V->code = car (SCHEME_V->code); 3472 SCHEME_V->code = car (SCHEME_V->code);
3423 SCHEME_V->args = NIL; 3473 SCHEME_V->args = NIL;
3424 s_goto (OP_EVAL); 3474 s_goto (OP_EVAL);
3425 } 3475 }
3426 else /* end */ 3476 else /* end */
3427 { 3477 {
3428 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3478 args = reverse_in_place (SCHEME_A_ NIL, args);
3429 SCHEME_V->code = car (SCHEME_V->args); 3479 SCHEME_V->code = car (args);
3430 SCHEME_V->args = cdr (SCHEME_V->args); 3480 SCHEME_V->args = cdr (args);
3431 s_goto (OP_APPLY); 3481 s_goto (OP_APPLY);
3432 } 3482 }
3433 3483
3434#if USE_TRACING 3484#if USE_TRACING
3435 3485
3436 case OP_TRACING: 3486 case OP_TRACING:
3437 { 3487 {
3438 int tr = SCHEME_V->tracing; 3488 int tr = SCHEME_V->tracing;
3439 3489
3440 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3490 SCHEME_V->tracing = ivalue_unchecked (car (args));
3441 s_return (mk_integer (SCHEME_A_ tr)); 3491 s_return (mk_integer (SCHEME_A_ tr));
3442 } 3492 }
3443 3493
3444#endif 3494#endif
3445 3495
3446 case OP_APPLY: /* apply 'code' to 'args' */ 3496 case OP_APPLY: /* apply 'code' to 'args' */
3447#if USE_TRACING 3497#if USE_TRACING
3448 if (SCHEME_V->tracing) 3498 if (SCHEME_V->tracing)
3449 { 3499 {
3450 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3500 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3451 SCHEME_V->print_flag = 1; 3501 SCHEME_V->print_flag = 1;
3452 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3502 /* args=cons(SCHEME_V->code,args); */
3453 putstr (SCHEME_A_ "\nApply to: "); 3503 putstr (SCHEME_A_ "\nApply to: ");
3454 s_goto (OP_P0LIST); 3504 s_goto (OP_P0LIST);
3455 } 3505 }
3456 3506
3457 /* fall through */ 3507 /* fall through */
3458 3508
3459 case OP_REAL_APPLY: 3509 case OP_REAL_APPLY:
3460#endif 3510#endif
3461 if (is_proc (SCHEME_V->code)) 3511 if (is_proc (SCHEME_V->code))
3462 {
3463 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3512 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3464 }
3465 else if (is_foreign (SCHEME_V->code)) 3513 else if (is_foreign (SCHEME_V->code))
3466 { 3514 {
3467 /* Keep nested calls from GC'ing the arglist */ 3515 /* Keep nested calls from GC'ing the arglist */
3468 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3516 push_recent_alloc (SCHEME_A_ args, NIL);
3469 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3517 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3470 3518
3471 s_return (x); 3519 s_return (x);
3472 } 3520 }
3473 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3521 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3474 { 3522 {
3475 /* Should not accept promise */ 3523 /* Should not accept promise */
3476 /* make environment */ 3524 /* make environment */
3477 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3525 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3478 3526
3479 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3527 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3480 { 3528 {
3481 if (y == NIL) 3529 if (y == NIL)
3482 Error_0 ("not enough arguments"); 3530 Error_0 ("not enough arguments");
3483 else 3531 else
3484 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3532 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3502 s_goto (OP_BEGIN); 3550 s_goto (OP_BEGIN);
3503 } 3551 }
3504 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3552 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3505 { 3553 {
3506 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3554 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3507 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3555 s_return (args != NIL ? car (args) : NIL);
3508 } 3556 }
3509 else 3557 else
3510 Error_0 ("illegal function"); 3558 Error_0 ("illegal function");
3511 3559
3512 case OP_DOMACRO: /* do macro */ 3560 case OP_DOMACRO: /* do macro */
… …
3521 { 3569 {
3522 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3570 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3523 3571
3524 if (f != NIL) 3572 if (f != NIL)
3525 { 3573 {
3526 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3574 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3527 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3575 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3528 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3529 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3530 } 3578 }
3531 3579
… …
3542 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3590 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3543 3591
3544#endif 3592#endif
3545 3593
3546 case OP_MKCLOSURE: /* make-closure */ 3594 case OP_MKCLOSURE: /* make-closure */
3547 x = car (SCHEME_V->args); 3595 x = car (args);
3548 3596
3549 if (car (x) == SCHEME_V->LAMBDA) 3597 if (car (x) == SCHEME_V->LAMBDA)
3550 x = cdr (x); 3598 x = cdr (x);
3551 3599
3552 if (cdr (SCHEME_V->args) == NIL) 3600 if (cdr (args) == NIL)
3553 y = SCHEME_V->envir; 3601 y = SCHEME_V->envir;
3554 else 3602 else
3555 y = cadr (SCHEME_V->args); 3603 y = cadr (args);
3556 3604
3557 s_return (mk_closure (SCHEME_A_ x, y)); 3605 s_return (mk_closure (SCHEME_A_ x, y));
3558 3606
3559 case OP_QUOTE: /* quote */ 3607 case OP_QUOTE: /* quote */
3560 s_return (car (SCHEME_V->code)); 3608 s_return (car (SCHEME_V->code));
… …
3592 3640
3593 3641
3594 case OP_DEFP: /* defined? */ 3642 case OP_DEFP: /* defined? */
3595 x = SCHEME_V->envir; 3643 x = SCHEME_V->envir;
3596 3644
3597 if (cdr (SCHEME_V->args) != NIL) 3645 if (cdr (args) != NIL)
3598 x = cadr (SCHEME_V->args); 3646 x = cadr (args);
3599 3647
3600 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3648 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3601 3649
3602 case OP_SET0: /* set! */ 3650 case OP_SET0: /* set! */
3603 if (is_immutable (car (SCHEME_V->code))) 3651 if (is_immutable (car (SCHEME_V->code)))
3604 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3652 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3605 3653
… …
3636 3684
3637 case OP_IF1: /* if */ 3685 case OP_IF1: /* if */
3638 if (is_true (SCHEME_V->value)) 3686 if (is_true (SCHEME_V->value))
3639 SCHEME_V->code = car (SCHEME_V->code); 3687 SCHEME_V->code = car (SCHEME_V->code);
3640 else 3688 else
3641 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3689 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3642
3643 * car(NIL) = NIL */
3644 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3645 3691
3646 case OP_LET0: /* let */ 3692 case OP_LET0: /* let */
3647 SCHEME_V->args = NIL; 3693 SCHEME_V->args = NIL;
3648 SCHEME_V->value = SCHEME_V->code; 3694 SCHEME_V->value = SCHEME_V->code;
3649 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3695 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3650 s_goto (OP_LET1); 3696 s_goto (OP_LET1);
3651 3697
3652 case OP_LET1: /* let (calculate parameters) */ 3698 case OP_LET1: /* let (calculate parameters) */
3653 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3699 args = cons (SCHEME_V->value, args);
3654 3700
3655 if (is_pair (SCHEME_V->code)) /* continue */ 3701 if (is_pair (SCHEME_V->code)) /* continue */
3656 { 3702 {
3657 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3703 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)); 3704 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3659 3705
3660 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3706 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3661 SCHEME_V->code = cadar (SCHEME_V->code); 3707 SCHEME_V->code = cadar (SCHEME_V->code);
3662 SCHEME_V->args = NIL; 3708 SCHEME_V->args = NIL;
3663 s_goto (OP_EVAL); 3709 s_goto (OP_EVAL);
3664 } 3710 }
3665 else /* end */ 3711 else /* end */
3666 { 3712 {
3667 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3713 args = reverse_in_place (SCHEME_A_ NIL, args);
3668 SCHEME_V->code = car (SCHEME_V->args); 3714 SCHEME_V->code = car (args);
3669 SCHEME_V->args = cdr (SCHEME_V->args); 3715 SCHEME_V->args = cdr (args);
3670 s_goto (OP_LET2); 3716 s_goto (OP_LET2);
3671 } 3717 }
3672 3718
3673 case OP_LET2: /* let */ 3719 case OP_LET2: /* let */
3674 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3720 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3675 3721
3676 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3722 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)) 3723 y != NIL; x = cdr (x), y = cdr (y))
3678 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3724 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3679 3725
3680 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3726 if (is_symbol (car (SCHEME_V->code))) /* named let */
3681 { 3727 {
3682 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3728 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3683 { 3729 {
3684 if (!is_pair (x)) 3730 if (!is_pair (x))
3685 Error_1 ("Bad syntax of binding in let :", x); 3731 Error_1 ("Bad syntax of binding in let :", x);
3686 3732
3687 if (!is_list (SCHEME_A_ car (x))) 3733 if (!is_list (SCHEME_A_ car (x)))
3688 Error_1 ("Bad syntax of binding in let :", car (x)); 3734 Error_1 ("Bad syntax of binding in let :", car (x));
3689 3735
3690 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3736 args = cons (caar (x), args);
3691 } 3737 }
3692 3738
3693 x =
3694 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3739 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3695 SCHEME_V->envir); 3740 SCHEME_V->envir);
3696 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3741 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3697 SCHEME_V->code = cddr (SCHEME_V->code); 3742 SCHEME_V->code = cddr (SCHEME_V->code);
3698 SCHEME_V->args = NIL;
3699 } 3743 }
3700 else 3744 else
3701 { 3745 {
3702 SCHEME_V->code = cdr (SCHEME_V->code); 3746 SCHEME_V->code = cdr (SCHEME_V->code);
3747 }
3748
3703 SCHEME_V->args = NIL; 3749 SCHEME_V->args = NIL;
3704 }
3705
3706 s_goto (OP_BEGIN); 3750 s_goto (OP_BEGIN);
3707 3751
3708 case OP_LET0AST: /* let* */ 3752 case OP_LET0AST: /* let* */
3709 if (car (SCHEME_V->code) == NIL) 3753 if (car (SCHEME_V->code) == NIL)
3710 { 3754 {
… …
3728 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3772 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3729 SCHEME_V->code = cdr (SCHEME_V->code); 3773 SCHEME_V->code = cdr (SCHEME_V->code);
3730 3774
3731 if (is_pair (SCHEME_V->code)) /* continue */ 3775 if (is_pair (SCHEME_V->code)) /* continue */
3732 { 3776 {
3733 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3777 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3734 SCHEME_V->code = cadar (SCHEME_V->code); 3778 SCHEME_V->code = cadar (SCHEME_V->code);
3735 SCHEME_V->args = NIL; 3779 SCHEME_V->args = NIL;
3736 s_goto (OP_EVAL); 3780 s_goto (OP_EVAL);
3737 } 3781 }
3738 else /* end */ 3782 else /* end */
3739 { 3783 {
3740 SCHEME_V->code = SCHEME_V->args; 3784 SCHEME_V->code = args;
3741 SCHEME_V->args = NIL; 3785 SCHEME_V->args = NIL;
3742 s_goto (OP_BEGIN); 3786 s_goto (OP_BEGIN);
3743 } 3787 }
3744 3788
3745 case OP_LET0REC: /* letrec */ 3789 case OP_LET0REC: /* letrec */
… …
3748 SCHEME_V->value = SCHEME_V->code; 3792 SCHEME_V->value = SCHEME_V->code;
3749 SCHEME_V->code = car (SCHEME_V->code); 3793 SCHEME_V->code = car (SCHEME_V->code);
3750 s_goto (OP_LET1REC); 3794 s_goto (OP_LET1REC);
3751 3795
3752 case OP_LET1REC: /* letrec (calculate parameters) */ 3796 case OP_LET1REC: /* letrec (calculate parameters) */
3753 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3797 args = cons (SCHEME_V->value, args);
3754 3798
3755 if (is_pair (SCHEME_V->code)) /* continue */ 3799 if (is_pair (SCHEME_V->code)) /* continue */
3756 { 3800 {
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3801 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)); 3802 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3759 3803
3760 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3804 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3761 SCHEME_V->code = cadar (SCHEME_V->code); 3805 SCHEME_V->code = cadar (SCHEME_V->code);
3762 SCHEME_V->args = NIL; 3806 SCHEME_V->args = NIL;
3763 s_goto (OP_EVAL); 3807 s_goto (OP_EVAL);
3764 } 3808 }
3765 else /* end */ 3809 else /* end */
3766 { 3810 {
3767 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3811 args = reverse_in_place (SCHEME_A_ NIL, args);
3768 SCHEME_V->code = car (SCHEME_V->args); 3812 SCHEME_V->code = car (args);
3769 SCHEME_V->args = cdr (SCHEME_V->args); 3813 SCHEME_V->args = cdr (args);
3770 s_goto (OP_LET2REC); 3814 s_goto (OP_LET2REC);
3771 } 3815 }
3772 3816
3773 case OP_LET2REC: /* letrec */ 3817 case OP_LET2REC: /* letrec */
3774 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3818 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)); 3819 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3776 3820
3777 SCHEME_V->code = cdr (SCHEME_V->code); 3821 SCHEME_V->code = cdr (SCHEME_V->code);
3778 SCHEME_V->args = NIL; 3822 SCHEME_V->args = NIL;
3779 s_goto (OP_BEGIN); 3823 s_goto (OP_BEGIN);
… …
3865 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3909 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3866 SCHEME_V->code = car (SCHEME_V->code); 3910 SCHEME_V->code = car (SCHEME_V->code);
3867 s_goto (OP_EVAL); 3911 s_goto (OP_EVAL);
3868 3912
3869 case OP_C1STREAM: /* cons-stream */ 3913 case OP_C1STREAM: /* cons-stream */
3870 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3914 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); 3915 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3872 set_typeflag (x, T_PROMISE); 3916 set_typeflag (x, T_PROMISE);
3873 s_return (cons (SCHEME_V->args, x)); 3917 s_return (cons (args, x));
3874 3918
3875 case OP_MACRO0: /* macro */ 3919 case OP_MACRO0: /* macro */
3876 if (is_pair (car (SCHEME_V->code))) 3920 if (is_pair (car (SCHEME_V->code)))
3877 { 3921 {
3878 x = caar (SCHEME_V->code); 3922 x = caar (SCHEME_V->code);
… …
3911 { 3955 {
3912 if (!is_pair (y = caar (x))) 3956 if (!is_pair (y = caar (x)))
3913 break; 3957 break;
3914 3958
3915 for (; y != NIL; y = cdr (y)) 3959 for (; y != NIL; y = cdr (y))
3916 {
3917 if (eqv (car (y), SCHEME_V->value)) 3960 if (eqv (car (y), SCHEME_V->value))
3918 break; 3961 break;
3919 }
3920 3962
3921 if (y != NIL) 3963 if (y != NIL)
3922 break; 3964 break;
3923 } 3965 }
3924 3966
… …
3944 s_goto (OP_BEGIN); 3986 s_goto (OP_BEGIN);
3945 else 3987 else
3946 s_return (NIL); 3988 s_return (NIL);
3947 3989
3948 case OP_PAPPLY: /* apply */ 3990 case OP_PAPPLY: /* apply */
3949 SCHEME_V->code = car (SCHEME_V->args); 3991 SCHEME_V->code = car (args);
3950 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3992 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3951 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3993 /*SCHEME_V->args = cadr(args); */
3952 s_goto (OP_APPLY); 3994 s_goto (OP_APPLY);
3953 3995
3954 case OP_PEVAL: /* eval */ 3996 case OP_PEVAL: /* eval */
3955 if (cdr (SCHEME_V->args) != NIL) 3997 if (cdr (args) != NIL)
3956 SCHEME_V->envir = cadr (SCHEME_V->args); 3998 SCHEME_V->envir = cadr (args);
3957 3999
3958 SCHEME_V->code = car (SCHEME_V->args); 4000 SCHEME_V->code = car (args);
3959 s_goto (OP_EVAL); 4001 s_goto (OP_EVAL);
3960 4002
3961 case OP_CONTINUATION: /* call-with-current-continuation */ 4003 case OP_CONTINUATION: /* call-with-current-continuation */
3962 SCHEME_V->code = car (SCHEME_V->args); 4004 SCHEME_V->code = car (args);
3963 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4005 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3964 s_goto (OP_APPLY); 4006 s_goto (OP_APPLY);
3965 } 4007 }
3966 4008
3967 return S_T; 4009 if (USE_ERROR_CHECKING) abort ();
3968} 4010}
3969 4011
3970static pointer 4012static int
3971opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4013opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3972{ 4014{
3973 pointer x; 4015 pointer args = SCHEME_V->args;
4016 pointer x = car (args);
3974 num v; 4017 num v;
3975 4018
4019 switch (op)
4020 {
3976#if USE_MATH 4021#if USE_MATH
3977 RVALUE dd;
3978#endif
3979
3980 switch (op)
3981 {
3982#if USE_MATH
3983
3984 case OP_INEX2EX: /* inexact->exact */ 4022 case OP_INEX2EX: /* inexact->exact */
3985 x = car (SCHEME_V->args); 4023 {
3986
3987 if (num_is_integer (x)) 4024 if (is_integer (x))
3988 s_return (x); 4025 s_return (x);
3989 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4026
4027 RVALUE r = rvalue_unchecked (x);
4028
4029 if (r == (RVALUE)(IVALUE)r)
3990 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4030 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3991 else 4031 else
3992 Error_1 ("inexact->exact: not integral:", x); 4032 Error_1 ("inexact->exact: not integral:", x);
4033 }
3993 4034
3994 case OP_EXP:
3995 x = car (SCHEME_V->args);
3996 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4035 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)))); 4036 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)))); 4037 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)))); 4038 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)))); 4039 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)))); 4040 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)))); 4041 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4021 4042
4022 case OP_ATAN: 4043 case OP_ATAN:
4023 x = car (SCHEME_V->args);
4024
4025 if (cdr (SCHEME_V->args) == NIL) 4044 if (cdr (args) == NIL)
4026 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4045 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4027 else 4046 else
4028 { 4047 {
4029 pointer y = cadr (SCHEME_V->args); 4048 pointer y = cadr (args);
4030
4031 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4049 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4032 } 4050 }
4033 4051
4034 case OP_SQRT: 4052 case OP_SQRT:
4035 x = car (SCHEME_V->args);
4036 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4053 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4037 4054
4038 case OP_EXPT: 4055 case OP_EXPT:
4039 { 4056 {
4040 RVALUE result; 4057 RVALUE result;
4041 int real_result = 1; 4058 int real_result = 1;
4042 pointer y = cadr (SCHEME_V->args); 4059 pointer y = cadr (args);
4043 4060
4044 x = car (SCHEME_V->args);
4045
4046 if (num_is_integer (x) && num_is_integer (y)) 4061 if (is_integer (x) && is_integer (y))
4047 real_result = 0; 4062 real_result = 0;
4048 4063
4049 /* This 'if' is an R5RS compatibility fix. */ 4064 /* This 'if' is an R5RS compatibility fix. */
4050 /* NOTE: Remove this 'if' fix for R6RS. */ 4065 /* NOTE: Remove this 'if' fix for R6RS. */
4051 if (rvalue (x) == 0 && rvalue (y) < 0) 4066 if (rvalue (x) == 0 && rvalue (y) < 0)
4052 result = 0.0; 4067 result = 0;
4053 else 4068 else
4054 result = pow (rvalue (x), rvalue (y)); 4069 result = pow (rvalue (x), rvalue (y));
4055 4070
4056 /* Before returning integer result make sure we can. */ 4071 /* Before returning integer result make sure we can. */
4057 /* If the test fails, result is too big for integer. */ 4072 /* If the test fails, result is too big for integer. */
4058 if (!real_result) 4073 if (!real_result)
4059 { 4074 {
4060 long result_as_long = (long) result; 4075 long result_as_long = result;
4061 4076
4062 if (result != (RVALUE) result_as_long) 4077 if (result != result_as_long)
4063 real_result = 1; 4078 real_result = 1;
4064 } 4079 }
4065 4080
4066 if (real_result) 4081 if (real_result)
4067 s_return (mk_real (SCHEME_A_ result)); 4082 s_return (mk_real (SCHEME_A_ result));
4068 else 4083 else
4069 s_return (mk_integer (SCHEME_A_ result)); 4084 s_return (mk_integer (SCHEME_A_ result));
4070 } 4085 }
4071 4086
4072 case OP_FLOOR:
4073 x = car (SCHEME_V->args);
4074 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4087 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)))); 4088 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4079 4089
4080 case OP_TRUNCATE: 4090 case OP_TRUNCATE:
4081 { 4091 {
4082 RVALUE rvalue_of_x; 4092 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))); 4093 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 } 4094 }
4092 4095
4093 case OP_ROUND: 4096 case OP_ROUND:
4094 x = car (SCHEME_V->args);
4095
4096 if (num_is_integer (x)) 4097 if (is_integer (x))
4097 s_return (x); 4098 s_return (x);
4098 4099
4099 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4100 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4100#endif 4101#endif
4101 4102
4102 case OP_ADD: /* + */ 4103 case OP_ADD: /* + */
4103 v = num_zero; 4104 v = num_zero;
4104 4105
4105 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4106 for (x = args; x != NIL; x = cdr (x))
4106 v = num_add (v, nvalue (car (x))); 4107 v = num_op (NUM_ADD, v, nvalue (car (x)));
4107 4108
4108 s_return (mk_number (SCHEME_A_ v)); 4109 s_return (mk_number (SCHEME_A_ v));
4109 4110
4110 case OP_MUL: /* * */ 4111 case OP_MUL: /* * */
4111 v = num_one; 4112 v = num_one;
4112 4113
4113 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4114 for (x = args; x != NIL; x = cdr (x))
4114 v = num_mul (v, nvalue (car (x))); 4115 v = num_op (NUM_MUL, v, nvalue (car (x)));
4115 4116
4116 s_return (mk_number (SCHEME_A_ v)); 4117 s_return (mk_number (SCHEME_A_ v));
4117 4118
4118 case OP_SUB: /* - */ 4119 case OP_SUB: /* - */
4119 if (cdr (SCHEME_V->args) == NIL) 4120 if (cdr (args) == NIL)
4120 { 4121 {
4121 x = SCHEME_V->args; 4122 x = args;
4122 v = num_zero; 4123 v = num_zero;
4123 } 4124 }
4124 else 4125 else
4125 { 4126 {
4126 x = cdr (SCHEME_V->args); 4127 x = cdr (args);
4127 v = nvalue (car (SCHEME_V->args)); 4128 v = nvalue (car (args));
4128 } 4129 }
4129 4130
4130 for (; x != NIL; x = cdr (x)) 4131 for (; x != NIL; x = cdr (x))
4131 v = num_sub (v, nvalue (car (x))); 4132 v = num_op (NUM_SUB, v, nvalue (car (x)));
4132 4133
4133 s_return (mk_number (SCHEME_A_ v)); 4134 s_return (mk_number (SCHEME_A_ v));
4134 4135
4135 case OP_DIV: /* / */ 4136 case OP_DIV: /* / */
4136 if (cdr (SCHEME_V->args) == NIL) 4137 if (cdr (args) == NIL)
4137 { 4138 {
4138 x = SCHEME_V->args; 4139 x = args;
4139 v = num_one; 4140 v = num_one;
4140 } 4141 }
4141 else 4142 else
4142 { 4143 {
4143 x = cdr (SCHEME_V->args); 4144 x = cdr (args);
4144 v = nvalue (car (SCHEME_V->args)); 4145 v = nvalue (car (args));
4145 } 4146 }
4146 4147
4147 for (; x != NIL; x = cdr (x)) 4148 for (; x != NIL; x = cdr (x))
4148 {
4149 if (!is_zero_rvalue (rvalue (car (x)))) 4149 if (!is_zero_rvalue (rvalue (car (x))))
4150 v = num_div (v, nvalue (car (x))); 4150 v = num_div (v, nvalue (car (x)));
4151 else 4151 else
4152 Error_0 ("/: division by zero"); 4152 Error_0 ("/: division by zero");
4153 }
4154 4153
4155 s_return (mk_number (SCHEME_A_ v)); 4154 s_return (mk_number (SCHEME_A_ v));
4156 4155
4157 case OP_INTDIV: /* quotient */ 4156 case OP_INTDIV: /* quotient */
4158 if (cdr (SCHEME_V->args) == NIL) 4157 if (cdr (args) == NIL)
4159 { 4158 {
4160 x = SCHEME_V->args; 4159 x = args;
4161 v = num_one; 4160 v = num_one;
4162 } 4161 }
4163 else 4162 else
4164 { 4163 {
4165 x = cdr (SCHEME_V->args); 4164 x = cdr (args);
4166 v = nvalue (car (SCHEME_V->args)); 4165 v = nvalue (car (args));
4167 } 4166 }
4168 4167
4169 for (; x != NIL; x = cdr (x)) 4168 for (; x != NIL; x = cdr (x))
4170 { 4169 {
4171 if (ivalue (car (x)) != 0) 4170 if (ivalue (car (x)) != 0)
4172 v = num_intdiv (v, nvalue (car (x))); 4171 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4173 else 4172 else
4174 Error_0 ("quotient: division by zero"); 4173 Error_0 ("quotient: division by zero");
4175 } 4174 }
4176 4175
4177 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4178 4177
4179 case OP_REM: /* remainder */ 4178 case OP_REM: /* remainder */
4180 v = nvalue (car (SCHEME_V->args)); 4179 v = nvalue (x);
4181 4180
4182 if (ivalue (cadr (SCHEME_V->args)) != 0) 4181 if (ivalue (cadr (args)) != 0)
4183 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4182 v = num_rem (v, nvalue (cadr (args)));
4184 else 4183 else
4185 Error_0 ("remainder: division by zero"); 4184 Error_0 ("remainder: division by zero");
4186 4185
4187 s_return (mk_number (SCHEME_A_ v)); 4186 s_return (mk_number (SCHEME_A_ v));
4188 4187
4189 case OP_MOD: /* modulo */ 4188 case OP_MOD: /* modulo */
4190 v = nvalue (car (SCHEME_V->args)); 4189 v = nvalue (x);
4191 4190
4192 if (ivalue (cadr (SCHEME_V->args)) != 0) 4191 if (ivalue (cadr (args)) != 0)
4193 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4192 v = num_mod (v, nvalue (cadr (args)));
4194 else 4193 else
4195 Error_0 ("modulo: division by zero"); 4194 Error_0 ("modulo: division by zero");
4196 4195
4197 s_return (mk_number (SCHEME_A_ v)); 4196 s_return (mk_number (SCHEME_A_ v));
4198 4197
4199 case OP_CAR: /* car */ 4198 case OP_CAR: /* car */
4200 s_return (caar (SCHEME_V->args)); 4199 s_return (caar (args));
4201 4200
4202 case OP_CDR: /* cdr */ 4201 case OP_CDR: /* cdr */
4203 s_return (cdar (SCHEME_V->args)); 4202 s_return (cdar (args));
4204 4203
4205 case OP_CONS: /* cons */ 4204 case OP_CONS: /* cons */
4206 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4205 set_cdr (args, cadr (args));
4207 s_return (SCHEME_V->args); 4206 s_return (args);
4208 4207
4209 case OP_SETCAR: /* set-car! */ 4208 case OP_SETCAR: /* set-car! */
4210 if (!is_immutable (car (SCHEME_V->args))) 4209 if (!is_immutable (x))
4211 { 4210 {
4212 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4211 set_car (x, cadr (args));
4213 s_return (car (SCHEME_V->args)); 4212 s_return (car (args));
4214 } 4213 }
4215 else 4214 else
4216 Error_0 ("set-car!: unable to alter immutable pair"); 4215 Error_0 ("set-car!: unable to alter immutable pair");
4217 4216
4218 case OP_SETCDR: /* set-cdr! */ 4217 case OP_SETCDR: /* set-cdr! */
4219 if (!is_immutable (car (SCHEME_V->args))) 4218 if (!is_immutable (x))
4220 { 4219 {
4221 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4220 set_cdr (x, cadr (args));
4222 s_return (car (SCHEME_V->args)); 4221 s_return (car (args));
4223 } 4222 }
4224 else 4223 else
4225 Error_0 ("set-cdr!: unable to alter immutable pair"); 4224 Error_0 ("set-cdr!: unable to alter immutable pair");
4226 4225
4227 case OP_CHAR2INT: /* char->integer */ 4226 case OP_CHAR2INT: /* char->integer */
4228 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4227 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4229 4228
4230 case OP_INT2CHAR: /* integer->char */ 4229 case OP_INT2CHAR: /* integer->char */
4231 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4230 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4232 4231
4233 case OP_CHARUPCASE: 4232 case OP_CHARUPCASE:
4234 { 4233 {
4235 unsigned char c = ivalue (car (SCHEME_V->args)); 4234 unsigned char c = ivalue_unchecked (x);
4236 c = toupper (c); 4235 c = toupper (c);
4237 s_return (mk_character (SCHEME_A_ c)); 4236 s_return (mk_character (SCHEME_A_ c));
4238 } 4237 }
4239 4238
4240 case OP_CHARDNCASE: 4239 case OP_CHARDNCASE:
4241 { 4240 {
4242 unsigned char c = ivalue (car (SCHEME_V->args)); 4241 unsigned char c = ivalue_unchecked (x);
4243 c = tolower (c); 4242 c = tolower (c);
4244 s_return (mk_character (SCHEME_A_ c)); 4243 s_return (mk_character (SCHEME_A_ c));
4245 } 4244 }
4246 4245
4247 case OP_STR2SYM: /* string->symbol */ 4246 case OP_STR2SYM: /* string->symbol */
4248 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4247 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4249 4248
4250 case OP_STR2ATOM: /* string->atom */ 4249 case OP_STR2ATOM: /* string->atom */
4251 { 4250 {
4252 char *s = strvalue (car (SCHEME_V->args)); 4251 char *s = strvalue (x);
4253 long pf = 0; 4252 long pf = 0;
4254 4253
4255 if (cdr (SCHEME_V->args) != NIL) 4254 if (cdr (args) != NIL)
4256 { 4255 {
4257 /* we know cadr(SCHEME_V->args) is a natural number */ 4256 /* we know cadr(args) is a natural number */
4258 /* see if it is 2, 8, 10, or 16, or error */ 4257 /* see if it is 2, 8, 10, or 16, or error */
4259 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4258 pf = ivalue_unchecked (cadr (args));
4260 4259
4261 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4260 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4262 { 4261 {
4263 /* base is OK */ 4262 /* base is OK */
4264 } 4263 }
4265 else 4264 else
4266 pf = -1; 4265 pf = -1;
4267 } 4266 }
4268 4267
4269 if (pf < 0) 4268 if (pf < 0)
4270 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4269 Error_1 ("string->atom: bad base:", cadr (args));
4271 else if (*s == '#') /* no use of base! */ 4270 else if (*s == '#') /* no use of base! */
4272 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4271 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4273 else 4272 else
4274 { 4273 {
4275 if (pf == 0 || pf == 10) 4274 if (pf == 0 || pf == 10)
… …
4286 } 4285 }
4287 } 4286 }
4288 } 4287 }
4289 4288
4290 case OP_SYM2STR: /* symbol->string */ 4289 case OP_SYM2STR: /* symbol->string */
4291 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4290 x = mk_string (SCHEME_A_ symname (x));
4292 setimmutable (x); 4291 setimmutable (x);
4293 s_return (x); 4292 s_return (x);
4294 4293
4295 case OP_ATOM2STR: /* atom->string */ 4294 case OP_ATOM2STR: /* atom->string */
4296 { 4295 {
4297 long pf = 0; 4296 long pf = 0;
4298 4297
4299 x = car (SCHEME_V->args);
4300
4301 if (cdr (SCHEME_V->args) != NIL) 4298 if (cdr (args) != NIL)
4302 { 4299 {
4303 /* we know cadr(SCHEME_V->args) is a natural number */ 4300 /* we know cadr(args) is a natural number */
4304 /* see if it is 2, 8, 10, or 16, or error */ 4301 /* see if it is 2, 8, 10, or 16, or error */
4305 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4302 pf = ivalue_unchecked (cadr (args));
4306 4303
4307 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4304 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4308 { 4305 {
4309 /* base is OK */ 4306 /* base is OK */
4310 } 4307 }
4311 else 4308 else
4312 pf = -1; 4309 pf = -1;
4313 } 4310 }
4314 4311
4315 if (pf < 0) 4312 if (pf < 0)
4316 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4313 Error_1 ("atom->string: bad base:", cadr (args));
4317 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4314 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4318 { 4315 {
4319 char *p; 4316 char *p;
4320 int len; 4317 int len;
4321 4318
… …
4326 Error_1 ("atom->string: not an atom:", x); 4323 Error_1 ("atom->string: not an atom:", x);
4327 } 4324 }
4328 4325
4329 case OP_MKSTRING: /* make-string */ 4326 case OP_MKSTRING: /* make-string */
4330 { 4327 {
4331 int fill = ' '; 4328 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4332 int len; 4329 int len = ivalue_unchecked (x);
4333 4330
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)); 4331 s_return (mk_empty_string (SCHEME_A_ len, fill));
4340 } 4332 }
4341 4333
4342 case OP_STRLEN: /* string-length */ 4334 case OP_STRLEN: /* string-length */
4343 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4335 s_return (mk_integer (SCHEME_A_ strlength (x)));
4344 4336
4345 case OP_STRREF: /* string-ref */ 4337 case OP_STRREF: /* string-ref */
4346 { 4338 {
4347 char *str; 4339 char *str = strvalue (x);
4348 int index;
4349
4350 str = strvalue (car (SCHEME_V->args));
4351
4352 index = ivalue (cadr (SCHEME_V->args)); 4340 int index = ivalue_unchecked (cadr (args));
4353 4341
4354 if (index >= strlength (car (SCHEME_V->args))) 4342 if (index >= strlength (x))
4355 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4343 Error_1 ("string-ref: out of bounds:", cadr (args));
4356 4344
4357 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4345 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4358 } 4346 }
4359 4347
4360 case OP_STRSET: /* string-set! */ 4348 case OP_STRSET: /* string-set! */
4361 { 4349 {
4362 char *str; 4350 char *str = strvalue (x);
4363 int index; 4351 int index = ivalue_unchecked (cadr (args));
4364 int c; 4352 int c;
4365 4353
4366 if (is_immutable (car (SCHEME_V->args))) 4354 if (is_immutable (x))
4367 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4355 Error_1 ("string-set!: unable to alter immutable string:", x);
4368 4356
4369 str = strvalue (car (SCHEME_V->args));
4370
4371 index = ivalue (cadr (SCHEME_V->args));
4372
4373 if (index >= strlength (car (SCHEME_V->args))) 4357 if (index >= strlength (x))
4374 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4358 Error_1 ("string-set!: out of bounds:", cadr (args));
4375 4359
4376 c = charvalue (caddr (SCHEME_V->args)); 4360 c = charvalue (caddr (args));
4377 4361
4378 str[index] = (char) c; 4362 str[index] = c;
4379 s_return (car (SCHEME_V->args)); 4363 s_return (car (args));
4380 } 4364 }
4381 4365
4382 case OP_STRAPPEND: /* string-append */ 4366 case OP_STRAPPEND: /* string-append */
4383 { 4367 {
4384 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4368 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4385 int len = 0; 4369 int len = 0;
4386 pointer newstr; 4370 pointer newstr;
4387 char *pos; 4371 char *pos;
4388 4372
4389 /* compute needed length for new string */ 4373 /* compute needed length for new string */
4390 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4374 for (x = args; x != NIL; x = cdr (x))
4391 len += strlength (car (x)); 4375 len += strlength (car (x));
4392 4376
4393 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4377 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4394 4378
4395 /* store the contents of the argument strings into the new string */ 4379 /* 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)) 4380 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4397 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4381 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4398 4382
4399 s_return (newstr); 4383 s_return (newstr);
4400 } 4384 }
4401 4385
4402 case OP_SUBSTR: /* substring */ 4386 case OP_SUBSTR: /* substring */
4403 { 4387 {
4404 char *str; 4388 char *str = strvalue (x);
4405 int index0; 4389 int index0 = ivalue_unchecked (cadr (args));
4406 int index1; 4390 int index1;
4407 int len; 4391 int len;
4408 4392
4409 str = strvalue (car (SCHEME_V->args));
4410
4411 index0 = ivalue (cadr (SCHEME_V->args));
4412
4413 if (index0 > strlength (car (SCHEME_V->args))) 4393 if (index0 > strlength (x))
4414 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4394 Error_1 ("substring: start out of bounds:", cadr (args));
4415 4395
4416 if (cddr (SCHEME_V->args) != NIL) 4396 if (cddr (args) != NIL)
4417 { 4397 {
4418 index1 = ivalue (caddr (SCHEME_V->args)); 4398 index1 = ivalue_unchecked (caddr (args));
4419 4399
4420 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4400 if (index1 > strlength (x) || index1 < index0)
4421 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4401 Error_1 ("substring: end out of bounds:", caddr (args));
4422 } 4402 }
4423 else 4403 else
4424 index1 = strlength (car (SCHEME_V->args)); 4404 index1 = strlength (x);
4425 4405
4426 len = index1 - index0; 4406 len = index1 - index0;
4427 x = mk_empty_string (SCHEME_A_ len, ' '); 4407 x = mk_empty_string (SCHEME_A_ len, ' ');
4428 memcpy (strvalue (x), str + index0, len); 4408 memcpy (strvalue (x), str + index0, len);
4429 strvalue (x)[len] = 0; 4409 strvalue (x)[len] = 0;
… …
4433 4413
4434 case OP_VECTOR: /* vector */ 4414 case OP_VECTOR: /* vector */
4435 { 4415 {
4436 int i; 4416 int i;
4437 pointer vec; 4417 pointer vec;
4438 int len = list_length (SCHEME_A_ SCHEME_V->args); 4418 int len = list_length (SCHEME_A_ args);
4439 4419
4440 if (len < 0) 4420 if (len < 0)
4441 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4421 Error_1 ("vector: not a proper list:", args);
4442 4422
4443 vec = mk_vector (SCHEME_A_ len); 4423 vec = mk_vector (SCHEME_A_ len);
4444 4424
4445#if USE_ERROR_CHECKING 4425#if USE_ERROR_CHECKING
4446 if (SCHEME_V->no_memory) 4426 if (SCHEME_V->no_memory)
4447 s_return (S_SINK); 4427 s_return (S_SINK);
4448#endif 4428#endif
4449 4429
4450 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4430 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4451 set_vector_elem (vec, i, car (x)); 4431 vector_set (vec, i, car (x));
4452 4432
4453 s_return (vec); 4433 s_return (vec);
4454 } 4434 }
4455 4435
4456 case OP_MKVECTOR: /* make-vector */ 4436 case OP_MKVECTOR: /* make-vector */
4457 { 4437 {
4458 pointer fill = NIL; 4438 pointer fill = NIL;
4459 int len;
4460 pointer vec; 4439 pointer vec;
4440 int len = ivalue_unchecked (x);
4461 4441
4462 len = ivalue (car (SCHEME_V->args));
4463
4464 if (cdr (SCHEME_V->args) != NIL) 4442 if (cdr (args) != NIL)
4465 fill = cadr (SCHEME_V->args); 4443 fill = cadr (args);
4466 4444
4467 vec = mk_vector (SCHEME_A_ len); 4445 vec = mk_vector (SCHEME_A_ len);
4468 4446
4469#if USE_ERROR_CHECKING 4447#if USE_ERROR_CHECKING
4470 if (SCHEME_V->no_memory) 4448 if (SCHEME_V->no_memory)
4471 s_return (S_SINK); 4449 s_return (S_SINK);
4472#endif 4450#endif
4473 4451
4474 if (fill != NIL) 4452 if (fill != NIL)
4475 fill_vector (vec, fill); 4453 fill_vector (vec, 0, fill);
4476 4454
4477 s_return (vec); 4455 s_return (vec);
4478 } 4456 }
4479 4457
4480 case OP_VECLEN: /* vector-length */ 4458 case OP_VECLEN: /* vector-length */
4481 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4459 s_return (mk_integer (SCHEME_A_ veclength (x)));
4460
4461 case OP_VECRESIZE:
4462 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4463 s_return (x);
4482 4464
4483 case OP_VECREF: /* vector-ref */ 4465 case OP_VECREF: /* vector-ref */
4484 { 4466 {
4485 int index;
4486
4487 index = ivalue (cadr (SCHEME_V->args)); 4467 int index = ivalue_unchecked (cadr (args));
4488 4468
4489 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4469 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4490 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4470 Error_1 ("vector-ref: out of bounds:", cadr (args));
4491 4471
4492 s_return (vector_elem (car (SCHEME_V->args), index)); 4472 s_return (vector_get (x, index));
4493 } 4473 }
4494 4474
4495 case OP_VECSET: /* vector-set! */ 4475 case OP_VECSET: /* vector-set! */
4496 { 4476 {
4497 int index; 4477 int index = ivalue_unchecked (cadr (args));
4498 4478
4499 if (is_immutable (car (SCHEME_V->args))) 4479 if (is_immutable (x))
4500 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4480 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4501 4481
4502 index = ivalue (cadr (SCHEME_V->args));
4503
4504 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4482 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4505 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4483 Error_1 ("vector-set!: out of bounds:", cadr (args));
4506 4484
4507 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4485 vector_set (x, index, caddr (args));
4508 s_return (car (SCHEME_V->args)); 4486 s_return (x);
4509 } 4487 }
4510 } 4488 }
4511 4489
4512 return S_T; 4490 if (USE_ERROR_CHECKING) abort ();
4513} 4491}
4514 4492
4515INTERFACE int 4493static int
4516is_list (SCHEME_P_ pointer a) 4494opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4517{ 4495{
4518 return list_length (SCHEME_A_ a) >= 0; 4496 pointer x = SCHEME_V->args;
4519}
4520 4497
4521/* Result is: 4498 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 { 4499 {
4500 num v = nvalue (car (x));
4501 x = cdr (x);
4502
4537 if (fast == NIL) 4503 if (x == NIL)
4538 return i; 4504 break;
4539 4505
4540 if (!is_pair (fast)) 4506 int r = num_cmp (v, nvalue (car (x)));
4541 return -2 - i;
4542 4507
4543 fast = cdr (fast); 4508 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 { 4509 {
4561 /* the fast pointer has looped back around and caught up 4510 case OP_NUMEQ: r = r == 0; break;
4562 with the slow pointer, hence the structure is circular, 4511 case OP_LESS: r = r < 0; break;
4563 not of finite length, and therefore not a list */ 4512 case OP_GRE: r = r > 0; break;
4564 return -1; 4513 case OP_LEQ: r = r <= 0; break;
4514 case OP_GEQ: r = r >= 0; break;
4565 } 4515 }
4566 }
4567}
4568 4516
4517 if (!r)
4518 s_return (S_F);
4519 }
4520
4521 s_return (S_T);
4522}
4523
4569static pointer 4524static int
4570opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4525opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4571{ 4526{
4572 pointer x; 4527 pointer args = SCHEME_V->args;
4573 num v; 4528 pointer a = car (args);
4574 int (*comp_func) (num, num); 4529 pointer d = cdr (args);
4530 int r;
4575 4531
4576 switch (op) 4532 switch (op)
4577 { 4533 {
4578 case OP_NOT: /* not */ 4534 case OP_NOT: /* not */ r = is_false (a) ; break;
4579 s_retbool (is_false (car (SCHEME_V->args))); 4535 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4536 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4537 case OP_NULLP: /* null? */ r = a == NIL ; break;
4538 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4539 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4540 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4541 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4542 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4543 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4580 4544
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 4545#if USE_CHAR_CLASSIFIERS
4650 4546 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4651 case OP_CHARAP: /* char-alphabetic? */ 4547 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4652 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4548 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4653 4549 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4654 case OP_CHARNP: /* char-numeric? */ 4550 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 4551#endif
4552
4666#if USE_PORTS 4553#if USE_PORTS
4667 4554 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? */ 4555 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? */ 4556 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4675 s_retbool (is_outport (car (SCHEME_V->args)));
4676#endif 4557#endif
4677 4558
4678 case OP_PROCP: /* procedure? */ 4559 case OP_PROCP: /* procedure? */
4679 4560
4680 /*-- 4561 /*--
4681 * continuation should be procedure by the example 4562 * continuation should be procedure by the example
4682 * (call-with-current-continuation procedure?) ==> #t 4563 * (call-with-current-continuation procedure?) ==> #t
4683 * in R^3 report sec. 6.9 4564 * in R^3 report sec. 6.9
4684 */ 4565 */
4685 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4566 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))); 4567 break;
4687 4568
4688 case OP_PAIRP: /* pair? */ 4569 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4689 s_retbool (is_pair (car (SCHEME_V->args))); 4570 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4690 4571 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4691 case OP_LISTP: /* list? */ 4572 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4692 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4573 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4693 4574 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 } 4575 }
4706 4576
4707 return S_T; 4577 s_retbool (r);
4708} 4578}
4709 4579
4710static pointer 4580static int
4711opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4581opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4712{ 4582{
4583 pointer args = SCHEME_V->args;
4584 pointer a = car (args);
4713 pointer x, y; 4585 pointer x, y;
4714 4586
4715 switch (op) 4587 switch (op)
4716 { 4588 {
4717 case OP_FORCE: /* force */ 4589 case OP_FORCE: /* force */
4718 SCHEME_V->code = car (SCHEME_V->args); 4590 SCHEME_V->code = a;
4719 4591
4720 if (is_promise (SCHEME_V->code)) 4592 if (is_promise (SCHEME_V->code))
4721 { 4593 {
4722 /* Should change type to closure here */ 4594 /* Should change type to closure here */
4723 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4595 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4744 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4616 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4745 SCHEME_V->outport = cadr (SCHEME_V->args); 4617 SCHEME_V->outport = cadr (SCHEME_V->args);
4746 } 4618 }
4747 } 4619 }
4748 4620
4749 SCHEME_V->args = car (SCHEME_V->args); 4621 SCHEME_V->args = a;
4750 4622
4751 if (op == OP_WRITE) 4623 if (op == OP_WRITE)
4752 SCHEME_V->print_flag = 1; 4624 SCHEME_V->print_flag = 1;
4753 else 4625 else
4754 SCHEME_V->print_flag = 0; 4626 SCHEME_V->print_flag = 0;
4755 4627
4756 s_goto (OP_P0LIST); 4628 s_goto (OP_P0LIST);
4757 4629
4758 case OP_NEWLINE: /* newline */ 4630 case OP_NEWLINE: /* newline */
4759 if (is_pair (SCHEME_V->args)) 4631 if (is_pair (args))
4760 { 4632 {
4761 if (car (SCHEME_V->args) != SCHEME_V->outport) 4633 if (a != SCHEME_V->outport)
4762 { 4634 {
4763 x = cons (SCHEME_V->outport, NIL); 4635 x = cons (SCHEME_V->outport, NIL);
4764 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4636 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4765 SCHEME_V->outport = car (SCHEME_V->args); 4637 SCHEME_V->outport = a;
4766 } 4638 }
4767 } 4639 }
4768 4640
4769 putstr (SCHEME_A_ "\n"); 4641 putstr (SCHEME_A_ "\n");
4770 s_return (S_T); 4642 s_return (S_T);
4771#endif 4643#endif
4772 4644
4773 case OP_ERR0: /* error */ 4645 case OP_ERR0: /* error */
4774 SCHEME_V->retcode = -1; 4646 SCHEME_V->retcode = -1;
4775 4647
4776 if (!is_string (car (SCHEME_V->args))) 4648 if (!is_string (a))
4777 { 4649 {
4778 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4650 args = cons (mk_string (SCHEME_A_ " -- "), args);
4779 setimmutable (car (SCHEME_V->args)); 4651 setimmutable (car (args));
4780 } 4652 }
4781 4653
4782 putstr (SCHEME_A_ "Error: "); 4654 putstr (SCHEME_A_ "Error: ");
4783 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4655 putstr (SCHEME_A_ strvalue (car (args)));
4784 SCHEME_V->args = cdr (SCHEME_V->args); 4656 SCHEME_V->args = cdr (args);
4785 s_goto (OP_ERR1); 4657 s_goto (OP_ERR1);
4786 4658
4787 case OP_ERR1: /* error */ 4659 case OP_ERR1: /* error */
4788 putstr (SCHEME_A_ " "); 4660 putstr (SCHEME_A_ " ");
4789 4661
4790 if (SCHEME_V->args != NIL) 4662 if (args != NIL)
4791 { 4663 {
4792 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4664 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4793 SCHEME_V->args = car (SCHEME_V->args); 4665 SCHEME_V->args = a;
4794 SCHEME_V->print_flag = 1; 4666 SCHEME_V->print_flag = 1;
4795 s_goto (OP_P0LIST); 4667 s_goto (OP_P0LIST);
4796 } 4668 }
4797 else 4669 else
4798 { 4670 {
4799 putstr (SCHEME_A_ "\n"); 4671 putstr (SCHEME_A_ "\n");
4800 4672
4801 if (SCHEME_V->interactive_repl) 4673 if (SCHEME_V->interactive_repl)
4802 s_goto (OP_T0LVL); 4674 s_goto (OP_T0LVL);
4803 else 4675 else
4804 return NIL; 4676 return -1;
4805 } 4677 }
4806 4678
4807 case OP_REVERSE: /* reverse */ 4679 case OP_REVERSE: /* reverse */
4808 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4680 s_return (reverse (SCHEME_A_ a));
4809 4681
4810 case OP_LIST_STAR: /* list* */ 4682 case OP_LIST_STAR: /* list* */
4811 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4683 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4812 4684
4813 case OP_APPEND: /* append */ 4685 case OP_APPEND: /* append */
4814 x = NIL; 4686 x = NIL;
4815 y = SCHEME_V->args; 4687 y = args;
4816 4688
4817 if (y == x) 4689 if (y == x)
4818 s_return (x); 4690 s_return (x);
4819 4691
4820 /* cdr() in the while condition is not a typo. If car() */ 4692 /* cdr() in the while condition is not a typo. If car() */
… …
4831 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4703 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4832 4704
4833#if USE_PLIST 4705#if USE_PLIST
4834 4706
4835 case OP_PUT: /* put */ 4707 case OP_PUT: /* put */
4836 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4708 if (!hasprop (a) || !hasprop (cadr (args)))
4837 Error_0 ("illegal use of put"); 4709 Error_0 ("illegal use of put");
4838 4710
4839 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4711 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4840 { 4712 {
4841 if (caar (x) == y) 4713 if (caar (x) == y)
4842 break; 4714 break;
4843 } 4715 }
4844 4716
4845 if (x != NIL) 4717 if (x != NIL)
4846 cdar (x) = caddr (SCHEME_V->args); 4718 cdar (x) = caddr (args);
4847 else 4719 else
4848 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4720 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4849 4721
4850 s_return (S_T); 4722 s_return (S_T);
4851 4723
4852 case OP_GET: /* get */ 4724 case OP_GET: /* get */
4853 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4725 if (!hasprop (a) || !hasprop (cadr (args)))
4854 Error_0 ("illegal use of get"); 4726 Error_0 ("illegal use of get");
4855 4727
4856 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4728 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4857 if (caar (x) == y) 4729 if (caar (x) == y)
4858 break; 4730 break;
4859 4731
4860 if (x != NIL) 4732 if (x != NIL)
4861 s_return (cdar (x)); 4733 s_return (cdar (x));
… …
4863 s_return (NIL); 4735 s_return (NIL);
4864 4736
4865#endif /* USE_PLIST */ 4737#endif /* USE_PLIST */
4866 4738
4867 case OP_QUIT: /* quit */ 4739 case OP_QUIT: /* quit */
4868 if (is_pair (SCHEME_V->args)) 4740 if (is_pair (args))
4869 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4741 SCHEME_V->retcode = ivalue (a);
4870 4742
4871 return NIL; 4743 return -1;
4872 4744
4873 case OP_GC: /* gc */ 4745 case OP_GC: /* gc */
4874 gc (SCHEME_A_ NIL, NIL); 4746 gc (SCHEME_A_ NIL, NIL);
4875 s_return (S_T); 4747 s_return (S_T);
4876 4748
4877 case OP_GCVERB: /* gc-verbose */ 4749 case OP_GCVERB: /* gc-verbose */
4878 { 4750 {
4879 int was = SCHEME_V->gc_verbose; 4751 int was = SCHEME_V->gc_verbose;
4880 4752
4881 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4753 SCHEME_V->gc_verbose = (a != S_F);
4882 s_retbool (was); 4754 s_retbool (was);
4883 } 4755 }
4884 4756
4885 case OP_NEWSEGMENT: /* new-segment */ 4757 case OP_NEWSEGMENT: /* new-segment */
4886 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4758 if (!is_pair (args) || !is_number (a))
4887 Error_0 ("new-segment: argument must be a number"); 4759 Error_0 ("new-segment: argument must be a number");
4888 4760
4889 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4761 alloc_cellseg (SCHEME_A_ ivalue (a));
4890 4762
4891 s_return (S_T); 4763 s_return (S_T);
4892 4764
4893 case OP_OBLIST: /* oblist */ 4765 case OP_OBLIST: /* oblist */
4894 s_return (oblist_all_symbols (SCHEME_A)); 4766 s_return (oblist_all_symbols (SCHEME_A));
… …
4921 case OP_OPEN_INOUTFILE: 4793 case OP_OPEN_INOUTFILE:
4922 prop = port_input | port_output; 4794 prop = port_input | port_output;
4923 break; 4795 break;
4924 } 4796 }
4925 4797
4926 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4798 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4927 4799
4928 if (p == NIL) 4800 s_return (p == NIL ? S_F : p);
4929 s_return (S_F);
4930
4931 s_return (p);
4932 } 4801 }
4933 4802
4934# if USE_STRING_PORTS 4803# if USE_STRING_PORTS
4935 4804
4936 case OP_OPEN_INSTRING: /* open-input-string */ 4805 case OP_OPEN_INSTRING: /* open-input-string */
… …
4948 case OP_OPEN_INOUTSTRING: 4817 case OP_OPEN_INOUTSTRING:
4949 prop = port_input | port_output; 4818 prop = port_input | port_output;
4950 break; 4819 break;
4951 } 4820 }
4952 4821
4953 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4822 p = port_from_string (SCHEME_A_ strvalue (a),
4954 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4823 strvalue (a) + strlength (a), prop);
4955 4824
4956 if (p == NIL) 4825 s_return (p == NIL ? S_F : p);
4957 s_return (S_F);
4958
4959 s_return (p);
4960 } 4826 }
4961 4827
4962 case OP_OPEN_OUTSTRING: /* open-output-string */ 4828 case OP_OPEN_OUTSTRING: /* open-output-string */
4963 { 4829 {
4964 pointer p; 4830 pointer p;
4965 4831
4966 if (car (SCHEME_V->args) == NIL) 4832 if (a == NIL)
4967 {
4968 p = port_from_scratch (SCHEME_A); 4833 p = port_from_scratch (SCHEME_A);
4969
4970 if (p == NIL)
4971 s_return (S_F);
4972 }
4973 else 4834 else
4974 {
4975 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4835 p = port_from_string (SCHEME_A_ strvalue (a),
4976 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4836 strvalue (a) + strlength (a), port_output);
4977 4837
4978 if (p == NIL) 4838 s_return (p == NIL ? S_F : p);
4979 s_return (S_F);
4980 }
4981
4982 s_return (p);
4983 } 4839 }
4984 4840
4985 case OP_GET_OUTSTRING: /* get-output-string */ 4841 case OP_GET_OUTSTRING: /* get-output-string */
4986 { 4842 {
4987 port *p; 4843 port *p;
4988 4844
4989 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4845 if ((p = a->object.port)->kind & port_string)
4990 { 4846 {
4991 off_t size; 4847 off_t size;
4992 char *str; 4848 char *str;
4993 4849
4994 size = p->rep.string.curr - p->rep.string.start + 1; 4850 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5010 } 4866 }
5011 4867
5012# endif 4868# endif
5013 4869
5014 case OP_CLOSE_INPORT: /* close-input-port */ 4870 case OP_CLOSE_INPORT: /* close-input-port */
5015 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4871 port_close (SCHEME_A_ a, port_input);
5016 s_return (S_T); 4872 s_return (S_T);
5017 4873
5018 case OP_CLOSE_OUTPORT: /* close-output-port */ 4874 case OP_CLOSE_OUTPORT: /* close-output-port */
5019 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4875 port_close (SCHEME_A_ a, port_output);
5020 s_return (S_T); 4876 s_return (S_T);
5021#endif 4877#endif
5022 4878
5023 case OP_INT_ENV: /* interaction-environment */ 4879 case OP_INT_ENV: /* interaction-environment */
5024 s_return (SCHEME_V->global_env); 4880 s_return (SCHEME_V->global_env);
… …
5026 case OP_CURR_ENV: /* current-environment */ 4882 case OP_CURR_ENV: /* current-environment */
5027 s_return (SCHEME_V->envir); 4883 s_return (SCHEME_V->envir);
5028 4884
5029 } 4885 }
5030 4886
5031 return S_T; 4887 if (USE_ERROR_CHECKING) abort ();
5032} 4888}
5033 4889
5034static pointer 4890static int
5035opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4891opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5036{ 4892{
4893 pointer args = SCHEME_V->args;
5037 pointer x; 4894 pointer x;
5038 4895
5039 if (SCHEME_V->nesting != 0) 4896 if (SCHEME_V->nesting != 0)
5040 { 4897 {
5041 int n = SCHEME_V->nesting; 4898 int n = SCHEME_V->nesting;
… …
5048 switch (op) 4905 switch (op)
5049 { 4906 {
5050 /* ========== reading part ========== */ 4907 /* ========== reading part ========== */
5051#if USE_PORTS 4908#if USE_PORTS
5052 case OP_READ: 4909 case OP_READ:
5053 if (!is_pair (SCHEME_V->args)) 4910 if (!is_pair (args))
5054 s_goto (OP_READ_INTERNAL); 4911 s_goto (OP_READ_INTERNAL);
5055 4912
5056 if (!is_inport (car (SCHEME_V->args))) 4913 if (!is_inport (car (args)))
5057 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4914 Error_1 ("read: not an input port:", car (args));
5058 4915
5059 if (car (SCHEME_V->args) == SCHEME_V->inport) 4916 if (car (args) == SCHEME_V->inport)
5060 s_goto (OP_READ_INTERNAL); 4917 s_goto (OP_READ_INTERNAL);
5061 4918
5062 x = SCHEME_V->inport; 4919 x = SCHEME_V->inport;
5063 SCHEME_V->inport = car (SCHEME_V->args); 4920 SCHEME_V->inport = car (args);
5064 x = cons (x, NIL); 4921 x = cons (x, NIL);
5065 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4922 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5066 s_goto (OP_READ_INTERNAL); 4923 s_goto (OP_READ_INTERNAL);
5067 4924
5068 case OP_READ_CHAR: /* read-char */ 4925 case OP_READ_CHAR: /* read-char */
5069 case OP_PEEK_CHAR: /* peek-char */ 4926 case OP_PEEK_CHAR: /* peek-char */
5070 { 4927 {
5071 int c; 4928 int c;
5072 4929
5073 if (is_pair (SCHEME_V->args)) 4930 if (is_pair (args))
5074 { 4931 {
5075 if (car (SCHEME_V->args) != SCHEME_V->inport) 4932 if (car (args) != SCHEME_V->inport)
5076 { 4933 {
5077 x = SCHEME_V->inport; 4934 x = SCHEME_V->inport;
5078 x = cons (x, NIL); 4935 x = cons (x, NIL);
5079 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4936 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5080 SCHEME_V->inport = car (SCHEME_V->args); 4937 SCHEME_V->inport = car (args);
5081 } 4938 }
5082 } 4939 }
5083 4940
5084 c = inchar (SCHEME_A); 4941 c = inchar (SCHEME_A);
5085 4942
… …
5095 case OP_CHAR_READY: /* char-ready? */ 4952 case OP_CHAR_READY: /* char-ready? */
5096 { 4953 {
5097 pointer p = SCHEME_V->inport; 4954 pointer p = SCHEME_V->inport;
5098 int res; 4955 int res;
5099 4956
5100 if (is_pair (SCHEME_V->args)) 4957 if (is_pair (args))
5101 p = car (SCHEME_V->args); 4958 p = car (args);
5102 4959
5103 res = p->object.port->kind & port_string; 4960 res = p->object.port->kind & port_string;
5104 4961
5105 s_retbool (res); 4962 s_retbool (res);
5106 } 4963 }
5107 4964
5108 case OP_SET_INPORT: /* set-input-port */ 4965 case OP_SET_INPORT: /* set-input-port */
5109 SCHEME_V->inport = car (SCHEME_V->args); 4966 SCHEME_V->inport = car (args);
5110 s_return (SCHEME_V->value); 4967 s_return (SCHEME_V->value);
5111 4968
5112 case OP_SET_OUTPORT: /* set-output-port */ 4969 case OP_SET_OUTPORT: /* set-output-port */
5113 SCHEME_V->outport = car (SCHEME_V->args); 4970 SCHEME_V->outport = car (args);
5114 s_return (SCHEME_V->value); 4971 s_return (SCHEME_V->value);
5115#endif 4972#endif
5116 4973
5117 case OP_RDSEXPR: 4974 case OP_RDSEXPR:
5118 switch (SCHEME_V->tok) 4975 switch (SCHEME_V->tok)
… …
5167 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5024 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5168 SCHEME_V->tok = token (SCHEME_A); 5025 SCHEME_V->tok = token (SCHEME_A);
5169 s_goto (OP_RDSEXPR); 5026 s_goto (OP_RDSEXPR);
5170 5027
5171 case TOK_ATOM: 5028 case TOK_ATOM:
5172 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5029 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5030
5031 case TOK_DOTATOM:
5032 SCHEME_V->strbuff[0] = '.';
5033 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5034
5035 case TOK_STRATOM:
5036 x = readstrexp (SCHEME_A_ '|');
5037 //TODO: haven't checked whether the garbage collector could interfere
5038 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5173 5039
5174 case TOK_DQUOTE: 5040 case TOK_DQUOTE:
5175 x = readstrexp (SCHEME_A); 5041 x = readstrexp (SCHEME_A_ '"');
5176 5042
5177 if (x == S_F) 5043 if (x == S_F)
5178 Error_0 ("Error reading string"); 5044 Error_0 ("Error reading string");
5179 5045
5180 setimmutable (x); 5046 setimmutable (x);
… …
5192 s_goto (OP_EVAL); 5058 s_goto (OP_EVAL);
5193 } 5059 }
5194 } 5060 }
5195 5061
5196 case TOK_SHARP_CONST: 5062 case TOK_SHARP_CONST:
5197 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5063 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5198 Error_0 ("undefined sharp expression"); 5064 Error_0 ("undefined sharp expression");
5199 else 5065 else
5200 s_return (x); 5066 s_return (x);
5201 5067
5202 default: 5068 default:
… …
5204 } 5070 }
5205 5071
5206 break; 5072 break;
5207 5073
5208 case OP_RDLIST: 5074 case OP_RDLIST:
5209 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5075 SCHEME_V->args = cons (SCHEME_V->value, args);
5210 SCHEME_V->tok = token (SCHEME_A); 5076 SCHEME_V->tok = token (SCHEME_A);
5211 5077
5212 switch (SCHEME_V->tok) 5078 switch (SCHEME_V->tok)
5213 { 5079 {
5214 case TOK_EOF: 5080 case TOK_EOF:
… …
5242 case OP_RDDOT: 5108 case OP_RDDOT:
5243 if (token (SCHEME_A) != TOK_RPAREN) 5109 if (token (SCHEME_A) != TOK_RPAREN)
5244 Error_0 ("syntax error: illegal dot expression"); 5110 Error_0 ("syntax error: illegal dot expression");
5245 5111
5246 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5112 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5247 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5113 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5248 5114
5249 case OP_RDQUOTE: 5115 case OP_RDQUOTE:
5250 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5116 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5251 5117
5252 case OP_RDQQUOTE: 5118 case OP_RDQQUOTE:
… …
5274 SCHEME_V->args = SCHEME_V->value; 5140 SCHEME_V->args = SCHEME_V->value;
5275 s_goto (OP_VECTOR); 5141 s_goto (OP_VECTOR);
5276 5142
5277 /* ========== printing part ========== */ 5143 /* ========== printing part ========== */
5278 case OP_P0LIST: 5144 case OP_P0LIST:
5279 if (is_vector (SCHEME_V->args)) 5145 if (is_vector (args))
5280 { 5146 {
5281 putstr (SCHEME_A_ "#("); 5147 putstr (SCHEME_A_ "#(");
5282 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5148 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5283 s_goto (OP_PVECFROM); 5149 s_goto (OP_PVECFROM);
5284 } 5150 }
5285 else if (is_environment (SCHEME_V->args)) 5151 else if (is_environment (args))
5286 { 5152 {
5287 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5153 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5288 s_return (S_T); 5154 s_return (S_T);
5289 } 5155 }
5290 else if (!is_pair (SCHEME_V->args)) 5156 else if (!is_pair (args))
5291 { 5157 {
5292 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5158 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5293 s_return (S_T); 5159 s_return (S_T);
5294 } 5160 }
5295 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5161 else
5296 { 5162 {
5163 pointer a = car (args);
5164 pointer b = cdr (args);
5165 int ok_abbr = ok_abbrev (b);
5166 SCHEME_V->args = car (b);
5167
5168 if (a == SCHEME_V->QUOTE && ok_abbr)
5297 putstr (SCHEME_A_ "'"); 5169 putstr (SCHEME_A_ "'");
5298 SCHEME_V->args = cadr (SCHEME_V->args); 5170 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ "`");
5172 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5173 putstr (SCHEME_A_ ",");
5174 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5175 putstr (SCHEME_A_ ",@");
5176 else
5177 {
5178 putstr (SCHEME_A_ "(");
5179 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5180 SCHEME_V->args = a;
5181 }
5182
5299 s_goto (OP_P0LIST); 5183 s_goto (OP_P0LIST);
5300 } 5184 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5185
5186 case OP_P1LIST:
5187 if (is_pair (args))
5302 { 5188 {
5189 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5303 putstr (SCHEME_A_ "`"); 5190 putstr (SCHEME_A_ " ");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5191 SCHEME_V->args = car (args);
5305 s_goto (OP_P0LIST); 5192 s_goto (OP_P0LIST);
5306 } 5193 }
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)) 5194 else if (is_vector (args))
5336 { 5195 {
5337 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5196 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5338 putstr (SCHEME_A_ " . "); 5197 putstr (SCHEME_A_ " . ");
5339 s_goto (OP_P0LIST); 5198 s_goto (OP_P0LIST);
5340 } 5199 }
5341 else 5200 else
5342 { 5201 {
5343 if (SCHEME_V->args != NIL) 5202 if (args != NIL)
5344 { 5203 {
5345 putstr (SCHEME_A_ " . "); 5204 putstr (SCHEME_A_ " . ");
5346 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5205 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5347 } 5206 }
5348 5207
5349 putstr (SCHEME_A_ ")"); 5208 putstr (SCHEME_A_ ")");
5350 s_return (S_T); 5209 s_return (S_T);
5351 } 5210 }
5352 5211
5353 case OP_PVECFROM: 5212 case OP_PVECFROM:
5354 { 5213 {
5355 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5214 int i = ivalue_unchecked (cdr (args));
5356 pointer vec = car (SCHEME_V->args); 5215 pointer vec = car (args);
5357 int len = veclength (vec); 5216 int len = veclength (vec);
5358 5217
5359 if (i == len) 5218 if (i == len)
5360 { 5219 {
5361 putstr (SCHEME_A_ ")"); 5220 putstr (SCHEME_A_ ")");
5362 s_return (S_T); 5221 s_return (S_T);
5363 } 5222 }
5364 else 5223 else
5365 { 5224 {
5366 pointer elem = vector_elem (vec, i); 5225 pointer elem = vector_get (vec, i);
5367 5226
5368 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5227 ivalue_unchecked (cdr (args)) = i + 1;
5369 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5228 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5370 SCHEME_V->args = elem; 5229 SCHEME_V->args = elem;
5371 5230
5372 if (i > 0) 5231 if (i > 0)
5373 putstr (SCHEME_A_ " "); 5232 putstr (SCHEME_A_ " ");
5374 5233
5375 s_goto (OP_P0LIST); 5234 s_goto (OP_P0LIST);
5376 } 5235 }
5377 } 5236 }
5378 } 5237 }
5379 5238
5380 return S_T; 5239 if (USE_ERROR_CHECKING) abort ();
5381} 5240}
5382 5241
5383static pointer 5242static int
5384opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5243opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5385{ 5244{
5245 pointer args = SCHEME_V->args;
5246 pointer a = car (args);
5386 pointer x, y; 5247 pointer x, y;
5387 5248
5388 switch (op) 5249 switch (op)
5389 { 5250 {
5390 case OP_LIST_LENGTH: /* length *//* a.k */ 5251 case OP_LIST_LENGTH: /* length *//* a.k */
5391 { 5252 {
5392 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5253 long v = list_length (SCHEME_A_ a);
5393 5254
5394 if (v < 0) 5255 if (v < 0)
5395 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5256 Error_1 ("length: not a list:", a);
5396 5257
5397 s_return (mk_integer (SCHEME_A_ v)); 5258 s_return (mk_integer (SCHEME_A_ v));
5398 } 5259 }
5399 5260
5400 case OP_ASSQ: /* assq *//* a.k */ 5261 case OP_ASSQ: /* assq *//* a.k */
5401 x = car (SCHEME_V->args); 5262 x = a;
5402 5263
5403 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5264 for (y = cadr (args); is_pair (y); y = cdr (y))
5404 { 5265 {
5405 if (!is_pair (car (y))) 5266 if (!is_pair (car (y)))
5406 Error_0 ("unable to handle non pair element"); 5267 Error_0 ("unable to handle non pair element");
5407 5268
5408 if (x == caar (y)) 5269 if (x == caar (y))
… …
5414 else 5275 else
5415 s_return (S_F); 5276 s_return (S_F);
5416 5277
5417 5278
5418 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5279 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5419 SCHEME_V->args = car (SCHEME_V->args); 5280 SCHEME_V->args = a;
5420 5281
5421 if (SCHEME_V->args == NIL) 5282 if (SCHEME_V->args == NIL)
5422 s_return (S_F); 5283 s_return (S_F);
5423 else if (is_closure (SCHEME_V->args)) 5284 else if (is_closure (SCHEME_V->args))
5424 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5429 5290
5430 case OP_CLOSUREP: /* closure? */ 5291 case OP_CLOSUREP: /* closure? */
5431 /* 5292 /*
5432 * Note, macro object is also a closure. 5293 * Note, macro object is also a closure.
5433 * Therefore, (closure? <#MACRO>) ==> #t 5294 * Therefore, (closure? <#MACRO>) ==> #t
5295 * (schmorp) well, obviously not, fix? TODO
5434 */ 5296 */
5435 s_retbool (is_closure (car (SCHEME_V->args))); 5297 s_retbool (is_closure (a));
5436 5298
5437 case OP_MACROP: /* macro? */ 5299 case OP_MACROP: /* macro? */
5438 s_retbool (is_macro (car (SCHEME_V->args))); 5300 s_retbool (is_macro (a));
5439 } 5301 }
5440 5302
5441 return S_T; /* NOTREACHED */ 5303 if (USE_ERROR_CHECKING) abort ();
5442} 5304}
5443 5305
5306/* 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); 5307typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5445 5308
5446typedef int (*test_predicate) (pointer); 5309typedef int (*test_predicate)(pointer);
5447static int 5310static int
5448is_any (pointer p) 5311tst_any (pointer p)
5449{ 5312{
5450 return 1; 5313 return 1;
5451} 5314}
5452 5315
5453static int 5316static int
5454is_nonneg (pointer p) 5317tst_inonneg (pointer p)
5455{ 5318{
5456 return ivalue (p) >= 0 && is_integer (p); 5319 return is_integer (p) && ivalue_unchecked (p) >= 0;
5320}
5321
5322static int
5323tst_is_list (SCHEME_P_ pointer p)
5324{
5325 return p == NIL || is_pair (p);
5457} 5326}
5458 5327
5459/* Correspond carefully with following defines! */ 5328/* Correspond carefully with following defines! */
5460static struct 5329static struct
5461{ 5330{
5462 test_predicate fct; 5331 test_predicate fct;
5463 const char *kind; 5332 const char *kind;
5464} tests[] = 5333} tests[] = {
5465{ 5334 { tst_any , 0 },
5466 { 0, 0}, /* unused */ 5335 { is_string , "string" },
5467 { is_any, 0}, 5336 { is_symbol , "symbol" },
5468 { is_string, "string" }, 5337 { is_port , "port" },
5469 { is_symbol, "symbol" },
5470 { is_port, "port" },
5471 { is_inport, "input port" }, 5338 { is_inport , "input port" },
5472 { is_outport, "output port" }, 5339 { is_outport , "output port" },
5473 { is_environment, "environment" }, 5340 { is_environment, "environment" },
5474 { is_pair, "pair" }, 5341 { is_pair , "pair" },
5475 { 0, "pair or '()" }, 5342 { 0 , "pair or '()" },
5476 { is_character, "character" }, 5343 { is_character , "character" },
5477 { is_vector, "vector" }, 5344 { is_vector , "vector" },
5478 { is_number, "number" }, 5345 { is_number , "number" },
5479 { is_integer, "integer" }, 5346 { is_integer , "integer" },
5480 { is_nonneg, "non-negative integer" } 5347 { tst_inonneg , "non-negative integer" }
5481}; 5348};
5482 5349
5483#define TST_NONE 0 5350#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5484#define TST_ANY "\001" 5351#define TST_ANY "\001"
5485#define TST_STRING "\002" 5352#define TST_STRING "\002"
5486#define TST_SYMBOL "\003" 5353#define TST_SYMBOL "\003"
5487#define TST_PORT "\004" 5354#define TST_PORT "\004"
5488#define TST_INPORT "\005" 5355#define TST_INPORT "\005"
5489#define TST_OUTPORT "\006" 5356#define TST_OUTPORT "\006"
5490#define TST_ENVIRONMENT "\007" 5357#define TST_ENVIRONMENT "\007"
5491#define TST_PAIR "\010" 5358#define TST_PAIR "\010"
5492#define TST_LIST "\011" 5359#define TST_LIST "\011"
5493#define TST_CHAR "\012" 5360#define TST_CHAR "\012"
5494#define TST_VECTOR "\013" 5361#define TST_VECTOR "\013"
5495#define TST_NUMBER "\014" 5362#define TST_NUMBER "\014"
5496#define TST_INTEGER "\015" 5363#define TST_INTEGER "\015"
5497#define TST_NATURAL "\016" 5364#define TST_NATURAL "\016"
5365
5366#define INF_ARG 0xff
5367#define UNNAMED_OP ""
5368
5369static const char opnames[] =
5370#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5371#include "opdefines.h"
5372#undef OP_DEF
5373;
5374
5375static const char *
5376opname (int idx)
5377{
5378 const char *name = opnames;
5379
5380 /* should do this at compile time, but would require external program, right? */
5381 while (idx--)
5382 name += strlen (name) + 1;
5383
5384 return *name ? name : "ILLEGAL";
5385}
5386
5387static const char *
5388procname (pointer x)
5389{
5390 return opname (procnum (x));
5391}
5498 5392
5499typedef struct 5393typedef struct
5500{ 5394{
5501 dispatch_func func; 5395 uint8_t func;
5502 char *name; 5396 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5397 uint8_t builtin;
5398#if USE_ERROR_CHECKING
5503 int min_arity; 5399 uint8_t min_arity;
5504 int max_arity; 5400 uint8_t max_arity;
5505 char *arg_tests_encoding; 5401 char arg_tests_encoding[3];
5402#endif
5506} op_code_info; 5403} op_code_info;
5507 5404
5508#define INF_ARG 0xffff
5509
5510static op_code_info dispatch_table[] = { 5405static const op_code_info dispatch_table[] = {
5511#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5406#if USE_ERROR_CHECKING
5407#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5408#else
5409#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5410#endif
5512#include "opdefines.h" 5411#include "opdefines.h"
5412#undef OP_DEF
5513 {0} 5413 {0}
5514}; 5414};
5515 5415
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 */ 5416/* kernel of this interpreter */
5529static void 5417static void ecb_hot
5530Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5418Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5531{ 5419{
5532 SCHEME_V->op = op; 5420 SCHEME_V->op = op;
5533 5421
5534 for (;;) 5422 for (;;)
5535 { 5423 {
5536 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5424 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5537 5425
5538#if USE_ERROR_CHECKING 5426#if USE_ERROR_CHECKING
5539 if (pcd->name) /* if built-in function, check arguments */ 5427 if (pcd->builtin) /* if built-in function, check arguments */
5540 { 5428 {
5541 int ok = 1;
5542 char msg[STRBUFFSIZE]; 5429 char msg[STRBUFFSIZE];
5543 int n = list_length (SCHEME_A_ SCHEME_V->args); 5430 int n = list_length (SCHEME_A_ SCHEME_V->args);
5544 5431
5545 /* Check number of arguments */ 5432 /* Check number of arguments */
5546 if (n < pcd->min_arity) 5433 if (ecb_expect_false (n < pcd->min_arity))
5547 { 5434 {
5548 ok = 0;
5549 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5435 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5550 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5436 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5437 xError_1 (SCHEME_A_ msg, 0);
5438 continue;
5551 } 5439 }
5552 5440 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5553 if (ok && n > pcd->max_arity)
5554 { 5441 {
5555 ok = 0;
5556 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5442 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5557 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5443 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5444 xError_1 (SCHEME_A_ msg, 0);
5445 continue;
5558 } 5446 }
5559 5447 else
5560 if (ok)
5561 { 5448 {
5562 if (pcd->arg_tests_encoding) 5449 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5563 { 5450 {
5564 int i = 0; 5451 int i = 0;
5565 int j; 5452 int j;
5566 const char *t = pcd->arg_tests_encoding; 5453 const char *t = pcd->arg_tests_encoding;
5567 pointer arglist = SCHEME_V->args; 5454 pointer arglist = SCHEME_V->args;
5568 5455
5569 do 5456 do
5570 { 5457 {
5571 pointer arg = car (arglist); 5458 pointer arg = car (arglist);
5572 5459
5573 j = (int) t[0]; 5460 j = t[0];
5574 5461
5462 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5575 if (j == TST_LIST[0]) 5463 if (j == TST_LIST[0])
5576 { 5464 {
5577 if (arg != NIL && !is_pair (arg)) 5465 if (!tst_is_list (SCHEME_A_ arg))
5578 break; 5466 break;
5579 } 5467 }
5580 else 5468 else
5581 { 5469 {
5582 if (!tests[j].fct (arg)) 5470 if (!tests[j - 1].fct (arg))
5583 break; 5471 break;
5584 } 5472 }
5585 5473
5586 if (t[1] != 0) /* last test is replicated as necessary */ 5474 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5587 t++; 5475 t++;
5588 5476
5589 arglist = cdr (arglist); 5477 arglist = cdr (arglist);
5590 i++; 5478 i++;
5591 } 5479 }
5592 while (i < n); 5480 while (i < n);
5593 5481
5594 if (i < n) 5482 if (i < n)
5595 { 5483 {
5596 ok = 0;
5597 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5484 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5485 xError_1 (SCHEME_A_ msg, 0);
5486 continue;
5598 } 5487 }
5599 } 5488 }
5600 } 5489 }
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 } 5490 }
5610#endif 5491#endif
5611 5492
5612 ok_to_freely_gc (SCHEME_A); 5493 ok_to_freely_gc (SCHEME_A);
5613 5494
5614 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5495 static const dispatch_func dispatch_funcs[] = {
5496 opexe_0,
5497 opexe_1,
5498 opexe_2,
5499 opexe_3,
5500 opexe_4,
5501 opexe_5,
5502 opexe_6,
5503 };
5504
5505 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5615 return; 5506 return;
5616 5507
5617 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5508 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5618 { 5509 {
5619 xwrstr ("No memory!\n"); 5510 xwrstr ("No memory!\n");
… …
5643mk_proc (SCHEME_P_ enum scheme_opcodes op) 5534mk_proc (SCHEME_P_ enum scheme_opcodes op)
5644{ 5535{
5645 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5536 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5646 set_typeflag (y, (T_PROC | T_ATOM)); 5537 set_typeflag (y, (T_PROC | T_ATOM));
5647 ivalue_unchecked (y) = op; 5538 ivalue_unchecked (y) = op;
5648 set_num_integer (y);
5649 return y; 5539 return y;
5650} 5540}
5651 5541
5652/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5542/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5653static int 5543static int
5654syntaxnum (pointer p) 5544syntaxnum (pointer p)
5655{ 5545{
5656 const char *s = strvalue (car (p)); 5546 const char *s = strvalue (p);
5657 5547
5658 switch (strlength (car (p))) 5548 switch (strlength (p))
5659 { 5549 {
5660 case 2: 5550 case 2:
5661 if (s[0] == 'i') 5551 if (s[0] == 'i')
5662 return OP_IF0; /* if */ 5552 return OP_IF0; /* if */
5663 else 5553 else
… …
5677 5567
5678 case 'd': 5568 case 'd':
5679 return OP_COND0; /* cond */ 5569 return OP_COND0; /* cond */
5680 5570
5681 case '*': 5571 case '*':
5682 return OP_LET0AST; /* let* */ 5572 return OP_LET0AST;/* let* */
5683 5573
5684 default: 5574 default:
5685 return OP_SET0; /* set! */ 5575 return OP_SET0; /* set! */
5686 } 5576 }
5687 5577
… …
5709 5599
5710 case 'f': 5600 case 'f':
5711 return OP_DEF0; /* define */ 5601 return OP_DEF0; /* define */
5712 5602
5713 default: 5603 default:
5714 return OP_LET0REC; /* letrec */ 5604 return OP_LET0REC;/* letrec */
5715 } 5605 }
5716 5606
5717 default: 5607 default:
5718 return OP_C0STREAM; /* cons-stream */ 5608 return OP_C0STREAM; /* cons-stream */
5719 } 5609 }
5720} 5610}
5721 5611
5722#if USE_MULTIPLICITY 5612#if USE_MULTIPLICITY
5723scheme * 5613ecb_cold scheme *
5724scheme_init_new () 5614scheme_init_new ()
5725{ 5615{
5726 scheme *sc = malloc (sizeof (scheme)); 5616 scheme *sc = malloc (sizeof (scheme));
5727 5617
5728 if (!scheme_init (SCHEME_A)) 5618 if (!scheme_init (SCHEME_A))
… …
5733 else 5623 else
5734 return sc; 5624 return sc;
5735} 5625}
5736#endif 5626#endif
5737 5627
5738int 5628ecb_cold int
5739scheme_init (SCHEME_P) 5629scheme_init (SCHEME_P)
5740{ 5630{
5741 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5631 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5742 pointer x; 5632 pointer x;
5743 5633
… …
5816 5706
5817 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5707 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5818 assign_syntax (SCHEME_A_ syntax_names[i]); 5708 assign_syntax (SCHEME_A_ syntax_names[i]);
5819 } 5709 }
5820 5710
5711 // TODO: should iterate via strlen, to avoid n² complexity
5821 for (i = 0; i < n; i++) 5712 for (i = 0; i < n; i++)
5822 if (dispatch_table[i].name != 0) 5713 if (dispatch_table[i].builtin)
5823 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5714 assign_proc (SCHEME_A_ i, opname (i));
5824 5715
5825 /* initialization of global pointers to special symbols */ 5716 /* initialization of global pointers to special symbols */
5826 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5717 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5827 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5718 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5828 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5719 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5867scheme_set_external_data (SCHEME_P_ void *p) 5758scheme_set_external_data (SCHEME_P_ void *p)
5868{ 5759{
5869 SCHEME_V->ext_data = p; 5760 SCHEME_V->ext_data = p;
5870} 5761}
5871 5762
5872void 5763ecb_cold void
5873scheme_deinit (SCHEME_P) 5764scheme_deinit (SCHEME_P)
5874{ 5765{
5875 int i; 5766 int i;
5876 5767
5877#if SHOW_ERROR_LINE 5768#if SHOW_ERROR_LINE
… …
5969{ 5860{
5970 dump_stack_reset (SCHEME_A); 5861 dump_stack_reset (SCHEME_A);
5971 SCHEME_V->envir = SCHEME_V->global_env; 5862 SCHEME_V->envir = SCHEME_V->global_env;
5972 SCHEME_V->file_i = 0; 5863 SCHEME_V->file_i = 0;
5973 SCHEME_V->load_stack[0].kind = port_input | port_string; 5864 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 */ 5865 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); 5866 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; 5867 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5977#if USE_PORTS 5868#if USE_PORTS
5978 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5869 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5979#endif 5870#endif
5980 SCHEME_V->retcode = 0; 5871 SCHEME_V->retcode = 0;
5981 SCHEME_V->interactive_repl = 0; 5872 SCHEME_V->interactive_repl = 0;
… …
6098# endif 5989# endif
6099 int fin; 5990 int fin;
6100 char *file_name = InitFile; 5991 char *file_name = InitFile;
6101 int retcode; 5992 int retcode;
6102 int isfile = 1; 5993 int isfile = 1;
5994 system ("ps v $PPID");//D
6103 5995
6104 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5996 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6105 { 5997 {
6106 xwrstr ("Usage: tinyscheme -?\n"); 5998 xwrstr ("Usage: tinyscheme -?\n");
6107 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5999 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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