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.47 by root, Mon Nov 30 09:25:19 2015 UTC

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

Diff Legend

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