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

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

Diff Legend

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