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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.8 by root, Wed Nov 25 22:36:25 2015 UTC vs.
Revision 1.52 by root, Tue Dec 1 01:56:22 2015 UTC

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

Diff Legend

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