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.52 by root, Tue Dec 1 01:56:22 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
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69 91
70#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
71static scheme sc; 93static scheme sc;
72#endif 94#endif
73 95
… …
143 165
144#define toupper(c) xtoupper (c) 166#define toupper(c) xtoupper (c)
145#define tolower(c) xtolower (c) 167#define tolower(c) xtolower (c)
146#define isdigit(c) xisdigit (c) 168#define isdigit(c) xisdigit (c)
147 169
148#if USE_STRLWR 170#if USE_IGNORECASE
149static const char * 171static const char *
150strlwr (char *s) 172xstrlwr (char *s)
151{ 173{
152 const char *p = s; 174 const char *p = s;
153 175
154 while (*s) 176 while (*s)
155 { 177 {
… …
157 s++; 179 s++;
158 } 180 }
159 181
160 return p; 182 return p;
161} 183}
162#endif
163 184
185#define stricmp(a,b) strcasecmp (a, b)
186#define strlwr(s) xstrlwr (s)
187
188#else
164#define stricmp(a,b) strcmp (a, b) 189# define stricmp(a,b) strcmp (a, b)
165#define strlwr(s) (s) 190# define strlwr(s) (s)
191#endif
166 192
167#ifndef prompt 193#ifndef prompt
168# define prompt "ts> " 194# define prompt "ts> "
169#endif 195#endif
170 196
171#ifndef InitFile 197#ifndef InitFile
172# define InitFile "init.scm" 198# define InitFile "init.scm"
173#endif 199#endif
174 200
175#ifndef FIRST_CELLSEGS
176# define FIRST_CELLSEGS 3
177#endif
178
179enum scheme_types 201enum scheme_types
180{ 202{
203 T_INTEGER,
181 T_FREE, 204 T_REAL,
182 T_STRING, 205 T_STRING,
183 T_NUMBER,
184 T_SYMBOL, 206 T_SYMBOL,
185 T_PROC, 207 T_PROC,
186 T_PAIR, 208 T_PAIR, /* also used for free cells */
187 T_CLOSURE, 209 T_CLOSURE,
188 T_CONTINUATION, 210 T_CONTINUATION,
189 T_FOREIGN, 211 T_FOREIGN,
190 T_CHARACTER, 212 T_CHARACTER,
191 T_PORT, 213 T_PORT,
… …
201#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
202#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
203#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
204#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
205 227
206static num num_add (num a, num b); 228/* num, for generic arithmetic */
207static num num_mul (num a, num b); 229struct num
208static num num_div (num a, num b); 230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
255
256static num num_op (enum num_op op, num a, num b);
209static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
210static num num_sub (num a, num b);
211static num num_rem (num a, num b); 258static num num_rem (num a, num b);
212static num num_mod (num a, num b); 259static 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 260
219#if USE_MATH 261#if USE_MATH
220static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
221#endif 263#endif
222static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
223 265
224static INLINE int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229
230static num num_zero; 266static num num_zero;
231static num num_one; 267static num num_one;
232 268
269/* convert "pointer" to cell* / cell* to pointer */
270#define CELL(p) ((struct cell *)(p) + 0)
271#define POINTER(c) ((void *)((c) - 0))
272
233/* macros for cell operations */ 273/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 274#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 275#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 276#define type(p) (typeflag (p) & T_MASKTYPE)
237 277
238INTERFACE INLINE int 278INTERFACE int
239is_string (pointer p) 279is_string (pointer p)
240{ 280{
241 return type (p) == T_STRING; 281 return type (p) == T_STRING;
242} 282}
243 283
244#define strvalue(p) ((p)->object.string.svalue) 284#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 285#define strlength(p) (CELL(p)->object.string.length)
246 286
247INTERFACE int is_list (SCHEME_P_ pointer p);
248INTERFACE INLINE int 287INTERFACE int
249is_vector (pointer p) 288is_vector (pointer p)
250{ 289{
251 return type (p) == T_VECTOR; 290 return type (p) == T_VECTOR;
252} 291}
253 292
254#define vecvalue(p) ((p)->object.vector.vvalue) 293#define vecvalue(p) (CELL(p)->object.vector.vvalue)
255#define veclength(p) ((p)->object.vector.length) 294#define veclength(p) (CELL(p)->object.vector.length)
256INTERFACE void fill_vector (pointer vec, pointer obj); 295INTERFACE 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); 296INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
259INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 297INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
260 298
261INTERFACE uint32_t 299INTERFACE int
262vector_length (pointer vec) 300is_integer (pointer p)
263{ 301{
264 return vec->object.vector.length; 302 return type (p) == T_INTEGER;
265} 303}
266 304
305/* not the same as in scheme, where integers are (correctly :) reals */
267INTERFACE INLINE int 306INTERFACE int
307is_real (pointer p)
308{
309 return type (p) == T_REAL;
310}
311
312INTERFACE int
268is_number (pointer p) 313is_number (pointer p)
269{ 314{
270 return type (p) == T_NUMBER; 315 return is_integer (p) || is_real (p);
271} 316}
272 317
273INTERFACE INLINE int 318INTERFACE 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) 319is_character (pointer p)
293{ 320{
294 return type (p) == T_CHARACTER; 321 return type (p) == T_CHARACTER;
295} 322}
296 323
297INTERFACE INLINE char * 324INTERFACE char *
298string_value (pointer p) 325string_value (pointer p)
299{ 326{
300 return strvalue (p); 327 return strvalue (p);
301} 328}
302 329
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) 330#define ivalue_unchecked(p) CELL(p)->object.ivalue
331#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
332
334#if USE_REAL 333#if USE_REAL
335# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 334#define rvalue_unchecked(p) CELL(p)->object.rvalue
336# define set_num_integer(p) (p)->object.number.is_fixnum=1; 335#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
337# define set_num_real(p) (p)->object.number.is_fixnum=0;
338#else 336#else
339# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 337#define rvalue_unchecked(p) CELL(p)->object.ivalue
340# define set_num_integer(p) 0 338#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
341# define set_num_real(p) 0
342#endif 339#endif
340
343INTERFACE long 341INTERFACE long
344charvalue (pointer p) 342charvalue (pointer p)
345{ 343{
346 return ivalue_unchecked (p); 344 return ivalue_unchecked (p);
347} 345}
348 346
347#define port(p) CELL(p)->object.port
348#define set_port(p,v) port(p) = (v)
349INTERFACE INLINE int 349INTERFACE int
350is_port (pointer p) 350is_port (pointer p)
351{ 351{
352 return type (p) == T_PORT; 352 return type (p) == T_PORT;
353} 353}
354 354
355INTERFACE INLINE int 355INTERFACE int
356is_inport (pointer p) 356is_inport (pointer p)
357{ 357{
358 return is_port (p) && p->object.port->kind & port_input; 358 return is_port (p) && port (p)->kind & port_input;
359} 359}
360 360
361INTERFACE INLINE int 361INTERFACE int
362is_outport (pointer p) 362is_outport (pointer p)
363{ 363{
364 return is_port (p) && p->object.port->kind & port_output; 364 return is_port (p) && port (p)->kind & port_output;
365} 365}
366 366
367INTERFACE INLINE int 367INTERFACE int
368is_pair (pointer p) 368is_pair (pointer p)
369{ 369{
370 return type (p) == T_PAIR; 370 return type (p) == T_PAIR;
371} 371}
372 372
373#define car(p) ((p)->object.cons.car + 0) 373#define car(p) (POINTER (CELL(p)->object.cons.car))
374#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 374#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
375 375
376#define caar(p) car (car (p)) 376static pointer caar (pointer p) { return car (car (p)); }
377#define cadr(p) car (cdr (p)) 377static pointer cadr (pointer p) { return car (cdr (p)); }
378#define cdar(p) cdr (car (p)) 378static pointer cdar (pointer p) { return cdr (car (p)); }
379#define cddr(p) cdr (cdr (p)) 379static pointer cddr (pointer p) { return cdr (cdr (p)); }
380 380
381#define cadar(p) car (cdr (car (p))) 381static pointer cadar (pointer p) { return car (cdr (car (p))); }
382#define caddr(p) car (cdr (cdr (p))) 382static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
383#define cdaar(p) cdr (car (car (p))) 383static pointer cdaar (pointer p) { return cdr (car (car (p))); }
384 384
385INTERFACE void 385INTERFACE void
386set_car (pointer p, pointer q) 386set_car (pointer p, pointer q)
387{ 387{
388 p->object.cons.car = q; 388 CELL(p)->object.cons.car = CELL (q);
389} 389}
390 390
391INTERFACE void 391INTERFACE void
392set_cdr (pointer p, pointer q) 392set_cdr (pointer p, pointer q)
393{ 393{
394 p->object.cons.cdr = q; 394 CELL(p)->object.cons.cdr = CELL (q);
395} 395}
396 396
397INTERFACE pointer 397INTERFACE pointer
398pair_car (pointer p) 398pair_car (pointer p)
399{ 399{
… …
404pair_cdr (pointer p) 404pair_cdr (pointer p)
405{ 405{
406 return cdr (p); 406 return cdr (p);
407} 407}
408 408
409INTERFACE INLINE int 409INTERFACE int
410is_symbol (pointer p) 410is_symbol (pointer p)
411{ 411{
412 return type (p) == T_SYMBOL; 412 return type (p) == T_SYMBOL;
413} 413}
414 414
415INTERFACE INLINE char * 415INTERFACE char *
416symname (pointer p) 416symname (pointer p)
417{ 417{
418 return strvalue (car (p)); 418 return strvalue (p);
419} 419}
420 420
421#if USE_PLIST 421#if USE_PLIST
422#error plists are broken because symbols are no longer pairs
423#define symprop(p) cdr(p)
422SCHEME_EXPORT INLINE int 424SCHEME_EXPORT int
423hasprop (pointer p) 425hasprop (pointer p)
424{ 426{
425 return typeflag (p) & T_SYMBOL; 427 return typeflag (p) & T_SYMBOL;
426} 428}
427
428# define symprop(p) cdr(p)
429#endif 429#endif
430 430
431INTERFACE INLINE int 431INTERFACE int
432is_syntax (pointer p) 432is_syntax (pointer p)
433{ 433{
434 return typeflag (p) & T_SYNTAX; 434 return typeflag (p) & T_SYNTAX;
435} 435}
436 436
437INTERFACE INLINE int 437INTERFACE int
438is_proc (pointer p) 438is_proc (pointer p)
439{ 439{
440 return type (p) == T_PROC; 440 return type (p) == T_PROC;
441} 441}
442 442
443INTERFACE INLINE int 443INTERFACE int
444is_foreign (pointer p) 444is_foreign (pointer p)
445{ 445{
446 return type (p) == T_FOREIGN; 446 return type (p) == T_FOREIGN;
447} 447}
448 448
449INTERFACE INLINE char * 449INTERFACE char *
450syntaxname (pointer p) 450syntaxname (pointer p)
451{ 451{
452 return strvalue (car (p)); 452 return strvalue (p);
453} 453}
454 454
455#define procnum(p) ivalue (p) 455#define procnum(p) ivalue_unchecked (p)
456static const char *procname (pointer x); 456static const char *procname (pointer x);
457 457
458INTERFACE INLINE int 458INTERFACE int
459is_closure (pointer p) 459is_closure (pointer p)
460{ 460{
461 return type (p) == T_CLOSURE; 461 return type (p) == T_CLOSURE;
462} 462}
463 463
464INTERFACE INLINE int 464INTERFACE int
465is_macro (pointer p) 465is_macro (pointer p)
466{ 466{
467 return type (p) == T_MACRO; 467 return type (p) == T_MACRO;
468} 468}
469 469
470INTERFACE INLINE pointer 470INTERFACE pointer
471closure_code (pointer p) 471closure_code (pointer p)
472{ 472{
473 return car (p); 473 return car (p);
474} 474}
475 475
476INTERFACE INLINE pointer 476INTERFACE pointer
477closure_env (pointer p) 477closure_env (pointer p)
478{ 478{
479 return cdr (p); 479 return cdr (p);
480} 480}
481 481
482INTERFACE INLINE int 482INTERFACE int
483is_continuation (pointer p) 483is_continuation (pointer p)
484{ 484{
485 return type (p) == T_CONTINUATION; 485 return type (p) == T_CONTINUATION;
486} 486}
487 487
488#define cont_dump(p) cdr (p) 488#define cont_dump(p) cdr (p)
489#define set_cont_dump(p,v) set_cdr ((p), (v)) 489#define set_cont_dump(p,v) set_cdr ((p), (v))
490 490
491/* To do: promise should be forced ONCE only */ 491/* To do: promise should be forced ONCE only */
492INTERFACE INLINE int 492INTERFACE int
493is_promise (pointer p) 493is_promise (pointer p)
494{ 494{
495 return type (p) == T_PROMISE; 495 return type (p) == T_PROMISE;
496} 496}
497 497
498INTERFACE INLINE int 498INTERFACE int
499is_environment (pointer p) 499is_environment (pointer p)
500{ 500{
501 return type (p) == T_ENVIRONMENT; 501 return type (p) == T_ENVIRONMENT;
502} 502}
503 503
… …
509 509
510#define is_mark(p) (typeflag (p) & T_MARK) 510#define is_mark(p) (typeflag (p) & T_MARK)
511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
513 513
514INTERFACE INLINE int 514INTERFACE int
515is_immutable (pointer p) 515is_immutable (pointer p)
516{ 516{
517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
518} 518}
519 519
520INTERFACE INLINE void 520INTERFACE void
521setimmutable (pointer p) 521setimmutable (pointer p)
522{ 522{
523#if USE_ERROR_CHECKING 523#if USE_ERROR_CHECKING
524 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 524 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
525#endif 525#endif
526} 526}
527 527
528/* Result is:
529 proper list: length
530 circular list: -1
531 not even a pair: -2
532 dotted list: -2 minus length before dot
533*/
534INTERFACE int
535list_length (SCHEME_P_ pointer a)
536{
537 int i = 0;
538 pointer slow, fast;
539
540 slow = fast = a;
541
542 while (1)
543 {
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 fast = cdr (fast);
551 ++i;
552
553 if (fast == NIL)
554 return i;
555
556 if (!is_pair (fast))
557 return -2 - i;
558
559 ++i;
560 fast = cdr (fast);
561
562 /* Safe because we would have already returned if `fast'
563 encountered a non-pair. */
564 slow = cdr (slow);
565
566 if (fast == slow)
567 {
568 /* the fast pointer has looped back around and caught up
569 with the slow pointer, hence the structure is circular,
570 not of finite length, and therefore not a list */
571 return -1;
572 }
573 }
574}
575
576INTERFACE int
577is_list (SCHEME_P_ pointer a)
578{
579 return list_length (SCHEME_A_ a) >= 0;
580}
581
528#if USE_CHAR_CLASSIFIERS 582#if USE_CHAR_CLASSIFIERS
529static INLINE int 583ecb_inline int
530Cisalpha (int c) 584Cisalpha (int c)
531{ 585{
532 return isascii (c) && isalpha (c); 586 return isascii (c) && isalpha (c);
533} 587}
534 588
535static INLINE int 589ecb_inline int
536Cisdigit (int c) 590Cisdigit (int c)
537{ 591{
538 return isascii (c) && isdigit (c); 592 return isascii (c) && isdigit (c);
539} 593}
540 594
541static INLINE int 595ecb_inline int
542Cisspace (int c) 596Cisspace (int c)
543{ 597{
544 return isascii (c) && isspace (c); 598 return isascii (c) && isspace (c);
545} 599}
546 600
547static INLINE int 601ecb_inline int
548Cisupper (int c) 602Cisupper (int c)
549{ 603{
550 return isascii (c) && isupper (c); 604 return isascii (c) && isupper (c);
551} 605}
552 606
553static INLINE int 607ecb_inline int
554Cislower (int c) 608Cislower (int c)
555{ 609{
556 return isascii (c) && islower (c); 610 return isascii (c) && islower (c);
557} 611}
558#endif 612#endif
… …
619#endif 673#endif
620 674
621static int file_push (SCHEME_P_ const char *fname); 675static int file_push (SCHEME_P_ const char *fname);
622static void file_pop (SCHEME_P); 676static void file_pop (SCHEME_P);
623static int file_interactive (SCHEME_P); 677static int file_interactive (SCHEME_P);
624static INLINE int is_one_of (char *s, int c); 678ecb_inline int is_one_of (const char *s, int c);
625static int alloc_cellseg (SCHEME_P_ int n); 679static int alloc_cellseg (SCHEME_P);
626static long binary_decode (const char *s);
627static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 680ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
628static void finalize_cell (SCHEME_P_ pointer a); 681static void finalize_cell (SCHEME_P_ pointer a);
629static int count_consecutive_cells (pointer x, int needed); 682static int count_consecutive_cells (pointer x, int needed);
630static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 683static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
631static pointer mk_number (SCHEME_P_ const num n); 684static pointer mk_number (SCHEME_P_ const num n);
632static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 685static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
647static void mark (pointer a); 700static void mark (pointer a);
648static void gc (SCHEME_P_ pointer a, pointer b); 701static void gc (SCHEME_P_ pointer a, pointer b);
649static int basic_inchar (port *pt); 702static int basic_inchar (port *pt);
650static int inchar (SCHEME_P); 703static int inchar (SCHEME_P);
651static void backchar (SCHEME_P_ int c); 704static void backchar (SCHEME_P_ int c);
652static char *readstr_upto (SCHEME_P_ char *delim); 705static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
653static pointer readstrexp (SCHEME_P); 706static pointer readstrexp (SCHEME_P_ char delim);
654static INLINE int skipspace (SCHEME_P); 707ecb_inline int skipspace (SCHEME_P);
655static int token (SCHEME_P); 708static int token (SCHEME_P);
656static void printslashstring (SCHEME_P_ char *s, int len); 709static void printslashstring (SCHEME_P_ char *s, int len);
657static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 710static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
658static void printatom (SCHEME_P_ pointer l, int f); 711static void printatom (SCHEME_P_ pointer l, int f);
659static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 712static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
663static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 716static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
664static pointer revappend (SCHEME_P_ pointer a, pointer b); 717static pointer revappend (SCHEME_P_ pointer a, pointer b);
665static pointer ss_get_cont (SCHEME_P); 718static pointer ss_get_cont (SCHEME_P);
666static void ss_set_cont (SCHEME_P_ pointer cont); 719static void ss_set_cont (SCHEME_P_ pointer cont);
667static void dump_stack_mark (SCHEME_P); 720static void dump_stack_mark (SCHEME_P);
668static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
722static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 724static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
671static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 725static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
672static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 726static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 727static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
674static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 728static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
675static void assign_syntax (SCHEME_P_ const char *name); 729static void assign_syntax (SCHEME_P_ const char *name);
676static int syntaxnum (pointer p); 730static int syntaxnum (pointer p);
677static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 731static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
678 732
733static IVALUE
734ivalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739static RVALUE
740rvalue (pointer x)
741{
742 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
743}
744
745INTERFACE num
746nvalue (pointer x)
747{
748 num n;
749
750 num_set_fixnum (n, is_integer (x));
751
752 if (num_is_fixnum (n))
753 num_set_ivalue (n, ivalue_unchecked (x));
754 else
755 num_set_rvalue (n, rvalue_unchecked (x));
756
757 return n;
758}
759
679static num 760static num
680num_add (num a, num b) 761num_op (enum num_op op, num a, num b)
681{ 762{
682 num ret; 763 num ret;
683 764
684 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 765 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
685 766
686 if (num_is_fixnum (ret)) 767 if (num_is_fixnum (ret))
687 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 768 {
769 switch (op)
770 {
771 case NUM_ADD: a.ivalue += b.ivalue; break;
772 case NUM_SUB: a.ivalue -= b.ivalue; break;
773 case NUM_MUL: a.ivalue *= b.ivalue; break;
774 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
775 }
776
777 num_set_ivalue (ret, a.ivalue);
778 }
779#if USE_REAL
688 else 780 else
689 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 781 {
782 switch (op)
783 {
784 case NUM_ADD: a.rvalue += b.rvalue; break;
785 case NUM_SUB: a.rvalue -= b.rvalue; break;
786 case NUM_MUL: a.rvalue *= b.rvalue; break;
787 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
788 }
690 789
691 return ret; 790 num_set_rvalue (ret, a.rvalue);
692} 791 }
693 792#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 793
706 return ret; 794 return ret;
707} 795}
708 796
709static num 797static num
710num_div (num a, num b) 798num_div (num a, num b)
711{ 799{
712 num ret; 800 num ret;
713 801
714 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 802 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
715 803
716 if (num_is_fixnum (ret)) 804 if (num_is_fixnum (ret))
717 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 805 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
718 else 806 else
719 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 807 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 808
751 return ret; 809 return ret;
752} 810}
753 811
754static num 812static num
… …
756{ 814{
757 num ret; 815 num ret;
758 long e1, e2, res; 816 long e1, e2, res;
759 817
760 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 818 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
761 e1 = num_get_ivalue (a); 819 e1 = num_ivalue (a);
762 e2 = num_get_ivalue (b); 820 e2 = num_ivalue (b);
763 res = e1 % e2; 821 res = e1 % e2;
764 822
765 /* remainder should have same sign as second operand */ 823 /* remainder should have same sign as second operand */
766 if (res > 0) 824 if (res > 0)
767 { 825 {
… …
783{ 841{
784 num ret; 842 num ret;
785 long e1, e2, res; 843 long e1, e2, res;
786 844
787 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 845 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
788 e1 = num_get_ivalue (a); 846 e1 = num_ivalue (a);
789 e2 = num_get_ivalue (b); 847 e2 = num_ivalue (b);
790 res = e1 % e2; 848 res = e1 % e2;
791 849
792 /* modulo should have same sign as second operand */ 850 /* modulo should have same sign as second operand */
793 if (res * e2 < 0) 851 if (res * e2 < 0)
794 res += e2; 852 res += e2;
795 853
796 num_set_ivalue (ret, res); 854 num_set_ivalue (ret, res);
797 return ret; 855 return ret;
798} 856}
799 857
858/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
800static int 859static int
801num_eq (num a, num b) 860num_cmp (num a, num b)
802{ 861{
862 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
803 int ret; 863 int ret;
804 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
805 864
806 if (is_fixnum) 865 if (is_fixnum)
807 ret = num_get_ivalue (a) == num_get_ivalue (b); 866 {
867 IVALUE av = num_ivalue (a);
868 IVALUE bv = num_ivalue (b);
869
870 ret = av == bv ? 0 : av < bv ? -1 : +1;
871 }
808 else 872 else
809 ret = num_get_rvalue (a) == num_get_rvalue (b); 873 {
874 RVALUE av = num_rvalue (a);
875 RVALUE bv = num_rvalue (b);
876
877 ret = av == bv ? 0 : av < bv ? -1 : +1;
878 }
810 879
811 return ret; 880 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} 881}
854 882
855#if USE_MATH 883#if USE_MATH
856 884
857/* Round to nearest. Round to even if midway */ 885/* Round to nearest. Round to even if midway */
… …
867 return ce; 895 return ce;
868 else if (dfl < dce) 896 else if (dfl < dce)
869 return fl; 897 return fl;
870 else 898 else
871 { 899 {
872 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 900 if (fmod (fl, 2) == 0) /* I imagine this holds */
873 return fl; 901 return fl;
874 else 902 else
875 return ce; 903 return ce;
876 } 904 }
877} 905}
878#endif 906#endif
879 907
880static int 908static int
881is_zero_rvalue (RVALUE x) 909is_zero_rvalue (RVALUE x)
882{ 910{
911 return x == 0;
912#if 0
883#if USE_REAL 913#if USE_REAL
884 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 914 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
885#else 915#else
886 return x == 0; 916 return x == 0;
887#endif 917#endif
888} 918#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} 919}
904 920
905/* allocate new cell segment */ 921/* allocate new cell segment */
906static int 922static int
907alloc_cellseg (SCHEME_P_ int n) 923alloc_cellseg (SCHEME_P)
908{ 924{
909 pointer newp; 925 struct cell *newp;
910 pointer last; 926 struct cell *last;
911 pointer p; 927 struct cell *p;
912 char *cp; 928 char *cp;
913 long i; 929 long i;
914 int k; 930 int k;
915 931
916 static int segsize = CELL_SEGSIZE >> 1; 932 static int segsize = CELL_SEGSIZE >> 1;
917 segsize <<= 1; 933 segsize <<= 1;
918 934
919 for (k = 0; k < n; k++)
920 {
921 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
922 return k;
923
924 cp = malloc (segsize * sizeof (struct cell)); 935 cp = malloc (segsize * sizeof (struct cell));
925 936
926 if (!cp && USE_ERROR_CHECKING) 937 if (!cp && USE_ERROR_CHECKING)
927 return k; 938 return k;
928 939
929 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
930 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
931 942
932 /* insert new segment in address order */ 943 newp = (struct cell *)cp;
933 newp = (pointer)cp;
934 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
935 SCHEME_V->cell_segsize[i] = segsize; 945 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; 946 SCHEME_V->fcells += segsize;
952 last = newp + segsize - 1; 947 last = newp + segsize - 1;
953 948
954 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
955 { 950 {
951 pointer cp = POINTER (p);
956 set_typeflag (p, T_FREE); 952 set_typeflag (cp, T_PAIR);
957 set_car (p, NIL); 953 set_car (cp, NIL);
958 set_cdr (p, p + 1); 954 set_cdr (cp, POINTER (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 (POINTER (last), SCHEME_V->free_cell);
965 SCHEME_V->free_cell = newp; 958 SCHEME_V->free_cell = POINTER (newp);
966 }
967 else
968 {
969 p = SCHEME_V->free_cell;
970 959
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 }
978
979 return n; 960 return 1;
980} 961}
981 962
982/* get new cell. parameter a, b is marked by gc. */ 963/* get new cell. parameter a, b is marked by gc. */
983static INLINE pointer 964ecb_inline pointer
984get_cell_x (SCHEME_P_ pointer a, pointer b) 965get_cell_x (SCHEME_P_ pointer a, pointer b)
985{ 966{
986 if (SCHEME_V->free_cell == NIL) 967 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
987 { 968 {
988 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 969 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
989 return S_SINK; 970 return S_SINK;
990 971
991 if (SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->free_cell == NIL)
992 { 973 {
993 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 974 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
994 975
995 gc (SCHEME_A_ a, b); 976 gc (SCHEME_A_ a, b);
996 977
997 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 978 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
998 { 979 {
999 /* if only a few recovered, get more to avoid fruitless gc's */ 980 /* if only a few recovered, get more to avoid fruitless gc's */
1000 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 981 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
1001 { 982 {
1002#if USE_ERROR_CHECKING 983#if USE_ERROR_CHECKING
1003 SCHEME_V->no_memory = 1; 984 SCHEME_V->no_memory = 1;
1004 return S_SINK; 985 return S_SINK;
1005#endif 986#endif
… …
1017 } 998 }
1018} 999}
1019 1000
1020/* To retain recent allocs before interpreter knows about them - 1001/* To retain recent allocs before interpreter knows about them -
1021 Tehom */ 1002 Tehom */
1022
1023static void 1003static void
1024push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1025{ 1005{
1026 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1027 1007
… …
1049} 1029}
1050 1030
1051static pointer 1031static pointer
1052get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1032get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1053{ 1033{
1054 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1034 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1055 pointer *e = malloc (len * sizeof (pointer)); 1035 pointer *e = malloc (len * sizeof (pointer));
1056 1036
1057 if (!e && USE_ERROR_CHECKING) 1037 if (!e && USE_ERROR_CHECKING)
1058 return S_SINK; 1038 return S_SINK;
1059 1039
1060 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1061 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1062 1042
1063 v->object.vector.vvalue = e; 1043 CELL(v)->object.vector.vvalue = e;
1064 v->object.vector.length = len; 1044 CELL(v)->object.vector.length = len;
1065 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1066 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1067 1047
1068 return v; 1048 return v;
1069} 1049}
1070 1050
1071static INLINE void 1051ecb_inline void
1072ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1073{ 1053{
1074 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1075} 1055}
1076 1056
… …
1113 set_cdr (x, b); 1093 set_cdr (x, b);
1114 1094
1115 return x; 1095 return x;
1116} 1096}
1117 1097
1098static pointer
1099generate_symbol (SCHEME_P_ const char *name)
1100{
1101 pointer x = mk_string (SCHEME_A_ name);
1102 setimmutable (x);
1103 set_typeflag (x, T_SYMBOL | T_ATOM);
1104 return x;
1105}
1106
1118/* ========== oblist implementation ========== */ 1107/* ========== oblist implementation ========== */
1119 1108
1120#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1121 1110
1111static int
1122static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1123 1122
1124static pointer 1123static pointer
1125oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1126{ 1125{
1127 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1129 1128
1130/* returns the new symbol */ 1129/* returns the new symbol */
1131static pointer 1130static pointer
1132oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1133{ 1132{
1134 int location; 1133 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)); 1134 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))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1142 return x; 1136 return x;
1143} 1137}
1144 1138
1145static INLINE pointer 1139ecb_inline pointer
1146oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1147{ 1141{
1148 int location; 1142 int location;
1149 pointer x; 1143 pointer x;
1150 char *s; 1144 char *s;
1151 1145
1152 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1153 1147
1154 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1155 { 1149 {
1156 s = symname (car (x)); 1150 s = symname (car (x));
1157 1151
1158 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1159 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1169 int i; 1163 int i;
1170 pointer x; 1164 pointer x;
1171 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1172 1166
1173 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1174 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1175 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1176 1170
1177 return ob_list; 1171 return ob_list;
1178} 1172}
1179 1173
… …
1183oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1184{ 1178{
1185 return NIL; 1179 return NIL;
1186} 1180}
1187 1181
1188static INLINE pointer 1182ecb_inline pointer
1189oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1190{ 1184{
1191 pointer x; 1185 pointer x;
1192 char *s; 1186 char *s;
1193 1187
… …
1205 1199
1206/* returns the new symbol */ 1200/* returns the new symbol */
1207static pointer 1201static pointer
1208oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1209{ 1203{
1210 pointer x; 1204 pointer x = generate_symbol (SCHEME_A_ name);
1211
1212 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1213 set_typeflag (x, T_SYMBOL);
1214 setimmutable (car (x));
1215 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1205 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1216 return x; 1206 return x;
1217} 1207}
1218 1208
1219static pointer 1209static pointer
… …
1229mk_port (SCHEME_P_ port *p) 1219mk_port (SCHEME_P_ port *p)
1230{ 1220{
1231 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1221 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1232 1222
1233 set_typeflag (x, T_PORT | T_ATOM); 1223 set_typeflag (x, T_PORT | T_ATOM);
1234 x->object.port = p; 1224 set_port (x, p);
1235 1225
1236 return x; 1226 return x;
1237} 1227}
1238#endif 1228#endif
1239 1229
1240pointer 1230pointer
1241mk_foreign_func (SCHEME_P_ foreign_func f) 1231mk_foreign_func (SCHEME_P_ foreign_func f)
1242{ 1232{
1243 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1233 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1244 1234
1245 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1235 set_typeflag (x, T_FOREIGN | T_ATOM);
1246 x->object.ff = f; 1236 CELL(x)->object.ff = f;
1247 1237
1248 return x; 1238 return x;
1249} 1239}
1250 1240
1251INTERFACE pointer 1241INTERFACE pointer
1252mk_character (SCHEME_P_ int c) 1242mk_character (SCHEME_P_ int c)
1253{ 1243{
1254 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1244 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1255 1245
1256 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1246 set_typeflag (x, T_CHARACTER | T_ATOM);
1257 ivalue_unchecked (x) = c & 0xff; 1247 set_ivalue (x, c & 0xff);
1258 set_num_integer (x); 1248
1259 return x; 1249 return x;
1260} 1250}
1261 1251
1262/* get number atom (integer) */ 1252/* get number atom (integer) */
1263INTERFACE pointer 1253INTERFACE pointer
1264mk_integer (SCHEME_P_ long num) 1254mk_integer (SCHEME_P_ long n)
1265{ 1255{
1256 pointer p = 0;
1257 pointer *pp = &p;
1258
1259#if USE_INTCACHE
1260 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1261 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1262#endif
1263
1264 if (!*pp)
1265 {
1266 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1266 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1267 1267
1268 set_typeflag (x, (T_NUMBER | T_ATOM)); 1268 set_typeflag (x, T_INTEGER | T_ATOM);
1269 ivalue_unchecked (x) = num; 1269 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1270 set_num_integer (x); 1270 set_ivalue (x, n);
1271
1272 *pp = x;
1273 }
1274
1271 return x; 1275 return *pp;
1272} 1276}
1273 1277
1274INTERFACE pointer 1278INTERFACE pointer
1275mk_real (SCHEME_P_ RVALUE n) 1279mk_real (SCHEME_P_ RVALUE n)
1276{ 1280{
1281#if USE_REAL
1277 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1282 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1278 1283
1279 set_typeflag (x, (T_NUMBER | T_ATOM)); 1284 set_typeflag (x, T_REAL | T_ATOM);
1280 rvalue_unchecked (x) = n; 1285 set_rvalue (x, n);
1281 set_num_real (x); 1286
1282 return x; 1287 return x;
1288#else
1289 return mk_integer (SCHEME_A_ n);
1290#endif
1283} 1291}
1284 1292
1285static pointer 1293static pointer
1286mk_number (SCHEME_P_ const num n) 1294mk_number (SCHEME_P_ const num n)
1287{ 1295{
1296#if USE_REAL
1288 if (num_is_fixnum (n)) 1297 return num_is_fixnum (n)
1298 ? mk_integer (SCHEME_A_ num_ivalue (n))
1299 : mk_real (SCHEME_A_ num_rvalue (n));
1300#else
1289 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1301 return mk_integer (SCHEME_A_ num_ivalue (n));
1290 else 1302#endif
1291 return mk_real (SCHEME_A_ num_get_rvalue (n));
1292} 1303}
1293 1304
1294/* allocate name to string area */ 1305/* allocate name to string area */
1295static char * 1306static char *
1296store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1307store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1302 SCHEME_V->no_memory = 1; 1313 SCHEME_V->no_memory = 1;
1303 return SCHEME_V->strbuff; 1314 return SCHEME_V->strbuff;
1304 } 1315 }
1305 1316
1306 if (str) 1317 if (str)
1307 { 1318 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 1319 else
1317 {
1318 memset (q, fill, len_str); 1320 memset (q, fill, len_str);
1321
1319 q[len_str] = 0; 1322 q[len_str] = 0;
1320 }
1321 1323
1322 return q; 1324 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} 1325}
1342 1326
1343INTERFACE pointer 1327INTERFACE pointer
1344mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1328mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1345{ 1329{
… …
1350 strlength (x) = len; 1334 strlength (x) = len;
1351 return x; 1335 return x;
1352} 1336}
1353 1337
1354INTERFACE pointer 1338INTERFACE pointer
1339mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1340{
1341 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1342
1343 set_typeflag (x, T_STRING | T_ATOM);
1344 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1345 strlength (x) = len;
1346
1347 return x;
1348}
1349
1350INTERFACE pointer
1351mk_string (SCHEME_P_ const char *str)
1352{
1353 return mk_counted_string (SCHEME_A_ str, strlen (str));
1354}
1355
1356INTERFACE pointer
1355mk_vector (SCHEME_P_ uint32_t len) 1357mk_vector (SCHEME_P_ uint32_t len)
1356{ 1358{
1357 return get_vector_object (SCHEME_A_ len, NIL); 1359 return get_vector_object (SCHEME_A_ len, NIL);
1358} 1360}
1359 1361
1360INTERFACE void 1362INTERFACE void
1361fill_vector (pointer vec, pointer obj) 1363fill_vector (pointer vec, uint32_t start, pointer obj)
1362{ 1364{
1363 int i; 1365 int i;
1364 1366
1365 for (i = 0; i < vec->object.vector.length; i++) 1367 for (i = start; i < veclength (vec); i++)
1366 vecvalue (vec)[i] = obj; 1368 vecvalue (vec)[i] = obj;
1367} 1369}
1368 1370
1371INTERFACE void
1372vector_resize (pointer vec, uint32_t newsize, pointer fill)
1373{
1374 uint32_t oldsize = veclength (vec);
1375 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1376 veclength (vec) = newsize;
1377 fill_vector (vec, oldsize, fill);
1378}
1379
1369INTERFACE pointer 1380INTERFACE pointer
1370vector_elem (pointer vec, uint32_t ielem) 1381vector_get (pointer vec, uint32_t ielem)
1371{ 1382{
1372 return vecvalue(vec)[ielem]; 1383 return vecvalue(vec)[ielem];
1373} 1384}
1374 1385
1375INTERFACE void 1386INTERFACE void
1376set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1387vector_set (pointer vec, uint32_t ielem, pointer a)
1377{ 1388{
1378 vecvalue(vec)[ielem] = a; 1389 vecvalue(vec)[ielem] = a;
1379} 1390}
1380 1391
1381/* get new symbol */ 1392/* get new symbol */
… …
1393 1404
1394INTERFACE pointer 1405INTERFACE pointer
1395gensym (SCHEME_P) 1406gensym (SCHEME_P)
1396{ 1407{
1397 pointer x; 1408 pointer x;
1398 char name[40]; 1409 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); 1410 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1404 1411
1405 /* first check oblist */ 1412 return generate_symbol (SCHEME_A_ name);
1406 x = oblist_find_by_name (SCHEME_A_ name); 1413}
1407 1414
1408 if (x != NIL) 1415static int
1409 continue; 1416is_gensym (SCHEME_P_ pointer x)
1410 else 1417{
1411 { 1418 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} 1419}
1419 1420
1420/* make symbol or number atom from string */ 1421/* make symbol or number atom from string */
1421static pointer 1422static pointer
1422mk_atom (SCHEME_P_ char *q) 1423mk_atom (SCHEME_P_ char *q)
… …
1424 char c, *p; 1425 char c, *p;
1425 int has_dec_point = 0; 1426 int has_dec_point = 0;
1426 int has_fp_exp = 0; 1427 int has_fp_exp = 0;
1427 1428
1428#if USE_COLON_HOOK 1429#if USE_COLON_HOOK
1429
1430 if ((p = strstr (q, "::")) != 0) 1430 if ((p = strstr (q, "::")) != 0)
1431 { 1431 {
1432 *p = 0; 1432 *p = 0;
1433 return cons (SCHEME_V->COLON_HOOK, 1433 return cons (SCHEME_V->COLON_HOOK,
1434 cons (cons (SCHEME_V->QUOTE, 1434 cons (cons (SCHEME_V->QUOTE,
1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1435 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1436 } 1436 }
1437
1438#endif 1437#endif
1439 1438
1440 p = q; 1439 p = q;
1441 c = *p++; 1440 c = *p++;
1442 1441
… …
1478 } 1477 }
1479 else if ((c == 'e') || (c == 'E')) 1478 else if ((c == 'e') || (c == 'E'))
1480 { 1479 {
1481 if (!has_fp_exp) 1480 if (!has_fp_exp)
1482 { 1481 {
1483 has_dec_point = 1; /* decimal point illegal 1482 has_dec_point = 1; /* decimal point illegal from now on */
1484 from now on */
1485 p++; 1483 p++;
1486 1484
1487 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1485 if ((*p == '-') || (*p == '+') || isdigit (*p))
1488 continue; 1486 continue;
1489 } 1487 }
… …
1503 1501
1504/* make constant */ 1502/* make constant */
1505static pointer 1503static pointer
1506mk_sharp_const (SCHEME_P_ char *name) 1504mk_sharp_const (SCHEME_P_ char *name)
1507{ 1505{
1508 long x;
1509 char tmp[STRBUFFSIZE];
1510
1511 if (!strcmp (name, "t")) 1506 if (!strcmp (name, "t"))
1512 return S_T; 1507 return S_T;
1513 else if (!strcmp (name, "f")) 1508 else if (!strcmp (name, "f"))
1514 return S_F; 1509 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) */ 1510 else if (*name == '\\') /* #\w (character) */
1536 { 1511 {
1537 int c = 0; 1512 int c;
1538 1513
1539 if (stricmp (name + 1, "space") == 0) 1514 if (stricmp (name + 1, "space") == 0)
1540 c = ' '; 1515 c = ' ';
1541 else if (stricmp (name + 1, "newline") == 0) 1516 else if (stricmp (name + 1, "newline") == 0)
1542 c = '\n'; 1517 c = '\n';
… …
1544 c = '\r'; 1519 c = '\r';
1545 else if (stricmp (name + 1, "tab") == 0) 1520 else if (stricmp (name + 1, "tab") == 0)
1546 c = '\t'; 1521 c = '\t';
1547 else if (name[1] == 'x' && name[2] != 0) 1522 else if (name[1] == 'x' && name[2] != 0)
1548 { 1523 {
1549 int c1 = strtol (name + 2, 0, 16); 1524 long c1 = strtol (name + 2, 0, 16);
1550 1525
1551 if (c1 <= UCHAR_MAX) 1526 if (0 <= c1 && c1 <= UCHAR_MAX)
1552 c = c1; 1527 c = c1;
1553 else 1528 else
1554 return NIL; 1529 return NIL;
1555 1530 }
1556#if USE_ASCII_NAMES 1531#if USE_ASCII_NAMES
1557 }
1558 else if (is_ascii_name (name + 1, &c)) 1532 else if (is_ascii_name (name + 1, &c))
1559 {
1560 /* nothing */ 1533 /* nothing */;
1561#endif 1534#endif
1562 }
1563 else if (name[2] == 0) 1535 else if (name[2] == 0)
1564 c = name[1]; 1536 c = name[1];
1565 else 1537 else
1566 return NIL; 1538 return NIL;
1567 1539
1568 return mk_character (SCHEME_A_ c); 1540 return mk_character (SCHEME_A_ c);
1569 } 1541 }
1570 else 1542 else
1543 {
1544 /* identify base by string index */
1545 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1546 char *base = strchr (baseidx, *name);
1547
1548 if (base)
1549 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1550
1571 return NIL; 1551 return NIL;
1552 }
1572} 1553}
1573 1554
1574/* ========== garbage collector ========== */ 1555/* ========== garbage collector ========== */
1575 1556
1576/*-- 1557/*--
1577 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1558 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1578 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1559 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1579 * for marking. 1560 * for marking.
1561 *
1562 * The exception is vectors - vectors are currently marked recursively,
1563 * which is inherited form tinyscheme and could be fixed by having another
1564 * word of context in the vector
1580 */ 1565 */
1581static void 1566static void
1582mark (pointer a) 1567mark (pointer a)
1583{ 1568{
1584 pointer t, q, p; 1569 pointer t, q, p;
… …
1586 t = 0; 1571 t = 0;
1587 p = a; 1572 p = a;
1588E2: 1573E2:
1589 setmark (p); 1574 setmark (p);
1590 1575
1591 if (is_vector (p)) 1576 if (ecb_expect_false (is_vector (p)))
1592 { 1577 {
1593 int i; 1578 int i;
1594 1579
1595 for (i = 0; i < p->object.vector.length; i++) 1580 for (i = 0; i < veclength (p); i++)
1596 mark (vecvalue (p)[i]); 1581 mark (vecvalue (p)[i]);
1597 } 1582 }
1598 1583
1599 if (is_atom (p)) 1584 if (is_atom (p))
1600 goto E6; 1585 goto E6;
… …
1647 1632
1648/* garbage collection. parameter a, b is marked. */ 1633/* garbage collection. parameter a, b is marked. */
1649static void 1634static void
1650gc (SCHEME_P_ pointer a, pointer b) 1635gc (SCHEME_P_ pointer a, pointer b)
1651{ 1636{
1652 pointer p;
1653 int i; 1637 int i;
1654 1638
1655 if (SCHEME_V->gc_verbose) 1639 if (SCHEME_V->gc_verbose)
1656 putstr (SCHEME_A_ "gc..."); 1640 putstr (SCHEME_A_ "gc...");
1657 1641
… …
1673 /* Mark recent objects the interpreter doesn't know about yet. */ 1657 /* Mark recent objects the interpreter doesn't know about yet. */
1674 mark (car (S_SINK)); 1658 mark (car (S_SINK));
1675 /* Mark any older stuff above nested C calls */ 1659 /* Mark any older stuff above nested C calls */
1676 mark (SCHEME_V->c_nest); 1660 mark (SCHEME_V->c_nest);
1677 1661
1662#if USE_INTCACHE
1663 /* mark intcache */
1664 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1665 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1666 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1667#endif
1668
1678 /* mark variables a, b */ 1669 /* mark variables a, b */
1679 mark (a); 1670 mark (a);
1680 mark (b); 1671 mark (b);
1681 1672
1682 /* garbage collect */ 1673 /* garbage collect */
1683 clrmark (NIL); 1674 clrmark (NIL);
1684 SCHEME_V->fcells = 0; 1675 SCHEME_V->fcells = 0;
1685 SCHEME_V->free_cell = NIL; 1676 SCHEME_V->free_cell = NIL;
1686 1677
1687 /* free-list is kept sorted by address so as to maintain consecutive 1678 if (SCHEME_V->gc_verbose)
1688 ranges, if possible, for use with vectors. Here we scan the cells 1679 xwrstr ("freeing...");
1689 (which are also kept sorted by address) downwards to build the 1680
1690 free-list in sorted order. 1681 uint32_t total = 0;
1691 */ 1682
1683 /* Here we scan the cells to build the free-list. */
1692 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1684 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1693 { 1685 {
1694 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1686 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1687 struct cell *p;
1688 total += SCHEME_V->cell_segsize [i];
1695 1689
1696 while (--p >= SCHEME_V->cell_seg[i]) 1690 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1697 { 1691 {
1692 pointer c = POINTER (p);
1693
1698 if (is_mark (p)) 1694 if (is_mark (c))
1699 clrmark (p); 1695 clrmark (c);
1700 else 1696 else
1701 { 1697 {
1702 /* reclaim cell */ 1698 /* reclaim cell */
1703 if (typeflag (p) != T_FREE) 1699 if (typeflag (c) != T_PAIR)
1704 { 1700 {
1705 finalize_cell (SCHEME_A_ p); 1701 finalize_cell (SCHEME_A_ c);
1706 set_typeflag (p, T_FREE); 1702 set_typeflag (c, T_PAIR);
1707 set_car (p, NIL); 1703 set_car (c, NIL);
1708 } 1704 }
1709 1705
1710 ++SCHEME_V->fcells; 1706 ++SCHEME_V->fcells;
1711 set_cdr (p, SCHEME_V->free_cell); 1707 set_cdr (c, SCHEME_V->free_cell);
1712 SCHEME_V->free_cell = p; 1708 SCHEME_V->free_cell = c;
1713 } 1709 }
1714 } 1710 }
1715 } 1711 }
1716 1712
1717 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1714 {
1718 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1716 }
1719} 1717}
1720 1718
1721static void 1719static void
1722finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1723{ 1721{
1724 if (is_string (a)) 1722 /* TODO, fast bitmap check? */
1723 if (is_string (a) || is_symbol (a))
1725 free (strvalue (a)); 1724 free (strvalue (a));
1726 else if (is_vector (a)) 1725 else if (is_vector (a))
1727 free (vecvalue (a)); 1726 free (vecvalue (a));
1728#if USE_PORTS 1727#if USE_PORTS
1729 else if (is_port (a)) 1728 else if (is_port (a))
1730 { 1729 {
1731 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1730 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1732 port_close (SCHEME_A_ a, port_input | port_output); 1731 port_close (SCHEME_A_ a, port_input | port_output);
1733 1732
1734 free (a->object.port); 1733 free (port (a));
1735 } 1734 }
1736#endif 1735#endif
1737} 1736}
1738 1737
1739/* ========== Routines for Reading ========== */ 1738/* ========== Routines for Reading ========== */
… …
1755 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1754 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1756 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1755 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1758 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1759 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1758 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1760 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1759 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1761 1760
1762#if SHOW_ERROR_LINE 1761#if SHOW_ERROR_LINE
1763 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1762 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1764 1763
1765 if (fname) 1764 if (fname)
… …
1782 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1783#if USE_PORTS 1782#if USE_PORTS
1784 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1785#endif 1784#endif
1786 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1787 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1788 } 1787 }
1789} 1788}
1790 1789
1791static int 1790static int
1792file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1793{ 1792{
1794#if USE_PORTS 1793#if USE_PORTS
1795 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1796 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1797 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1798#else 1797#else
1799 return 0; 1798 return 0;
1800#endif 1799#endif
1801} 1800}
1802 1801
… …
1936} 1935}
1937 1936
1938static void 1937static void
1939port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1940{ 1939{
1941 port *pt = p->object.port; 1940 port *pt = port (p);
1942 1941
1943 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1944 1943
1945 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1946 { 1945 {
… …
1967/* get new character from input file */ 1966/* get new character from input file */
1968static int 1967static int
1969inchar (SCHEME_P) 1968inchar (SCHEME_P)
1970{ 1969{
1971 int c; 1970 int c;
1972 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1973
1974 pt = SCHEME_V->inport->object.port;
1975 1972
1976 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1977 return EOF; 1974 return EOF;
1978 1975
1979 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
2046 port *pt; 2043 port *pt;
2047 2044
2048 if (c == EOF) 2045 if (c == EOF)
2049 return; 2046 return;
2050 2047
2051 pt = SCHEME_V->inport->object.port; 2048 pt = port (SCHEME_V->inport);
2052 pt->unget = c; 2049 pt->unget = c;
2053#else 2050#else
2054 if (c == EOF) 2051 if (c == EOF)
2055 return; 2052 return;
2056 2053
… …
2084 2081
2085INTERFACE void 2082INTERFACE void
2086putstr (SCHEME_P_ const char *s) 2083putstr (SCHEME_P_ const char *s)
2087{ 2084{
2088#if USE_PORTS 2085#if USE_PORTS
2089 port *pt = SCHEME_V->outport->object.port; 2086 port *pt = port (SCHEME_V->outport);
2090 2087
2091 if (pt->kind & port_file) 2088 if (pt->kind & port_file)
2092 write (pt->rep.stdio.file, s, strlen (s)); 2089 write (pt->rep.stdio.file, s, strlen (s));
2093 else 2090 else
2094 for (; *s; s++) 2091 for (; *s; s++)
… …
2104 2101
2105static void 2102static void
2106putchars (SCHEME_P_ const char *s, int len) 2103putchars (SCHEME_P_ const char *s, int len)
2107{ 2104{
2108#if USE_PORTS 2105#if USE_PORTS
2109 port *pt = SCHEME_V->outport->object.port; 2106 port *pt = port (SCHEME_V->outport);
2110 2107
2111 if (pt->kind & port_file) 2108 if (pt->kind & port_file)
2112 write (pt->rep.stdio.file, s, len); 2109 write (pt->rep.stdio.file, s, len);
2113 else 2110 else
2114 { 2111 {
… …
2128 2125
2129INTERFACE void 2126INTERFACE void
2130putcharacter (SCHEME_P_ int c) 2127putcharacter (SCHEME_P_ int c)
2131{ 2128{
2132#if USE_PORTS 2129#if USE_PORTS
2133 port *pt = SCHEME_V->outport->object.port; 2130 port *pt = port (SCHEME_V->outport);
2134 2131
2135 if (pt->kind & port_file) 2132 if (pt->kind & port_file)
2136 { 2133 {
2137 char cc = c; 2134 char cc = c;
2138 write (pt->rep.stdio.file, &cc, 1); 2135 write (pt->rep.stdio.file, &cc, 1);
… …
2151#endif 2148#endif
2152} 2149}
2153 2150
2154/* read characters up to delimiter, but cater to character constants */ 2151/* read characters up to delimiter, but cater to character constants */
2155static char * 2152static char *
2156readstr_upto (SCHEME_P_ char *delim) 2153readstr_upto (SCHEME_P_ int skip, const char *delim)
2157{ 2154{
2158 char *p = SCHEME_V->strbuff; 2155 char *p = SCHEME_V->strbuff + skip;
2159 2156
2160 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2157 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2161 2158
2162 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2159 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2163 *p = 0; 2160 *p = 0;
… …
2170 return SCHEME_V->strbuff; 2167 return SCHEME_V->strbuff;
2171} 2168}
2172 2169
2173/* read string expression "xxx...xxx" */ 2170/* read string expression "xxx...xxx" */
2174static pointer 2171static pointer
2175readstrexp (SCHEME_P) 2172readstrexp (SCHEME_P_ char delim)
2176{ 2173{
2177 char *p = SCHEME_V->strbuff; 2174 char *p = SCHEME_V->strbuff;
2178 int c; 2175 int c;
2179 int c1 = 0; 2176 int c1 = 0;
2180 enum
2181 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2177 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2182 2178
2183 for (;;) 2179 for (;;)
2184 { 2180 {
2185 c = inchar (SCHEME_A); 2181 c = inchar (SCHEME_A);
2186 2182
… …
2188 return S_F; 2184 return S_F;
2189 2185
2190 switch (state) 2186 switch (state)
2191 { 2187 {
2192 case st_ok: 2188 case st_ok:
2193 switch (c) 2189 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); 2190 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2202 2191
2203 default: 2192 if (ecb_expect_false (c == '\\'))
2193 state = st_bsl;
2194 else
2204 *p++ = c; 2195 *p++ = c;
2205 break;
2206 }
2207 2196
2208 break; 2197 break;
2209 2198
2210 case st_bsl: 2199 case st_bsl:
2211 switch (c) 2200 switch (c)
… …
2241 case 'r': 2230 case 'r':
2242 *p++ = '\r'; 2231 *p++ = '\r';
2243 state = st_ok; 2232 state = st_ok;
2244 break; 2233 break;
2245 2234
2246 case '"':
2247 *p++ = '"';
2248 state = st_ok;
2249 break;
2250
2251 default: 2235 default:
2252 *p++ = c; 2236 *p++ = c;
2253 state = st_ok; 2237 state = st_ok;
2254 break; 2238 break;
2255 } 2239 }
2256 2240
2257 break; 2241 break;
2258 2242
2259 case st_x1: 2243 case st_x1:
2260 case st_x2: 2244 case st_x2:
2261 c = toupper (c); 2245 c = tolower (c);
2262 2246
2263 if (c >= '0' && c <= 'F') 2247 if (c >= '0' && c <= '9')
2264 {
2265 if (c <= '9')
2266 c1 = (c1 << 4) + c - '0'; 2248 c1 = (c1 << 4) + c - '0';
2267 else 2249 else if (c >= 'a' && c <= 'f')
2268 c1 = (c1 << 4) + c - 'A' + 10; 2250 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 2251 else
2279 return S_F; 2252 return S_F;
2253
2254 if (state == st_x1)
2255 state = st_x2;
2256 else
2257 {
2258 *p++ = c1;
2259 state = st_ok;
2260 }
2280 2261
2281 break; 2262 break;
2282 2263
2283 case st_oct1: 2264 case st_oct1:
2284 case st_oct2: 2265 case st_oct2:
… …
2288 backchar (SCHEME_A_ c); 2269 backchar (SCHEME_A_ c);
2289 state = st_ok; 2270 state = st_ok;
2290 } 2271 }
2291 else 2272 else
2292 { 2273 {
2293 if (state == st_oct2 && c1 >= 32) 2274 if (state == st_oct2 && c1 >= ' ')
2294 return S_F; 2275 return S_F;
2295 2276
2296 c1 = (c1 << 3) + (c - '0'); 2277 c1 = (c1 << 3) + (c - '0');
2297 2278
2298 if (state == st_oct1) 2279 if (state == st_oct1)
… …
2303 state = st_ok; 2284 state = st_ok;
2304 } 2285 }
2305 } 2286 }
2306 2287
2307 break; 2288 break;
2308
2309 } 2289 }
2310 } 2290 }
2311} 2291}
2312 2292
2313/* check c is in chars */ 2293/* check c is in chars */
2314static INLINE int 2294ecb_inline int
2315is_one_of (char *s, int c) 2295is_one_of (const char *s, int c)
2316{ 2296{
2317 if (c == EOF)
2318 return 1;
2319
2320 return !!strchr (s, c); 2297 return c == EOF || !!strchr (s, c);
2321} 2298}
2322 2299
2323/* skip white characters */ 2300/* skip white characters */
2324static INLINE int 2301ecb_inline int
2325skipspace (SCHEME_P) 2302skipspace (SCHEME_P)
2326{ 2303{
2327 int c, curr_line = 0; 2304 int c, curr_line = 0;
2328 2305
2329 do 2306 do
2330 { 2307 {
2331 c = inchar (SCHEME_A); 2308 c = inchar (SCHEME_A);
2309
2332#if SHOW_ERROR_LINE 2310#if SHOW_ERROR_LINE
2333 if (c == '\n') 2311 if (ecb_expect_false (c == '\n'))
2334 curr_line++; 2312 curr_line++;
2335#endif 2313#endif
2314
2315 if (ecb_expect_false (c == EOF))
2316 return c;
2336 } 2317 }
2337 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2318 while (is_one_of (WHITESPACE, c));
2338 2319
2339 /* record it */ 2320 /* record it */
2340#if SHOW_ERROR_LINE 2321#if SHOW_ERROR_LINE
2341 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2322 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; 2323 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2343#endif 2324#endif
2344 2325
2345 if (c != EOF)
2346 {
2347 backchar (SCHEME_A_ c); 2326 backchar (SCHEME_A_ c);
2348 return 1; 2327 return 1;
2349 }
2350 else
2351 return EOF;
2352} 2328}
2353 2329
2354/* get token */ 2330/* get token */
2355static int 2331static int
2356token (SCHEME_P) 2332token (SCHEME_P)
… …
2372 return TOK_RPAREN; 2348 return TOK_RPAREN;
2373 2349
2374 case '.': 2350 case '.':
2375 c = inchar (SCHEME_A); 2351 c = inchar (SCHEME_A);
2376 2352
2377 if (is_one_of (" \n\t", c)) 2353 if (is_one_of (WHITESPACE, c))
2378 return TOK_DOT; 2354 return TOK_DOT;
2379 else 2355 else
2380 { 2356 {
2381 //TODO: ungetc twice in a row is not supported in C
2382 backchar (SCHEME_A_ c); 2357 backchar (SCHEME_A_ c);
2383 backchar (SCHEME_A_ '.');
2384 return TOK_ATOM; 2358 return TOK_DOTATOM;
2385 } 2359 }
2360
2361 case '|':
2362 return TOK_STRATOM;
2386 2363
2387 case '\'': 2364 case '\'':
2388 return TOK_QUOTE; 2365 return TOK_QUOTE;
2389 2366
2390 case ';': 2367 case ';':
… …
2522 } 2499 }
2523 2500
2524 putcharacter (SCHEME_A_ '"'); 2501 putcharacter (SCHEME_A_ '"');
2525} 2502}
2526 2503
2527
2528/* print atoms */ 2504/* print atoms */
2529static void 2505static void
2530printatom (SCHEME_P_ pointer l, int f) 2506printatom (SCHEME_P_ pointer l, int f)
2531{ 2507{
2532 char *p; 2508 char *p;
2533 int len; 2509 int len;
2534 2510
2535 atom2str (SCHEME_A_ l, f, &p, &len); 2511 atom2str (SCHEME_A_ l, f, &p, &len);
2536 putchars (SCHEME_A_ p, len); 2512 putchars (SCHEME_A_ p, len);
2537} 2513}
2538
2539 2514
2540/* Uses internal buffer unless string pointer is already available */ 2515/* Uses internal buffer unless string pointer is already available */
2541static void 2516static void
2542atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2517atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2543{ 2518{
… …
2557 { 2532 {
2558 p = SCHEME_V->strbuff; 2533 p = SCHEME_V->strbuff;
2559 2534
2560 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2535 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2561 { 2536 {
2562 if (num_is_integer (l)) 2537 if (is_integer (l))
2563 xnum (p, ivalue_unchecked (l)); 2538 xnum (p, ivalue_unchecked (l));
2564#if USE_REAL 2539#if USE_REAL
2565 else 2540 else
2566 { 2541 {
2567 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2542 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2704#endif 2679#endif
2705 } 2680 }
2706 else if (is_continuation (l)) 2681 else if (is_continuation (l))
2707 p = "#<CONTINUATION>"; 2682 p = "#<CONTINUATION>";
2708 else 2683 else
2684 {
2685#if USE_PRINTF
2686 p = SCHEME_V->strbuff;
2687 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2688#else
2709 p = "#<ERROR>"; 2689 p = "#<ERROR>";
2690#endif
2691 }
2710 2692
2711 *pp = p; 2693 *pp = p;
2712 *plen = strlen (p); 2694 *plen = strlen (p);
2713} 2695}
2714 2696
… …
2822 return 0; 2804 return 0;
2823 } 2805 }
2824 else if (is_number (a)) 2806 else if (is_number (a))
2825 { 2807 {
2826 if (is_number (b)) 2808 if (is_number (b))
2827 if (num_is_integer (a) == num_is_integer (b))
2828 return num_eq (nvalue (a), nvalue (b)); 2809 return num_cmp (nvalue (a), nvalue (b)) == 0;
2829 2810
2830 return 0; 2811 return 0;
2831 } 2812 }
2832 else if (is_character (a)) 2813 else if (is_character (a))
2833 { 2814 {
… …
2859/* () is #t in R5RS */ 2840/* () is #t in R5RS */
2860#define is_true(p) ((p) != S_F) 2841#define is_true(p) ((p) != S_F)
2861#define is_false(p) ((p) == S_F) 2842#define is_false(p) ((p) == S_F)
2862 2843
2863/* ========== Environment implementation ========== */ 2844/* ========== 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 2845
2880#ifndef USE_ALIST_ENV 2846#ifndef USE_ALIST_ENV
2881 2847
2882/* 2848/*
2883 * In this implementation, each frame of the environment may be 2849 * In this implementation, each frame of the environment may be
… …
2900 2866
2901 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2867 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2902 setenvironment (SCHEME_V->envir); 2868 setenvironment (SCHEME_V->envir);
2903} 2869}
2904 2870
2905static INLINE void 2871static uint32_t
2872sym_hash (pointer sym, uint32_t size)
2873{
2874 uintptr_t ptr = (uintptr_t)sym;
2875
2876#if 0
2877 /* table size is prime, so why mix */
2878 ptr += ptr >> 32;
2879 ptr += ptr >> 16;
2880 ptr += ptr >> 8;
2881#endif
2882
2883 return ptr % size;
2884}
2885
2886ecb_inline void
2906new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2887new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2907{ 2888{
2908 pointer slot = immutable_cons (variable, value); 2889 pointer slot = immutable_cons (variable, value);
2909 2890
2910 if (is_vector (car (env))) 2891 if (is_vector (car (env)))
2911 { 2892 {
2912 int location = hash_fn (symname (variable), veclength (car (env))); 2893 int location = sym_hash (variable, veclength (car (env)));
2913
2914 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2894 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2915 } 2895 }
2916 else 2896 else
2917 set_car (env, immutable_cons (slot, car (env))); 2897 set_car (env, immutable_cons (slot, car (env)));
2918} 2898}
2919 2899
2920static pointer 2900static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2901find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2902{
2923 pointer x, y; 2903 pointer x, y;
2924 int location;
2925 2904
2926 for (x = env; x != NIL; x = cdr (x)) 2905 for (x = env; x != NIL; x = cdr (x))
2927 { 2906 {
2928 if (is_vector (car (x))) 2907 if (is_vector (car (x)))
2929 { 2908 {
2930 location = hash_fn (symname (hdl), veclength (car (x))); 2909 int location = sym_hash (hdl, veclength (car (x)));
2931 y = vector_elem (car (x), location); 2910 y = vector_get (car (x), location);
2932 } 2911 }
2933 else 2912 else
2934 y = car (x); 2913 y = car (x);
2935 2914
2936 for (; y != NIL; y = cdr (y)) 2915 for (; y != NIL; y = cdr (y))
2937 if (caar (y) == hdl) 2916 if (caar (y) == hdl)
2938 break; 2917 break;
2939 2918
2940 if (y != NIL) 2919 if (y != NIL)
2920 return car (y);
2921
2922 if (!all)
2941 break; 2923 break;
2942
2943 if (!all)
2944 return NIL;
2945 } 2924 }
2946
2947 if (x != NIL)
2948 return car (y);
2949 2925
2950 return NIL; 2926 return NIL;
2951} 2927}
2952 2928
2953#else /* USE_ALIST_ENV */ 2929#else /* USE_ALIST_ENV */
2954 2930
2955static INLINE void 2931ecb_inline void
2956new_frame_in_env (SCHEME_P_ pointer old_env) 2932new_frame_in_env (SCHEME_P_ pointer old_env)
2957{ 2933{
2958 SCHEME_V->envir = immutable_cons (NIL, old_env); 2934 SCHEME_V->envir = immutable_cons (NIL, old_env);
2959 setenvironment (SCHEME_V->envir); 2935 setenvironment (SCHEME_V->envir);
2960} 2936}
2961 2937
2962static INLINE void 2938ecb_inline void
2963new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2939new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2964{ 2940{
2965 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2941 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2966} 2942}
2967 2943
… …
2975 for (y = car (x); y != NIL; y = cdr (y)) 2951 for (y = car (x); y != NIL; y = cdr (y))
2976 if (caar (y) == hdl) 2952 if (caar (y) == hdl)
2977 break; 2953 break;
2978 2954
2979 if (y != NIL) 2955 if (y != NIL)
2956 return car (y);
2980 break; 2957 break;
2981 2958
2982 if (!all) 2959 if (!all)
2983 return NIL; 2960 break;
2984 } 2961 }
2985
2986 if (x != NIL)
2987 return car (y);
2988 2962
2989 return NIL; 2963 return NIL;
2990} 2964}
2991 2965
2992#endif /* USE_ALIST_ENV else */ 2966#endif /* USE_ALIST_ENV else */
2993 2967
2994static INLINE void 2968ecb_inline void
2995new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2969new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2996{ 2970{
2971 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2997 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2972 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2998} 2973}
2999 2974
3000static INLINE void 2975ecb_inline void
3001set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2976set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3002{ 2977{
3003 set_cdr (slot, value); 2978 set_cdr (slot, value);
3004} 2979}
3005 2980
3006static INLINE pointer 2981ecb_inline pointer
3007slot_value_in_env (pointer slot) 2982slot_value_in_env (pointer slot)
3008{ 2983{
3009 return cdr (slot); 2984 return cdr (slot);
3010} 2985}
3011 2986
3012/* ========== Evaluation Cycle ========== */ 2987/* ========== Evaluation Cycle ========== */
3013 2988
3014static pointer 2989static int
3015xError_1 (SCHEME_P_ const char *s, pointer a) 2990xError_1 (SCHEME_P_ const char *s, pointer a)
3016{ 2991{
3017#if USE_ERROR_HOOK 2992#if USE_ERROR_HOOK
3018 pointer x; 2993 pointer x;
3019 pointer hdl = SCHEME_V->ERROR_HOOK; 2994 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3054 code = cons (mk_string (SCHEME_A_ s), code); 3029 code = cons (mk_string (SCHEME_A_ s), code);
3055 setimmutable (car (code)); 3030 setimmutable (car (code));
3056 SCHEME_V->code = cons (slot_value_in_env (x), code); 3031 SCHEME_V->code = cons (slot_value_in_env (x), code);
3057 SCHEME_V->op = OP_EVAL; 3032 SCHEME_V->op = OP_EVAL;
3058 3033
3059 return S_T; 3034 return 0;
3060 } 3035 }
3061#endif 3036#endif
3062 3037
3063 if (a) 3038 if (a)
3064 SCHEME_V->args = cons (a, NIL); 3039 SCHEME_V->args = cons (a, NIL);
… …
3066 SCHEME_V->args = NIL; 3041 SCHEME_V->args = NIL;
3067 3042
3068 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3043 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3069 setimmutable (car (SCHEME_V->args)); 3044 setimmutable (car (SCHEME_V->args));
3070 SCHEME_V->op = OP_ERR0; 3045 SCHEME_V->op = OP_ERR0;
3046
3071 return S_T; 3047 return 0;
3072} 3048}
3073 3049
3074#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3050#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3075#define Error_0(s) Error_1 (s, 0) 3051#define Error_0(s) Error_1 (s, 0)
3076 3052
3077/* Too small to turn into function */ 3053/* Too small to turn into function */
3078#define BEGIN do { 3054#define BEGIN do {
3079#define END } while (0) 3055#define END } while (0)
3080#define s_goto(a) BEGIN \ 3056#define s_goto(a) BEGIN \
3081 SCHEME_V->op = a; \ 3057 SCHEME_V->op = a; \
3082 return S_T; END 3058 return 0; END
3083 3059
3084#define s_return(a) return xs_return (SCHEME_A_ a) 3060#define s_return(a) return xs_return (SCHEME_A_ a)
3085 3061
3086#ifndef USE_SCHEME_STACK 3062#ifndef USE_SCHEME_STACK
3087 3063
… …
3101{ 3077{
3102 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3103 struct dump_stack_frame *next_frame; 3079 struct dump_stack_frame *next_frame;
3104 3080
3105 /* enough room for the next frame? */ 3081 /* enough room for the next frame? */
3106 if (nframes >= SCHEME_V->dump_size) 3082 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3107 { 3083 {
3108 SCHEME_V->dump_size += STACK_GROWTH; 3084 SCHEME_V->dump_size += STACK_GROWTH;
3109 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3085 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3110 } 3086 }
3111 3087
3112 next_frame = SCHEME_V->dump_base + nframes; 3088 next_frame = SCHEME_V->dump_base + nframes;
3113 3089
3114 next_frame->op = op; 3090 next_frame->op = op;
3115 next_frame->args = args; 3091 next_frame->args = args;
3116 next_frame->envir = SCHEME_V->envir; 3092 next_frame->envir = SCHEME_V->envir;
3117 next_frame->code = code; 3093 next_frame->code = code;
3118 3094
3119 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3095 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3120} 3096}
3121 3097
3122static pointer 3098static int
3123xs_return (SCHEME_P_ pointer a) 3099xs_return (SCHEME_P_ pointer a)
3124{ 3100{
3125 int nframes = (uintptr_t)SCHEME_V->dump; 3101 int nframes = (uintptr_t)SCHEME_V->dump;
3126 struct dump_stack_frame *frame; 3102 struct dump_stack_frame *frame;
3127 3103
3128 SCHEME_V->value = a; 3104 SCHEME_V->value = a;
3129 3105
3130 if (nframes <= 0) 3106 if (nframes <= 0)
3131 return NIL; 3107 return -1;
3132 3108
3133 frame = &SCHEME_V->dump_base[--nframes]; 3109 frame = &SCHEME_V->dump_base[--nframes];
3134 SCHEME_V->op = frame->op; 3110 SCHEME_V->op = frame->op;
3135 SCHEME_V->args = frame->args; 3111 SCHEME_V->args = frame->args;
3136 SCHEME_V->envir = frame->envir; 3112 SCHEME_V->envir = frame->envir;
3137 SCHEME_V->code = frame->code; 3113 SCHEME_V->code = frame->code;
3138 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3114 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3139 3115
3140 return S_T; 3116 return 0;
3141} 3117}
3142 3118
3143static INLINE void 3119ecb_inline void
3144dump_stack_reset (SCHEME_P) 3120dump_stack_reset (SCHEME_P)
3145{ 3121{
3146 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3122 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3147 SCHEME_V->dump = (pointer)+0; 3123 SCHEME_V->dump = (pointer)+0;
3148} 3124}
3149 3125
3150static INLINE void 3126ecb_inline void
3151dump_stack_initialize (SCHEME_P) 3127dump_stack_initialize (SCHEME_P)
3152{ 3128{
3153 SCHEME_V->dump_size = 0; 3129 SCHEME_V->dump_size = 0;
3154 SCHEME_V->dump_base = 0; 3130 SCHEME_V->dump_base = 0;
3155 dump_stack_reset (SCHEME_A); 3131 dump_stack_reset (SCHEME_A);
… …
3208 int i = 0; 3184 int i = 0;
3209 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3185 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3210 3186
3211 while (cont != NIL) 3187 while (cont != NIL)
3212 { 3188 {
3213 frame->op = ivalue (car (cont)); cont = cdr (cont); 3189 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3214 frame->args = car (cont) ; cont = cdr (cont); 3190 frame->args = car (cont) ; cont = cdr (cont);
3215 frame->envir = car (cont) ; cont = cdr (cont); 3191 frame->envir = car (cont) ; cont = cdr (cont);
3216 frame->code = car (cont) ; cont = cdr (cont); 3192 frame->code = car (cont) ; cont = cdr (cont);
3217 3193
3218 ++frame; 3194 ++frame;
3219 ++i; 3195 ++i;
3220 } 3196 }
3221 3197
3222 SCHEME_V->dump = (pointer)(uintptr_t)i; 3198 SCHEME_V->dump = (pointer)(uintptr_t)i;
3223} 3199}
3224 3200
3225#else 3201#else
3226 3202
3227static INLINE void 3203ecb_inline void
3228dump_stack_reset (SCHEME_P) 3204dump_stack_reset (SCHEME_P)
3229{ 3205{
3230 SCHEME_V->dump = NIL; 3206 SCHEME_V->dump = NIL;
3231} 3207}
3232 3208
3233static INLINE void 3209ecb_inline void
3234dump_stack_initialize (SCHEME_P) 3210dump_stack_initialize (SCHEME_P)
3235{ 3211{
3236 dump_stack_reset (SCHEME_A); 3212 dump_stack_reset (SCHEME_A);
3237} 3213}
3238 3214
… …
3240dump_stack_free (SCHEME_P) 3216dump_stack_free (SCHEME_P)
3241{ 3217{
3242 SCHEME_V->dump = NIL; 3218 SCHEME_V->dump = NIL;
3243} 3219}
3244 3220
3245static pointer 3221static int
3246xs_return (SCHEME_P_ pointer a) 3222xs_return (SCHEME_P_ pointer a)
3247{ 3223{
3248 pointer dump = SCHEME_V->dump; 3224 pointer dump = SCHEME_V->dump;
3249 3225
3250 SCHEME_V->value = a; 3226 SCHEME_V->value = a;
3251 3227
3252 if (dump == NIL) 3228 if (dump == NIL)
3253 return NIL; 3229 return -1;
3254 3230
3255 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3231 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3256 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3232 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3257 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3233 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3258 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3234 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3259 3235
3260 SCHEME_V->dump = dump; 3236 SCHEME_V->dump = dump;
3261 3237
3262 return S_T; 3238 return 0;
3263} 3239}
3264 3240
3265static void 3241static void
3266s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3242s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3267{ 3243{
… …
3292 3268
3293#endif 3269#endif
3294 3270
3295#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3271#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3296 3272
3273#if EXPERIMENT
3297static pointer 3274static int
3275debug (SCHEME_P_ int indent, pointer x)
3276{
3277 int c;
3278
3279 if (is_syntax (x))
3280 {
3281 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3282 return 8 + 8;
3283 }
3284
3285 if (x == NIL)
3286 {
3287 printf ("%*sNIL\n", indent, "");
3288 return 3;
3289 }
3290
3291 switch (type (x))
3292 {
3293 case T_INTEGER:
3294 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3295 return 32+8;
3296
3297 case T_SYMBOL:
3298 printf ("%*sS<%s>\n", indent, "", symname (x));
3299 return 24+8;
3300
3301 case T_CLOSURE:
3302 printf ("%*sS<%s>\n", indent, "", "closure");
3303 debug (SCHEME_A_ indent + 3, cdr(x));
3304 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3305
3306 case T_PAIR:
3307 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3308 c = debug (SCHEME_A_ indent + 3, car (x));
3309 c += debug (SCHEME_A_ indent + 3, cdr (x));
3310 return c + 1;
3311
3312 case T_PORT:
3313 printf ("%*sS<%s>\n", indent, "", "port");
3314 return 24+8;
3315
3316 case T_VECTOR:
3317 printf ("%*sS<%s>\n", indent, "", "vector");
3318 return 24+8;
3319
3320 case T_ENVIRONMENT:
3321 printf ("%*sS<%s>\n", indent, "", "environment");
3322 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3323
3324 default:
3325 printf ("unhandled type %d\n", type (x));
3326 break;
3327 }
3328}
3329#endif
3330
3331static int
3298opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3332opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3299{ 3333{
3334 pointer args = SCHEME_V->args;
3300 pointer x, y; 3335 pointer x, y;
3301 3336
3302 switch (op) 3337 switch (op)
3303 { 3338 {
3339#if EXPERIMENT //D
3340 case OP_DEBUG:
3341 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3342 printf ("\n");
3343 s_return (S_T);
3344#endif
3304 case OP_LOAD: /* load */ 3345 case OP_LOAD: /* load */
3305 if (file_interactive (SCHEME_A)) 3346 if (file_interactive (SCHEME_A))
3306 { 3347 {
3307 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3348 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))); 3349 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3309 } 3350 }
3310 3351
3311 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3352 if (!file_push (SCHEME_A_ strvalue (car (args))))
3312 Error_1 ("unable to open", car (SCHEME_V->args)); 3353 Error_1 ("unable to open", car (args));
3313 else 3354 else
3314 { 3355 {
3315 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3356 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3316 s_goto (OP_T0LVL); 3357 s_goto (OP_T0LVL);
3317 } 3358 }
3318 3359
3319 case OP_T0LVL: /* top level */ 3360 case OP_T0LVL: /* top level */
3320 3361
3321 /* If we reached the end of file, this loop is done. */ 3362 /* If we reached the end of file, this loop is done. */
3322 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3363 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3323 { 3364 {
3324 if (SCHEME_V->file_i == 0) 3365 if (SCHEME_V->file_i == 0)
3325 { 3366 {
3326 SCHEME_V->args = NIL; 3367 SCHEME_V->args = NIL;
3327 s_goto (OP_QUIT); 3368 s_goto (OP_QUIT);
… …
3391 case OP_EVAL: /* main part of evaluation */ 3432 case OP_EVAL: /* main part of evaluation */
3392#if USE_TRACING 3433#if USE_TRACING
3393 if (SCHEME_V->tracing) 3434 if (SCHEME_V->tracing)
3394 { 3435 {
3395 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3436 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3396 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3437 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3397 SCHEME_V->args = SCHEME_V->code; 3438 SCHEME_V->args = SCHEME_V->code;
3398 putstr (SCHEME_A_ "\nEval: "); 3439 putstr (SCHEME_A_ "\nEval: ");
3399 s_goto (OP_P0LIST); 3440 s_goto (OP_P0LIST);
3400 } 3441 }
3401 3442
… …
3405#endif 3446#endif
3406 if (is_symbol (SCHEME_V->code)) /* symbol */ 3447 if (is_symbol (SCHEME_V->code)) /* symbol */
3407 { 3448 {
3408 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3449 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3409 3450
3410 if (x != NIL) 3451 if (x == NIL)
3411 s_return (slot_value_in_env (x));
3412 else
3413 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3452 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3453
3454 s_return (slot_value_in_env (x));
3414 } 3455 }
3415 else if (is_pair (SCHEME_V->code)) 3456 else if (is_pair (SCHEME_V->code))
3416 { 3457 {
3417 x = car (SCHEME_V->code); 3458 x = car (SCHEME_V->code);
3418 3459
… …
3431 } 3472 }
3432 else 3473 else
3433 s_return (SCHEME_V->code); 3474 s_return (SCHEME_V->code);
3434 3475
3435 case OP_E0ARGS: /* eval arguments */ 3476 case OP_E0ARGS: /* eval arguments */
3436 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3477 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3437 { 3478 {
3438 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3479 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3439 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3480 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3440 SCHEME_V->code = SCHEME_V->value; 3481 SCHEME_V->code = SCHEME_V->value;
3441 s_goto (OP_APPLY); 3482 s_goto (OP_APPLY);
… …
3445 SCHEME_V->code = cdr (SCHEME_V->code); 3486 SCHEME_V->code = cdr (SCHEME_V->code);
3446 s_goto (OP_E1ARGS); 3487 s_goto (OP_E1ARGS);
3447 } 3488 }
3448 3489
3449 case OP_E1ARGS: /* eval arguments */ 3490 case OP_E1ARGS: /* eval arguments */
3450 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3491 args = cons (SCHEME_V->value, args);
3451 3492
3452 if (is_pair (SCHEME_V->code)) /* continue */ 3493 if (is_pair (SCHEME_V->code)) /* continue */
3453 { 3494 {
3454 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3495 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3455 SCHEME_V->code = car (SCHEME_V->code); 3496 SCHEME_V->code = car (SCHEME_V->code);
3456 SCHEME_V->args = NIL; 3497 SCHEME_V->args = NIL;
3457 s_goto (OP_EVAL); 3498 s_goto (OP_EVAL);
3458 } 3499 }
3459 else /* end */ 3500 else /* end */
3460 { 3501 {
3461 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3502 args = reverse_in_place (SCHEME_A_ NIL, args);
3462 SCHEME_V->code = car (SCHEME_V->args); 3503 SCHEME_V->code = car (args);
3463 SCHEME_V->args = cdr (SCHEME_V->args); 3504 SCHEME_V->args = cdr (args);
3464 s_goto (OP_APPLY); 3505 s_goto (OP_APPLY);
3465 } 3506 }
3466 3507
3467#if USE_TRACING 3508#if USE_TRACING
3468 3509
3469 case OP_TRACING: 3510 case OP_TRACING:
3470 { 3511 {
3471 int tr = SCHEME_V->tracing; 3512 int tr = SCHEME_V->tracing;
3472 3513
3473 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3514 SCHEME_V->tracing = ivalue_unchecked (car (args));
3474 s_return (mk_integer (SCHEME_A_ tr)); 3515 s_return (mk_integer (SCHEME_A_ tr));
3475 } 3516 }
3476 3517
3477#endif 3518#endif
3478 3519
3479 case OP_APPLY: /* apply 'code' to 'args' */ 3520 case OP_APPLY: /* apply 'code' to 'args' */
3480#if USE_TRACING 3521#if USE_TRACING
3481 if (SCHEME_V->tracing) 3522 if (SCHEME_V->tracing)
3482 { 3523 {
3483 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3524 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3484 SCHEME_V->print_flag = 1; 3525 SCHEME_V->print_flag = 1;
3485 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3526 /* args=cons(SCHEME_V->code,args); */
3486 putstr (SCHEME_A_ "\nApply to: "); 3527 putstr (SCHEME_A_ "\nApply to: ");
3487 s_goto (OP_P0LIST); 3528 s_goto (OP_P0LIST);
3488 } 3529 }
3489 3530
3490 /* fall through */ 3531 /* fall through */
3491 3532
3492 case OP_REAL_APPLY: 3533 case OP_REAL_APPLY:
3493#endif 3534#endif
3494 if (is_proc (SCHEME_V->code)) 3535 if (is_proc (SCHEME_V->code))
3495 {
3496 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3536 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3497 }
3498 else if (is_foreign (SCHEME_V->code)) 3537 else if (is_foreign (SCHEME_V->code))
3499 { 3538 {
3500 /* Keep nested calls from GC'ing the arglist */ 3539 /* Keep nested calls from GC'ing the arglist */
3501 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3540 push_recent_alloc (SCHEME_A_ args, NIL);
3502 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3541 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3503 3542
3504 s_return (x); 3543 s_return (x);
3505 } 3544 }
3506 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3545 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3507 { 3546 {
3508 /* Should not accept promise */ 3547 /* Should not accept promise */
3509 /* make environment */ 3548 /* make environment */
3510 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3549 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3511 3550
3512 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3551 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3513 { 3552 {
3514 if (y == NIL) 3553 if (y == NIL)
3515 Error_0 ("not enough arguments"); 3554 Error_0 ("not enough arguments");
3516 else 3555 else
3517 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3556 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3535 s_goto (OP_BEGIN); 3574 s_goto (OP_BEGIN);
3536 } 3575 }
3537 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3576 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3538 { 3577 {
3539 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3578 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3540 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3579 s_return (args != NIL ? car (args) : NIL);
3541 } 3580 }
3542 else 3581 else
3543 Error_0 ("illegal function"); 3582 Error_0 ("illegal function");
3544 3583
3545 case OP_DOMACRO: /* do macro */ 3584 case OP_DOMACRO: /* do macro */
3546 SCHEME_V->code = SCHEME_V->value; 3585 SCHEME_V->code = SCHEME_V->value;
3547 s_goto (OP_EVAL); 3586 s_goto (OP_EVAL);
3548
3549#if 1
3550 3587
3551 case OP_LAMBDA: /* lambda */ 3588 case OP_LAMBDA: /* lambda */
3552 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3589 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3553 set SCHEME_V->value fall thru */ 3590 set SCHEME_V->value fall thru */
3554 { 3591 {
3555 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3592 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3556 3593
3557 if (f != NIL) 3594 if (f != NIL)
3558 { 3595 {
3559 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3596 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3560 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3597 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3561 SCHEME_V->code = slot_value_in_env (f); 3598 SCHEME_V->code = slot_value_in_env (f);
3562 s_goto (OP_APPLY); 3599 s_goto (OP_APPLY);
3563 } 3600 }
3564 3601
3565 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3566 /* Fallthru */
3567 } 3603 }
3604 /* Fallthru */
3568 3605
3569 case OP_LAMBDA1: 3606 case OP_LAMBDA1:
3570 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3607 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3571 3608
3572#else
3573
3574 case OP_LAMBDA: /* lambda */
3575 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3576
3577#endif
3578
3579 case OP_MKCLOSURE: /* make-closure */ 3609 case OP_MKCLOSURE: /* make-closure */
3580 x = car (SCHEME_V->args); 3610 x = car (args);
3581 3611
3582 if (car (x) == SCHEME_V->LAMBDA) 3612 if (car (x) == SCHEME_V->LAMBDA)
3583 x = cdr (x); 3613 x = cdr (x);
3584 3614
3585 if (cdr (SCHEME_V->args) == NIL) 3615 if (cdr (args) == NIL)
3586 y = SCHEME_V->envir; 3616 y = SCHEME_V->envir;
3587 else 3617 else
3588 y = cadr (SCHEME_V->args); 3618 y = cadr (args);
3589 3619
3590 s_return (mk_closure (SCHEME_A_ x, y)); 3620 s_return (mk_closure (SCHEME_A_ x, y));
3591 3621
3592 case OP_QUOTE: /* quote */ 3622 case OP_QUOTE: /* quote */
3593 s_return (car (SCHEME_V->code)); 3623 s_return (car (SCHEME_V->code));
… …
3625 3655
3626 3656
3627 case OP_DEFP: /* defined? */ 3657 case OP_DEFP: /* defined? */
3628 x = SCHEME_V->envir; 3658 x = SCHEME_V->envir;
3629 3659
3630 if (cdr (SCHEME_V->args) != NIL) 3660 if (cdr (args) != NIL)
3631 x = cadr (SCHEME_V->args); 3661 x = cadr (args);
3632 3662
3633 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3663 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3634 3664
3635 case OP_SET0: /* set! */ 3665 case OP_SET0: /* set! */
3636 if (is_immutable (car (SCHEME_V->code))) 3666 if (is_immutable (car (SCHEME_V->code)))
3637 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3667 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3638 3668
… …
3669 3699
3670 case OP_IF1: /* if */ 3700 case OP_IF1: /* if */
3671 if (is_true (SCHEME_V->value)) 3701 if (is_true (SCHEME_V->value))
3672 SCHEME_V->code = car (SCHEME_V->code); 3702 SCHEME_V->code = car (SCHEME_V->code);
3673 else 3703 else
3674 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3704 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3675
3676 * car(NIL) = NIL */
3677 s_goto (OP_EVAL); 3705 s_goto (OP_EVAL);
3678 3706
3679 case OP_LET0: /* let */ 3707 case OP_LET0: /* let */
3680 SCHEME_V->args = NIL; 3708 SCHEME_V->args = NIL;
3681 SCHEME_V->value = SCHEME_V->code; 3709 SCHEME_V->value = SCHEME_V->code;
3682 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3710 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3683 s_goto (OP_LET1); 3711 s_goto (OP_LET1);
3684 3712
3685 case OP_LET1: /* let (calculate parameters) */ 3713 case OP_LET1: /* let (calculate parameters) */
3686 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3714 args = cons (SCHEME_V->value, args);
3687 3715
3688 if (is_pair (SCHEME_V->code)) /* continue */ 3716 if (is_pair (SCHEME_V->code)) /* continue */
3689 { 3717 {
3690 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3718 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)); 3719 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3692 3720
3693 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3721 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3694 SCHEME_V->code = cadar (SCHEME_V->code); 3722 SCHEME_V->code = cadar (SCHEME_V->code);
3695 SCHEME_V->args = NIL; 3723 SCHEME_V->args = NIL;
3696 s_goto (OP_EVAL); 3724 s_goto (OP_EVAL);
3697 } 3725 }
3698 else /* end */ 3726 else /* end */
3699 { 3727 {
3700 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3728 args = reverse_in_place (SCHEME_A_ NIL, args);
3701 SCHEME_V->code = car (SCHEME_V->args); 3729 SCHEME_V->code = car (args);
3702 SCHEME_V->args = cdr (SCHEME_V->args); 3730 SCHEME_V->args = cdr (args);
3703 s_goto (OP_LET2); 3731 s_goto (OP_LET2);
3704 } 3732 }
3705 3733
3706 case OP_LET2: /* let */ 3734 case OP_LET2: /* let */
3707 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3735 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3708 3736
3709 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3737 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)) 3738 y != NIL; x = cdr (x), y = cdr (y))
3711 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3739 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3712 3740
3713 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3741 if (is_symbol (car (SCHEME_V->code))) /* named let */
3714 { 3742 {
3715 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3743 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3716 { 3744 {
3717 if (!is_pair (x)) 3745 if (!is_pair (x))
3718 Error_1 ("Bad syntax of binding in let :", x); 3746 Error_1 ("Bad syntax of binding in let :", x);
3719 3747
3720 if (!is_list (SCHEME_A_ car (x))) 3748 if (!is_list (SCHEME_A_ car (x)))
3721 Error_1 ("Bad syntax of binding in let :", car (x)); 3749 Error_1 ("Bad syntax of binding in let :", car (x));
3722 3750
3723 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3751 args = cons (caar (x), args);
3724 } 3752 }
3725 3753
3726 x =
3727 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3754 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3728 SCHEME_V->envir); 3755 SCHEME_V->envir);
3729 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3756 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3730 SCHEME_V->code = cddr (SCHEME_V->code); 3757 SCHEME_V->code = cddr (SCHEME_V->code);
3731 SCHEME_V->args = NIL;
3732 } 3758 }
3733 else 3759 else
3734 { 3760 {
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3761 SCHEME_V->code = cdr (SCHEME_V->code);
3762 }
3763
3736 SCHEME_V->args = NIL; 3764 SCHEME_V->args = NIL;
3737 }
3738
3739 s_goto (OP_BEGIN); 3765 s_goto (OP_BEGIN);
3740 3766
3741 case OP_LET0AST: /* let* */ 3767 case OP_LET0AST: /* let* */
3742 if (car (SCHEME_V->code) == NIL) 3768 if (car (SCHEME_V->code) == NIL)
3743 { 3769 {
… …
3761 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3787 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3762 SCHEME_V->code = cdr (SCHEME_V->code); 3788 SCHEME_V->code = cdr (SCHEME_V->code);
3763 3789
3764 if (is_pair (SCHEME_V->code)) /* continue */ 3790 if (is_pair (SCHEME_V->code)) /* continue */
3765 { 3791 {
3766 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3792 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3793 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3794 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3795 s_goto (OP_EVAL);
3770 } 3796 }
3771 else /* end */ 3797 else /* end */
3772 { 3798 {
3773 SCHEME_V->code = SCHEME_V->args; 3799 SCHEME_V->code = args;
3774 SCHEME_V->args = NIL; 3800 SCHEME_V->args = NIL;
3775 s_goto (OP_BEGIN); 3801 s_goto (OP_BEGIN);
3776 } 3802 }
3777 3803
3778 case OP_LET0REC: /* letrec */ 3804 case OP_LET0REC: /* letrec */
… …
3781 SCHEME_V->value = SCHEME_V->code; 3807 SCHEME_V->value = SCHEME_V->code;
3782 SCHEME_V->code = car (SCHEME_V->code); 3808 SCHEME_V->code = car (SCHEME_V->code);
3783 s_goto (OP_LET1REC); 3809 s_goto (OP_LET1REC);
3784 3810
3785 case OP_LET1REC: /* letrec (calculate parameters) */ 3811 case OP_LET1REC: /* letrec (calculate parameters) */
3786 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3812 args = cons (SCHEME_V->value, args);
3787 3813
3788 if (is_pair (SCHEME_V->code)) /* continue */ 3814 if (is_pair (SCHEME_V->code)) /* continue */
3789 { 3815 {
3790 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3816 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)); 3817 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3792 3818
3793 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3794 SCHEME_V->code = cadar (SCHEME_V->code); 3820 SCHEME_V->code = cadar (SCHEME_V->code);
3795 SCHEME_V->args = NIL; 3821 SCHEME_V->args = NIL;
3796 s_goto (OP_EVAL); 3822 s_goto (OP_EVAL);
3797 } 3823 }
3798 else /* end */ 3824 else /* end */
3799 { 3825 {
3800 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3826 args = reverse_in_place (SCHEME_A_ NIL, args);
3801 SCHEME_V->code = car (SCHEME_V->args); 3827 SCHEME_V->code = car (args);
3802 SCHEME_V->args = cdr (SCHEME_V->args); 3828 SCHEME_V->args = cdr (args);
3803 s_goto (OP_LET2REC); 3829 s_goto (OP_LET2REC);
3804 } 3830 }
3805 3831
3806 case OP_LET2REC: /* letrec */ 3832 case OP_LET2REC: /* letrec */
3807 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3833 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)); 3834 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3809 3835
3810 SCHEME_V->code = cdr (SCHEME_V->code); 3836 SCHEME_V->code = cdr (SCHEME_V->code);
3811 SCHEME_V->args = NIL; 3837 SCHEME_V->args = NIL;
3812 s_goto (OP_BEGIN); 3838 s_goto (OP_BEGIN);
… …
3898 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3924 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3899 SCHEME_V->code = car (SCHEME_V->code); 3925 SCHEME_V->code = car (SCHEME_V->code);
3900 s_goto (OP_EVAL); 3926 s_goto (OP_EVAL);
3901 3927
3902 case OP_C1STREAM: /* cons-stream */ 3928 case OP_C1STREAM: /* cons-stream */
3903 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3929 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); 3930 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3905 set_typeflag (x, T_PROMISE); 3931 set_typeflag (x, T_PROMISE);
3906 s_return (cons (SCHEME_V->args, x)); 3932 s_return (cons (args, x));
3907 3933
3908 case OP_MACRO0: /* macro */ 3934 case OP_MACRO0: /* macro */
3909 if (is_pair (car (SCHEME_V->code))) 3935 if (is_pair (car (SCHEME_V->code)))
3910 { 3936 {
3911 x = caar (SCHEME_V->code); 3937 x = caar (SCHEME_V->code);
… …
3944 { 3970 {
3945 if (!is_pair (y = caar (x))) 3971 if (!is_pair (y = caar (x)))
3946 break; 3972 break;
3947 3973
3948 for (; y != NIL; y = cdr (y)) 3974 for (; y != NIL; y = cdr (y))
3949 {
3950 if (eqv (car (y), SCHEME_V->value)) 3975 if (eqv (car (y), SCHEME_V->value))
3951 break; 3976 break;
3952 }
3953 3977
3954 if (y != NIL) 3978 if (y != NIL)
3955 break; 3979 break;
3956 } 3980 }
3957 3981
… …
3977 s_goto (OP_BEGIN); 4001 s_goto (OP_BEGIN);
3978 else 4002 else
3979 s_return (NIL); 4003 s_return (NIL);
3980 4004
3981 case OP_PAPPLY: /* apply */ 4005 case OP_PAPPLY: /* apply */
3982 SCHEME_V->code = car (SCHEME_V->args); 4006 SCHEME_V->code = car (args);
3983 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4007 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3984 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4008 /*SCHEME_V->args = cadr(args); */
3985 s_goto (OP_APPLY); 4009 s_goto (OP_APPLY);
3986 4010
3987 case OP_PEVAL: /* eval */ 4011 case OP_PEVAL: /* eval */
3988 if (cdr (SCHEME_V->args) != NIL) 4012 if (cdr (args) != NIL)
3989 SCHEME_V->envir = cadr (SCHEME_V->args); 4013 SCHEME_V->envir = cadr (args);
3990 4014
3991 SCHEME_V->code = car (SCHEME_V->args); 4015 SCHEME_V->code = car (args);
3992 s_goto (OP_EVAL); 4016 s_goto (OP_EVAL);
3993 4017
3994 case OP_CONTINUATION: /* call-with-current-continuation */ 4018 case OP_CONTINUATION: /* call-with-current-continuation */
3995 SCHEME_V->code = car (SCHEME_V->args); 4019 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4020 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3997 s_goto (OP_APPLY); 4021 s_goto (OP_APPLY);
3998 } 4022 }
3999 4023
4000 return S_T; 4024 if (USE_ERROR_CHECKING) abort ();
4001} 4025}
4002 4026
4003static pointer 4027static int
4004opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4028opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4005{ 4029{
4006 pointer x; 4030 pointer args = SCHEME_V->args;
4031 pointer x = car (args);
4007 num v; 4032 num v;
4008 4033
4034 switch (op)
4035 {
4009#if USE_MATH 4036#if USE_MATH
4010 RVALUE dd;
4011#endif
4012
4013 switch (op)
4014 {
4015#if USE_MATH
4016
4017 case OP_INEX2EX: /* inexact->exact */ 4037 case OP_INEX2EX: /* inexact->exact */
4018 x = car (SCHEME_V->args); 4038 {
4019
4020 if (num_is_integer (x)) 4039 if (is_integer (x))
4021 s_return (x); 4040 s_return (x);
4022 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4041
4042 RVALUE r = rvalue_unchecked (x);
4043
4044 if (r == (RVALUE)(IVALUE)r)
4023 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4045 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4024 else 4046 else
4025 Error_1 ("inexact->exact: not integral:", x); 4047 Error_1 ("inexact->exact: not integral:", x);
4048 }
4026 4049
4027 case OP_EXP:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4050 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)))); 4051 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)))); 4052 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)))); 4053 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)))); 4054 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)))); 4055 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)))); 4056 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4054 4057
4055 case OP_ATAN: 4058 case OP_ATAN:
4056 x = car (SCHEME_V->args);
4057
4058 if (cdr (SCHEME_V->args) == NIL) 4059 if (cdr (args) == NIL)
4059 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4060 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4060 else 4061 else
4061 { 4062 {
4062 pointer y = cadr (SCHEME_V->args); 4063 pointer y = cadr (args);
4063
4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4065 } 4065 }
4066 4066
4067 case OP_SQRT: 4067 case OP_SQRT:
4068 x = car (SCHEME_V->args);
4069 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4068 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4070 4069
4071 case OP_EXPT: 4070 case OP_EXPT:
4072 { 4071 {
4073 RVALUE result; 4072 RVALUE result;
4074 int real_result = 1; 4073 int real_result = 1;
4075 pointer y = cadr (SCHEME_V->args); 4074 pointer y = cadr (args);
4076 4075
4077 x = car (SCHEME_V->args);
4078
4079 if (num_is_integer (x) && num_is_integer (y)) 4076 if (is_integer (x) && is_integer (y))
4080 real_result = 0; 4077 real_result = 0;
4081 4078
4082 /* This 'if' is an R5RS compatibility fix. */ 4079 /* This 'if' is an R5RS compatibility fix. */
4083 /* NOTE: Remove this 'if' fix for R6RS. */ 4080 /* NOTE: Remove this 'if' fix for R6RS. */
4084 if (rvalue (x) == 0 && rvalue (y) < 0) 4081 if (rvalue (x) == 0 && rvalue (y) < 0)
4085 result = 0.0; 4082 result = 0;
4086 else 4083 else
4087 result = pow (rvalue (x), rvalue (y)); 4084 result = pow (rvalue (x), rvalue (y));
4088 4085
4089 /* Before returning integer result make sure we can. */ 4086 /* Before returning integer result make sure we can. */
4090 /* If the test fails, result is too big for integer. */ 4087 /* If the test fails, result is too big for integer. */
4091 if (!real_result) 4088 if (!real_result)
4092 { 4089 {
4093 long result_as_long = (long) result; 4090 long result_as_long = result;
4094 4091
4095 if (result != (RVALUE) result_as_long) 4092 if (result != result_as_long)
4096 real_result = 1; 4093 real_result = 1;
4097 } 4094 }
4098 4095
4099 if (real_result) 4096 if (real_result)
4100 s_return (mk_real (SCHEME_A_ result)); 4097 s_return (mk_real (SCHEME_A_ result));
4101 else 4098 else
4102 s_return (mk_integer (SCHEME_A_ result)); 4099 s_return (mk_integer (SCHEME_A_ result));
4103 } 4100 }
4104 4101
4105 case OP_FLOOR:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4102 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)))); 4103 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4112 4104
4113 case OP_TRUNCATE: 4105 case OP_TRUNCATE:
4114 { 4106 {
4115 RVALUE rvalue_of_x; 4107 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))); 4108 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 } 4109 }
4125 4110
4126 case OP_ROUND: 4111 case OP_ROUND:
4127 x = car (SCHEME_V->args);
4128
4129 if (num_is_integer (x)) 4112 if (is_integer (x))
4130 s_return (x); 4113 s_return (x);
4131 4114
4132 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4115 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4133#endif 4116#endif
4134 4117
4135 case OP_ADD: /* + */ 4118 case OP_ADD: /* + */
4136 v = num_zero; 4119 v = num_zero;
4137 4120
4138 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4121 for (x = args; x != NIL; x = cdr (x))
4139 v = num_add (v, nvalue (car (x))); 4122 v = num_op (NUM_ADD, v, nvalue (car (x)));
4140 4123
4141 s_return (mk_number (SCHEME_A_ v)); 4124 s_return (mk_number (SCHEME_A_ v));
4142 4125
4143 case OP_MUL: /* * */ 4126 case OP_MUL: /* * */
4144 v = num_one; 4127 v = num_one;
4145 4128
4146 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4129 for (x = args; x != NIL; x = cdr (x))
4147 v = num_mul (v, nvalue (car (x))); 4130 v = num_op (NUM_MUL, v, nvalue (car (x)));
4148 4131
4149 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4150 4133
4151 case OP_SUB: /* - */ 4134 case OP_SUB: /* - */
4152 if (cdr (SCHEME_V->args) == NIL) 4135 if (cdr (args) == NIL)
4153 { 4136 {
4154 x = SCHEME_V->args; 4137 x = args;
4155 v = num_zero; 4138 v = num_zero;
4156 } 4139 }
4157 else 4140 else
4158 { 4141 {
4159 x = cdr (SCHEME_V->args); 4142 x = cdr (args);
4160 v = nvalue (car (SCHEME_V->args)); 4143 v = nvalue (car (args));
4161 } 4144 }
4162 4145
4163 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4164 v = num_sub (v, nvalue (car (x))); 4147 v = num_op (NUM_SUB, v, nvalue (car (x)));
4165 4148
4166 s_return (mk_number (SCHEME_A_ v)); 4149 s_return (mk_number (SCHEME_A_ v));
4167 4150
4168 case OP_DIV: /* / */ 4151 case OP_DIV: /* / */
4169 if (cdr (SCHEME_V->args) == NIL) 4152 if (cdr (args) == NIL)
4170 { 4153 {
4171 x = SCHEME_V->args; 4154 x = args;
4172 v = num_one; 4155 v = num_one;
4173 } 4156 }
4174 else 4157 else
4175 { 4158 {
4176 x = cdr (SCHEME_V->args); 4159 x = cdr (args);
4177 v = nvalue (car (SCHEME_V->args)); 4160 v = nvalue (car (args));
4178 } 4161 }
4179 4162
4180 for (; x != NIL; x = cdr (x)) 4163 for (; x != NIL; x = cdr (x))
4181 {
4182 if (!is_zero_rvalue (rvalue (car (x)))) 4164 if (!is_zero_rvalue (rvalue (car (x))))
4183 v = num_div (v, nvalue (car (x))); 4165 v = num_div (v, nvalue (car (x)));
4184 else 4166 else
4185 Error_0 ("/: division by zero"); 4167 Error_0 ("/: division by zero");
4186 }
4187 4168
4188 s_return (mk_number (SCHEME_A_ v)); 4169 s_return (mk_number (SCHEME_A_ v));
4189 4170
4190 case OP_INTDIV: /* quotient */ 4171 case OP_INTDIV: /* quotient */
4191 if (cdr (SCHEME_V->args) == NIL) 4172 if (cdr (args) == NIL)
4192 { 4173 {
4193 x = SCHEME_V->args; 4174 x = args;
4194 v = num_one; 4175 v = num_one;
4195 } 4176 }
4196 else 4177 else
4197 { 4178 {
4198 x = cdr (SCHEME_V->args); 4179 x = cdr (args);
4199 v = nvalue (car (SCHEME_V->args)); 4180 v = nvalue (car (args));
4200 } 4181 }
4201 4182
4202 for (; x != NIL; x = cdr (x)) 4183 for (; x != NIL; x = cdr (x))
4203 { 4184 {
4204 if (ivalue (car (x)) != 0) 4185 if (ivalue (car (x)) != 0)
4205 v = num_intdiv (v, nvalue (car (x))); 4186 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4206 else 4187 else
4207 Error_0 ("quotient: division by zero"); 4188 Error_0 ("quotient: division by zero");
4208 } 4189 }
4209 4190
4210 s_return (mk_number (SCHEME_A_ v)); 4191 s_return (mk_number (SCHEME_A_ v));
4211 4192
4212 case OP_REM: /* remainder */ 4193 case OP_REM: /* remainder */
4213 v = nvalue (car (SCHEME_V->args)); 4194 v = nvalue (x);
4214 4195
4215 if (ivalue (cadr (SCHEME_V->args)) != 0) 4196 if (ivalue (cadr (args)) != 0)
4216 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4197 v = num_rem (v, nvalue (cadr (args)));
4217 else 4198 else
4218 Error_0 ("remainder: division by zero"); 4199 Error_0 ("remainder: division by zero");
4219 4200
4220 s_return (mk_number (SCHEME_A_ v)); 4201 s_return (mk_number (SCHEME_A_ v));
4221 4202
4222 case OP_MOD: /* modulo */ 4203 case OP_MOD: /* modulo */
4223 v = nvalue (car (SCHEME_V->args)); 4204 v = nvalue (x);
4224 4205
4225 if (ivalue (cadr (SCHEME_V->args)) != 0) 4206 if (ivalue (cadr (args)) != 0)
4226 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4207 v = num_mod (v, nvalue (cadr (args)));
4227 else 4208 else
4228 Error_0 ("modulo: division by zero"); 4209 Error_0 ("modulo: division by zero");
4229 4210
4230 s_return (mk_number (SCHEME_A_ v)); 4211 s_return (mk_number (SCHEME_A_ v));
4231 4212
4232 case OP_CAR: /* car */ 4213 /* the compiler will optimize this mess... */
4233 s_return (caar (SCHEME_V->args)); 4214 case OP_CAR: op_car: s_return (car (x));
4234 4215 case OP_CDR: op_cdr: s_return (cdr (x));
4235 case OP_CDR: /* cdr */ 4216 case OP_CAAR: op_caar: x = car (x); goto op_car;
4236 s_return (cdar (SCHEME_V->args)); 4217 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4218 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4219 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4220 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4221 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4222 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4223 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4224 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4225 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4226 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4227 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4228 case OP_CAAAAR: x = car (x); goto op_caaar;
4229 case OP_CAAADR: x = cdr (x); goto op_caaar;
4230 case OP_CAADAR: x = car (x); goto op_caadr;
4231 case OP_CAADDR: x = cdr (x); goto op_caadr;
4232 case OP_CADAAR: x = car (x); goto op_cadar;
4233 case OP_CADADR: x = cdr (x); goto op_cadar;
4234 case OP_CADDAR: x = car (x); goto op_caddr;
4235 case OP_CADDDR: x = cdr (x); goto op_caddr;
4236 case OP_CDAAAR: x = car (x); goto op_cdaar;
4237 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4238 case OP_CDADAR: x = car (x); goto op_cdadr;
4239 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4240 case OP_CDDAAR: x = car (x); goto op_cddar;
4241 case OP_CDDADR: x = cdr (x); goto op_cddar;
4242 case OP_CDDDAR: x = car (x); goto op_cdddr;
4243 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4237 4244
4238 case OP_CONS: /* cons */ 4245 case OP_CONS: /* cons */
4239 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4246 set_cdr (args, cadr (args));
4240 s_return (SCHEME_V->args); 4247 s_return (args);
4241 4248
4242 case OP_SETCAR: /* set-car! */ 4249 case OP_SETCAR: /* set-car! */
4243 if (!is_immutable (car (SCHEME_V->args))) 4250 if (!is_immutable (x))
4244 { 4251 {
4245 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4252 set_car (x, cadr (args));
4246 s_return (car (SCHEME_V->args)); 4253 s_return (car (args));
4247 } 4254 }
4248 else 4255 else
4249 Error_0 ("set-car!: unable to alter immutable pair"); 4256 Error_0 ("set-car!: unable to alter immutable pair");
4250 4257
4251 case OP_SETCDR: /* set-cdr! */ 4258 case OP_SETCDR: /* set-cdr! */
4252 if (!is_immutable (car (SCHEME_V->args))) 4259 if (!is_immutable (x))
4253 { 4260 {
4254 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4261 set_cdr (x, cadr (args));
4255 s_return (car (SCHEME_V->args)); 4262 s_return (car (args));
4256 } 4263 }
4257 else 4264 else
4258 Error_0 ("set-cdr!: unable to alter immutable pair"); 4265 Error_0 ("set-cdr!: unable to alter immutable pair");
4259 4266
4260 case OP_CHAR2INT: /* char->integer */ 4267 case OP_CHAR2INT: /* char->integer */
4261 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4268 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4262 4269
4263 case OP_INT2CHAR: /* integer->char */ 4270 case OP_INT2CHAR: /* integer->char */
4264 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4271 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4265 4272
4266 case OP_CHARUPCASE: 4273 case OP_CHARUPCASE:
4267 { 4274 {
4268 unsigned char c = ivalue (car (SCHEME_V->args)); 4275 unsigned char c = ivalue_unchecked (x);
4269 c = toupper (c); 4276 c = toupper (c);
4270 s_return (mk_character (SCHEME_A_ c)); 4277 s_return (mk_character (SCHEME_A_ c));
4271 } 4278 }
4272 4279
4273 case OP_CHARDNCASE: 4280 case OP_CHARDNCASE:
4274 { 4281 {
4275 unsigned char c = ivalue (car (SCHEME_V->args)); 4282 unsigned char c = ivalue_unchecked (x);
4276 c = tolower (c); 4283 c = tolower (c);
4277 s_return (mk_character (SCHEME_A_ c)); 4284 s_return (mk_character (SCHEME_A_ c));
4278 } 4285 }
4279 4286
4280 case OP_STR2SYM: /* string->symbol */ 4287 case OP_STR2SYM: /* string->symbol */
4281 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4288 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4282 4289
4283 case OP_STR2ATOM: /* string->atom */ 4290 case OP_STR2ATOM: /* string->atom */
4284 { 4291 {
4285 char *s = strvalue (car (SCHEME_V->args)); 4292 char *s = strvalue (x);
4286 long pf = 0; 4293 long pf = 0;
4287 4294
4288 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4289 { 4296 {
4290 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4291 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4292 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4293 4300
4294 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4301 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4295 { 4302 {
4296 /* base is OK */ 4303 /* base is OK */
4297 } 4304 }
4298 else 4305 else
4299 pf = -1; 4306 pf = -1;
4300 } 4307 }
4301 4308
4302 if (pf < 0) 4309 if (pf < 0)
4303 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("string->atom: bad base:", cadr (args));
4304 else if (*s == '#') /* no use of base! */ 4311 else if (*s == '#') /* no use of base! */
4305 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4312 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4306 else 4313 else
4307 { 4314 {
4308 if (pf == 0 || pf == 10) 4315 if (pf == 0 || pf == 10)
… …
4319 } 4326 }
4320 } 4327 }
4321 } 4328 }
4322 4329
4323 case OP_SYM2STR: /* symbol->string */ 4330 case OP_SYM2STR: /* symbol->string */
4324 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4331 x = mk_string (SCHEME_A_ symname (x));
4325 setimmutable (x); 4332 setimmutable (x);
4326 s_return (x); 4333 s_return (x);
4327 4334
4328 case OP_ATOM2STR: /* atom->string */ 4335 case OP_ATOM2STR: /* atom->string */
4329 { 4336 {
4330 long pf = 0; 4337 long pf = 0;
4331 4338
4332 x = car (SCHEME_V->args);
4333
4334 if (cdr (SCHEME_V->args) != NIL) 4339 if (cdr (args) != NIL)
4335 { 4340 {
4336 /* we know cadr(SCHEME_V->args) is a natural number */ 4341 /* we know cadr(args) is a natural number */
4337 /* see if it is 2, 8, 10, or 16, or error */ 4342 /* see if it is 2, 8, 10, or 16, or error */
4338 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4343 pf = ivalue_unchecked (cadr (args));
4339 4344
4340 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4345 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4341 { 4346 {
4342 /* base is OK */ 4347 /* base is OK */
4343 } 4348 }
4344 else 4349 else
4345 pf = -1; 4350 pf = -1;
4346 } 4351 }
4347 4352
4348 if (pf < 0) 4353 if (pf < 0)
4349 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4354 Error_1 ("atom->string: bad base:", cadr (args));
4350 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4355 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4351 { 4356 {
4352 char *p; 4357 char *p;
4353 int len; 4358 int len;
4354 4359
… …
4359 Error_1 ("atom->string: not an atom:", x); 4364 Error_1 ("atom->string: not an atom:", x);
4360 } 4365 }
4361 4366
4362 case OP_MKSTRING: /* make-string */ 4367 case OP_MKSTRING: /* make-string */
4363 { 4368 {
4364 int fill = ' '; 4369 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4365 int len; 4370 int len = ivalue_unchecked (x);
4366 4371
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)); 4372 s_return (mk_empty_string (SCHEME_A_ len, fill));
4373 } 4373 }
4374 4374
4375 case OP_STRLEN: /* string-length */ 4375 case OP_STRLEN: /* string-length */
4376 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4376 s_return (mk_integer (SCHEME_A_ strlength (x)));
4377 4377
4378 case OP_STRREF: /* string-ref */ 4378 case OP_STRREF: /* string-ref */
4379 { 4379 {
4380 char *str; 4380 char *str = strvalue (x);
4381 int index;
4382
4383 str = strvalue (car (SCHEME_V->args));
4384
4385 index = ivalue (cadr (SCHEME_V->args)); 4381 int index = ivalue_unchecked (cadr (args));
4386 4382
4387 if (index >= strlength (car (SCHEME_V->args))) 4383 if (index >= strlength (x))
4388 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4384 Error_1 ("string-ref: out of bounds:", cadr (args));
4389 4385
4390 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4386 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4391 } 4387 }
4392 4388
4393 case OP_STRSET: /* string-set! */ 4389 case OP_STRSET: /* string-set! */
4394 { 4390 {
4395 char *str; 4391 char *str = strvalue (x);
4396 int index; 4392 int index = ivalue_unchecked (cadr (args));
4397 int c; 4393 int c;
4398 4394
4399 if (is_immutable (car (SCHEME_V->args))) 4395 if (is_immutable (x))
4400 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4396 Error_1 ("string-set!: unable to alter immutable string:", x);
4401 4397
4402 str = strvalue (car (SCHEME_V->args));
4403
4404 index = ivalue (cadr (SCHEME_V->args));
4405
4406 if (index >= strlength (car (SCHEME_V->args))) 4398 if (index >= strlength (x))
4407 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4399 Error_1 ("string-set!: out of bounds:", cadr (args));
4408 4400
4409 c = charvalue (caddr (SCHEME_V->args)); 4401 c = charvalue (caddr (args));
4410 4402
4411 str[index] = (char) c; 4403 str[index] = c;
4412 s_return (car (SCHEME_V->args)); 4404 s_return (car (args));
4413 } 4405 }
4414 4406
4415 case OP_STRAPPEND: /* string-append */ 4407 case OP_STRAPPEND: /* string-append */
4416 { 4408 {
4417 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4409 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4418 int len = 0; 4410 int len = 0;
4419 pointer newstr; 4411 pointer newstr;
4420 char *pos; 4412 char *pos;
4421 4413
4422 /* compute needed length for new string */ 4414 /* compute needed length for new string */
4423 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4415 for (x = args; x != NIL; x = cdr (x))
4424 len += strlength (car (x)); 4416 len += strlength (car (x));
4425 4417
4426 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4418 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4427 4419
4428 /* store the contents of the argument strings into the new string */ 4420 /* 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)) 4421 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4430 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4422 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4431 4423
4432 s_return (newstr); 4424 s_return (newstr);
4433 } 4425 }
4434 4426
4435 case OP_SUBSTR: /* substring */ 4427 case OP_SUBSTR: /* substring */
4436 { 4428 {
4437 char *str; 4429 char *str = strvalue (x);
4438 int index0; 4430 int index0 = ivalue_unchecked (cadr (args));
4439 int index1; 4431 int index1;
4440 int len; 4432 int len;
4441 4433
4442 str = strvalue (car (SCHEME_V->args));
4443
4444 index0 = ivalue (cadr (SCHEME_V->args));
4445
4446 if (index0 > strlength (car (SCHEME_V->args))) 4434 if (index0 > strlength (x))
4447 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4435 Error_1 ("substring: start out of bounds:", cadr (args));
4448 4436
4449 if (cddr (SCHEME_V->args) != NIL) 4437 if (cddr (args) != NIL)
4450 { 4438 {
4451 index1 = ivalue (caddr (SCHEME_V->args)); 4439 index1 = ivalue_unchecked (caddr (args));
4452 4440
4453 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4441 if (index1 > strlength (x) || index1 < index0)
4454 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4442 Error_1 ("substring: end out of bounds:", caddr (args));
4455 } 4443 }
4456 else 4444 else
4457 index1 = strlength (car (SCHEME_V->args)); 4445 index1 = strlength (x);
4458 4446
4459 len = index1 - index0; 4447 len = index1 - index0;
4460 x = mk_empty_string (SCHEME_A_ len, ' '); 4448 x = mk_empty_string (SCHEME_A_ len, ' ');
4461 memcpy (strvalue (x), str + index0, len); 4449 memcpy (strvalue (x), str + index0, len);
4462 strvalue (x)[len] = 0; 4450 strvalue (x)[len] = 0;
… …
4466 4454
4467 case OP_VECTOR: /* vector */ 4455 case OP_VECTOR: /* vector */
4468 { 4456 {
4469 int i; 4457 int i;
4470 pointer vec; 4458 pointer vec;
4471 int len = list_length (SCHEME_A_ SCHEME_V->args); 4459 int len = list_length (SCHEME_A_ args);
4472 4460
4473 if (len < 0) 4461 if (len < 0)
4474 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4462 Error_1 ("vector: not a proper list:", args);
4475 4463
4476 vec = mk_vector (SCHEME_A_ len); 4464 vec = mk_vector (SCHEME_A_ len);
4477 4465
4478#if USE_ERROR_CHECKING 4466#if USE_ERROR_CHECKING
4479 if (SCHEME_V->no_memory) 4467 if (SCHEME_V->no_memory)
4480 s_return (S_SINK); 4468 s_return (S_SINK);
4481#endif 4469#endif
4482 4470
4483 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4471 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4484 set_vector_elem (vec, i, car (x)); 4472 vector_set (vec, i, car (x));
4485 4473
4486 s_return (vec); 4474 s_return (vec);
4487 } 4475 }
4488 4476
4489 case OP_MKVECTOR: /* make-vector */ 4477 case OP_MKVECTOR: /* make-vector */
4490 { 4478 {
4491 pointer fill = NIL; 4479 pointer fill = NIL;
4492 int len;
4493 pointer vec; 4480 pointer vec;
4481 int len = ivalue_unchecked (x);
4494 4482
4495 len = ivalue (car (SCHEME_V->args));
4496
4497 if (cdr (SCHEME_V->args) != NIL) 4483 if (cdr (args) != NIL)
4498 fill = cadr (SCHEME_V->args); 4484 fill = cadr (args);
4499 4485
4500 vec = mk_vector (SCHEME_A_ len); 4486 vec = mk_vector (SCHEME_A_ len);
4501 4487
4502#if USE_ERROR_CHECKING 4488#if USE_ERROR_CHECKING
4503 if (SCHEME_V->no_memory) 4489 if (SCHEME_V->no_memory)
4504 s_return (S_SINK); 4490 s_return (S_SINK);
4505#endif 4491#endif
4506 4492
4507 if (fill != NIL) 4493 if (fill != NIL)
4508 fill_vector (vec, fill); 4494 fill_vector (vec, 0, fill);
4509 4495
4510 s_return (vec); 4496 s_return (vec);
4511 } 4497 }
4512 4498
4513 case OP_VECLEN: /* vector-length */ 4499 case OP_VECLEN: /* vector-length */
4514 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4500 s_return (mk_integer (SCHEME_A_ veclength (x)));
4501
4502 case OP_VECRESIZE:
4503 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4504 s_return (x);
4515 4505
4516 case OP_VECREF: /* vector-ref */ 4506 case OP_VECREF: /* vector-ref */
4517 { 4507 {
4518 int index;
4519
4520 index = ivalue (cadr (SCHEME_V->args)); 4508 int index = ivalue_unchecked (cadr (args));
4521 4509
4522 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4510 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4523 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4511 Error_1 ("vector-ref: out of bounds:", cadr (args));
4524 4512
4525 s_return (vector_elem (car (SCHEME_V->args), index)); 4513 s_return (vector_get (x, index));
4526 } 4514 }
4527 4515
4528 case OP_VECSET: /* vector-set! */ 4516 case OP_VECSET: /* vector-set! */
4529 { 4517 {
4530 int index; 4518 int index = ivalue_unchecked (cadr (args));
4531 4519
4532 if (is_immutable (car (SCHEME_V->args))) 4520 if (is_immutable (x))
4533 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4521 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4534 4522
4535 index = ivalue (cadr (SCHEME_V->args));
4536
4537 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4523 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4538 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4524 Error_1 ("vector-set!: out of bounds:", cadr (args));
4539 4525
4540 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4526 vector_set (x, index, caddr (args));
4541 s_return (car (SCHEME_V->args)); 4527 s_return (x);
4542 } 4528 }
4543 } 4529 }
4544 4530
4545 return S_T; 4531 if (USE_ERROR_CHECKING) abort ();
4546} 4532}
4547 4533
4548INTERFACE int 4534static int
4549is_list (SCHEME_P_ pointer a) 4535opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4550{ 4536{
4551 return list_length (SCHEME_A_ a) >= 0; 4537 pointer x = SCHEME_V->args;
4552}
4553 4538
4554/* Result is: 4539 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 { 4540 {
4541 num v = nvalue (car (x));
4542 x = cdr (x);
4543
4570 if (fast == NIL) 4544 if (x == NIL)
4571 return i; 4545 break;
4572 4546
4573 if (!is_pair (fast)) 4547 int r = num_cmp (v, nvalue (car (x)));
4574 return -2 - i;
4575 4548
4576 fast = cdr (fast); 4549 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 { 4550 {
4594 /* the fast pointer has looped back around and caught up 4551 case OP_NUMEQ: r = r == 0; break;
4595 with the slow pointer, hence the structure is circular, 4552 case OP_LESS: r = r < 0; break;
4596 not of finite length, and therefore not a list */ 4553 case OP_GRE: r = r > 0; break;
4597 return -1; 4554 case OP_LEQ: r = r <= 0; break;
4555 case OP_GEQ: r = r >= 0; break;
4598 } 4556 }
4599 }
4600}
4601 4557
4558 if (!r)
4559 s_return (S_F);
4560 }
4561
4562 s_return (S_T);
4563}
4564
4602static pointer 4565static int
4603opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4566opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4604{ 4567{
4605 pointer x; 4568 pointer args = SCHEME_V->args;
4606 num v; 4569 pointer a = car (args);
4607 int (*comp_func) (num, num); 4570 pointer d = cdr (args);
4571 int r;
4608 4572
4609 switch (op) 4573 switch (op)
4610 { 4574 {
4611 case OP_NOT: /* not */ 4575 case OP_NOT: /* not */ r = is_false (a) ; break;
4612 s_retbool (is_false (car (SCHEME_V->args))); 4576 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4577 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4578 case OP_NULLP: /* null? */ r = a == NIL ; break;
4579 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4580 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4581 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4582 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4583 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4584 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4585 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4613 4586
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 4587#if USE_CHAR_CLASSIFIERS
4683 4588 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4684 case OP_CHARAP: /* char-alphabetic? */ 4589 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4685 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4590 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4686 4591 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4687 case OP_CHARNP: /* char-numeric? */ 4592 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 4593#endif
4594
4699#if USE_PORTS 4595#if USE_PORTS
4700 4596 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? */ 4597 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? */ 4598 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4708 s_retbool (is_outport (car (SCHEME_V->args)));
4709#endif 4599#endif
4710 4600
4711 case OP_PROCP: /* procedure? */ 4601 case OP_PROCP: /* procedure? */
4712 4602
4713 /*-- 4603 /*--
4714 * continuation should be procedure by the example 4604 * continuation should be procedure by the example
4715 * (call-with-current-continuation procedure?) ==> #t 4605 * (call-with-current-continuation procedure?) ==> #t
4716 * in R^3 report sec. 6.9 4606 * in R^3 report sec. 6.9
4717 */ 4607 */
4718 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4608 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))); 4609 break;
4720 4610
4721 case OP_PAIRP: /* pair? */ 4611 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4722 s_retbool (is_pair (car (SCHEME_V->args))); 4612 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4723 4613 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4724 case OP_LISTP: /* list? */ 4614 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4725 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4615 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4726 4616 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 } 4617 }
4739 4618
4740 return S_T; 4619 s_retbool (r);
4741} 4620}
4742 4621
4743static pointer 4622static int
4744opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4623opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4745{ 4624{
4625 pointer args = SCHEME_V->args;
4626 pointer a = car (args);
4746 pointer x, y; 4627 pointer x, y;
4747 4628
4748 switch (op) 4629 switch (op)
4749 { 4630 {
4750 case OP_FORCE: /* force */ 4631 case OP_FORCE: /* force */
4751 SCHEME_V->code = car (SCHEME_V->args); 4632 SCHEME_V->code = a;
4752 4633
4753 if (is_promise (SCHEME_V->code)) 4634 if (is_promise (SCHEME_V->code))
4754 { 4635 {
4755 /* Should change type to closure here */ 4636 /* Should change type to closure here */
4756 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4637 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4759 } 4640 }
4760 else 4641 else
4761 s_return (SCHEME_V->code); 4642 s_return (SCHEME_V->code);
4762 4643
4763 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4644 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4764 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4645 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4765 s_return (SCHEME_V->value); 4646 s_return (SCHEME_V->value);
4766 4647
4767#if USE_PORTS 4648#if USE_PORTS
4768 4649
4769 case OP_WRITE: /* write */ 4650 case OP_WRITE: /* write */
… …
4777 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4658 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4778 SCHEME_V->outport = cadr (SCHEME_V->args); 4659 SCHEME_V->outport = cadr (SCHEME_V->args);
4779 } 4660 }
4780 } 4661 }
4781 4662
4782 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4783 4664
4784 if (op == OP_WRITE) 4665 if (op == OP_WRITE)
4785 SCHEME_V->print_flag = 1; 4666 SCHEME_V->print_flag = 1;
4786 else 4667 else
4787 SCHEME_V->print_flag = 0; 4668 SCHEME_V->print_flag = 0;
4788 4669
4789 s_goto (OP_P0LIST); 4670 s_goto (OP_P0LIST);
4790 4671
4791 case OP_NEWLINE: /* newline */ 4672 case OP_NEWLINE: /* newline */
4792 if (is_pair (SCHEME_V->args)) 4673 if (is_pair (args))
4793 { 4674 {
4794 if (car (SCHEME_V->args) != SCHEME_V->outport) 4675 if (a != SCHEME_V->outport)
4795 { 4676 {
4796 x = cons (SCHEME_V->outport, NIL); 4677 x = cons (SCHEME_V->outport, NIL);
4797 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4678 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4798 SCHEME_V->outport = car (SCHEME_V->args); 4679 SCHEME_V->outport = a;
4799 } 4680 }
4800 } 4681 }
4801 4682
4802 putstr (SCHEME_A_ "\n"); 4683 putstr (SCHEME_A_ "\n");
4803 s_return (S_T); 4684 s_return (S_T);
4804#endif 4685#endif
4805 4686
4806 case OP_ERR0: /* error */ 4687 case OP_ERR0: /* error */
4807 SCHEME_V->retcode = -1; 4688 SCHEME_V->retcode = -1;
4808 4689
4809 if (!is_string (car (SCHEME_V->args))) 4690 if (!is_string (a))
4810 { 4691 {
4811 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4692 args = cons (mk_string (SCHEME_A_ " -- "), args);
4812 setimmutable (car (SCHEME_V->args)); 4693 setimmutable (car (args));
4813 } 4694 }
4814 4695
4815 putstr (SCHEME_A_ "Error: "); 4696 putstr (SCHEME_A_ "Error: ");
4816 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4697 putstr (SCHEME_A_ strvalue (car (args)));
4817 SCHEME_V->args = cdr (SCHEME_V->args); 4698 SCHEME_V->args = cdr (args);
4818 s_goto (OP_ERR1); 4699 s_goto (OP_ERR1);
4819 4700
4820 case OP_ERR1: /* error */ 4701 case OP_ERR1: /* error */
4821 putstr (SCHEME_A_ " "); 4702 putstr (SCHEME_A_ " ");
4822 4703
4823 if (SCHEME_V->args != NIL) 4704 if (args != NIL)
4824 { 4705 {
4825 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4706 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4826 SCHEME_V->args = car (SCHEME_V->args); 4707 SCHEME_V->args = a;
4827 SCHEME_V->print_flag = 1; 4708 SCHEME_V->print_flag = 1;
4828 s_goto (OP_P0LIST); 4709 s_goto (OP_P0LIST);
4829 } 4710 }
4830 else 4711 else
4831 { 4712 {
4832 putstr (SCHEME_A_ "\n"); 4713 putstr (SCHEME_A_ "\n");
4833 4714
4834 if (SCHEME_V->interactive_repl) 4715 if (SCHEME_V->interactive_repl)
4835 s_goto (OP_T0LVL); 4716 s_goto (OP_T0LVL);
4836 else 4717 else
4837 return NIL; 4718 return -1;
4838 } 4719 }
4839 4720
4840 case OP_REVERSE: /* reverse */ 4721 case OP_REVERSE: /* reverse */
4841 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4722 s_return (reverse (SCHEME_A_ a));
4842 4723
4843 case OP_LIST_STAR: /* list* */ 4724 case OP_LIST_STAR: /* list* */
4844 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4725 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4845 4726
4846 case OP_APPEND: /* append */ 4727 case OP_APPEND: /* append */
4847 x = NIL; 4728 x = NIL;
4848 y = SCHEME_V->args; 4729 y = args;
4849 4730
4850 if (y == x) 4731 if (y == x)
4851 s_return (x); 4732 s_return (x);
4852 4733
4853 /* cdr() in the while condition is not a typo. If car() */ 4734 /* cdr() in the while condition is not a typo. If car() */
… …
4864 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4745 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4865 4746
4866#if USE_PLIST 4747#if USE_PLIST
4867 4748
4868 case OP_PUT: /* put */ 4749 case OP_PUT: /* put */
4869 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4750 if (!hasprop (a) || !hasprop (cadr (args)))
4870 Error_0 ("illegal use of put"); 4751 Error_0 ("illegal use of put");
4871 4752
4872 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4753 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4873 { 4754 {
4874 if (caar (x) == y) 4755 if (caar (x) == y)
4875 break; 4756 break;
4876 } 4757 }
4877 4758
4878 if (x != NIL) 4759 if (x != NIL)
4879 cdar (x) = caddr (SCHEME_V->args); 4760 cdar (x) = caddr (args);
4880 else 4761 else
4881 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4762 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4882 4763
4883 s_return (S_T); 4764 s_return (S_T);
4884 4765
4885 case OP_GET: /* get */ 4766 case OP_GET: /* get */
4886 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4767 if (!hasprop (a) || !hasprop (cadr (args)))
4887 Error_0 ("illegal use of get"); 4768 Error_0 ("illegal use of get");
4888 4769
4889 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4770 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4890 if (caar (x) == y) 4771 if (caar (x) == y)
4891 break; 4772 break;
4892 4773
4893 if (x != NIL) 4774 if (x != NIL)
4894 s_return (cdar (x)); 4775 s_return (cdar (x));
… …
4896 s_return (NIL); 4777 s_return (NIL);
4897 4778
4898#endif /* USE_PLIST */ 4779#endif /* USE_PLIST */
4899 4780
4900 case OP_QUIT: /* quit */ 4781 case OP_QUIT: /* quit */
4901 if (is_pair (SCHEME_V->args)) 4782 if (is_pair (args))
4902 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4783 SCHEME_V->retcode = ivalue (a);
4903 4784
4904 return NIL; 4785 return -1;
4905 4786
4906 case OP_GC: /* gc */ 4787 case OP_GC: /* gc */
4907 gc (SCHEME_A_ NIL, NIL); 4788 gc (SCHEME_A_ NIL, NIL);
4908 s_return (S_T); 4789 s_return (S_T);
4909 4790
4910 case OP_GCVERB: /* gc-verbose */ 4791 case OP_GCVERB: /* gc-verbose */
4911 { 4792 {
4912 int was = SCHEME_V->gc_verbose; 4793 int was = SCHEME_V->gc_verbose;
4913 4794
4914 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4795 SCHEME_V->gc_verbose = (a != S_F);
4915 s_retbool (was); 4796 s_retbool (was);
4916 } 4797 }
4917 4798
4918 case OP_NEWSEGMENT: /* new-segment */ 4799 case OP_NEWSEGMENT: /* new-segment */
4800#if 0
4919 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4801 if (!is_pair (args) || !is_number (a))
4920 Error_0 ("new-segment: argument must be a number"); 4802 Error_0 ("new-segment: argument must be a number");
4921 4803#endif
4922 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4804 s_retbool (alloc_cellseg (SCHEME_A));
4923
4924 s_return (S_T);
4925 4805
4926 case OP_OBLIST: /* oblist */ 4806 case OP_OBLIST: /* oblist */
4927 s_return (oblist_all_symbols (SCHEME_A)); 4807 s_return (oblist_all_symbols (SCHEME_A));
4928 4808
4929#if USE_PORTS 4809#if USE_PORTS
… …
4954 case OP_OPEN_INOUTFILE: 4834 case OP_OPEN_INOUTFILE:
4955 prop = port_input | port_output; 4835 prop = port_input | port_output;
4956 break; 4836 break;
4957 } 4837 }
4958 4838
4959 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4839 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4960 4840
4961 if (p == NIL) 4841 s_return (p == NIL ? S_F : p);
4962 s_return (S_F);
4963
4964 s_return (p);
4965 } 4842 }
4966 4843
4967# if USE_STRING_PORTS 4844# if USE_STRING_PORTS
4968 4845
4969 case OP_OPEN_INSTRING: /* open-input-string */ 4846 case OP_OPEN_INSTRING: /* open-input-string */
… …
4981 case OP_OPEN_INOUTSTRING: 4858 case OP_OPEN_INOUTSTRING:
4982 prop = port_input | port_output; 4859 prop = port_input | port_output;
4983 break; 4860 break;
4984 } 4861 }
4985 4862
4986 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4863 p = port_from_string (SCHEME_A_ strvalue (a),
4987 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4864 strvalue (a) + strlength (a), prop);
4988 4865
4989 if (p == NIL) 4866 s_return (p == NIL ? S_F : p);
4990 s_return (S_F);
4991
4992 s_return (p);
4993 } 4867 }
4994 4868
4995 case OP_OPEN_OUTSTRING: /* open-output-string */ 4869 case OP_OPEN_OUTSTRING: /* open-output-string */
4996 { 4870 {
4997 pointer p; 4871 pointer p;
4998 4872
4999 if (car (SCHEME_V->args) == NIL) 4873 if (a == NIL)
5000 {
5001 p = port_from_scratch (SCHEME_A); 4874 p = port_from_scratch (SCHEME_A);
5002
5003 if (p == NIL)
5004 s_return (S_F);
5005 }
5006 else 4875 else
5007 {
5008 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4876 p = port_from_string (SCHEME_A_ strvalue (a),
5009 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4877 strvalue (a) + strlength (a), port_output);
5010 4878
5011 if (p == NIL) 4879 s_return (p == NIL ? S_F : p);
5012 s_return (S_F);
5013 }
5014
5015 s_return (p);
5016 } 4880 }
5017 4881
5018 case OP_GET_OUTSTRING: /* get-output-string */ 4882 case OP_GET_OUTSTRING: /* get-output-string */
5019 { 4883 {
5020 port *p; 4884 port *p = port (a);
5021 4885
5022 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4886 if (p->kind & port_string)
5023 { 4887 {
5024 off_t size; 4888 off_t size;
5025 char *str; 4889 char *str;
5026 4890
5027 size = p->rep.string.curr - p->rep.string.start + 1; 4891 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5043 } 4907 }
5044 4908
5045# endif 4909# endif
5046 4910
5047 case OP_CLOSE_INPORT: /* close-input-port */ 4911 case OP_CLOSE_INPORT: /* close-input-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4912 port_close (SCHEME_A_ a, port_input);
5049 s_return (S_T); 4913 s_return (S_T);
5050 4914
5051 case OP_CLOSE_OUTPORT: /* close-output-port */ 4915 case OP_CLOSE_OUTPORT: /* close-output-port */
5052 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4916 port_close (SCHEME_A_ a, port_output);
5053 s_return (S_T); 4917 s_return (S_T);
5054#endif 4918#endif
5055 4919
5056 case OP_INT_ENV: /* interaction-environment */ 4920 case OP_INT_ENV: /* interaction-environment */
5057 s_return (SCHEME_V->global_env); 4921 s_return (SCHEME_V->global_env);
… …
5059 case OP_CURR_ENV: /* current-environment */ 4923 case OP_CURR_ENV: /* current-environment */
5060 s_return (SCHEME_V->envir); 4924 s_return (SCHEME_V->envir);
5061 4925
5062 } 4926 }
5063 4927
5064 return S_T; 4928 if (USE_ERROR_CHECKING) abort ();
5065} 4929}
5066 4930
5067static pointer 4931static int
5068opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4932opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5069{ 4933{
4934 pointer args = SCHEME_V->args;
5070 pointer x; 4935 pointer x;
5071 4936
5072 if (SCHEME_V->nesting != 0) 4937 if (SCHEME_V->nesting != 0)
5073 { 4938 {
5074 int n = SCHEME_V->nesting; 4939 int n = SCHEME_V->nesting;
… …
5081 switch (op) 4946 switch (op)
5082 { 4947 {
5083 /* ========== reading part ========== */ 4948 /* ========== reading part ========== */
5084#if USE_PORTS 4949#if USE_PORTS
5085 case OP_READ: 4950 case OP_READ:
5086 if (!is_pair (SCHEME_V->args)) 4951 if (!is_pair (args))
5087 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
5088 4953
5089 if (!is_inport (car (SCHEME_V->args))) 4954 if (!is_inport (car (args)))
5090 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4955 Error_1 ("read: not an input port:", car (args));
5091 4956
5092 if (car (SCHEME_V->args) == SCHEME_V->inport) 4957 if (car (args) == SCHEME_V->inport)
5093 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
5094 4959
5095 x = SCHEME_V->inport; 4960 x = SCHEME_V->inport;
5096 SCHEME_V->inport = car (SCHEME_V->args); 4961 SCHEME_V->inport = car (args);
5097 x = cons (x, NIL); 4962 x = cons (x, NIL);
5098 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4963 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5099 s_goto (OP_READ_INTERNAL); 4964 s_goto (OP_READ_INTERNAL);
5100 4965
5101 case OP_READ_CHAR: /* read-char */ 4966 case OP_READ_CHAR: /* read-char */
5102 case OP_PEEK_CHAR: /* peek-char */ 4967 case OP_PEEK_CHAR: /* peek-char */
5103 { 4968 {
5104 int c; 4969 int c;
5105 4970
5106 if (is_pair (SCHEME_V->args)) 4971 if (is_pair (args))
5107 { 4972 {
5108 if (car (SCHEME_V->args) != SCHEME_V->inport) 4973 if (car (args) != SCHEME_V->inport)
5109 { 4974 {
5110 x = SCHEME_V->inport; 4975 x = SCHEME_V->inport;
5111 x = cons (x, NIL); 4976 x = cons (x, NIL);
5112 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4977 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5113 SCHEME_V->inport = car (SCHEME_V->args); 4978 SCHEME_V->inport = car (args);
5114 } 4979 }
5115 } 4980 }
5116 4981
5117 c = inchar (SCHEME_A); 4982 c = inchar (SCHEME_A);
5118 4983
… …
5128 case OP_CHAR_READY: /* char-ready? */ 4993 case OP_CHAR_READY: /* char-ready? */
5129 { 4994 {
5130 pointer p = SCHEME_V->inport; 4995 pointer p = SCHEME_V->inport;
5131 int res; 4996 int res;
5132 4997
5133 if (is_pair (SCHEME_V->args)) 4998 if (is_pair (args))
5134 p = car (SCHEME_V->args); 4999 p = car (args);
5135 5000
5136 res = p->object.port->kind & port_string; 5001 res = port (p)->kind & port_string;
5137 5002
5138 s_retbool (res); 5003 s_retbool (res);
5139 } 5004 }
5140 5005
5141 case OP_SET_INPORT: /* set-input-port */ 5006 case OP_SET_INPORT: /* set-input-port */
5142 SCHEME_V->inport = car (SCHEME_V->args); 5007 SCHEME_V->inport = car (args);
5143 s_return (SCHEME_V->value); 5008 s_return (SCHEME_V->value);
5144 5009
5145 case OP_SET_OUTPORT: /* set-output-port */ 5010 case OP_SET_OUTPORT: /* set-output-port */
5146 SCHEME_V->outport = car (SCHEME_V->args); 5011 SCHEME_V->outport = car (args);
5147 s_return (SCHEME_V->value); 5012 s_return (SCHEME_V->value);
5148#endif 5013#endif
5149 5014
5150 case OP_RDSEXPR: 5015 case OP_RDSEXPR:
5151 switch (SCHEME_V->tok) 5016 switch (SCHEME_V->tok)
… …
5200 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5065 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5201 SCHEME_V->tok = token (SCHEME_A); 5066 SCHEME_V->tok = token (SCHEME_A);
5202 s_goto (OP_RDSEXPR); 5067 s_goto (OP_RDSEXPR);
5203 5068
5204 case TOK_ATOM: 5069 case TOK_ATOM:
5205 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5070 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5071
5072 case TOK_DOTATOM:
5073 SCHEME_V->strbuff[0] = '.';
5074 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5075
5076 case TOK_STRATOM:
5077 x = readstrexp (SCHEME_A_ '|');
5078 //TODO: haven't checked whether the garbage collector could interfere
5079 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5206 5080
5207 case TOK_DQUOTE: 5081 case TOK_DQUOTE:
5208 x = readstrexp (SCHEME_A); 5082 x = readstrexp (SCHEME_A_ '"');
5209 5083
5210 if (x == S_F) 5084 if (x == S_F)
5211 Error_0 ("Error reading string"); 5085 Error_0 ("Error reading string");
5212 5086
5213 setimmutable (x); 5087 setimmutable (x);
… …
5225 s_goto (OP_EVAL); 5099 s_goto (OP_EVAL);
5226 } 5100 }
5227 } 5101 }
5228 5102
5229 case TOK_SHARP_CONST: 5103 case TOK_SHARP_CONST:
5230 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5104 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5231 Error_0 ("undefined sharp expression"); 5105 Error_0 ("undefined sharp expression");
5232 else 5106 else
5233 s_return (x); 5107 s_return (x);
5234 5108
5235 default: 5109 default:
… …
5237 } 5111 }
5238 5112
5239 break; 5113 break;
5240 5114
5241 case OP_RDLIST: 5115 case OP_RDLIST:
5242 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5116 SCHEME_V->args = cons (SCHEME_V->value, args);
5243 SCHEME_V->tok = token (SCHEME_A); 5117 SCHEME_V->tok = token (SCHEME_A);
5244 5118
5245 switch (SCHEME_V->tok) 5119 switch (SCHEME_V->tok)
5246 { 5120 {
5247 case TOK_EOF: 5121 case TOK_EOF:
… …
5275 case OP_RDDOT: 5149 case OP_RDDOT:
5276 if (token (SCHEME_A) != TOK_RPAREN) 5150 if (token (SCHEME_A) != TOK_RPAREN)
5277 Error_0 ("syntax error: illegal dot expression"); 5151 Error_0 ("syntax error: illegal dot expression");
5278 5152
5279 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5153 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5280 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5154 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5281 5155
5282 case OP_RDQUOTE: 5156 case OP_RDQUOTE:
5283 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5157 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5284 5158
5285 case OP_RDQQUOTE: 5159 case OP_RDQQUOTE:
… …
5307 SCHEME_V->args = SCHEME_V->value; 5181 SCHEME_V->args = SCHEME_V->value;
5308 s_goto (OP_VECTOR); 5182 s_goto (OP_VECTOR);
5309 5183
5310 /* ========== printing part ========== */ 5184 /* ========== printing part ========== */
5311 case OP_P0LIST: 5185 case OP_P0LIST:
5312 if (is_vector (SCHEME_V->args)) 5186 if (is_vector (args))
5313 { 5187 {
5314 putstr (SCHEME_A_ "#("); 5188 putstr (SCHEME_A_ "#(");
5315 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5189 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5316 s_goto (OP_PVECFROM); 5190 s_goto (OP_PVECFROM);
5317 } 5191 }
5318 else if (is_environment (SCHEME_V->args)) 5192 else if (is_environment (args))
5319 { 5193 {
5320 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5194 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5321 s_return (S_T); 5195 s_return (S_T);
5322 } 5196 }
5323 else if (!is_pair (SCHEME_V->args)) 5197 else if (!is_pair (args))
5324 { 5198 {
5325 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5199 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5326 s_return (S_T); 5200 s_return (S_T);
5327 } 5201 }
5328 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5202 else
5329 { 5203 {
5204 pointer a = car (args);
5205 pointer b = cdr (args);
5206 int ok_abbr = ok_abbrev (b);
5207 SCHEME_V->args = car (b);
5208
5209 if (a == SCHEME_V->QUOTE && ok_abbr)
5330 putstr (SCHEME_A_ "'"); 5210 putstr (SCHEME_A_ "'");
5331 SCHEME_V->args = cadr (SCHEME_V->args); 5211 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5212 putstr (SCHEME_A_ "`");
5213 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5214 putstr (SCHEME_A_ ",");
5215 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5216 putstr (SCHEME_A_ ",@");
5217 else
5218 {
5219 putstr (SCHEME_A_ "(");
5220 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5221 SCHEME_V->args = a;
5222 }
5223
5332 s_goto (OP_P0LIST); 5224 s_goto (OP_P0LIST);
5333 } 5225 }
5334 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5226
5227 case OP_P1LIST:
5228 if (is_pair (args))
5335 { 5229 {
5230 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5336 putstr (SCHEME_A_ "`"); 5231 putstr (SCHEME_A_ " ");
5337 SCHEME_V->args = cadr (SCHEME_V->args); 5232 SCHEME_V->args = car (args);
5338 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5339 } 5234 }
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)) 5235 else if (is_vector (args))
5369 { 5236 {
5370 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5237 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5371 putstr (SCHEME_A_ " . "); 5238 putstr (SCHEME_A_ " . ");
5372 s_goto (OP_P0LIST); 5239 s_goto (OP_P0LIST);
5373 } 5240 }
5374 else 5241 else
5375 { 5242 {
5376 if (SCHEME_V->args != NIL) 5243 if (args != NIL)
5377 { 5244 {
5378 putstr (SCHEME_A_ " . "); 5245 putstr (SCHEME_A_ " . ");
5379 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5246 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5380 } 5247 }
5381 5248
5382 putstr (SCHEME_A_ ")"); 5249 putstr (SCHEME_A_ ")");
5383 s_return (S_T); 5250 s_return (S_T);
5384 } 5251 }
5385 5252
5386 case OP_PVECFROM: 5253 case OP_PVECFROM:
5387 { 5254 {
5388 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5255 int i = ivalue_unchecked (cdr (args));
5389 pointer vec = car (SCHEME_V->args); 5256 pointer vec = car (args);
5390 int len = veclength (vec); 5257 int len = veclength (vec);
5391 5258
5392 if (i == len) 5259 if (i == len)
5393 { 5260 {
5394 putstr (SCHEME_A_ ")"); 5261 putstr (SCHEME_A_ ")");
5395 s_return (S_T); 5262 s_return (S_T);
5396 } 5263 }
5397 else 5264 else
5398 { 5265 {
5399 pointer elem = vector_elem (vec, i); 5266 pointer elem = vector_get (vec, i);
5400 5267
5401 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5268 ivalue_unchecked (cdr (args)) = i + 1;
5402 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5269 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5403 SCHEME_V->args = elem; 5270 SCHEME_V->args = elem;
5404 5271
5405 if (i > 0) 5272 if (i > 0)
5406 putstr (SCHEME_A_ " "); 5273 putstr (SCHEME_A_ " ");
5407 5274
5408 s_goto (OP_P0LIST); 5275 s_goto (OP_P0LIST);
5409 } 5276 }
5410 } 5277 }
5411 } 5278 }
5412 5279
5413 return S_T; 5280 if (USE_ERROR_CHECKING) abort ();
5414} 5281}
5415 5282
5416static pointer 5283static int
5417opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5418{ 5285{
5286 pointer args = SCHEME_V->args;
5287 pointer a = car (args);
5419 pointer x, y; 5288 pointer x, y;
5420 5289
5421 switch (op) 5290 switch (op)
5422 { 5291 {
5423 case OP_LIST_LENGTH: /* length *//* a.k */ 5292 case OP_LIST_LENGTH: /* length *//* a.k */
5424 { 5293 {
5425 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5294 long v = list_length (SCHEME_A_ a);
5426 5295
5427 if (v < 0) 5296 if (v < 0)
5428 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5297 Error_1 ("length: not a list:", a);
5429 5298
5430 s_return (mk_integer (SCHEME_A_ v)); 5299 s_return (mk_integer (SCHEME_A_ v));
5431 } 5300 }
5432 5301
5433 case OP_ASSQ: /* assq *//* a.k */ 5302 case OP_ASSQ: /* assq *//* a.k */
5434 x = car (SCHEME_V->args); 5303 x = a;
5435 5304
5436 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5305 for (y = cadr (args); is_pair (y); y = cdr (y))
5437 { 5306 {
5438 if (!is_pair (car (y))) 5307 if (!is_pair (car (y)))
5439 Error_0 ("unable to handle non pair element"); 5308 Error_0 ("unable to handle non pair element");
5440 5309
5441 if (x == caar (y)) 5310 if (x == caar (y))
… …
5447 else 5316 else
5448 s_return (S_F); 5317 s_return (S_F);
5449 5318
5450 5319
5451 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5320 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5452 SCHEME_V->args = car (SCHEME_V->args); 5321 SCHEME_V->args = a;
5453 5322
5454 if (SCHEME_V->args == NIL) 5323 if (SCHEME_V->args == NIL)
5455 s_return (S_F); 5324 s_return (S_F);
5456 else if (is_closure (SCHEME_V->args)) 5325 else if (is_closure (SCHEME_V->args))
5457 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5326 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5462 5331
5463 case OP_CLOSUREP: /* closure? */ 5332 case OP_CLOSUREP: /* closure? */
5464 /* 5333 /*
5465 * Note, macro object is also a closure. 5334 * Note, macro object is also a closure.
5466 * Therefore, (closure? <#MACRO>) ==> #t 5335 * Therefore, (closure? <#MACRO>) ==> #t
5336 * (schmorp) well, obviously not, fix? TODO
5467 */ 5337 */
5468 s_retbool (is_closure (car (SCHEME_V->args))); 5338 s_retbool (is_closure (a));
5469 5339
5470 case OP_MACROP: /* macro? */ 5340 case OP_MACROP: /* macro? */
5471 s_retbool (is_macro (car (SCHEME_V->args))); 5341 s_retbool (is_macro (a));
5472 } 5342 }
5473 5343
5474 return S_T; /* NOTREACHED */ 5344 if (USE_ERROR_CHECKING) abort ();
5475} 5345}
5476 5346
5347/* 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); 5348typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5478 5349
5479typedef int (*test_predicate) (pointer); 5350typedef int (*test_predicate)(pointer);
5480static int 5351static int
5481is_any (pointer p) 5352tst_any (pointer p)
5482{ 5353{
5483 return 1; 5354 return 1;
5484} 5355}
5485 5356
5486static int 5357static int
5487is_nonneg (pointer p) 5358tst_inonneg (pointer p)
5488{ 5359{
5489 return ivalue (p) >= 0 && is_integer (p); 5360 return is_integer (p) && ivalue_unchecked (p) >= 0;
5361}
5362
5363static int
5364tst_is_list (SCHEME_P_ pointer p)
5365{
5366 return p == NIL || is_pair (p);
5490} 5367}
5491 5368
5492/* Correspond carefully with following defines! */ 5369/* Correspond carefully with following defines! */
5493static struct 5370static struct
5494{ 5371{
5495 test_predicate fct; 5372 test_predicate fct;
5496 const char *kind; 5373 const char *kind;
5497} tests[] = 5374} tests[] = {
5498{ 5375 { tst_any , 0 },
5499 { 0, 0}, /* unused */ 5376 { is_string , "string" },
5500 { is_any, 0}, 5377 { is_symbol , "symbol" },
5501 { is_string, "string" }, 5378 { is_port , "port" },
5502 { is_symbol, "symbol" },
5503 { is_port, "port" },
5504 { is_inport, "input port" }, 5379 { is_inport , "input port" },
5505 { is_outport, "output port" }, 5380 { is_outport , "output port" },
5506 { is_environment, "environment" }, 5381 { is_environment, "environment" },
5507 { is_pair, "pair" }, 5382 { is_pair , "pair" },
5508 { 0, "pair or '()" }, 5383 { 0 , "pair or '()" },
5509 { is_character, "character" }, 5384 { is_character , "character" },
5510 { is_vector, "vector" }, 5385 { is_vector , "vector" },
5511 { is_number, "number" }, 5386 { is_number , "number" },
5512 { is_integer, "integer" }, 5387 { is_integer , "integer" },
5513 { is_nonneg, "non-negative integer" } 5388 { tst_inonneg , "non-negative integer" }
5514}; 5389};
5515 5390
5516#define TST_NONE 0 5391#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5517#define TST_ANY "\001" 5392#define TST_ANY "\001"
5518#define TST_STRING "\002" 5393#define TST_STRING "\002"
5519#define TST_SYMBOL "\003" 5394#define TST_SYMBOL "\003"
5520#define TST_PORT "\004" 5395#define TST_PORT "\004"
5521#define TST_INPORT "\005" 5396#define TST_INPORT "\005"
5522#define TST_OUTPORT "\006" 5397#define TST_OUTPORT "\006"
5523#define TST_ENVIRONMENT "\007" 5398#define TST_ENVIRONMENT "\007"
5524#define TST_PAIR "\010" 5399#define TST_PAIR "\010"
5525#define TST_LIST "\011" 5400#define TST_LIST "\011"
5526#define TST_CHAR "\012" 5401#define TST_CHAR "\012"
5527#define TST_VECTOR "\013" 5402#define TST_VECTOR "\013"
5528#define TST_NUMBER "\014" 5403#define TST_NUMBER "\014"
5529#define TST_INTEGER "\015" 5404#define TST_INTEGER "\015"
5530#define TST_NATURAL "\016" 5405#define TST_NATURAL "\016"
5406
5407#define INF_ARG 0xff
5408#define UNNAMED_OP ""
5409
5410static const char opnames[] =
5411#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5412#include "opdefines.h"
5413#undef OP_DEF
5414;
5415
5416static const char *
5417opname (int idx)
5418{
5419 const char *name = opnames;
5420
5421 /* should do this at compile time, but would require external program, right? */
5422 while (idx--)
5423 name += strlen (name) + 1;
5424
5425 return *name ? name : "ILLEGAL";
5426}
5427
5428static const char *
5429procname (pointer x)
5430{
5431 return opname (procnum (x));
5432}
5531 5433
5532typedef struct 5434typedef struct
5533{ 5435{
5534 dispatch_func func; 5436 uint8_t func;
5535 char *name; 5437 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5438 uint8_t builtin;
5439#if USE_ERROR_CHECKING
5536 int min_arity; 5440 uint8_t min_arity;
5537 int max_arity; 5441 uint8_t max_arity;
5538 char *arg_tests_encoding; 5442 char arg_tests_encoding[3];
5443#endif
5539} op_code_info; 5444} op_code_info;
5540 5445
5541#define INF_ARG 0xffff
5542
5543static op_code_info dispatch_table[] = { 5446static const op_code_info dispatch_table[] = {
5544#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5447#if USE_ERROR_CHECKING
5448#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5449#else
5450#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5451#endif
5545#include "opdefines.h" 5452#include "opdefines.h"
5453#undef OP_DEF
5546 {0} 5454 {0}
5547}; 5455};
5548 5456
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 */ 5457/* kernel of this interpreter */
5562static void 5458static void ecb_hot
5563Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5459Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5564{ 5460{
5565 SCHEME_V->op = op; 5461 SCHEME_V->op = op;
5566 5462
5567 for (;;) 5463 for (;;)
5568 { 5464 {
5569 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5465 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5570 5466
5571#if USE_ERROR_CHECKING 5467#if USE_ERROR_CHECKING
5572 if (pcd->name) /* if built-in function, check arguments */ 5468 if (pcd->builtin) /* if built-in function, check arguments */
5573 { 5469 {
5574 int ok = 1;
5575 char msg[STRBUFFSIZE]; 5470 char msg[STRBUFFSIZE];
5576 int n = list_length (SCHEME_A_ SCHEME_V->args); 5471 int n = list_length (SCHEME_A_ SCHEME_V->args);
5577 5472
5578 /* Check number of arguments */ 5473 /* Check number of arguments */
5579 if (n < pcd->min_arity) 5474 if (ecb_expect_false (n < pcd->min_arity))
5580 { 5475 {
5581 ok = 0;
5582 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5476 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5583 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5477 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5478 xError_1 (SCHEME_A_ msg, 0);
5479 continue;
5584 } 5480 }
5585 5481 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5586 if (ok && n > pcd->max_arity)
5587 { 5482 {
5588 ok = 0;
5589 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5483 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5590 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5484 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5485 xError_1 (SCHEME_A_ msg, 0);
5486 continue;
5591 } 5487 }
5592 5488 else
5593 if (ok)
5594 { 5489 {
5595 if (pcd->arg_tests_encoding) 5490 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5596 { 5491 {
5597 int i = 0; 5492 int i = 0;
5598 int j; 5493 int j;
5599 const char *t = pcd->arg_tests_encoding; 5494 const char *t = pcd->arg_tests_encoding;
5600 pointer arglist = SCHEME_V->args; 5495 pointer arglist = SCHEME_V->args;
5601 5496
5602 do 5497 do
5603 { 5498 {
5604 pointer arg = car (arglist); 5499 pointer arg = car (arglist);
5605 5500
5606 j = (int) t[0]; 5501 j = t[0];
5607 5502
5503 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5608 if (j == TST_LIST[0]) 5504 if (j == TST_LIST[0])
5609 { 5505 {
5610 if (arg != NIL && !is_pair (arg)) 5506 if (!tst_is_list (SCHEME_A_ arg))
5611 break; 5507 break;
5612 } 5508 }
5613 else 5509 else
5614 { 5510 {
5615 if (!tests[j].fct (arg)) 5511 if (!tests[j - 1].fct (arg))
5616 break; 5512 break;
5617 } 5513 }
5618 5514
5619 if (t[1] != 0) /* last test is replicated as necessary */ 5515 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5620 t++; 5516 t++;
5621 5517
5622 arglist = cdr (arglist); 5518 arglist = cdr (arglist);
5623 i++; 5519 i++;
5624 } 5520 }
5625 while (i < n); 5521 while (i < n);
5626 5522
5627 if (i < n) 5523 if (i < n)
5628 { 5524 {
5629 ok = 0;
5630 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5525 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5526 xError_1 (SCHEME_A_ msg, 0);
5527 continue;
5631 } 5528 }
5632 } 5529 }
5633 } 5530 }
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 } 5531 }
5643#endif 5532#endif
5644 5533
5645 ok_to_freely_gc (SCHEME_A); 5534 ok_to_freely_gc (SCHEME_A);
5646 5535
5647 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5536 static const dispatch_func dispatch_funcs[] = {
5537 opexe_0,
5538 opexe_1,
5539 opexe_2,
5540 opexe_3,
5541 opexe_4,
5542 opexe_5,
5543 opexe_6,
5544 };
5545
5546 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5648 return; 5547 return;
5649 5548
5650 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5549 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5651 { 5550 {
5652 xwrstr ("No memory!\n"); 5551 xwrstr ("No memory!\n");
… …
5676mk_proc (SCHEME_P_ enum scheme_opcodes op) 5575mk_proc (SCHEME_P_ enum scheme_opcodes op)
5677{ 5576{
5678 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5577 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5679 set_typeflag (y, (T_PROC | T_ATOM)); 5578 set_typeflag (y, (T_PROC | T_ATOM));
5680 ivalue_unchecked (y) = op; 5579 ivalue_unchecked (y) = op;
5681 set_num_integer (y);
5682 return y; 5580 return y;
5683} 5581}
5684 5582
5685/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5583/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5686static int 5584static int
5687syntaxnum (pointer p) 5585syntaxnum (pointer p)
5688{ 5586{
5689 const char *s = strvalue (car (p)); 5587 const char *s = strvalue (p);
5690 5588
5691 switch (strlength (car (p))) 5589 switch (strlength (p))
5692 { 5590 {
5693 case 2: 5591 case 2:
5694 if (s[0] == 'i') 5592 if (s[0] == 'i')
5695 return OP_IF0; /* if */ 5593 return OP_IF0; /* if */
5696 else 5594 else
… …
5710 5608
5711 case 'd': 5609 case 'd':
5712 return OP_COND0; /* cond */ 5610 return OP_COND0; /* cond */
5713 5611
5714 case '*': 5612 case '*':
5715 return OP_LET0AST; /* let* */ 5613 return OP_LET0AST;/* let* */
5716 5614
5717 default: 5615 default:
5718 return OP_SET0; /* set! */ 5616 return OP_SET0; /* set! */
5719 } 5617 }
5720 5618
… …
5742 5640
5743 case 'f': 5641 case 'f':
5744 return OP_DEF0; /* define */ 5642 return OP_DEF0; /* define */
5745 5643
5746 default: 5644 default:
5747 return OP_LET0REC; /* letrec */ 5645 return OP_LET0REC;/* letrec */
5748 } 5646 }
5749 5647
5750 default: 5648 default:
5751 return OP_C0STREAM; /* cons-stream */ 5649 return OP_C0STREAM; /* cons-stream */
5752 } 5650 }
5753} 5651}
5754 5652
5755#if USE_MULTIPLICITY 5653#if USE_MULTIPLICITY
5756scheme * 5654ecb_cold scheme *
5757scheme_init_new () 5655scheme_init_new ()
5758{ 5656{
5759 scheme *sc = malloc (sizeof (scheme)); 5657 scheme *sc = malloc (sizeof (scheme));
5760 5658
5761 if (!scheme_init (SCHEME_A)) 5659 if (!scheme_init (SCHEME_A))
… …
5766 else 5664 else
5767 return sc; 5665 return sc;
5768} 5666}
5769#endif 5667#endif
5770 5668
5771int 5669ecb_cold int
5772scheme_init (SCHEME_P) 5670scheme_init (SCHEME_P)
5773{ 5671{
5774 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5672 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5775 pointer x; 5673 pointer x;
5674
5675 /* this memset is not strictly correct, as we assume (intcache)
5676 * that memset 0 will also set pointers to 0, but memset does
5677 * of course not guarantee that. screw such systems.
5678 */
5679 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5776 5680
5777 num_set_fixnum (num_zero, 1); 5681 num_set_fixnum (num_zero, 1);
5778 num_set_ivalue (num_zero, 0); 5682 num_set_ivalue (num_zero, 0);
5779 num_set_fixnum (num_one, 1); 5683 num_set_fixnum (num_one, 1);
5780 num_set_ivalue (num_one, 1); 5684 num_set_ivalue (num_one, 1);
… …
5792 SCHEME_V->save_inport = NIL; 5696 SCHEME_V->save_inport = NIL;
5793 SCHEME_V->loadport = NIL; 5697 SCHEME_V->loadport = NIL;
5794 SCHEME_V->nesting = 0; 5698 SCHEME_V->nesting = 0;
5795 SCHEME_V->interactive_repl = 0; 5699 SCHEME_V->interactive_repl = 0;
5796 5700
5797 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5701 if (!alloc_cellseg (SCHEME_A))
5798 { 5702 {
5799#if USE_ERROR_CHECKING 5703#if USE_ERROR_CHECKING
5800 SCHEME_V->no_memory = 1; 5704 SCHEME_V->no_memory = 1;
5801 return 0; 5705 return 0;
5802#endif 5706#endif
… …
5849 5753
5850 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5754 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5851 assign_syntax (SCHEME_A_ syntax_names[i]); 5755 assign_syntax (SCHEME_A_ syntax_names[i]);
5852 } 5756 }
5853 5757
5758 // TODO: should iterate via strlen, to avoid n² complexity
5854 for (i = 0; i < n; i++) 5759 for (i = 0; i < n; i++)
5855 if (dispatch_table[i].name != 0) 5760 if (dispatch_table[i].builtin)
5856 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5761 assign_proc (SCHEME_A_ i, opname (i));
5857 5762
5858 /* initialization of global pointers to special symbols */ 5763 /* initialization of global pointers to special symbols */
5859 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5764 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5860 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5765 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5861 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5766 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5900scheme_set_external_data (SCHEME_P_ void *p) 5805scheme_set_external_data (SCHEME_P_ void *p)
5901{ 5806{
5902 SCHEME_V->ext_data = p; 5807 SCHEME_V->ext_data = p;
5903} 5808}
5904 5809
5905void 5810ecb_cold void
5906scheme_deinit (SCHEME_P) 5811scheme_deinit (SCHEME_P)
5907{ 5812{
5908 int i; 5813 int i;
5909 5814
5910#if SHOW_ERROR_LINE 5815#if SHOW_ERROR_LINE
… …
6002{ 5907{
6003 dump_stack_reset (SCHEME_A); 5908 dump_stack_reset (SCHEME_A);
6004 SCHEME_V->envir = SCHEME_V->global_env; 5909 SCHEME_V->envir = SCHEME_V->global_env;
6005 SCHEME_V->file_i = 0; 5910 SCHEME_V->file_i = 0;
6006 SCHEME_V->load_stack[0].kind = port_input | port_string; 5911 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 */ 5912 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); 5913 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; 5914 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6010#if USE_PORTS 5915#if USE_PORTS
6011 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5916 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6012#endif 5917#endif
6013 SCHEME_V->retcode = 0; 5918 SCHEME_V->retcode = 0;
6014 SCHEME_V->interactive_repl = 0; 5919 SCHEME_V->interactive_repl = 0;
… …
6131# endif 6036# endif
6132 int fin; 6037 int fin;
6133 char *file_name = InitFile; 6038 char *file_name = InitFile;
6134 int retcode; 6039 int retcode;
6135 int isfile = 1; 6040 int isfile = 1;
6041 system ("ps v $PPID");//D
6136 6042
6137 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6043 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6138 { 6044 {
6139 xwrstr ("Usage: tinyscheme -?\n"); 6045 xwrstr ("Usage: tinyscheme -?\n");
6140 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6046 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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