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.43 by root, Mon Nov 30 06:40:57 2015 UTC

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

Diff Legend

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