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.51 by root, Tue Dec 1 01:54:27 2015 UTC

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

Diff Legend

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