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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.7 by root, Wed Nov 25 22:12:59 2015 UTC vs.
Revision 1.38 by root, Sun Nov 29 13:47:15 2015 UTC

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

Diff Legend

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