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.2 by root, Wed Nov 25 10:01:39 2015 UTC vs.
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
22# include <unistd.h> 27# include <unistd.h>
23#endif 28#endif
24#if USE_MATH 29#if USE_MATH
25# include <math.h> 30# include <math.h>
26#endif 31#endif
32
33#include "ecb.h"
27 34
28#include <sys/types.h> 35#include <sys/types.h>
29#include <sys/stat.h> 36#include <sys/stat.h>
30#include <fcntl.h> 37#include <fcntl.h>
31 38
… …
128 c += 'a' - 'A'; 135 c += 'a' - 'A';
129 136
130 return c; 137 return c;
131} 138}
132 139
133#if USE_STRLWR 140static int
141xisdigit (char c)
142{
143 return c >= '0' && c <= '9';
144}
145
146#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c)
149
150#if USE_IGNORECASE
134static const char * 151static const char *
135strlwr (char *s) 152xstrlwr (char *s)
136{ 153{
137 const char *p = s; 154 const char *p = s;
138 155
139 while (*s) 156 while (*s)
140 { 157 {
… …
142 s++; 159 s++;
143 } 160 }
144 161
145 return p; 162 return p;
146} 163}
147#endif
148 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
149#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 170# define strlwr(s) (s)
151#define toupper(c) xtoupper(c) 171#endif
152#define tolower(c) xtolower(c)
153 172
154#ifndef prompt 173#ifndef prompt
155# define prompt "ts> " 174# define prompt "ts> "
156#endif 175#endif
157 176
… …
163# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
164#endif 183#endif
165 184
166enum scheme_types 185enum scheme_types
167{ 186{
187 T_INTEGER,
168 T_FREE, 188 T_REAL,
169 T_STRING, 189 T_STRING,
170 T_NUMBER,
171 T_SYMBOL, 190 T_SYMBOL,
172 T_PROC, 191 T_PROC,
173 T_PAIR, 192 T_PAIR, /* also used for free cells */
174 T_CLOSURE, 193 T_CLOSURE,
175 T_CONTINUATION, 194 T_CONTINUATION,
176 T_FOREIGN, 195 T_FOREIGN,
177 T_CHARACTER, 196 T_CHARACTER,
178 T_PORT, 197 T_PORT,
… …
188#define T_SYNTAX 0x0010 207#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 208#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
192 211
193static num num_add (num a, num b); 212/* num, for generic arithmetic */
194static num num_mul (num a, num b); 213struct num
195static num num_div (num a, num b); 214{
215 IVALUE ivalue;
216#if USE_REAL
217 RVALUE rvalue;
218 char is_fixnum;
219#endif
220};
221
222#if USE_REAL
223# define num_is_fixnum(n) (n).is_fixnum
224# define num_set_fixnum(n,f) (n).is_fixnum = (f)
225# define num_ivalue(n) (n).ivalue
226# define num_rvalue(n) (n).rvalue
227# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
228# define num_set_rvalue(n,r) (n).rvalue = (r)
229#else
230# define num_is_fixnum(n) 1
231# define num_set_fixnum(n,f) 0
232# define num_ivalue(n) (n).ivalue
233# define num_rvalue(n) (n).ivalue
234# define num_set_ivalue(n,i) (n).ivalue = (i)
235# define num_set_rvalue(n,r) (n).ivalue = (r)
236#endif
237
238enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
239
240static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 241static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 242static num num_rem (num a, num b);
199static num num_mod (num a, num b); 243static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 244
206#if USE_MATH 245#if USE_MATH
207static double round_per_R5RS (double x); 246static double round_per_R5RS (double x);
208#endif 247#endif
209static int is_zero_rvalue (RVALUE x); 248static int is_zero_rvalue (RVALUE x);
210
211static INLINE int
212num_is_integer (pointer p)
213{
214 return num_is_fixnum (p->object.number);
215}
216 249
217static num num_zero; 250static num num_zero;
218static num num_one; 251static num num_one;
219 252
220/* macros for cell operations */ 253/* macros for cell operations */
221#define typeflag(p) ((p)->flag + 0) 254#define typeflag(p) ((p)->flag + 0)
222#define set_typeflag(p,v) ((p)->flag = (v)) 255#define set_typeflag(p,v) ((p)->flag = (v))
223#define type(p) (typeflag (p) & T_MASKTYPE) 256#define type(p) (typeflag (p) & T_MASKTYPE)
224 257
225INTERFACE INLINE int 258INTERFACE int
226is_string (pointer p) 259is_string (pointer p)
227{ 260{
228 return type (p) == T_STRING; 261 return type (p) == T_STRING;
229} 262}
230 263
231#define strvalue(p) ((p)->object.string.svalue) 264#define strvalue(p) ((p)->object.string.svalue)
232#define strlength(p) ((p)->object.string.length) 265#define strlength(p) ((p)->object.string.length)
233 266
234INTERFACE int is_list (SCHEME_P_ pointer p);
235INTERFACE INLINE int 267INTERFACE int
236is_vector (pointer p) 268is_vector (pointer p)
237{ 269{
238 return type (p) == T_VECTOR; 270 return type (p) == T_VECTOR;
239} 271}
240 272
273#define vecvalue(p) ((p)->object.vector.vvalue)
274#define veclength(p) ((p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
242INTERFACE pointer vector_elem (pointer vec, int ielem); 276INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
243INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
244 278
245INTERFACE INLINE int 279INTERFACE int
280is_integer (pointer p)
281{
282 return type (p) == T_INTEGER;
283}
284
285/* not the same as in scheme, where integers are (correctly :) reals */
286INTERFACE int
287is_real (pointer p)
288{
289 return type (p) == T_REAL;
290}
291
292INTERFACE int
246is_number (pointer p) 293is_number (pointer p)
247{ 294{
248 return type (p) == T_NUMBER; 295 return is_integer (p) || is_real (p);
249} 296}
250 297
251INTERFACE INLINE int 298INTERFACE int
252is_integer (pointer p)
253{
254 if (!is_number (p))
255 return 0;
256
257 if (num_is_integer (p) || ivalue (p) == rvalue (p))
258 return 1;
259
260 return 0;
261}
262
263INTERFACE INLINE int
264is_real (pointer p)
265{
266 return is_number (p) && !num_is_fixnum (p->object.number);
267}
268
269INTERFACE INLINE int
270is_character (pointer p) 299is_character (pointer p)
271{ 300{
272 return type (p) == T_CHARACTER; 301 return type (p) == T_CHARACTER;
273} 302}
274 303
275INTERFACE INLINE char * 304INTERFACE char *
276string_value (pointer p) 305string_value (pointer p)
277{ 306{
278 return strvalue (p); 307 return strvalue (p);
279} 308}
280 309
281INLINE num
282nvalue (pointer p)
283{
284 return (p)->object.number;
285}
286
287static IVALUE
288num_get_ivalue (const num n)
289{
290 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
291}
292
293static RVALUE
294num_get_rvalue (const num n)
295{
296 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
297}
298
299INTERFACE IVALUE
300ivalue (pointer p)
301{
302 return num_get_ivalue (p->object.number);
303}
304
305INTERFACE RVALUE
306rvalue (pointer p)
307{
308 return num_get_rvalue (p->object.number);
309}
310
311#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 310#define ivalue_unchecked(p) (p)->object.ivalue
312#if USE_FLOAT 311#define set_ivalue(p,v) (p)->object.ivalue = (v)
312
313#if USE_REAL
313# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 314#define rvalue_unchecked(p) (p)->object.rvalue
314# define set_num_integer(p) (p)->object.number.is_fixnum=1; 315#define set_rvalue(p,v) (p)->object.rvalue = (v)
315# define set_num_real(p) (p)->object.number.is_fixnum=0;
316#else 316#else
317# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 317#define rvalue_unchecked(p) (p)->object.ivalue
318# define set_num_integer(p) 0 318#define set_rvalue(p,v) (p)->object.ivalue = (v)
319# define set_num_real(p) 0
320#endif 319#endif
320
321INTERFACE long 321INTERFACE long
322charvalue (pointer p) 322charvalue (pointer p)
323{ 323{
324 return ivalue_unchecked (p); 324 return ivalue_unchecked (p);
325} 325}
326 326
327INTERFACE INLINE int 327INTERFACE int
328is_port (pointer p) 328is_port (pointer p)
329{ 329{
330 return type (p) == T_PORT; 330 return type (p) == T_PORT;
331} 331}
332 332
333INTERFACE INLINE int 333INTERFACE int
334is_inport (pointer p) 334is_inport (pointer p)
335{ 335{
336 return is_port (p) && p->object.port->kind & port_input; 336 return is_port (p) && p->object.port->kind & port_input;
337} 337}
338 338
339INTERFACE INLINE int 339INTERFACE int
340is_outport (pointer p) 340is_outport (pointer p)
341{ 341{
342 return is_port (p) && p->object.port->kind & port_output; 342 return is_port (p) && p->object.port->kind & port_output;
343} 343}
344 344
345INTERFACE INLINE int 345INTERFACE int
346is_pair (pointer p) 346is_pair (pointer p)
347{ 347{
348 return type (p) == T_PAIR; 348 return type (p) == T_PAIR;
349} 349}
350 350
351#define car(p) ((p)->object.cons.car + 0) 351#define car(p) ((p)->object.cons.car + 0)
352#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 352#define cdr(p) ((p)->object.cons.cdr + 0)
353 353
354#define caar(p) car (car (p)) 354static pointer caar (pointer p) { return car (car (p)); }
355#define cadr(p) car (cdr (p)) 355static pointer cadr (pointer p) { return car (cdr (p)); }
356#define cdar(p) cdr (car (p)) 356static pointer cdar (pointer p) { return cdr (car (p)); }
357#define cddr(p) cdr (cdr (p)) 357static pointer cddr (pointer p) { return cdr (cdr (p)); }
358 358
359#define cadar(p) car (cdr (car (p))) 359static pointer cadar (pointer p) { return car (cdr (car (p))); }
360#define caddr(p) car (cdr (cdr (p))) 360static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
361#define cdaar(p) cdr (car (car (p))) 361static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 362
363INTERFACE void 363INTERFACE void
364set_car (pointer p, pointer q) 364set_car (pointer p, pointer q)
365{ 365{
366 p->object.cons.car = q; 366 p->object.cons.car = q;
… …
382pair_cdr (pointer p) 382pair_cdr (pointer p)
383{ 383{
384 return cdr (p); 384 return cdr (p);
385} 385}
386 386
387INTERFACE INLINE int 387INTERFACE int
388is_symbol (pointer p) 388is_symbol (pointer p)
389{ 389{
390 return type (p) == T_SYMBOL; 390 return type (p) == T_SYMBOL;
391} 391}
392 392
393INTERFACE INLINE char * 393INTERFACE char *
394symname (pointer p) 394symname (pointer p)
395{ 395{
396 return strvalue (car (p)); 396 return strvalue (car (p));
397} 397}
398 398
399#if USE_PLIST 399#if USE_PLIST
400SCHEME_EXPORT INLINE int 400SCHEME_EXPORT int
401hasprop (pointer p) 401hasprop (pointer p)
402{ 402{
403 return typeflag (p) & T_SYMBOL; 403 return typeflag (p) & T_SYMBOL;
404} 404}
405 405
406# define symprop(p) cdr(p) 406# define symprop(p) cdr(p)
407#endif 407#endif
408 408
409INTERFACE INLINE int 409INTERFACE int
410is_syntax (pointer p) 410is_syntax (pointer p)
411{ 411{
412 return typeflag (p) & T_SYNTAX; 412 return typeflag (p) & T_SYNTAX;
413} 413}
414 414
415INTERFACE INLINE int 415INTERFACE int
416is_proc (pointer p) 416is_proc (pointer p)
417{ 417{
418 return type (p) == T_PROC; 418 return type (p) == T_PROC;
419} 419}
420 420
421INTERFACE INLINE int 421INTERFACE int
422is_foreign (pointer p) 422is_foreign (pointer p)
423{ 423{
424 return type (p) == T_FOREIGN; 424 return type (p) == T_FOREIGN;
425} 425}
426 426
427INTERFACE INLINE char * 427INTERFACE char *
428syntaxname (pointer p) 428syntaxname (pointer p)
429{ 429{
430 return strvalue (car (p)); 430 return strvalue (car (p));
431} 431}
432 432
433#define procnum(p) ivalue (p) 433#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 434static const char *procname (pointer x);
435 435
436INTERFACE INLINE int 436INTERFACE int
437is_closure (pointer p) 437is_closure (pointer p)
438{ 438{
439 return type (p) == T_CLOSURE; 439 return type (p) == T_CLOSURE;
440} 440}
441 441
442INTERFACE INLINE int 442INTERFACE int
443is_macro (pointer p) 443is_macro (pointer p)
444{ 444{
445 return type (p) == T_MACRO; 445 return type (p) == T_MACRO;
446} 446}
447 447
448INTERFACE INLINE pointer 448INTERFACE pointer
449closure_code (pointer p) 449closure_code (pointer p)
450{ 450{
451 return car (p); 451 return car (p);
452} 452}
453 453
454INTERFACE INLINE pointer 454INTERFACE pointer
455closure_env (pointer p) 455closure_env (pointer p)
456{ 456{
457 return cdr (p); 457 return cdr (p);
458} 458}
459 459
460INTERFACE INLINE int 460INTERFACE int
461is_continuation (pointer p) 461is_continuation (pointer p)
462{ 462{
463 return type (p) == T_CONTINUATION; 463 return type (p) == T_CONTINUATION;
464} 464}
465 465
466#define cont_dump(p) cdr (p) 466#define cont_dump(p) cdr (p)
467#define set_cont_dump(p,v) set_cdr ((p), (v)) 467#define set_cont_dump(p,v) set_cdr ((p), (v))
468 468
469/* To do: promise should be forced ONCE only */ 469/* To do: promise should be forced ONCE only */
470INTERFACE INLINE int 470INTERFACE int
471is_promise (pointer p) 471is_promise (pointer p)
472{ 472{
473 return type (p) == T_PROMISE; 473 return type (p) == T_PROMISE;
474} 474}
475 475
476INTERFACE INLINE int 476INTERFACE int
477is_environment (pointer p) 477is_environment (pointer p)
478{ 478{
479 return type (p) == T_ENVIRONMENT; 479 return type (p) == T_ENVIRONMENT;
480} 480}
481 481
482#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 482#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
483 483
484#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
485#define is_atom(p) (typeflag (p) & T_ATOM) 484#define is_atom(p) (typeflag (p) & T_ATOM)
486#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 485#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
487#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 486#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
488 487
489#define is_mark(p) (typeflag (p) & T_MARK) 488#define is_mark(p) (typeflag (p) & T_MARK)
490#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 489#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
491#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 490#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
492 491
493#if 0
494static int
495is_atom(pointer p)
496{
497 if (!is_atom1(p) != !is_atom2(p))
498 printf ("atoms disagree %x\n", typeflag(p));
499
500 return is_atom2(p);
501}
502#endif
503
504INTERFACE INLINE int 492INTERFACE int
505is_immutable (pointer p) 493is_immutable (pointer p)
506{ 494{
507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 495 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
508} 496}
509 497
510INTERFACE INLINE void 498INTERFACE void
511setimmutable (pointer p) 499setimmutable (pointer p)
512{ 500{
513#if USE_ERROR_CHECKING 501#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 502 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 503#endif
516} 504}
517 505
506/* Result is:
507 proper list: length
508 circular list: -1
509 not even a pair: -2
510 dotted list: -2 minus length before dot
511*/
512INTERFACE int
513list_length (SCHEME_P_ pointer a)
514{
515 int i = 0;
516 pointer slow, fast;
517
518 slow = fast = a;
519
520 while (1)
521 {
522 if (fast == NIL)
523 return i;
524
525 if (!is_pair (fast))
526 return -2 - i;
527
528 fast = cdr (fast);
529 ++i;
530
531 if (fast == NIL)
532 return i;
533
534 if (!is_pair (fast))
535 return -2 - i;
536
537 ++i;
538 fast = cdr (fast);
539
540 /* Safe because we would have already returned if `fast'
541 encountered a non-pair. */
542 slow = cdr (slow);
543
544 if (fast == slow)
545 {
546 /* the fast pointer has looped back around and caught up
547 with the slow pointer, hence the structure is circular,
548 not of finite length, and therefore not a list */
549 return -1;
550 }
551 }
552}
553
554INTERFACE int
555is_list (SCHEME_P_ pointer a)
556{
557 return list_length (SCHEME_A_ a) >= 0;
558}
559
518#if USE_CHAR_CLASSIFIERS 560#if USE_CHAR_CLASSIFIERS
519static INLINE int 561ecb_inline int
520Cisalpha (int c) 562Cisalpha (int c)
521{ 563{
522 return isascii (c) && isalpha (c); 564 return isascii (c) && isalpha (c);
523} 565}
524 566
525static INLINE int 567ecb_inline int
526Cisdigit (int c) 568Cisdigit (int c)
527{ 569{
528 return isascii (c) && isdigit (c); 570 return isascii (c) && isdigit (c);
529} 571}
530 572
531static INLINE int 573ecb_inline int
532Cisspace (int c) 574Cisspace (int c)
533{ 575{
534 return isascii (c) && isspace (c); 576 return isascii (c) && isspace (c);
535} 577}
536 578
537static INLINE int 579ecb_inline int
538Cisupper (int c) 580Cisupper (int c)
539{ 581{
540 return isascii (c) && isupper (c); 582 return isascii (c) && isupper (c);
541} 583}
542 584
543static INLINE int 585ecb_inline int
544Cislower (int c) 586Cislower (int c)
545{ 587{
546 return isascii (c) && islower (c); 588 return isascii (c) && islower (c);
547} 589}
548#endif 590#endif
… …
609#endif 651#endif
610 652
611static int file_push (SCHEME_P_ const char *fname); 653static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 654static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 655static int file_interactive (SCHEME_P);
614static INLINE int is_one_of (char *s, int c); 656ecb_inline int is_one_of (char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 657static int alloc_cellseg (SCHEME_P_ int n);
616static long binary_decode (const char *s);
617static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
618static pointer reserve_cells (SCHEME_P_ int n);
619static pointer get_consecutive_cells (SCHEME_P_ int n);
620static pointer find_consecutive_cells (SCHEME_P_ int n);
621static void finalize_cell (SCHEME_P_ pointer a); 659static void finalize_cell (SCHEME_P_ pointer a);
622static int count_consecutive_cells (pointer x, int needed); 660static int count_consecutive_cells (pointer x, int needed);
623static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
624static pointer mk_number (SCHEME_P_ const num n); 662static pointer mk_number (SCHEME_P_ const num n);
625static char *store_string (SCHEME_P_ int len, const char *str, char fill); 663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
626static pointer mk_vector (SCHEME_P_ int len); 664static pointer mk_vector (SCHEME_P_ uint32_t len);
627static pointer mk_atom (SCHEME_P_ char *q); 665static pointer mk_atom (SCHEME_P_ char *q);
628static pointer mk_sharp_const (SCHEME_P_ char *name); 666static pointer mk_sharp_const (SCHEME_P_ char *name);
629 667
630#if USE_PORTS 668#if USE_PORTS
631static pointer mk_port (SCHEME_P_ port *p); 669static pointer mk_port (SCHEME_P_ port *p);
… …
642static int basic_inchar (port *pt); 680static int basic_inchar (port *pt);
643static int inchar (SCHEME_P); 681static int inchar (SCHEME_P);
644static void backchar (SCHEME_P_ int c); 682static void backchar (SCHEME_P_ int c);
645static char *readstr_upto (SCHEME_P_ char *delim); 683static char *readstr_upto (SCHEME_P_ char *delim);
646static pointer readstrexp (SCHEME_P); 684static pointer readstrexp (SCHEME_P);
647static INLINE int skipspace (SCHEME_P); 685ecb_inline int skipspace (SCHEME_P);
648static int token (SCHEME_P); 686static int token (SCHEME_P);
649static void printslashstring (SCHEME_P_ char *s, int len); 687static void printslashstring (SCHEME_P_ char *s, int len);
650static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
651static void printatom (SCHEME_P_ pointer l, int f); 689static void printatom (SCHEME_P_ pointer l, int f);
652static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
656static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 694static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
657static pointer revappend (SCHEME_P_ pointer a, pointer b); 695static pointer revappend (SCHEME_P_ pointer a, pointer b);
658static pointer ss_get_cont (SCHEME_P); 696static pointer ss_get_cont (SCHEME_P);
659static void ss_set_cont (SCHEME_P_ pointer cont); 697static void ss_set_cont (SCHEME_P_ pointer cont);
660static void dump_stack_mark (SCHEME_P); 698static void dump_stack_mark (SCHEME_P);
661static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 699static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
700static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
662static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 701static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
663static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 702static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
664static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 703static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
665static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 704static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 705static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
667static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 706static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
668static void assign_syntax (SCHEME_P_ const char *name); 707static void assign_syntax (SCHEME_P_ const char *name);
669static int syntaxnum (pointer p); 708static int syntaxnum (pointer p);
670static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 709static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
671 710
711static IVALUE
712ivalue (pointer x)
713{
714 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
715}
716
717static RVALUE
718rvalue (pointer x)
719{
720 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
721}
722
723INTERFACE num
724nvalue (pointer x)
725{
726 num n;
727
728 num_set_fixnum (n, is_integer (x));
729
730 if (num_is_fixnum (n))
731 num_set_ivalue (n, ivalue_unchecked (x));
732 else
733 num_set_rvalue (n, rvalue_unchecked (x));
734
735 return n;
736}
737
672static num 738static num
673num_add (num a, num b) 739num_op (enum num_op op, num a, num b)
674{ 740{
675 num ret; 741 num ret;
676 742
677 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
678 744
679 if (num_is_fixnum (ret)) 745 if (num_is_fixnum (ret))
680 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 746 {
747 switch (op)
748 {
749 case NUM_ADD: a.ivalue += b.ivalue; break;
750 case NUM_SUB: a.ivalue -= b.ivalue; break;
751 case NUM_MUL: a.ivalue *= b.ivalue; break;
752 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
753 }
754
755 num_set_ivalue (ret, a.ivalue);
756 }
757#if USE_REAL
681 else 758 else
682 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 759 {
760 switch (op)
761 {
762 case NUM_ADD: a.rvalue += b.rvalue; break;
763 case NUM_SUB: a.rvalue -= b.rvalue; break;
764 case NUM_MUL: a.rvalue *= b.rvalue; break;
765 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
766 }
683 767
684 return ret; 768 num_set_rvalue (ret, a.rvalue);
685} 769 }
686 770#endif
687static num
688num_mul (num a, num b)
689{
690 num ret;
691
692 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
693
694 if (num_is_fixnum (ret))
695 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
696 else
697 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
698 771
699 return ret; 772 return ret;
700} 773}
701 774
702static num 775static num
703num_div (num a, num b) 776num_div (num a, num b)
704{ 777{
705 num ret; 778 num ret;
706 779
707 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
708 781
709 if (num_is_fixnum (ret)) 782 if (num_is_fixnum (ret))
710 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 783 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
711 else 784 else
712 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 785 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
713
714 return ret;
715}
716
717static num
718num_intdiv (num a, num b)
719{
720 num ret;
721
722 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
723
724 if (num_is_fixnum (ret))
725 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
726 else
727 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
728
729 return ret;
730}
731
732static num
733num_sub (num a, num b)
734{
735 num ret;
736
737 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
738
739 if (num_is_fixnum (ret))
740 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
741 else
742 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
743 786
744 return ret; 787 return ret;
745} 788}
746 789
747static num 790static num
… …
749{ 792{
750 num ret; 793 num ret;
751 long e1, e2, res; 794 long e1, e2, res;
752 795
753 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
754 e1 = num_get_ivalue (a); 797 e1 = num_ivalue (a);
755 e2 = num_get_ivalue (b); 798 e2 = num_ivalue (b);
756 res = e1 % e2; 799 res = e1 % e2;
757 800
758 /* remainder should have same sign as second operand */ 801 /* remainder should have same sign as second operand */
759 if (res > 0) 802 if (res > 0)
760 { 803 {
… …
776{ 819{
777 num ret; 820 num ret;
778 long e1, e2, res; 821 long e1, e2, res;
779 822
780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 823 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
781 e1 = num_get_ivalue (a); 824 e1 = num_ivalue (a);
782 e2 = num_get_ivalue (b); 825 e2 = num_ivalue (b);
783 res = e1 % e2; 826 res = e1 % e2;
784 827
785 /* modulo should have same sign as second operand */ 828 /* modulo should have same sign as second operand */
786 if (res * e2 < 0) 829 if (res * e2 < 0)
787 res += e2; 830 res += e2;
788 831
789 num_set_ivalue (ret, res); 832 num_set_ivalue (ret, res);
790 return ret; 833 return ret;
791} 834}
792 835
836/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
793static int 837static int
794num_eq (num a, num b) 838num_cmp (num a, num b)
795{ 839{
840 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796 int ret; 841 int ret;
797 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
798 842
799 if (is_fixnum) 843 if (is_fixnum)
800 ret = num_get_ivalue (a) == num_get_ivalue (b); 844 {
845 IVALUE av = num_ivalue (a);
846 IVALUE bv = num_ivalue (b);
847
848 ret = av == bv ? 0 : av < bv ? -1 : +1;
849 }
801 else 850 else
802 ret = num_get_rvalue (a) == num_get_rvalue (b); 851 {
852 RVALUE av = num_rvalue (a);
853 RVALUE bv = num_rvalue (b);
854
855 ret = av == bv ? 0 : av < bv ? -1 : +1;
856 }
803 857
804 return ret; 858 return ret;
805}
806
807
808static int
809num_gt (num a, num b)
810{
811 int ret;
812 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
813
814 if (is_fixnum)
815 ret = num_get_ivalue (a) > num_get_ivalue (b);
816 else
817 ret = num_get_rvalue (a) > num_get_rvalue (b);
818
819 return ret;
820}
821
822static int
823num_ge (num a, num b)
824{
825 return !num_lt (a, b);
826}
827
828static int
829num_lt (num a, num b)
830{
831 int ret;
832 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
833
834 if (is_fixnum)
835 ret = num_get_ivalue (a) < num_get_ivalue (b);
836 else
837 ret = num_get_rvalue (a) < num_get_rvalue (b);
838
839 return ret;
840}
841
842static int
843num_le (num a, num b)
844{
845 return !num_gt (a, b);
846} 859}
847 860
848#if USE_MATH 861#if USE_MATH
849 862
850/* Round to nearest. Round to even if midway */ 863/* Round to nearest. Round to even if midway */
… …
860 return ce; 873 return ce;
861 else if (dfl < dce) 874 else if (dfl < dce)
862 return fl; 875 return fl;
863 else 876 else
864 { 877 {
865 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 878 if (fmod (fl, 2) == 0) /* I imagine this holds */
866 return fl; 879 return fl;
867 else 880 else
868 return ce; 881 return ce;
869 } 882 }
870} 883}
871#endif 884#endif
872 885
873static int 886static int
874is_zero_rvalue (RVALUE x) 887is_zero_rvalue (RVALUE x)
875{ 888{
876#if USE_FLOAT 889 return x == 0;
890#if 0
891#if USE_REAL
877 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 892 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
878#else 893#else
879 return x == 0; 894 return x == 0;
880#endif 895#endif
881} 896#endif
882
883static long
884binary_decode (const char *s)
885{
886 long x = 0;
887
888 while (*s != 0 && (*s == '1' || *s == '0'))
889 {
890 x <<= 1;
891 x += *s - '0';
892 s++;
893 }
894
895 return x;
896} 897}
897 898
898/* allocate new cell segment */ 899/* allocate new cell segment */
899static int 900static int
900alloc_cellseg (SCHEME_P_ int n) 901alloc_cellseg (SCHEME_P_ int n)
… …
920 return k; 921 return k;
921 922
922 i = ++SCHEME_V->last_cell_seg; 923 i = ++SCHEME_V->last_cell_seg;
923 SCHEME_V->alloc_seg[i] = cp; 924 SCHEME_V->alloc_seg[i] = cp;
924 925
925 /* insert new segment in address order */
926 newp = (pointer)cp; 926 newp = (pointer)cp;
927 SCHEME_V->cell_seg[i] = newp; 927 SCHEME_V->cell_seg[i] = newp;
928 SCHEME_V->cell_segsize[i] = segsize; 928 SCHEME_V->cell_segsize[i] = segsize;
929
930 //TODO: insert, not swap
931 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
932 {
933 p = SCHEME_V->cell_seg[i];
934 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
935 SCHEME_V->cell_seg[i - 1] = p;
936
937 k = SCHEME_V->cell_segsize[i];
938 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
939 SCHEME_V->cell_segsize[i - 1] = k;
940
941 --i;
942 }
943
944 SCHEME_V->fcells += segsize; 929 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 930 last = newp + segsize - 1;
946 931
947 for (p = newp; p <= last; p++) 932 for (p = newp; p <= last; p++)
948 { 933 {
949 set_typeflag (p, T_FREE); 934 set_typeflag (p, T_PAIR);
950 set_car (p, NIL); 935 set_car (p, NIL);
951 set_cdr (p, p + 1); 936 set_cdr (p, p + 1);
952 } 937 }
953 938
954 /* insert new cells in address order on free list */
955 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
956 {
957 set_cdr (last, SCHEME_V->free_cell); 939 set_cdr (last, SCHEME_V->free_cell);
958 SCHEME_V->free_cell = newp; 940 SCHEME_V->free_cell = newp;
959 }
960 else
961 {
962 p = SCHEME_V->free_cell;
963
964 while (cdr (p) != NIL && newp > cdr (p))
965 p = cdr (p);
966
967 set_cdr (last, cdr (p));
968 set_cdr (p, newp);
969 }
970 } 941 }
971 942
972 return n; 943 return n;
973} 944}
974 945
975/* get new cell. parameter a, b is marked by gc. */ 946/* get new cell. parameter a, b is marked by gc. */
976static INLINE pointer 947ecb_inline pointer
977get_cell_x (SCHEME_P_ pointer a, pointer b) 948get_cell_x (SCHEME_P_ pointer a, pointer b)
978{ 949{
979 if (SCHEME_V->free_cell == NIL) 950 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
980 { 951 {
981 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
982 return S_SINK; 953 return S_SINK;
983 954
984 if (SCHEME_V->free_cell == NIL) 955 if (SCHEME_V->free_cell == NIL)
… …
1008 --SCHEME_V->fcells; 979 --SCHEME_V->fcells;
1009 return x; 980 return x;
1010 } 981 }
1011} 982}
1012 983
1013/* make sure that there is a given number of cells free */
1014static pointer
1015reserve_cells (SCHEME_P_ int n)
1016{
1017 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1018 return NIL;
1019
1020 /* Are there enough cells available? */
1021 if (SCHEME_V->fcells < n)
1022 {
1023 /* If not, try gc'ing some */
1024 gc (SCHEME_A_ NIL, NIL);
1025
1026 if (SCHEME_V->fcells < n)
1027 {
1028 /* If there still aren't, try getting more heap */
1029 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1030 {
1031 SCHEME_V->no_memory = 1;
1032 return NIL;
1033 }
1034 }
1035
1036 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1037 {
1038 /* If all fail, report failure */
1039 SCHEME_V->no_memory = 1;
1040 return NIL;
1041 }
1042 }
1043
1044 return S_T;
1045}
1046
1047static pointer
1048get_consecutive_cells (SCHEME_P_ int n)
1049{
1050 pointer x;
1051
1052 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1053 return S_SINK;
1054
1055 /* Are there any cells available? */
1056 x = find_consecutive_cells (SCHEME_A_ n);
1057
1058 if (x != NIL)
1059 return x;
1060
1061 /* If not, try gc'ing some */
1062 gc (SCHEME_A_ NIL, NIL);
1063
1064 for (;;)
1065 {
1066 x = find_consecutive_cells (SCHEME_A_ n);
1067
1068 if (x != NIL)
1069 return x;
1070
1071 /* If there still aren't, try getting more heap */
1072 if (!alloc_cellseg (SCHEME_A_ 1))
1073 {
1074#if USE_ERROR_CHECKING
1075 SCHEME_V->no_memory = 1;
1076 return S_SINK;
1077#endif
1078 }
1079 }
1080}
1081
1082static int
1083count_consecutive_cells (pointer x, int needed)
1084{
1085 int n = 1;
1086
1087 while (cdr (x) == x + 1)
1088 {
1089 x = cdr (x);
1090 n++;
1091
1092 if (n >= needed)
1093 break;
1094 }
1095
1096 return n;
1097}
1098
1099static pointer
1100find_consecutive_cells (SCHEME_P_ int n)
1101{
1102 pointer *pp = &SCHEME_V->free_cell;
1103
1104 while (*pp != NIL)
1105 {
1106 int cnt = count_consecutive_cells (*pp, n);
1107
1108 if (cnt >= n)
1109 {
1110 pointer x = *pp;
1111
1112 *pp = cdr (*pp + n - 1);
1113 SCHEME_V->fcells -= n;
1114 return x;
1115 }
1116
1117 pp = &cdr (*pp + cnt - 1);
1118 }
1119
1120 return NIL;
1121}
1122
1123/* To retain recent allocs before interpreter knows about them - 984/* To retain recent allocs before interpreter knows about them -
1124 Tehom */ 985 Tehom */
1125 986
1126static void 987static void
1127push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 988push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
… …
1150 1011
1151 return cell; 1012 return cell;
1152} 1013}
1153 1014
1154static pointer 1015static pointer
1155get_vector_object (SCHEME_P_ int len, pointer init) 1016get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1156{ 1017{
1157 pointer cells = get_consecutive_cells (SCHEME_A_ len / 2 + len % 2 + 1); 1018 pointer v = get_cell_x (SCHEME_A_ 0, 0);
1019 pointer *e = malloc (len * sizeof (pointer));
1158 1020
1159#if USE_ERROR_CHECKING 1021 if (!e && USE_ERROR_CHECKING)
1160 if (SCHEME_V->no_memory)
1161 return S_SINK; 1022 return S_SINK;
1162#endif
1163 1023
1164 /* Record it as a vector so that gc understands it. */ 1024 /* Record it as a vector so that gc understands it. */
1165 set_typeflag (cells, T_VECTOR | T_ATOM); 1025 set_typeflag (v, T_VECTOR | T_ATOM);
1166 ivalue_unchecked (cells) = len; 1026
1167 set_num_integer (cells); 1027 v->object.vector.vvalue = e;
1028 v->object.vector.length = len;
1168 fill_vector (cells, init); 1029 fill_vector (v, 0, init);
1169 push_recent_alloc (SCHEME_A_ cells, NIL); 1030 push_recent_alloc (SCHEME_A_ v, NIL);
1170 1031
1171 return cells; 1032 return v;
1172} 1033}
1173 1034
1174static INLINE void 1035ecb_inline void
1175ok_to_freely_gc (SCHEME_P) 1036ok_to_freely_gc (SCHEME_P)
1176{ 1037{
1177 set_car (S_SINK, NIL); 1038 set_car (S_SINK, NIL);
1178} 1039}
1179 1040
… …
1212 if (immutable) 1073 if (immutable)
1213 setimmutable (x); 1074 setimmutable (x);
1214 1075
1215 set_car (x, a); 1076 set_car (x, a);
1216 set_cdr (x, b); 1077 set_cdr (x, b);
1078
1217 return x; 1079 return x;
1218} 1080}
1219 1081
1220/* ========== oblist implementation ========== */ 1082/* ========== oblist implementation ========== */
1221 1083
… …
1237 1099
1238 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1239 set_typeflag (x, T_SYMBOL); 1101 set_typeflag (x, T_SYMBOL);
1240 setimmutable (car (x)); 1102 setimmutable (car (x));
1241 1103
1242 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1104 location = hash_fn (name, veclength (SCHEME_V->oblist));
1243 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1244 return x; 1106 return x;
1245} 1107}
1246 1108
1247static INLINE pointer 1109ecb_inline pointer
1248oblist_find_by_name (SCHEME_P_ const char *name) 1110oblist_find_by_name (SCHEME_P_ const char *name)
1249{ 1111{
1250 int location; 1112 int location;
1251 pointer x; 1113 pointer x;
1252 char *s; 1114 char *s;
1253 1115
1254 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1116 location = hash_fn (name, veclength (SCHEME_V->oblist));
1255 1117
1256 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1118 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1257 { 1119 {
1258 s = symname (car (x)); 1120 s = symname (car (x));
1259 1121
1260 /* case-insensitive, per R5RS section 2 */ 1122 /* case-insensitive, per R5RS section 2 */
1261 if (stricmp (name, s) == 0) 1123 if (stricmp (name, s) == 0)
… …
1270{ 1132{
1271 int i; 1133 int i;
1272 pointer x; 1134 pointer x;
1273 pointer ob_list = NIL; 1135 pointer ob_list = NIL;
1274 1136
1275 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1137 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1276 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1138 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1277 ob_list = cons (x, ob_list); 1139 ob_list = cons (x, ob_list);
1278 1140
1279 return ob_list; 1141 return ob_list;
1280} 1142}
1281 1143
… …
1285oblist_initial_value (SCHEME_P) 1147oblist_initial_value (SCHEME_P)
1286{ 1148{
1287 return NIL; 1149 return NIL;
1288} 1150}
1289 1151
1290static INLINE pointer 1152ecb_inline pointer
1291oblist_find_by_name (SCHEME_P_ const char *name) 1153oblist_find_by_name (SCHEME_P_ const char *name)
1292{ 1154{
1293 pointer x; 1155 pointer x;
1294 char *s; 1156 char *s;
1295 1157
… …
1354mk_character (SCHEME_P_ int c) 1216mk_character (SCHEME_P_ int c)
1355{ 1217{
1356 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1357 1219
1358 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1220 set_typeflag (x, (T_CHARACTER | T_ATOM));
1359 ivalue_unchecked (x) = c & 0xff; 1221 set_ivalue (x, c & 0xff);
1360 set_num_integer (x); 1222
1361 return x; 1223 return x;
1362} 1224}
1363 1225
1364/* get number atom (integer) */ 1226/* get number atom (integer) */
1365INTERFACE pointer 1227INTERFACE pointer
1366mk_integer (SCHEME_P_ long num) 1228mk_integer (SCHEME_P_ long n)
1367{ 1229{
1368 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1230 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1369 1231
1370 set_typeflag (x, (T_NUMBER | T_ATOM)); 1232 set_typeflag (x, (T_INTEGER | T_ATOM));
1371 ivalue_unchecked (x) = num; 1233 set_ivalue (x, n);
1372 set_num_integer (x); 1234
1373 return x; 1235 return x;
1374} 1236}
1375 1237
1376INTERFACE pointer 1238INTERFACE pointer
1377mk_real (SCHEME_P_ RVALUE n) 1239mk_real (SCHEME_P_ RVALUE n)
1378{ 1240{
1241#if USE_REAL
1379 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1242 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1380 1243
1381 set_typeflag (x, (T_NUMBER | T_ATOM)); 1244 set_typeflag (x, (T_REAL | T_ATOM));
1382 rvalue_unchecked (x) = n; 1245 set_rvalue (x, n);
1383 set_num_real (x); 1246
1384 return x; 1247 return x;
1248#else
1249 return mk_integer (SCHEME_A_ n);
1250#endif
1385} 1251}
1386 1252
1387static pointer 1253static pointer
1388mk_number (SCHEME_P_ const num n) 1254mk_number (SCHEME_P_ const num n)
1389{ 1255{
1256#if USE_REAL
1390 if (num_is_fixnum (n)) 1257 return num_is_fixnum (n)
1258 ? mk_integer (SCHEME_A_ num_ivalue (n))
1259 : mk_real (SCHEME_A_ num_rvalue (n));
1260#else
1391 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1261 return mk_integer (SCHEME_A_ num_ivalue (n));
1392 else 1262#endif
1393 return mk_real (SCHEME_A_ num_get_rvalue (n));
1394} 1263}
1395 1264
1396/* allocate name to string area */ 1265/* allocate name to string area */
1397static char * 1266static char *
1398store_string (SCHEME_P_ int len_str, const char *str, char fill) 1267store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1399{ 1268{
1400 char *q = malloc (len_str + 1); 1269 char *q = malloc (len_str + 1);
1401 1270
1402 if (q == 0 && USE_ERROR_CHECKING) 1271 if (q == 0 && USE_ERROR_CHECKING)
1403 { 1272 {
… …
1422 } 1291 }
1423 1292
1424 return q; 1293 return q;
1425} 1294}
1426 1295
1427/* get new string */
1428INTERFACE pointer 1296INTERFACE pointer
1429mk_string (SCHEME_P_ const char *str) 1297mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1430{ 1298{
1431 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1299 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1300
1301 set_typeflag (x, T_STRING | T_ATOM);
1302 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1303 strlength (x) = len;
1304 return x;
1432} 1305}
1433 1306
1434INTERFACE pointer 1307INTERFACE pointer
1435mk_counted_string (SCHEME_P_ const char *str, int len) 1308mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1436{ 1309{
1437 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1310 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1438 1311
1439 set_typeflag (x, T_STRING | T_ATOM); 1312 set_typeflag (x, T_STRING | T_ATOM);
1440 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1313 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1441 strlength (x) = len; 1314 strlength (x) = len;
1442 return x; 1315 return x;
1443} 1316}
1444 1317
1445INTERFACE pointer 1318INTERFACE pointer
1446mk_empty_string (SCHEME_P_ int len, char fill) 1319mk_string (SCHEME_P_ const char *str)
1447{ 1320{
1448 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1321 return mk_counted_string (SCHEME_A_ str, strlen (str));
1449
1450 set_typeflag (x, T_STRING | T_ATOM);
1451 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1452 strlength (x) = len;
1453 return x;
1454} 1322}
1455 1323
1456INTERFACE pointer 1324INTERFACE pointer
1457mk_vector (SCHEME_P_ int len) 1325mk_vector (SCHEME_P_ uint32_t len)
1458{ 1326{
1459 return get_vector_object (SCHEME_A_ len, NIL); 1327 return get_vector_object (SCHEME_A_ len, NIL);
1460} 1328}
1461 1329
1462INTERFACE void 1330INTERFACE void
1463fill_vector (pointer vec, pointer obj) 1331fill_vector (pointer vec, uint32_t start, pointer obj)
1464{ 1332{
1465 int i; 1333 int i;
1466 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1467 1334
1468 for (i = 0; i < num; i++) 1335 for (i = start; i < veclength (vec); i++)
1469 { 1336 vecvalue (vec)[i] = obj;
1470 set_typeflag (vec + 1 + i, T_PAIR);
1471 setimmutable (vec + 1 + i);
1472 set_car (vec + 1 + i, obj);
1473 set_cdr (vec + 1 + i, obj);
1474 }
1475} 1337}
1476 1338
1477INTERFACE pointer 1339INTERFACE pointer
1478vector_elem (pointer vec, int ielem) 1340vector_get (pointer vec, uint32_t ielem)
1479{ 1341{
1480 int n = ielem / 2; 1342 return vecvalue(vec)[ielem];
1481
1482 if (ielem % 2 == 0)
1483 return car (vec + 1 + n);
1484 else
1485 return cdr (vec + 1 + n);
1486} 1343}
1487 1344
1488INTERFACE void 1345INTERFACE void
1489set_vector_elem (pointer vec, int ielem, pointer a) 1346vector_set (pointer vec, uint32_t ielem, pointer a)
1490{ 1347{
1491 int n = ielem / 2; 1348 vecvalue(vec)[ielem] = a;
1492
1493 if (ielem % 2 == 0)
1494 set_car (vec + 1 + n, a);
1495 else
1496 set_cdr (vec + 1 + n, a);
1497} 1349}
1498 1350
1499/* get new symbol */ 1351/* get new symbol */
1500INTERFACE pointer 1352INTERFACE pointer
1501mk_symbol (SCHEME_P_ const char *name) 1353mk_symbol (SCHEME_P_ const char *name)
… …
1511 1363
1512INTERFACE pointer 1364INTERFACE pointer
1513gensym (SCHEME_P) 1365gensym (SCHEME_P)
1514{ 1366{
1515 pointer x; 1367 pointer x;
1516 char name[40];
1517 1368
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1369 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 { 1370 {
1520 strcpy (name, "gensym-"); 1371 char name[40] = "gensym-";
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1372 xnum (name + 7, SCHEME_V->gensym_cnt);
1522 1373
1523 /* first check oblist */ 1374 /* first check oblist */
1524 x = oblist_find_by_name (SCHEME_A_ name); 1375 x = oblist_find_by_name (SCHEME_A_ name);
1525 1376
1526 if (x != NIL) 1377 if (x == NIL)
1527 continue;
1528 else
1529 { 1378 {
1530 x = oblist_add_by_name (SCHEME_A_ name); 1379 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x; 1380 return x;
1532 } 1381 }
1533 } 1382 }
… …
1542 char c, *p; 1391 char c, *p;
1543 int has_dec_point = 0; 1392 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
1545 1394
1546#if USE_COLON_HOOK 1395#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1396 if ((p = strstr (q, "::")) != 0)
1549 { 1397 {
1550 *p = 0; 1398 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1399 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1400 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1401 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1402 }
1555
1556#endif 1403#endif
1557 1404
1558 p = q; 1405 p = q;
1559 c = *p++; 1406 c = *p++;
1560 1407
… …
1596 } 1443 }
1597 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1598 { 1445 {
1599 if (!has_fp_exp) 1446 if (!has_fp_exp)
1600 { 1447 {
1601 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1602 from now on */
1603 p++; 1449 p++;
1604 1450
1605 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1606 continue; 1452 continue;
1607 } 1453 }
… …
1609 1455
1610 return mk_symbol (SCHEME_A_ strlwr (q)); 1456 return mk_symbol (SCHEME_A_ strlwr (q));
1611 } 1457 }
1612 } 1458 }
1613 1459
1614#if USE_FLOAT 1460#if USE_REAL
1615 if (has_dec_point) 1461 if (has_dec_point)
1616 return mk_real (SCHEME_A_ atof (q)); 1462 return mk_real (SCHEME_A_ atof (q));
1617#endif 1463#endif
1618 1464
1619 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1621 1467
1622/* make constant */ 1468/* make constant */
1623static pointer 1469static pointer
1624mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1625{ 1471{
1626 long x;
1627 char tmp[STRBUFFSIZE];
1628
1629 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1630 return S_T; 1473 return S_T;
1631 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1632 return S_F; 1475 return S_F;
1633 else if (*name == 'o') /* #o (octal) */
1634 {
1635 x = strtol (name + 1, 0, 8);
1636 return mk_integer (SCHEME_A_ x);
1637 }
1638 else if (*name == 'd') /* #d (decimal) */
1639 {
1640 x = strtol (name + 1, 0, 10);
1641 return mk_integer (SCHEME_A_ x);
1642 }
1643 else if (*name == 'x') /* #x (hex) */
1644 {
1645 x = strtol (name + 1, 0, 16);
1646 return mk_integer (SCHEME_A_ x);
1647 }
1648 else if (*name == 'b') /* #b (binary) */
1649 {
1650 x = binary_decode (name + 1);
1651 return mk_integer (SCHEME_A_ x);
1652 }
1653 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1654 { 1477 {
1655 int c = 0; 1478 int c;
1656 1479
1657 if (stricmp (name + 1, "space") == 0) 1480 if (stricmp (name + 1, "space") == 0)
1658 c = ' '; 1481 c = ' ';
1659 else if (stricmp (name + 1, "newline") == 0) 1482 else if (stricmp (name + 1, "newline") == 0)
1660 c = '\n'; 1483 c = '\n';
… …
1662 c = '\r'; 1485 c = '\r';
1663 else if (stricmp (name + 1, "tab") == 0) 1486 else if (stricmp (name + 1, "tab") == 0)
1664 c = '\t'; 1487 c = '\t';
1665 else if (name[1] == 'x' && name[2] != 0) 1488 else if (name[1] == 'x' && name[2] != 0)
1666 { 1489 {
1667 int c1 = strtol (name + 2, 0, 16); 1490 long c1 = strtol (name + 2, 0, 16);
1668 1491
1669 if (c1 <= UCHAR_MAX) 1492 if (0 <= c1 && c1 <= UCHAR_MAX)
1670 c = c1; 1493 c = c1;
1671 else 1494 else
1672 return NIL; 1495 return NIL;
1673 1496 }
1674#if USE_ASCII_NAMES 1497#if USE_ASCII_NAMES
1675 }
1676 else if (is_ascii_name (name + 1, &c)) 1498 else if (is_ascii_name (name + 1, &c))
1677 {
1678 /* nothing */ 1499 /* nothing */;
1679#endif 1500#endif
1680 }
1681 else if (name[2] == 0) 1501 else if (name[2] == 0)
1682 c = name[1]; 1502 c = name[1];
1683 else 1503 else
1684 return NIL; 1504 return NIL;
1685 1505
1686 return mk_character (SCHEME_A_ c); 1506 return mk_character (SCHEME_A_ c);
1687 } 1507 }
1688 else 1508 else
1509 {
1510 /* identify base by string index */
1511 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1512 char *base = strchr (baseidx, *name);
1513
1514 if (base)
1515 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1516
1689 return NIL; 1517 return NIL;
1518 }
1690} 1519}
1691 1520
1692/* ========== garbage collector ========== */ 1521/* ========== garbage collector ========== */
1693 1522
1694/*-- 1523/*--
1695 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1696 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1697 * for marking. 1526 * for marking.
1527 *
1528 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector
1698 */ 1531 */
1699static void 1532static void
1700mark (pointer a) 1533mark (pointer a)
1701{ 1534{
1702 pointer t, q, p; 1535 pointer t, q, p;
… …
1704 t = 0; 1537 t = 0;
1705 p = a; 1538 p = a;
1706E2: 1539E2:
1707 setmark (p); 1540 setmark (p);
1708 1541
1709 if (is_vector (p)) 1542 if (ecb_expect_false (is_vector (p)))
1710 { 1543 {
1711 int i; 1544 int i;
1712 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1713 1545
1714 for (i = 0; i < num; i++) 1546 for (i = 0; i < veclength (p); i++)
1715 { 1547 mark (vecvalue (p)[i]);
1716 /* Vector cells will be treated like ordinary cells */
1717 mark (p + 1 + i);
1718 }
1719 } 1548 }
1720 1549
1721 if (is_atom (p)) 1550 if (is_atom (p))
1722 goto E6; 1551 goto E6;
1723 1552
… …
1820 if (is_mark (p)) 1649 if (is_mark (p))
1821 clrmark (p); 1650 clrmark (p);
1822 else 1651 else
1823 { 1652 {
1824 /* reclaim cell */ 1653 /* reclaim cell */
1825 if (typeflag (p) != T_FREE) 1654 if (typeflag (p) != T_PAIR)
1826 { 1655 {
1827 finalize_cell (SCHEME_A_ p); 1656 finalize_cell (SCHEME_A_ p);
1828 set_typeflag (p, T_FREE); 1657 set_typeflag (p, T_PAIR);
1829 set_car (p, NIL); 1658 set_car (p, NIL);
1830 } 1659 }
1831 1660
1832 ++SCHEME_V->fcells; 1661 ++SCHEME_V->fcells;
1833 set_cdr (p, SCHEME_V->free_cell); 1662 set_cdr (p, SCHEME_V->free_cell);
… …
1835 } 1664 }
1836 } 1665 }
1837 } 1666 }
1838 1667
1839 if (SCHEME_V->gc_verbose) 1668 if (SCHEME_V->gc_verbose)
1669 {
1840 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1841} 1672}
1842 1673
1843static void 1674static void
1844finalize_cell (SCHEME_P_ pointer a) 1675finalize_cell (SCHEME_P_ pointer a)
1845{ 1676{
1677 /* TODO, fast bitmap check? */
1846 if (is_string (a)) 1678 if (is_string (a))
1847 free (strvalue (a)); 1679 free (strvalue (a));
1680 else if (is_vector (a))
1681 free (vecvalue (a));
1848#if USE_PORTS 1682#if USE_PORTS
1849 else if (is_port (a)) 1683 else if (is_port (a))
1850 { 1684 {
1851 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1685 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1852 port_close (SCHEME_A_ a, port_input | port_output); 1686 port_close (SCHEME_A_ a, port_input | port_output);
… …
2429 } 2263 }
2430 } 2264 }
2431} 2265}
2432 2266
2433/* check c is in chars */ 2267/* check c is in chars */
2434static INLINE int 2268ecb_inline int
2435is_one_of (char *s, int c) 2269is_one_of (char *s, int c)
2436{ 2270{
2437 if (c == EOF) 2271 if (c == EOF)
2438 return 1; 2272 return 1;
2439 2273
2440 return !!strchr (s, c); 2274 return !!strchr (s, c);
2441} 2275}
2442 2276
2443/* skip white characters */ 2277/* skip white characters */
2444static INLINE int 2278ecb_inline int
2445skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2446{ 2280{
2447 int c, curr_line = 0; 2281 int c, curr_line = 0;
2448 2282
2449 do 2283 do
… …
2677 { 2511 {
2678 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2679 2513
2680 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2681 { 2515 {
2682 if (num_is_integer (l)) 2516 if (is_integer (l))
2683 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2684#if USE_FLOAT 2518#if USE_REAL
2685 else 2519 else
2686 { 2520 {
2687 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2688 /* r5rs says there must be a '.' (unless 'e'?) */ 2522 /* r5rs says there must be a '.' (unless 'e'?) */
2689 f = strcspn (p, ".e"); 2523 f = strcspn (p, ".e");
… …
2942 return 0; 2776 return 0;
2943 } 2777 }
2944 else if (is_number (a)) 2778 else if (is_number (a))
2945 { 2779 {
2946 if (is_number (b)) 2780 if (is_number (b))
2947 if (num_is_integer (a) == num_is_integer (b))
2948 return num_eq (nvalue (a), nvalue (b)); 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2949 2782
2950 return 0; 2783 return 0;
2951 } 2784 }
2952 else if (is_character (a)) 2785 else if (is_character (a))
2953 { 2786 {
… …
2985#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST) 2818#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2986 2819
2987static int 2820static int
2988hash_fn (const char *key, int table_size) 2821hash_fn (const char *key, int table_size)
2989{ 2822{
2990 unsigned int hashed = 0; 2823 const unsigned char *p = key;
2991 const char *c; 2824 uint32_t hash = 2166136261;
2992 int bits_per_int = sizeof (unsigned int) * 8;
2993 2825
2994 for (c = key; *c; c++) 2826 while (*p)
2995 { 2827 hash = (hash ^ *p++) * 16777619;
2996 /* letters have about 5 bits in them */
2997 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
2998 hashed ^= *c;
2999 }
3000 2828
3001 return hashed % table_size; 2829 return hash % table_size;
3002} 2830}
3003#endif 2831#endif
3004 2832
3005#ifndef USE_ALIST_ENV 2833#ifndef USE_ALIST_ENV
3006 2834
… …
3025 2853
3026 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2854 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3027 setenvironment (SCHEME_V->envir); 2855 setenvironment (SCHEME_V->envir);
3028} 2856}
3029 2857
3030static INLINE void 2858ecb_inline void
3031new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3032{ 2860{
3033 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
3034 2862
3035 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
3036 { 2864 {
3037 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2865 int location = hash_fn (symname (variable), veclength (car (env)));
3038 2866
3039 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
3040 } 2868 }
3041 else 2869 else
3042 set_car (env, immutable_cons (slot, car (env))); 2870 set_car (env, immutable_cons (slot, car (env)));
3043} 2871}
3044 2872
… …
3050 2878
3051 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
3052 { 2880 {
3053 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
3054 { 2882 {
3055 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2883 location = hash_fn (symname (hdl), veclength (car (x)));
3056 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
3057 } 2885 }
3058 else 2886 else
3059 y = car (x); 2887 y = car (x);
3060 2888
3061 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
3062 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
3063 break; 2891 break;
3064 2892
3065 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
3066 break; 2897 break;
3067
3068 if (!all)
3069 return NIL;
3070 } 2898 }
3071
3072 if (x != NIL)
3073 return car (y);
3074 2899
3075 return NIL; 2900 return NIL;
3076} 2901}
3077 2902
3078#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
3079 2904
3080static INLINE void 2905ecb_inline void
3081new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
3082{ 2907{
3083 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
3084 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
3085} 2910}
3086 2911
3087static INLINE void 2912ecb_inline void
3088new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3089{ 2914{
3090 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3091} 2916}
3092 2917
… …
3114 return NIL; 2939 return NIL;
3115} 2940}
3116 2941
3117#endif /* USE_ALIST_ENV else */ 2942#endif /* USE_ALIST_ENV else */
3118 2943
3119static INLINE void 2944ecb_inline void
3120new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3121{ 2946{
3122 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);
3123} 2948}
3124 2949
3125static INLINE void 2950ecb_inline void
3126set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3127{ 2952{
3128 set_cdr (slot, value); 2953 set_cdr (slot, value);
3129} 2954}
3130 2955
3131static INLINE pointer 2956ecb_inline pointer
3132slot_value_in_env (pointer slot) 2957slot_value_in_env (pointer slot)
3133{ 2958{
3134 return cdr (slot); 2959 return cdr (slot);
3135} 2960}
3136 2961
3137/* ========== Evaluation Cycle ========== */ 2962/* ========== Evaluation Cycle ========== */
3138 2963
3139static pointer 2964static int
3140xError_1 (SCHEME_P_ const char *s, pointer a) 2965xError_1 (SCHEME_P_ const char *s, pointer a)
3141{ 2966{
3142#if USE_ERROR_HOOK 2967#if USE_ERROR_HOOK
3143 pointer x; 2968 pointer x;
3144 pointer hdl = SCHEME_V->ERROR_HOOK; 2969 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3170#if USE_ERROR_HOOK 2995#if USE_ERROR_HOOK
3171 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2996 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3172 2997
3173 if (x != NIL) 2998 if (x != NIL)
3174 { 2999 {
3175 if (a) 3000 pointer code = a
3176 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 3001 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3177 else 3002 : NIL;
3178 SCHEME_V->code = NIL;
3179 3003
3180 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 3004 code = cons (mk_string (SCHEME_A_ s), code);
3181 setimmutable (car (SCHEME_V->code)); 3005 setimmutable (car (code));
3182 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 3006 SCHEME_V->code = cons (slot_value_in_env (x), code);
3183 SCHEME_V->op = OP_EVAL; 3007 SCHEME_V->op = OP_EVAL;
3184 3008
3185 return S_T; 3009 return 0;
3186 } 3010 }
3187#endif 3011#endif
3188 3012
3189 if (a) 3013 if (a)
3190 SCHEME_V->args = cons (a, NIL); 3014 SCHEME_V->args = cons (a, NIL);
… …
3192 SCHEME_V->args = NIL; 3016 SCHEME_V->args = NIL;
3193 3017
3194 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);
3195 setimmutable (car (SCHEME_V->args)); 3019 setimmutable (car (SCHEME_V->args));
3196 SCHEME_V->op = OP_ERR0; 3020 SCHEME_V->op = OP_ERR0;
3021
3197 return S_T; 3022 return 0;
3198} 3023}
3199 3024
3200#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)
3201#define Error_0(s) Error_1 (s, 0) 3026#define Error_0(s) Error_1 (s, 0)
3202 3027
3203/* Too small to turn into function */ 3028/* Too small to turn into function */
3204#define BEGIN do { 3029#define BEGIN do {
3205#define END } while (0) 3030#define END } while (0)
3206#define s_goto(a) BEGIN \ 3031#define s_goto(a) BEGIN \
3207 SCHEME_V->op = a; \ 3032 SCHEME_V->op = a; \
3208 return S_T; END 3033 return 0; END
3209 3034
3210#define s_return(a) return xs_return (SCHEME_A_ a) 3035#define s_return(a) return xs_return (SCHEME_A_ a)
3211 3036
3212#ifndef USE_SCHEME_STACK 3037#ifndef USE_SCHEME_STACK
3213 3038
… …
3238 next_frame = SCHEME_V->dump_base + nframes; 3063 next_frame = SCHEME_V->dump_base + nframes;
3239 3064
3240 next_frame->op = op; 3065 next_frame->op = op;
3241 next_frame->args = args; 3066 next_frame->args = args;
3242 next_frame->envir = SCHEME_V->envir; 3067 next_frame->envir = SCHEME_V->envir;
3243 next_frame->code = code; 3068 next_frame->code = code;
3244 3069
3245 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3246} 3071}
3247 3072
3248static pointer 3073static int
3249xs_return (SCHEME_P_ pointer a) 3074xs_return (SCHEME_P_ pointer a)
3250{ 3075{
3251 int nframes = (uintptr_t)SCHEME_V->dump; 3076 int nframes = (uintptr_t)SCHEME_V->dump;
3252 struct dump_stack_frame *frame; 3077 struct dump_stack_frame *frame;
3253 3078
3254 SCHEME_V->value = a; 3079 SCHEME_V->value = a;
3255 3080
3256 if (nframes <= 0) 3081 if (nframes <= 0)
3257 return NIL; 3082 return -1;
3258 3083
3259 frame = &SCHEME_V->dump_base[--nframes]; 3084 frame = &SCHEME_V->dump_base[--nframes];
3260 SCHEME_V->op = frame->op; 3085 SCHEME_V->op = frame->op;
3261 SCHEME_V->args = frame->args; 3086 SCHEME_V->args = frame->args;
3262 SCHEME_V->envir = frame->envir; 3087 SCHEME_V->envir = frame->envir;
3263 SCHEME_V->code = frame->code; 3088 SCHEME_V->code = frame->code;
3264 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3265 3090
3266 return S_T; 3091 return 0;
3267} 3092}
3268 3093
3269static INLINE void 3094ecb_inline void
3270dump_stack_reset (SCHEME_P) 3095dump_stack_reset (SCHEME_P)
3271{ 3096{
3272 /* 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 */
3273 SCHEME_V->dump = (pointer)+0; 3098 SCHEME_V->dump = (pointer)+0;
3274} 3099}
3275 3100
3276static INLINE void 3101ecb_inline void
3277dump_stack_initialize (SCHEME_P) 3102dump_stack_initialize (SCHEME_P)
3278{ 3103{
3279 SCHEME_V->dump_size = 0; 3104 SCHEME_V->dump_size = 0;
3280 SCHEME_V->dump_base = 0; 3105 SCHEME_V->dump_base = 0;
3281 dump_stack_reset (SCHEME_A); 3106 dump_stack_reset (SCHEME_A);
… …
3334 int i = 0; 3159 int i = 0;
3335 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3160 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3336 3161
3337 while (cont != NIL) 3162 while (cont != NIL)
3338 { 3163 {
3339 frame->op = ivalue (car (cont)); cont = cdr (cont); 3164 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3340 frame->args = car (cont) ; cont = cdr (cont); 3165 frame->args = car (cont) ; cont = cdr (cont);
3341 frame->envir = car (cont) ; cont = cdr (cont); 3166 frame->envir = car (cont) ; cont = cdr (cont);
3342 frame->code = car (cont) ; cont = cdr (cont); 3167 frame->code = car (cont) ; cont = cdr (cont);
3343 3168
3344 ++frame; 3169 ++frame;
3345 ++i; 3170 ++i;
3346 } 3171 }
3347 3172
3348 SCHEME_V->dump = (pointer)(uintptr_t)i; 3173 SCHEME_V->dump = (pointer)(uintptr_t)i;
3349} 3174}
3350 3175
3351#else 3176#else
3352 3177
3353static INLINE void 3178ecb_inline void
3354dump_stack_reset (SCHEME_P) 3179dump_stack_reset (SCHEME_P)
3355{ 3180{
3356 SCHEME_V->dump = NIL; 3181 SCHEME_V->dump = NIL;
3357} 3182}
3358 3183
3359static INLINE void 3184ecb_inline void
3360dump_stack_initialize (SCHEME_P) 3185dump_stack_initialize (SCHEME_P)
3361{ 3186{
3362 dump_stack_reset (SCHEME_A); 3187 dump_stack_reset (SCHEME_A);
3363} 3188}
3364 3189
… …
3366dump_stack_free (SCHEME_P) 3191dump_stack_free (SCHEME_P)
3367{ 3192{
3368 SCHEME_V->dump = NIL; 3193 SCHEME_V->dump = NIL;
3369} 3194}
3370 3195
3371static pointer 3196static int
3372xs_return (SCHEME_P_ pointer a) 3197xs_return (SCHEME_P_ pointer a)
3373{ 3198{
3374 pointer dump = SCHEME_V->dump; 3199 pointer dump = SCHEME_V->dump;
3375 3200
3376 SCHEME_V->value = a; 3201 SCHEME_V->value = a;
3377 3202
3378 if (dump == NIL) 3203 if (dump == NIL)
3379 return NIL; 3204 return -1;
3380 3205
3381 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3206 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3382 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3383 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3384 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3385 3210
3386 SCHEME_V->dump = dump; 3211 SCHEME_V->dump = dump;
3387 3212
3388 return S_T; 3213 return 0;
3389} 3214}
3390 3215
3391static void 3216static void
3392s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3393{ 3218{
… …
3418 3243
3419#endif 3244#endif
3420 3245
3421#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3422 3247
3423static pointer 3248static int
3424opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3249opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3425{ 3250{
3251 pointer args = SCHEME_V->args;
3426 pointer x, y; 3252 pointer x, y;
3427 3253
3428 switch (op) 3254 switch (op)
3429 { 3255 {
3430 case OP_LOAD: /* load */ 3256 case OP_LOAD: /* load */
3431 if (file_interactive (SCHEME_A)) 3257 if (file_interactive (SCHEME_A))
3432 { 3258 {
3433 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3434 //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)));
3435 } 3261 }
3436 3262
3437 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3263 if (!file_push (SCHEME_A_ strvalue (car (args))))
3438 Error_1 ("unable to open", car (SCHEME_V->args)); 3264 Error_1 ("unable to open", car (args));
3439 else 3265 else
3440 { 3266 {
3441 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3442 s_goto (OP_T0LVL); 3268 s_goto (OP_T0LVL);
3443 } 3269 }
… …
3478 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3304 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3479 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3305 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3480 s_goto (OP_READ_INTERNAL); 3306 s_goto (OP_READ_INTERNAL);
3481 3307
3482 case OP_T1LVL: /* top level */ 3308 case OP_T1LVL: /* top level */
3483 SCHEME_V->code = SCHEME_V->value; 3309 SCHEME_V->code = SCHEME_V->value;
3484 SCHEME_V->inport = SCHEME_V->save_inport; 3310 SCHEME_V->inport = SCHEME_V->save_inport;
3485 s_goto (OP_EVAL); 3311 s_goto (OP_EVAL);
3486 3312
3487 case OP_READ_INTERNAL: /* internal read */ 3313 case OP_READ_INTERNAL: /* internal read */
3488 SCHEME_V->tok = token (SCHEME_A); 3314 SCHEME_V->tok = token (SCHEME_A);
… …
3517 case OP_EVAL: /* main part of evaluation */ 3343 case OP_EVAL: /* main part of evaluation */
3518#if USE_TRACING 3344#if USE_TRACING
3519 if (SCHEME_V->tracing) 3345 if (SCHEME_V->tracing)
3520 { 3346 {
3521 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3347 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3522 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);
3523 SCHEME_V->args = SCHEME_V->code; 3349 SCHEME_V->args = SCHEME_V->code;
3524 putstr (SCHEME_A_ "\nEval: "); 3350 putstr (SCHEME_A_ "\nEval: ");
3525 s_goto (OP_P0LIST); 3351 s_goto (OP_P0LIST);
3526 } 3352 }
3527 3353
… …
3538 else 3364 else
3539 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3365 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3540 } 3366 }
3541 else if (is_pair (SCHEME_V->code)) 3367 else if (is_pair (SCHEME_V->code))
3542 { 3368 {
3369 x = car (SCHEME_V->code);
3370
3543 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3371 if (is_syntax (x)) /* SYNTAX */
3544 { 3372 {
3545 SCHEME_V->code = cdr (SCHEME_V->code); 3373 SCHEME_V->code = cdr (SCHEME_V->code);
3546 s_goto (syntaxnum (x)); 3374 s_goto (syntaxnum (x));
3547 } 3375 }
3548 else /* first, eval top element and eval arguments */ 3376 else /* first, eval top element and eval arguments */
3549 { 3377 {
3550 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3378 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3551 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3379 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3552 SCHEME_V->code = car (SCHEME_V->code); 3380 SCHEME_V->code = x;
3553 s_goto (OP_EVAL); 3381 s_goto (OP_EVAL);
3554 } 3382 }
3555 } 3383 }
3556 else 3384 else
3557 s_return (SCHEME_V->code); 3385 s_return (SCHEME_V->code);
… …
3569 SCHEME_V->code = cdr (SCHEME_V->code); 3397 SCHEME_V->code = cdr (SCHEME_V->code);
3570 s_goto (OP_E1ARGS); 3398 s_goto (OP_E1ARGS);
3571 } 3399 }
3572 3400
3573 case OP_E1ARGS: /* eval arguments */ 3401 case OP_E1ARGS: /* eval arguments */
3574 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3402 args = cons (SCHEME_V->value, args);
3575 3403
3576 if (is_pair (SCHEME_V->code)) /* continue */ 3404 if (is_pair (SCHEME_V->code)) /* continue */
3577 { 3405 {
3578 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));
3579 SCHEME_V->code = car (SCHEME_V->code); 3407 SCHEME_V->code = car (SCHEME_V->code);
3580 SCHEME_V->args = NIL; 3408 SCHEME_V->args = NIL;
3581 s_goto (OP_EVAL); 3409 s_goto (OP_EVAL);
3582 } 3410 }
3583 else /* end */ 3411 else /* end */
3584 { 3412 {
3585 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3413 args = reverse_in_place (SCHEME_A_ NIL, args);
3586 SCHEME_V->code = car (SCHEME_V->args); 3414 SCHEME_V->code = car (args);
3587 SCHEME_V->args = cdr (SCHEME_V->args); 3415 SCHEME_V->args = cdr (args);
3588 s_goto (OP_APPLY); 3416 s_goto (OP_APPLY);
3589 } 3417 }
3590 3418
3591#if USE_TRACING 3419#if USE_TRACING
3592 3420
3593 case OP_TRACING: 3421 case OP_TRACING:
3594 { 3422 {
3595 int tr = SCHEME_V->tracing; 3423 int tr = SCHEME_V->tracing;
3596 3424
3597 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3425 SCHEME_V->tracing = ivalue_unchecked (car (args));
3598 s_return (mk_integer (SCHEME_A_ tr)); 3426 s_return (mk_integer (SCHEME_A_ tr));
3599 } 3427 }
3600 3428
3601#endif 3429#endif
3602 3430
3603 case OP_APPLY: /* apply 'code' to 'args' */ 3431 case OP_APPLY: /* apply 'code' to 'args' */
3604#if USE_TRACING 3432#if USE_TRACING
3605 if (SCHEME_V->tracing) 3433 if (SCHEME_V->tracing)
3606 { 3434 {
3607 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);
3608 SCHEME_V->print_flag = 1; 3436 SCHEME_V->print_flag = 1;
3609 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3437 /* args=cons(SCHEME_V->code,args); */
3610 putstr (SCHEME_A_ "\nApply to: "); 3438 putstr (SCHEME_A_ "\nApply to: ");
3611 s_goto (OP_P0LIST); 3439 s_goto (OP_P0LIST);
3612 } 3440 }
3613 3441
3614 /* fall through */ 3442 /* fall through */
3615 3443
3616 case OP_REAL_APPLY: 3444 case OP_REAL_APPLY:
3617#endif 3445#endif
3618 if (is_proc (SCHEME_V->code)) 3446 if (is_proc (SCHEME_V->code))
3619 {
3620 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3621 }
3622 else if (is_foreign (SCHEME_V->code)) 3448 else if (is_foreign (SCHEME_V->code))
3623 { 3449 {
3624 /* Keep nested calls from GC'ing the arglist */ 3450 /* Keep nested calls from GC'ing the arglist */
3625 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3451 push_recent_alloc (SCHEME_A_ args, NIL);
3626 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3627 3453
3628 s_return (x); 3454 s_return (x);
3629 } 3455 }
3630 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 */
3631 { 3457 {
3632 /* Should not accept promise */ 3458 /* Should not accept promise */
3633 /* make environment */ 3459 /* make environment */
3634 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3460 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3635 3461
3636 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))
3637 { 3463 {
3638 if (y == NIL) 3464 if (y == NIL)
3639 Error_0 ("not enough arguments"); 3465 Error_0 ("not enough arguments");
3640 else 3466 else
3641 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3467 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3659 s_goto (OP_BEGIN); 3485 s_goto (OP_BEGIN);
3660 } 3486 }
3661 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3487 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3662 { 3488 {
3663 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3489 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3664 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3490 s_return (args != NIL ? car (args) : NIL);
3665 } 3491 }
3666 else 3492 else
3667 Error_0 ("illegal function"); 3493 Error_0 ("illegal function");
3668 3494
3669 case OP_DOMACRO: /* do macro */ 3495 case OP_DOMACRO: /* do macro */
… …
3678 { 3504 {
3679 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);
3680 3506
3681 if (f != NIL) 3507 if (f != NIL)
3682 { 3508 {
3683 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3509 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3684 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3510 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3685 SCHEME_V->code = slot_value_in_env (f); 3511 SCHEME_V->code = slot_value_in_env (f);
3686 s_goto (OP_APPLY); 3512 s_goto (OP_APPLY);
3687 } 3513 }
3688 3514
… …
3699 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));
3700 3526
3701#endif 3527#endif
3702 3528
3703 case OP_MKCLOSURE: /* make-closure */ 3529 case OP_MKCLOSURE: /* make-closure */
3704 x = car (SCHEME_V->args); 3530 x = car (args);
3705 3531
3706 if (car (x) == SCHEME_V->LAMBDA) 3532 if (car (x) == SCHEME_V->LAMBDA)
3707 x = cdr (x); 3533 x = cdr (x);
3708 3534
3709 if (cdr (SCHEME_V->args) == NIL) 3535 if (cdr (args) == NIL)
3710 y = SCHEME_V->envir; 3536 y = SCHEME_V->envir;
3711 else 3537 else
3712 y = cadr (SCHEME_V->args); 3538 y = cadr (args);
3713 3539
3714 s_return (mk_closure (SCHEME_A_ x, y)); 3540 s_return (mk_closure (SCHEME_A_ x, y));
3715 3541
3716 case OP_QUOTE: /* quote */ 3542 case OP_QUOTE: /* quote */
3717 s_return (car (SCHEME_V->code)); 3543 s_return (car (SCHEME_V->code));
… …
3749 3575
3750 3576
3751 case OP_DEFP: /* defined? */ 3577 case OP_DEFP: /* defined? */
3752 x = SCHEME_V->envir; 3578 x = SCHEME_V->envir;
3753 3579
3754 if (cdr (SCHEME_V->args) != NIL) 3580 if (cdr (args) != NIL)
3755 x = cadr (SCHEME_V->args); 3581 x = cadr (args);
3756 3582
3757 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);
3758 3584
3759 case OP_SET0: /* set! */ 3585 case OP_SET0: /* set! */
3760 if (is_immutable (car (SCHEME_V->code))) 3586 if (is_immutable (car (SCHEME_V->code)))
3761 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));
3762 3588
… …
3793 3619
3794 case OP_IF1: /* if */ 3620 case OP_IF1: /* if */
3795 if (is_true (SCHEME_V->value)) 3621 if (is_true (SCHEME_V->value))
3796 SCHEME_V->code = car (SCHEME_V->code); 3622 SCHEME_V->code = car (SCHEME_V->code);
3797 else 3623 else
3798 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 */
3799
3800 * car(NIL) = NIL */
3801 s_goto (OP_EVAL); 3625 s_goto (OP_EVAL);
3802 3626
3803 case OP_LET0: /* let */ 3627 case OP_LET0: /* let */
3804 SCHEME_V->args = NIL; 3628 SCHEME_V->args = NIL;
3805 SCHEME_V->value = SCHEME_V->code; 3629 SCHEME_V->value = SCHEME_V->code;
3806 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);
3807 s_goto (OP_LET1); 3631 s_goto (OP_LET1);
3808 3632
3809 case OP_LET1: /* let (calculate parameters) */ 3633 case OP_LET1: /* let (calculate parameters) */
3810 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3634 args = cons (SCHEME_V->value, args);
3811 3635
3812 if (is_pair (SCHEME_V->code)) /* continue */ 3636 if (is_pair (SCHEME_V->code)) /* continue */
3813 { 3637 {
3814 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)))
3815 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));
3816 3640
3817 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));
3818 SCHEME_V->code = cadar (SCHEME_V->code); 3642 SCHEME_V->code = cadar (SCHEME_V->code);
3819 SCHEME_V->args = NIL; 3643 SCHEME_V->args = NIL;
3820 s_goto (OP_EVAL); 3644 s_goto (OP_EVAL);
3821 } 3645 }
3822 else /* end */ 3646 else /* end */
3823 { 3647 {
3824 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3648 args = reverse_in_place (SCHEME_A_ NIL, args);
3825 SCHEME_V->code = car (SCHEME_V->args); 3649 SCHEME_V->code = car (args);
3826 SCHEME_V->args = cdr (SCHEME_V->args); 3650 SCHEME_V->args = cdr (args);
3827 s_goto (OP_LET2); 3651 s_goto (OP_LET2);
3828 } 3652 }
3829 3653
3830 case OP_LET2: /* let */ 3654 case OP_LET2: /* let */
3831 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3832 3656
3833 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;
3834 y != NIL; x = cdr (x), y = cdr (y)) 3658 y != NIL; x = cdr (x), y = cdr (y))
3835 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3659 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3836 3660
3837 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3661 if (is_symbol (car (SCHEME_V->code))) /* named let */
3838 { 3662 {
3839 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3663 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3840 { 3664 {
3841 if (!is_pair (x)) 3665 if (!is_pair (x))
3842 Error_1 ("Bad syntax of binding in let :", x); 3666 Error_1 ("Bad syntax of binding in let :", x);
3843 3667
3844 if (!is_list (SCHEME_A_ car (x))) 3668 if (!is_list (SCHEME_A_ car (x)))
3845 Error_1 ("Bad syntax of binding in let :", car (x)); 3669 Error_1 ("Bad syntax of binding in let :", car (x));
3846 3670
3847 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3671 args = cons (caar (x), args);
3848 } 3672 }
3849 3673
3850 x =
3851 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3674 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3852 SCHEME_V->envir); 3675 SCHEME_V->envir);
3853 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3676 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3854 SCHEME_V->code = cddr (SCHEME_V->code); 3677 SCHEME_V->code = cddr (SCHEME_V->code);
3855 SCHEME_V->args = NIL;
3856 } 3678 }
3857 else 3679 else
3858 { 3680 {
3859 SCHEME_V->code = cdr (SCHEME_V->code); 3681 SCHEME_V->code = cdr (SCHEME_V->code);
3682 }
3683
3860 SCHEME_V->args = NIL; 3684 SCHEME_V->args = NIL;
3861 }
3862
3863 s_goto (OP_BEGIN); 3685 s_goto (OP_BEGIN);
3864 3686
3865 case OP_LET0AST: /* let* */ 3687 case OP_LET0AST: /* let* */
3866 if (car (SCHEME_V->code) == NIL) 3688 if (car (SCHEME_V->code) == NIL)
3867 { 3689 {
… …
3885 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3707 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3886 SCHEME_V->code = cdr (SCHEME_V->code); 3708 SCHEME_V->code = cdr (SCHEME_V->code);
3887 3709
3888 if (is_pair (SCHEME_V->code)) /* continue */ 3710 if (is_pair (SCHEME_V->code)) /* continue */
3889 { 3711 {
3890 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3712 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3891 SCHEME_V->code = cadar (SCHEME_V->code); 3713 SCHEME_V->code = cadar (SCHEME_V->code);
3892 SCHEME_V->args = NIL; 3714 SCHEME_V->args = NIL;
3893 s_goto (OP_EVAL); 3715 s_goto (OP_EVAL);
3894 } 3716 }
3895 else /* end */ 3717 else /* end */
3896 { 3718 {
3897 SCHEME_V->code = SCHEME_V->args; 3719 SCHEME_V->code = args;
3898 SCHEME_V->args = NIL; 3720 SCHEME_V->args = NIL;
3899 s_goto (OP_BEGIN); 3721 s_goto (OP_BEGIN);
3900 } 3722 }
3901 3723
3902 case OP_LET0REC: /* letrec */ 3724 case OP_LET0REC: /* letrec */
… …
3905 SCHEME_V->value = SCHEME_V->code; 3727 SCHEME_V->value = SCHEME_V->code;
3906 SCHEME_V->code = car (SCHEME_V->code); 3728 SCHEME_V->code = car (SCHEME_V->code);
3907 s_goto (OP_LET1REC); 3729 s_goto (OP_LET1REC);
3908 3730
3909 case OP_LET1REC: /* letrec (calculate parameters) */ 3731 case OP_LET1REC: /* letrec (calculate parameters) */
3910 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3732 args = cons (SCHEME_V->value, args);
3911 3733
3912 if (is_pair (SCHEME_V->code)) /* continue */ 3734 if (is_pair (SCHEME_V->code)) /* continue */
3913 { 3735 {
3914 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3736 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3915 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3737 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3916 3738
3917 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3739 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3918 SCHEME_V->code = cadar (SCHEME_V->code); 3740 SCHEME_V->code = cadar (SCHEME_V->code);
3919 SCHEME_V->args = NIL; 3741 SCHEME_V->args = NIL;
3920 s_goto (OP_EVAL); 3742 s_goto (OP_EVAL);
3921 } 3743 }
3922 else /* end */ 3744 else /* end */
3923 { 3745 {
3924 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3746 args = reverse_in_place (SCHEME_A_ NIL, args);
3925 SCHEME_V->code = car (SCHEME_V->args); 3747 SCHEME_V->code = car (args);
3926 SCHEME_V->args = cdr (SCHEME_V->args); 3748 SCHEME_V->args = cdr (args);
3927 s_goto (OP_LET2REC); 3749 s_goto (OP_LET2REC);
3928 } 3750 }
3929 3751
3930 case OP_LET2REC: /* letrec */ 3752 case OP_LET2REC: /* letrec */
3931 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3753 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3932 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3754 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3933 3755
3934 SCHEME_V->code = cdr (SCHEME_V->code); 3756 SCHEME_V->code = cdr (SCHEME_V->code);
3935 SCHEME_V->args = NIL; 3757 SCHEME_V->args = NIL;
3936 s_goto (OP_BEGIN); 3758 s_goto (OP_BEGIN);
… …
4022 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4023 SCHEME_V->code = car (SCHEME_V->code); 3845 SCHEME_V->code = car (SCHEME_V->code);
4024 s_goto (OP_EVAL); 3846 s_goto (OP_EVAL);
4025 3847
4026 case OP_C1STREAM: /* cons-stream */ 3848 case OP_C1STREAM: /* cons-stream */
4027 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3849 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
4028 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3850 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4029 set_typeflag (x, T_PROMISE); 3851 set_typeflag (x, T_PROMISE);
4030 s_return (cons (SCHEME_V->args, x)); 3852 s_return (cons (args, x));
4031 3853
4032 case OP_MACRO0: /* macro */ 3854 case OP_MACRO0: /* macro */
4033 if (is_pair (car (SCHEME_V->code))) 3855 if (is_pair (car (SCHEME_V->code)))
4034 { 3856 {
4035 x = caar (SCHEME_V->code); 3857 x = caar (SCHEME_V->code);
… …
4068 { 3890 {
4069 if (!is_pair (y = caar (x))) 3891 if (!is_pair (y = caar (x)))
4070 break; 3892 break;
4071 3893
4072 for (; y != NIL; y = cdr (y)) 3894 for (; y != NIL; y = cdr (y))
4073 {
4074 if (eqv (car (y), SCHEME_V->value)) 3895 if (eqv (car (y), SCHEME_V->value))
4075 break; 3896 break;
4076 }
4077 3897
4078 if (y != NIL) 3898 if (y != NIL)
4079 break; 3899 break;
4080 } 3900 }
4081 3901
… …
4101 s_goto (OP_BEGIN); 3921 s_goto (OP_BEGIN);
4102 else 3922 else
4103 s_return (NIL); 3923 s_return (NIL);
4104 3924
4105 case OP_PAPPLY: /* apply */ 3925 case OP_PAPPLY: /* apply */
4106 SCHEME_V->code = car (SCHEME_V->args); 3926 SCHEME_V->code = car (args);
4107 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4108 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3928 /*SCHEME_V->args = cadr(args); */
4109 s_goto (OP_APPLY); 3929 s_goto (OP_APPLY);
4110 3930
4111 case OP_PEVAL: /* eval */ 3931 case OP_PEVAL: /* eval */
4112 if (cdr (SCHEME_V->args) != NIL) 3932 if (cdr (args) != NIL)
4113 SCHEME_V->envir = cadr (SCHEME_V->args); 3933 SCHEME_V->envir = cadr (args);
4114 3934
4115 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
4116 s_goto (OP_EVAL); 3936 s_goto (OP_EVAL);
4117 3937
4118 case OP_CONTINUATION: /* call-with-current-continuation */ 3938 case OP_CONTINUATION: /* call-with-current-continuation */
4119 SCHEME_V->code = car (SCHEME_V->args); 3939 SCHEME_V->code = car (args);
4120 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3940 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4121 s_goto (OP_APPLY); 3941 s_goto (OP_APPLY);
4122 } 3942 }
4123 3943
4124 return S_T; 3944 if (USE_ERROR_CHECKING) abort ();
4125} 3945}
4126 3946
4127static pointer 3947static int
4128opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3948opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4129{ 3949{
4130 pointer x; 3950 pointer args = SCHEME_V->args;
3951 pointer x = car (args);
4131 num v; 3952 num v;
4132 3953
3954 switch (op)
3955 {
4133#if USE_MATH 3956#if USE_MATH
4134 RVALUE dd;
4135#endif
4136
4137 switch (op)
4138 {
4139#if USE_MATH
4140
4141 case OP_INEX2EX: /* inexact->exact */ 3957 case OP_INEX2EX: /* inexact->exact */
4142 x = car (SCHEME_V->args); 3958 {
4143
4144 if (num_is_integer (x)) 3959 if (is_integer (x))
4145 s_return (x); 3960 s_return (x);
4146 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3961
3962 RVALUE r = rvalue_unchecked (x);
3963
3964 if (r == (RVALUE)(IVALUE)r)
4147 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4148 else 3966 else
4149 Error_1 ("inexact->exact: not integral:", x); 3967 Error_1 ("inexact->exact: not integral:", x);
3968 }
4150 3969
4151 case OP_EXP:
4152 x = car (SCHEME_V->args);
4153 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3970 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4154
4155 case OP_LOG:
4156 x = car (SCHEME_V->args);
4157 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3971 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4158
4159 case OP_SIN:
4160 x = car (SCHEME_V->args);
4161 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3972 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4162
4163 case OP_COS:
4164 x = car (SCHEME_V->args);
4165 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3973 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4166
4167 case OP_TAN:
4168 x = car (SCHEME_V->args);
4169 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3974 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4170
4171 case OP_ASIN:
4172 x = car (SCHEME_V->args);
4173 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3975 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4174
4175 case OP_ACOS:
4176 x = car (SCHEME_V->args);
4177 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4178 3977
4179 case OP_ATAN: 3978 case OP_ATAN:
4180 x = car (SCHEME_V->args);
4181
4182 if (cdr (SCHEME_V->args) == NIL) 3979 if (cdr (args) == NIL)
4183 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4184 else 3981 else
4185 { 3982 {
4186 pointer y = cadr (SCHEME_V->args); 3983 pointer y = cadr (args);
4187
4188 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4189 } 3985 }
4190 3986
4191 case OP_SQRT: 3987 case OP_SQRT:
4192 x = car (SCHEME_V->args);
4193 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4194 3989
4195 case OP_EXPT: 3990 case OP_EXPT:
4196 { 3991 {
4197 RVALUE result; 3992 RVALUE result;
4198 int real_result = 1; 3993 int real_result = 1;
4199 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4200 3995
4201 x = car (SCHEME_V->args);
4202
4203 if (num_is_integer (x) && num_is_integer (y)) 3996 if (is_integer (x) && is_integer (y))
4204 real_result = 0; 3997 real_result = 0;
4205 3998
4206 /* This 'if' is an R5RS compatibility fix. */ 3999 /* This 'if' is an R5RS compatibility fix. */
4207 /* NOTE: Remove this 'if' fix for R6RS. */ 4000 /* NOTE: Remove this 'if' fix for R6RS. */
4208 if (rvalue (x) == 0 && rvalue (y) < 0) 4001 if (rvalue (x) == 0 && rvalue (y) < 0)
4209 result = 0.0; 4002 result = 0;
4210 else 4003 else
4211 result = pow (rvalue (x), rvalue (y)); 4004 result = pow (rvalue (x), rvalue (y));
4212 4005
4213 /* Before returning integer result make sure we can. */ 4006 /* Before returning integer result make sure we can. */
4214 /* If the test fails, result is too big for integer. */ 4007 /* If the test fails, result is too big for integer. */
4215 if (!real_result) 4008 if (!real_result)
4216 { 4009 {
4217 long result_as_long = (long) result; 4010 long result_as_long = result;
4218 4011
4219 if (result != (RVALUE) result_as_long) 4012 if (result != result_as_long)
4220 real_result = 1; 4013 real_result = 1;
4221 } 4014 }
4222 4015
4223 if (real_result) 4016 if (real_result)
4224 s_return (mk_real (SCHEME_A_ result)); 4017 s_return (mk_real (SCHEME_A_ result));
4225 else 4018 else
4226 s_return (mk_integer (SCHEME_A_ result)); 4019 s_return (mk_integer (SCHEME_A_ result));
4227 } 4020 }
4228 4021
4229 case OP_FLOOR:
4230 x = car (SCHEME_V->args);
4231 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4022 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4232
4233 case OP_CEILING:
4234 x = car (SCHEME_V->args);
4235 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4236 4024
4237 case OP_TRUNCATE: 4025 case OP_TRUNCATE:
4238 { 4026 {
4239 RVALUE rvalue_of_x; 4027 RVALUE n = rvalue (x);
4240
4241 x = car (SCHEME_V->args);
4242 rvalue_of_x = rvalue (x);
4243
4244 if (rvalue_of_x > 0)
4245 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4028 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4246 else
4247 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4248 } 4029 }
4249 4030
4250 case OP_ROUND: 4031 case OP_ROUND:
4251 x = car (SCHEME_V->args);
4252
4253 if (num_is_integer (x)) 4032 if (is_integer (x))
4254 s_return (x); 4033 s_return (x);
4255 4034
4256 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4257#endif 4036#endif
4258 4037
4259 case OP_ADD: /* + */ 4038 case OP_ADD: /* + */
4260 v = num_zero; 4039 v = num_zero;
4261 4040
4262 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4041 for (x = args; x != NIL; x = cdr (x))
4263 v = num_add (v, nvalue (car (x))); 4042 v = num_op (NUM_ADD, v, nvalue (car (x)));
4264 4043
4265 s_return (mk_number (SCHEME_A_ v)); 4044 s_return (mk_number (SCHEME_A_ v));
4266 4045
4267 case OP_MUL: /* * */ 4046 case OP_MUL: /* * */
4268 v = num_one; 4047 v = num_one;
4269 4048
4270 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4049 for (x = args; x != NIL; x = cdr (x))
4271 v = num_mul (v, nvalue (car (x))); 4050 v = num_op (NUM_MUL, v, nvalue (car (x)));
4272 4051
4273 s_return (mk_number (SCHEME_A_ v)); 4052 s_return (mk_number (SCHEME_A_ v));
4274 4053
4275 case OP_SUB: /* - */ 4054 case OP_SUB: /* - */
4276 if (cdr (SCHEME_V->args) == NIL) 4055 if (cdr (args) == NIL)
4277 { 4056 {
4278 x = SCHEME_V->args; 4057 x = args;
4279 v = num_zero; 4058 v = num_zero;
4280 } 4059 }
4281 else 4060 else
4282 { 4061 {
4283 x = cdr (SCHEME_V->args); 4062 x = cdr (args);
4284 v = nvalue (car (SCHEME_V->args)); 4063 v = nvalue (car (args));
4285 } 4064 }
4286 4065
4287 for (; x != NIL; x = cdr (x)) 4066 for (; x != NIL; x = cdr (x))
4288 v = num_sub (v, nvalue (car (x))); 4067 v = num_op (NUM_SUB, v, nvalue (car (x)));
4289 4068
4290 s_return (mk_number (SCHEME_A_ v)); 4069 s_return (mk_number (SCHEME_A_ v));
4291 4070
4292 case OP_DIV: /* / */ 4071 case OP_DIV: /* / */
4293 if (cdr (SCHEME_V->args) == NIL) 4072 if (cdr (args) == NIL)
4294 { 4073 {
4295 x = SCHEME_V->args; 4074 x = args;
4296 v = num_one; 4075 v = num_one;
4297 } 4076 }
4298 else 4077 else
4299 { 4078 {
4300 x = cdr (SCHEME_V->args); 4079 x = cdr (args);
4301 v = nvalue (car (SCHEME_V->args)); 4080 v = nvalue (car (args));
4302 } 4081 }
4303 4082
4304 for (; x != NIL; x = cdr (x)) 4083 for (; x != NIL; x = cdr (x))
4305 {
4306 if (!is_zero_rvalue (rvalue (car (x)))) 4084 if (!is_zero_rvalue (rvalue (car (x))))
4307 v = num_div (v, nvalue (car (x))); 4085 v = num_div (v, nvalue (car (x)));
4308 else 4086 else
4309 Error_0 ("/: division by zero"); 4087 Error_0 ("/: division by zero");
4310 }
4311 4088
4312 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4313 4090
4314 case OP_INTDIV: /* quotient */ 4091 case OP_INTDIV: /* quotient */
4315 if (cdr (SCHEME_V->args) == NIL) 4092 if (cdr (args) == NIL)
4316 { 4093 {
4317 x = SCHEME_V->args; 4094 x = args;
4318 v = num_one; 4095 v = num_one;
4319 } 4096 }
4320 else 4097 else
4321 { 4098 {
4322 x = cdr (SCHEME_V->args); 4099 x = cdr (args);
4323 v = nvalue (car (SCHEME_V->args)); 4100 v = nvalue (car (args));
4324 } 4101 }
4325 4102
4326 for (; x != NIL; x = cdr (x)) 4103 for (; x != NIL; x = cdr (x))
4327 { 4104 {
4328 if (ivalue (car (x)) != 0) 4105 if (ivalue (car (x)) != 0)
4329 v = num_intdiv (v, nvalue (car (x))); 4106 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4330 else 4107 else
4331 Error_0 ("quotient: division by zero"); 4108 Error_0 ("quotient: division by zero");
4332 } 4109 }
4333 4110
4334 s_return (mk_number (SCHEME_A_ v)); 4111 s_return (mk_number (SCHEME_A_ v));
4335 4112
4336 case OP_REM: /* remainder */ 4113 case OP_REM: /* remainder */
4337 v = nvalue (car (SCHEME_V->args)); 4114 v = nvalue (x);
4338 4115
4339 if (ivalue (cadr (SCHEME_V->args)) != 0) 4116 if (ivalue (cadr (args)) != 0)
4340 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4117 v = num_rem (v, nvalue (cadr (args)));
4341 else 4118 else
4342 Error_0 ("remainder: division by zero"); 4119 Error_0 ("remainder: division by zero");
4343 4120
4344 s_return (mk_number (SCHEME_A_ v)); 4121 s_return (mk_number (SCHEME_A_ v));
4345 4122
4346 case OP_MOD: /* modulo */ 4123 case OP_MOD: /* modulo */
4347 v = nvalue (car (SCHEME_V->args)); 4124 v = nvalue (x);
4348 4125
4349 if (ivalue (cadr (SCHEME_V->args)) != 0) 4126 if (ivalue (cadr (args)) != 0)
4350 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4127 v = num_mod (v, nvalue (cadr (args)));
4351 else 4128 else
4352 Error_0 ("modulo: division by zero"); 4129 Error_0 ("modulo: division by zero");
4353 4130
4354 s_return (mk_number (SCHEME_A_ v)); 4131 s_return (mk_number (SCHEME_A_ v));
4355 4132
4356 case OP_CAR: /* car */ 4133 case OP_CAR: /* car */
4357 s_return (caar (SCHEME_V->args)); 4134 s_return (caar (args));
4358 4135
4359 case OP_CDR: /* cdr */ 4136 case OP_CDR: /* cdr */
4360 s_return (cdar (SCHEME_V->args)); 4137 s_return (cdar (args));
4361 4138
4362 case OP_CONS: /* cons */ 4139 case OP_CONS: /* cons */
4363 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4140 set_cdr (args, cadr (args));
4364 s_return (SCHEME_V->args); 4141 s_return (args);
4365 4142
4366 case OP_SETCAR: /* set-car! */ 4143 case OP_SETCAR: /* set-car! */
4367 if (!is_immutable (car (SCHEME_V->args))) 4144 if (!is_immutable (x))
4368 { 4145 {
4369 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4146 set_car (x, cadr (args));
4370 s_return (car (SCHEME_V->args)); 4147 s_return (car (args));
4371 } 4148 }
4372 else 4149 else
4373 Error_0 ("set-car!: unable to alter immutable pair"); 4150 Error_0 ("set-car!: unable to alter immutable pair");
4374 4151
4375 case OP_SETCDR: /* set-cdr! */ 4152 case OP_SETCDR: /* set-cdr! */
4376 if (!is_immutable (car (SCHEME_V->args))) 4153 if (!is_immutable (x))
4377 { 4154 {
4378 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4155 set_cdr (x, cadr (args));
4379 s_return (car (SCHEME_V->args)); 4156 s_return (car (args));
4380 } 4157 }
4381 else 4158 else
4382 Error_0 ("set-cdr!: unable to alter immutable pair"); 4159 Error_0 ("set-cdr!: unable to alter immutable pair");
4383 4160
4384 case OP_CHAR2INT: /* char->integer */ 4161 case OP_CHAR2INT: /* char->integer */
4385 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4162 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4386 4163
4387 case OP_INT2CHAR: /* integer->char */ 4164 case OP_INT2CHAR: /* integer->char */
4388 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4165 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4389 4166
4390 case OP_CHARUPCASE: 4167 case OP_CHARUPCASE:
4391 { 4168 {
4392 unsigned char c = ivalue (car (SCHEME_V->args)); 4169 unsigned char c = ivalue_unchecked (x);
4393 c = toupper (c); 4170 c = toupper (c);
4394 s_return (mk_character (SCHEME_A_ c)); 4171 s_return (mk_character (SCHEME_A_ c));
4395 } 4172 }
4396 4173
4397 case OP_CHARDNCASE: 4174 case OP_CHARDNCASE:
4398 { 4175 {
4399 unsigned char c = ivalue (car (SCHEME_V->args)); 4176 unsigned char c = ivalue_unchecked (x);
4400 c = tolower (c); 4177 c = tolower (c);
4401 s_return (mk_character (SCHEME_A_ c)); 4178 s_return (mk_character (SCHEME_A_ c));
4402 } 4179 }
4403 4180
4404 case OP_STR2SYM: /* string->symbol */ 4181 case OP_STR2SYM: /* string->symbol */
4405 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4182 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4406 4183
4407 case OP_STR2ATOM: /* string->atom */ 4184 case OP_STR2ATOM: /* string->atom */
4408 { 4185 {
4409 char *s = strvalue (car (SCHEME_V->args)); 4186 char *s = strvalue (x);
4410 long pf = 0; 4187 long pf = 0;
4411 4188
4412 if (cdr (SCHEME_V->args) != NIL) 4189 if (cdr (args) != NIL)
4413 { 4190 {
4414 /* we know cadr(SCHEME_V->args) is a natural number */ 4191 /* we know cadr(args) is a natural number */
4415 /* see if it is 2, 8, 10, or 16, or error */ 4192 /* see if it is 2, 8, 10, or 16, or error */
4416 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4193 pf = ivalue_unchecked (cadr (args));
4417 4194
4418 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4195 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4419 { 4196 {
4420 /* base is OK */ 4197 /* base is OK */
4421 } 4198 }
4422 else 4199 else
4423 pf = -1; 4200 pf = -1;
4424 } 4201 }
4425 4202
4426 if (pf < 0) 4203 if (pf < 0)
4427 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4204 Error_1 ("string->atom: bad base:", cadr (args));
4428 else if (*s == '#') /* no use of base! */ 4205 else if (*s == '#') /* no use of base! */
4429 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4206 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4430 else 4207 else
4431 { 4208 {
4432 if (pf == 0 || pf == 10) 4209 if (pf == 0 || pf == 10)
… …
4443 } 4220 }
4444 } 4221 }
4445 } 4222 }
4446 4223
4447 case OP_SYM2STR: /* symbol->string */ 4224 case OP_SYM2STR: /* symbol->string */
4448 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4225 x = mk_string (SCHEME_A_ symname (x));
4449 setimmutable (x); 4226 setimmutable (x);
4450 s_return (x); 4227 s_return (x);
4451 4228
4452 case OP_ATOM2STR: /* atom->string */ 4229 case OP_ATOM2STR: /* atom->string */
4453 { 4230 {
4454 long pf = 0; 4231 long pf = 0;
4455 4232
4456 x = car (SCHEME_V->args);
4457
4458 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4459 { 4234 {
4460 /* we know cadr(SCHEME_V->args) is a natural number */ 4235 /* we know cadr(args) is a natural number */
4461 /* see if it is 2, 8, 10, or 16, or error */ 4236 /* see if it is 2, 8, 10, or 16, or error */
4462 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4237 pf = ivalue_unchecked (cadr (args));
4463 4238
4464 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4239 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4465 { 4240 {
4466 /* base is OK */ 4241 /* base is OK */
4467 } 4242 }
4468 else 4243 else
4469 pf = -1; 4244 pf = -1;
4470 } 4245 }
4471 4246
4472 if (pf < 0) 4247 if (pf < 0)
4473 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4248 Error_1 ("atom->string: bad base:", cadr (args));
4474 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4249 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4475 { 4250 {
4476 char *p; 4251 char *p;
4477 int len; 4252 int len;
4478 4253
… …
4483 Error_1 ("atom->string: not an atom:", x); 4258 Error_1 ("atom->string: not an atom:", x);
4484 } 4259 }
4485 4260
4486 case OP_MKSTRING: /* make-string */ 4261 case OP_MKSTRING: /* make-string */
4487 { 4262 {
4488 int fill = ' '; 4263 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4489 int len; 4264 int len = ivalue_unchecked (x);
4490 4265
4491 len = ivalue (car (SCHEME_V->args));
4492
4493 if (cdr (SCHEME_V->args) != NIL)
4494 fill = charvalue (cadr (SCHEME_V->args));
4495
4496 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4266 s_return (mk_empty_string (SCHEME_A_ len, fill));
4497 } 4267 }
4498 4268
4499 case OP_STRLEN: /* string-length */ 4269 case OP_STRLEN: /* string-length */
4500 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4270 s_return (mk_integer (SCHEME_A_ strlength (x)));
4501 4271
4502 case OP_STRREF: /* string-ref */ 4272 case OP_STRREF: /* string-ref */
4503 { 4273 {
4504 char *str; 4274 char *str = strvalue (x);
4505 int index;
4506
4507 str = strvalue (car (SCHEME_V->args));
4508
4509 index = ivalue (cadr (SCHEME_V->args)); 4275 int index = ivalue_unchecked (cadr (args));
4510 4276
4511 if (index >= strlength (car (SCHEME_V->args))) 4277 if (index >= strlength (x))
4512 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4278 Error_1 ("string-ref: out of bounds:", cadr (args));
4513 4279
4514 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4280 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4515 } 4281 }
4516 4282
4517 case OP_STRSET: /* string-set! */ 4283 case OP_STRSET: /* string-set! */
4518 { 4284 {
4519 char *str; 4285 char *str = strvalue (x);
4520 int index; 4286 int index = ivalue_unchecked (cadr (args));
4521 int c; 4287 int c;
4522 4288
4523 if (is_immutable (car (SCHEME_V->args))) 4289 if (is_immutable (x))
4524 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4290 Error_1 ("string-set!: unable to alter immutable string:", x);
4525 4291
4526 str = strvalue (car (SCHEME_V->args));
4527
4528 index = ivalue (cadr (SCHEME_V->args));
4529
4530 if (index >= strlength (car (SCHEME_V->args))) 4292 if (index >= strlength (x))
4531 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4293 Error_1 ("string-set!: out of bounds:", cadr (args));
4532 4294
4533 c = charvalue (caddr (SCHEME_V->args)); 4295 c = charvalue (caddr (args));
4534 4296
4535 str[index] = (char) c; 4297 str[index] = c;
4536 s_return (car (SCHEME_V->args)); 4298 s_return (car (args));
4537 } 4299 }
4538 4300
4539 case OP_STRAPPEND: /* string-append */ 4301 case OP_STRAPPEND: /* string-append */
4540 { 4302 {
4541 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4303 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4542 int len = 0; 4304 int len = 0;
4543 pointer newstr; 4305 pointer newstr;
4544 char *pos; 4306 char *pos;
4545 4307
4546 /* compute needed length for new string */ 4308 /* compute needed length for new string */
4547 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4309 for (x = args; x != NIL; x = cdr (x))
4548 len += strlength (car (x)); 4310 len += strlength (car (x));
4549 4311
4550 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4312 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4551 4313
4552 /* store the contents of the argument strings into the new string */ 4314 /* store the contents of the argument strings into the new string */
4553 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4315 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4554 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4316 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4555 4317
4556 s_return (newstr); 4318 s_return (newstr);
4557 } 4319 }
4558 4320
4559 case OP_SUBSTR: /* substring */ 4321 case OP_SUBSTR: /* substring */
4560 { 4322 {
4561 char *str; 4323 char *str = strvalue (x);
4562 int index0; 4324 int index0 = ivalue_unchecked (cadr (args));
4563 int index1; 4325 int index1;
4564 int len; 4326 int len;
4565 4327
4566 str = strvalue (car (SCHEME_V->args));
4567
4568 index0 = ivalue (cadr (SCHEME_V->args));
4569
4570 if (index0 > strlength (car (SCHEME_V->args))) 4328 if (index0 > strlength (x))
4571 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4329 Error_1 ("substring: start out of bounds:", cadr (args));
4572 4330
4573 if (cddr (SCHEME_V->args) != NIL) 4331 if (cddr (args) != NIL)
4574 { 4332 {
4575 index1 = ivalue (caddr (SCHEME_V->args)); 4333 index1 = ivalue_unchecked (caddr (args));
4576 4334
4577 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4335 if (index1 > strlength (x) || index1 < index0)
4578 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4336 Error_1 ("substring: end out of bounds:", caddr (args));
4579 } 4337 }
4580 else 4338 else
4581 index1 = strlength (car (SCHEME_V->args)); 4339 index1 = strlength (x);
4582 4340
4583 len = index1 - index0; 4341 len = index1 - index0;
4584 x = mk_empty_string (SCHEME_A_ len, ' '); 4342 x = mk_empty_string (SCHEME_A_ len, ' ');
4585 memcpy (strvalue (x), str + index0, len); 4343 memcpy (strvalue (x), str + index0, len);
4586 strvalue (x)[len] = 0; 4344 strvalue (x)[len] = 0;
… …
4590 4348
4591 case OP_VECTOR: /* vector */ 4349 case OP_VECTOR: /* vector */
4592 { 4350 {
4593 int i; 4351 int i;
4594 pointer vec; 4352 pointer vec;
4595 int len = list_length (SCHEME_A_ SCHEME_V->args); 4353 int len = list_length (SCHEME_A_ args);
4596 4354
4597 if (len < 0) 4355 if (len < 0)
4598 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4356 Error_1 ("vector: not a proper list:", args);
4599 4357
4600 vec = mk_vector (SCHEME_A_ len); 4358 vec = mk_vector (SCHEME_A_ len);
4601 4359
4602#if USE_ERROR_CHECKING 4360#if USE_ERROR_CHECKING
4603 if (SCHEME_V->no_memory) 4361 if (SCHEME_V->no_memory)
4604 s_return (S_SINK); 4362 s_return (S_SINK);
4605#endif 4363#endif
4606 4364
4607 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4365 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4608 set_vector_elem (vec, i, car (x)); 4366 vector_set (vec, i, car (x));
4609 4367
4610 s_return (vec); 4368 s_return (vec);
4611 } 4369 }
4612 4370
4613 case OP_MKVECTOR: /* make-vector */ 4371 case OP_MKVECTOR: /* make-vector */
4614 { 4372 {
4615 pointer fill = NIL; 4373 pointer fill = NIL;
4616 int len;
4617 pointer vec; 4374 pointer vec;
4375 int len = ivalue_unchecked (x);
4618 4376
4619 len = ivalue (car (SCHEME_V->args));
4620
4621 if (cdr (SCHEME_V->args) != NIL) 4377 if (cdr (args) != NIL)
4622 fill = cadr (SCHEME_V->args); 4378 fill = cadr (args);
4623 4379
4624 vec = mk_vector (SCHEME_A_ len); 4380 vec = mk_vector (SCHEME_A_ len);
4625 4381
4626#if USE_ERROR_CHECKING 4382#if USE_ERROR_CHECKING
4627 if (SCHEME_V->no_memory) 4383 if (SCHEME_V->no_memory)
4628 s_return (S_SINK); 4384 s_return (S_SINK);
4629#endif 4385#endif
4630 4386
4631 if (fill != NIL) 4387 if (fill != NIL)
4632 fill_vector (vec, fill); 4388 fill_vector (vec, 0, fill);
4633 4389
4634 s_return (vec); 4390 s_return (vec);
4635 } 4391 }
4636 4392
4637 case OP_VECLEN: /* vector-length */ 4393 case OP_VECLEN: /* vector-length */
4638 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4394 s_return (mk_integer (SCHEME_A_ veclength (x)));
4639 4395
4640 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4641 { 4397 {
4642 int index;
4643
4644 index = ivalue (cadr (SCHEME_V->args)); 4398 int index = ivalue_unchecked (cadr (args));
4645 4399
4646 if (index >= ivalue (car (SCHEME_V->args))) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4647 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4648 4402
4649 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_get (x, index));
4650 } 4404 }
4651 4405
4652 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4653 { 4407 {
4654 int index; 4408 int index = ivalue_unchecked (cadr (args));
4655 4409
4656 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4657 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4658 4412
4659 index = ivalue (cadr (SCHEME_V->args)); 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4660
4661 if (index >= ivalue (car (SCHEME_V->args)))
4662 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4663 4415
4664 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4416 vector_set (x, index, caddr (args));
4665 s_return (car (SCHEME_V->args)); 4417 s_return (x);
4666 } 4418 }
4667 } 4419 }
4668 4420
4669 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4670} 4422}
4671 4423
4672INTERFACE int 4424static int
4673is_list (SCHEME_P_ pointer a) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4674{ 4426{
4675 return list_length (SCHEME_A_ a) >= 0; 4427 pointer x = SCHEME_V->args;
4676}
4677 4428
4678/* Result is: 4429 for (;;)
4679 proper list: length
4680 circular list: -1
4681 not even a pair: -2
4682 dotted list: -2 minus length before dot
4683*/
4684INTERFACE int
4685list_length (SCHEME_P_ pointer a)
4686{
4687 int i = 0;
4688 pointer slow, fast;
4689
4690 slow = fast = a;
4691
4692 while (1)
4693 { 4430 {
4431 num v = nvalue (car (x));
4432 x = cdr (x);
4433
4694 if (fast == NIL) 4434 if (x == NIL)
4695 return i; 4435 break;
4696 4436
4697 if (!is_pair (fast)) 4437 int r = num_cmp (v, nvalue (car (x)));
4698 return -2 - i;
4699 4438
4700 fast = cdr (fast); 4439 switch (op)
4701 ++i;
4702
4703 if (fast == NIL)
4704 return i;
4705
4706 if (!is_pair (fast))
4707 return -2 - i;
4708
4709 ++i;
4710 fast = cdr (fast);
4711
4712 /* Safe because we would have already returned if `fast'
4713 encountered a non-pair. */
4714 slow = cdr (slow);
4715
4716 if (fast == slow)
4717 { 4440 {
4718 /* the fast pointer has looped back around and caught up 4441 case OP_NUMEQ: r = r == 0; break;
4719 with the slow pointer, hence the structure is circular, 4442 case OP_LESS: r = r < 0; break;
4720 not of finite length, and therefore not a list */ 4443 case OP_GRE: r = r > 0; break;
4721 return -1; 4444 case OP_LEQ: r = r <= 0; break;
4445 case OP_GEQ: r = r >= 0; break;
4722 } 4446 }
4723 }
4724}
4725 4447
4448 if (!r)
4449 s_return (S_F);
4450 }
4451
4452 s_return (S_T);
4453}
4454
4726static pointer 4455static int
4727opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4728{ 4457{
4729 pointer x; 4458 pointer args = SCHEME_V->args;
4730 num v; 4459 pointer a = car (args);
4731 int (*comp_func) (num, num); 4460 pointer d = cdr (args);
4461 int r;
4732 4462
4733 switch (op) 4463 switch (op)
4734 { 4464 {
4735 case OP_NOT: /* not */ 4465 case OP_NOT: /* not */ r = is_false (a) ; break;
4736 s_retbool (is_false (car (SCHEME_V->args))); 4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4737 4475
4738 case OP_BOOLP: /* boolean? */
4739 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4740
4741 case OP_EOFOBJP: /* boolean? */
4742 s_retbool (car (SCHEME_V->args) == S_EOF);
4743
4744 case OP_NULLP: /* null? */
4745 s_retbool (car (SCHEME_V->args) == NIL);
4746
4747 case OP_NUMEQ: /* = */
4748 case OP_LESS: /* < */
4749 case OP_GRE: /* > */
4750 case OP_LEQ: /* <= */
4751 case OP_GEQ: /* >= */
4752 switch (op)
4753 {
4754 case OP_NUMEQ:
4755 comp_func = num_eq;
4756 break;
4757
4758 case OP_LESS:
4759 comp_func = num_lt;
4760 break;
4761
4762 case OP_GRE:
4763 comp_func = num_gt;
4764 break;
4765
4766 case OP_LEQ:
4767 comp_func = num_le;
4768 break;
4769
4770 case OP_GEQ:
4771 comp_func = num_ge;
4772 break;
4773 }
4774
4775 x = SCHEME_V->args;
4776 v = nvalue (car (x));
4777 x = cdr (x);
4778
4779 for (; x != NIL; x = cdr (x))
4780 {
4781 if (!comp_func (v, nvalue (car (x))))
4782 s_retbool (0);
4783
4784 v = nvalue (car (x));
4785 }
4786
4787 s_retbool (1);
4788
4789 case OP_SYMBOLP: /* symbol? */
4790 s_retbool (is_symbol (car (SCHEME_V->args)));
4791
4792 case OP_NUMBERP: /* number? */
4793 s_retbool (is_number (car (SCHEME_V->args)));
4794
4795 case OP_STRINGP: /* string? */
4796 s_retbool (is_string (car (SCHEME_V->args)));
4797
4798 case OP_INTEGERP: /* integer? */
4799 s_retbool (is_integer (car (SCHEME_V->args)));
4800
4801 case OP_REALP: /* real? */
4802 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4803
4804 case OP_CHARP: /* char? */
4805 s_retbool (is_character (car (SCHEME_V->args)));
4806#if USE_CHAR_CLASSIFIERS 4476#if USE_CHAR_CLASSIFIERS
4807 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4808 case OP_CHARAP: /* char-alphabetic? */ 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4809 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4810 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4811 case OP_CHARNP: /* char-numeric? */ 4481 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4812 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4813
4814 case OP_CHARWP: /* char-whitespace? */
4815 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4816
4817 case OP_CHARUP: /* char-upper-case? */
4818 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4819
4820 case OP_CHARLP: /* char-lower-case? */
4821 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4822#endif 4482#endif
4483
4823#if USE_PORTS 4484#if USE_PORTS
4824 4485 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4825 case OP_PORTP: /* port? */
4826 s_retbool (is_port (car (SCHEME_V->args)));
4827
4828 case OP_INPORTP: /* input-port? */ 4486 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4829 s_retbool (is_inport (car (SCHEME_V->args)));
4830
4831 case OP_OUTPORTP: /* output-port? */ 4487 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4832 s_retbool (is_outport (car (SCHEME_V->args)));
4833#endif 4488#endif
4834 4489
4835 case OP_PROCP: /* procedure? */ 4490 case OP_PROCP: /* procedure? */
4836 4491
4837 /*-- 4492 /*--
4838 * continuation should be procedure by the example 4493 * continuation should be procedure by the example
4839 * (call-with-current-continuation procedure?) ==> #t 4494 * (call-with-current-continuation procedure?) ==> #t
4840 * in R^3 report sec. 6.9 4495 * in R^3 report sec. 6.9
4841 */ 4496 */
4842 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4497 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4843 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4498 break;
4844 4499
4845 case OP_PAIRP: /* pair? */ 4500 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4846 s_retbool (is_pair (car (SCHEME_V->args))); 4501 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4847 4502 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4848 case OP_LISTP: /* list? */ 4503 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4849 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4504 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4850 4505 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4851 case OP_ENVP: /* environment? */
4852 s_retbool (is_environment (car (SCHEME_V->args)));
4853
4854 case OP_VECTORP: /* vector? */
4855 s_retbool (is_vector (car (SCHEME_V->args)));
4856
4857 case OP_EQ: /* eq? */
4858 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4859
4860 case OP_EQV: /* eqv? */
4861 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4862 } 4506 }
4863 4507
4864 return S_T; 4508 s_retbool (r);
4865} 4509}
4866 4510
4867static pointer 4511static int
4868opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4869{ 4513{
4514 pointer args = SCHEME_V->args;
4515 pointer a = car (args);
4870 pointer x, y; 4516 pointer x, y;
4871 4517
4872 switch (op) 4518 switch (op)
4873 { 4519 {
4874 case OP_FORCE: /* force */ 4520 case OP_FORCE: /* force */
4875 SCHEME_V->code = car (SCHEME_V->args); 4521 SCHEME_V->code = a;
4876 4522
4877 if (is_promise (SCHEME_V->code)) 4523 if (is_promise (SCHEME_V->code))
4878 { 4524 {
4879 /* Should change type to closure here */ 4525 /* Should change type to closure here */
4880 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4526 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4901 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4547 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4902 SCHEME_V->outport = cadr (SCHEME_V->args); 4548 SCHEME_V->outport = cadr (SCHEME_V->args);
4903 } 4549 }
4904 } 4550 }
4905 4551
4906 SCHEME_V->args = car (SCHEME_V->args); 4552 SCHEME_V->args = a;
4907 4553
4908 if (op == OP_WRITE) 4554 if (op == OP_WRITE)
4909 SCHEME_V->print_flag = 1; 4555 SCHEME_V->print_flag = 1;
4910 else 4556 else
4911 SCHEME_V->print_flag = 0; 4557 SCHEME_V->print_flag = 0;
4912 4558
4913 s_goto (OP_P0LIST); 4559 s_goto (OP_P0LIST);
4914 4560
4915 case OP_NEWLINE: /* newline */ 4561 case OP_NEWLINE: /* newline */
4916 if (is_pair (SCHEME_V->args)) 4562 if (is_pair (args))
4917 { 4563 {
4918 if (car (SCHEME_V->args) != SCHEME_V->outport) 4564 if (a != SCHEME_V->outport)
4919 { 4565 {
4920 x = cons (SCHEME_V->outport, NIL); 4566 x = cons (SCHEME_V->outport, NIL);
4921 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4922 SCHEME_V->outport = car (SCHEME_V->args); 4568 SCHEME_V->outport = a;
4923 } 4569 }
4924 } 4570 }
4925 4571
4926 putstr (SCHEME_A_ "\n"); 4572 putstr (SCHEME_A_ "\n");
4927 s_return (S_T); 4573 s_return (S_T);
4928#endif 4574#endif
4929 4575
4930 case OP_ERR0: /* error */ 4576 case OP_ERR0: /* error */
4931 SCHEME_V->retcode = -1; 4577 SCHEME_V->retcode = -1;
4932 4578
4933 if (!is_string (car (SCHEME_V->args))) 4579 if (!is_string (a))
4934 { 4580 {
4935 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4581 args = cons (mk_string (SCHEME_A_ " -- "), args);
4936 setimmutable (car (SCHEME_V->args)); 4582 setimmutable (car (args));
4937 } 4583 }
4938 4584
4939 putstr (SCHEME_A_ "Error: "); 4585 putstr (SCHEME_A_ "Error: ");
4940 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4586 putstr (SCHEME_A_ strvalue (car (args)));
4941 SCHEME_V->args = cdr (SCHEME_V->args); 4587 SCHEME_V->args = cdr (args);
4942 s_goto (OP_ERR1); 4588 s_goto (OP_ERR1);
4943 4589
4944 case OP_ERR1: /* error */ 4590 case OP_ERR1: /* error */
4945 putstr (SCHEME_A_ " "); 4591 putstr (SCHEME_A_ " ");
4946 4592
4947 if (SCHEME_V->args != NIL) 4593 if (args != NIL)
4948 { 4594 {
4949 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4950 SCHEME_V->args = car (SCHEME_V->args); 4596 SCHEME_V->args = a;
4951 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4952 s_goto (OP_P0LIST); 4598 s_goto (OP_P0LIST);
4953 } 4599 }
4954 else 4600 else
4955 { 4601 {
4956 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4957 4603
4958 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4959 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4960 else 4606 else
4961 return NIL; 4607 return -1;
4962 } 4608 }
4963 4609
4964 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4965 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4611 s_return (reverse (SCHEME_A_ a));
4966 4612
4967 case OP_LIST_STAR: /* list* */ 4613 case OP_LIST_STAR: /* list* */
4968 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4614 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4969 4615
4970 case OP_APPEND: /* append */ 4616 case OP_APPEND: /* append */
4971 x = NIL; 4617 x = NIL;
4972 y = SCHEME_V->args; 4618 y = args;
4973 4619
4974 if (y == x) 4620 if (y == x)
4975 s_return (x); 4621 s_return (x);
4976 4622
4977 /* cdr() in the while condition is not a typo. If car() */ 4623 /* cdr() in the while condition is not a typo. If car() */
… …
4988 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4634 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4989 4635
4990#if USE_PLIST 4636#if USE_PLIST
4991 4637
4992 case OP_PUT: /* put */ 4638 case OP_PUT: /* put */
4993 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4639 if (!hasprop (a) || !hasprop (cadr (args)))
4994 Error_0 ("illegal use of put"); 4640 Error_0 ("illegal use of put");
4995 4641
4996 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4642 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4997 { 4643 {
4998 if (caar (x) == y) 4644 if (caar (x) == y)
4999 break; 4645 break;
5000 } 4646 }
5001 4647
5002 if (x != NIL) 4648 if (x != NIL)
5003 cdar (x) = caddr (SCHEME_V->args); 4649 cdar (x) = caddr (args);
5004 else 4650 else
5005 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4651 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5006 4652
5007 s_return (S_T); 4653 s_return (S_T);
5008 4654
5009 case OP_GET: /* get */ 4655 case OP_GET: /* get */
5010 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4656 if (!hasprop (a) || !hasprop (cadr (args)))
5011 Error_0 ("illegal use of get"); 4657 Error_0 ("illegal use of get");
5012 4658
5013 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4659 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5014 if (caar (x) == y) 4660 if (caar (x) == y)
5015 break; 4661 break;
5016 4662
5017 if (x != NIL) 4663 if (x != NIL)
5018 s_return (cdar (x)); 4664 s_return (cdar (x));
… …
5020 s_return (NIL); 4666 s_return (NIL);
5021 4667
5022#endif /* USE_PLIST */ 4668#endif /* USE_PLIST */
5023 4669
5024 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
5025 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
5026 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4672 SCHEME_V->retcode = ivalue (a);
5027 4673
5028 return NIL; 4674 return -1;
5029 4675
5030 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
5031 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
5032 s_return (S_T); 4678 s_return (S_T);
5033 4679
5034 case OP_GCVERB: /* gc-verbose */ 4680 case OP_GCVERB: /* gc-verbose */
5035 { 4681 {
5036 int was = SCHEME_V->gc_verbose; 4682 int was = SCHEME_V->gc_verbose;
5037 4683
5038 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4684 SCHEME_V->gc_verbose = (a != S_F);
5039 s_retbool (was); 4685 s_retbool (was);
5040 } 4686 }
5041 4687
5042 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
5043 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4689 if (!is_pair (args) || !is_number (a))
5044 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
5045 4691
5046 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
5047 4693
5048 s_return (S_T); 4694 s_return (S_T);
5049 4695
5050 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
5051 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
5078 case OP_OPEN_INOUTFILE: 4724 case OP_OPEN_INOUTFILE:
5079 prop = port_input | port_output; 4725 prop = port_input | port_output;
5080 break; 4726 break;
5081 } 4727 }
5082 4728
5083 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5084 4730
5085 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
5086 s_return (S_F);
5087
5088 s_return (p);
5089 } 4732 }
5090 4733
5091# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
5092 4735
5093 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
5105 case OP_OPEN_INOUTSTRING: 4748 case OP_OPEN_INOUTSTRING:
5106 prop = port_input | port_output; 4749 prop = port_input | port_output;
5107 break; 4750 break;
5108 } 4751 }
5109 4752
5110 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
5111 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4754 strvalue (a) + strlength (a), prop);
5112 4755
5113 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
5114 s_return (S_F);
5115
5116 s_return (p);
5117 } 4757 }
5118 4758
5119 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
5120 { 4760 {
5121 pointer p; 4761 pointer p;
5122 4762
5123 if (car (SCHEME_V->args) == NIL) 4763 if (a == NIL)
5124 {
5125 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
5126
5127 if (p == NIL)
5128 s_return (S_F);
5129 }
5130 else 4765 else
5131 {
5132 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
5133 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4767 strvalue (a) + strlength (a), port_output);
5134 4768
5135 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
5136 s_return (S_F);
5137 }
5138
5139 s_return (p);
5140 } 4770 }
5141 4771
5142 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
5143 { 4773 {
5144 port *p; 4774 port *p;
5145 4775
5146 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4776 if ((p = a->object.port)->kind & port_string)
5147 { 4777 {
5148 off_t size; 4778 off_t size;
5149 char *str; 4779 char *str;
5150 4780
5151 size = p->rep.string.curr - p->rep.string.start + 1; 4781 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5167 } 4797 }
5168 4798
5169# endif 4799# endif
5170 4800
5171 case OP_CLOSE_INPORT: /* close-input-port */ 4801 case OP_CLOSE_INPORT: /* close-input-port */
5172 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4802 port_close (SCHEME_A_ a, port_input);
5173 s_return (S_T); 4803 s_return (S_T);
5174 4804
5175 case OP_CLOSE_OUTPORT: /* close-output-port */ 4805 case OP_CLOSE_OUTPORT: /* close-output-port */
5176 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4806 port_close (SCHEME_A_ a, port_output);
5177 s_return (S_T); 4807 s_return (S_T);
5178#endif 4808#endif
5179 4809
5180 case OP_INT_ENV: /* interaction-environment */ 4810 case OP_INT_ENV: /* interaction-environment */
5181 s_return (SCHEME_V->global_env); 4811 s_return (SCHEME_V->global_env);
… …
5183 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
5184 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
5185 4815
5186 } 4816 }
5187 4817
5188 return S_T; 4818 if (USE_ERROR_CHECKING) abort ();
5189} 4819}
5190 4820
5191static pointer 4821static int
5192opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5193{ 4823{
4824 pointer args = SCHEME_V->args;
5194 pointer x; 4825 pointer x;
5195 4826
5196 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
5197 { 4828 {
5198 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
5205 switch (op) 4836 switch (op)
5206 { 4837 {
5207 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
5208#if USE_PORTS 4839#if USE_PORTS
5209 case OP_READ: 4840 case OP_READ:
5210 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
5211 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
5212 4843
5213 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
5214 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
5215 4846
5216 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
5217 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
5218 4849
5219 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
5220 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
5221 x = cons (x, NIL); 4852 x = cons (x, NIL);
5222 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5223 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
5224 4855
5225 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
5226 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
5227 { 4858 {
5228 int c; 4859 int c;
5229 4860
5230 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
5231 { 4862 {
5232 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
5233 { 4864 {
5234 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
5235 x = cons (x, NIL); 4866 x = cons (x, NIL);
5236 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5237 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
5238 } 4869 }
5239 } 4870 }
5240 4871
5241 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
5242 4873
… …
5252 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
5253 { 4884 {
5254 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
5255 int res; 4886 int res;
5256 4887
5257 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
5258 p = car (SCHEME_V->args); 4889 p = car (args);
5259 4890
5260 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
5261 4892
5262 s_retbool (res); 4893 s_retbool (res);
5263 } 4894 }
5264 4895
5265 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
5266 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
5267 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
5268 4899
5269 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
5270 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
5271 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
5272#endif 4903#endif
5273 4904
5274 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
5275 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5361 } 4992 }
5362 4993
5363 break; 4994 break;
5364 4995
5365 case OP_RDLIST: 4996 case OP_RDLIST:
5366 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 4997 SCHEME_V->args = cons (SCHEME_V->value, args);
5367 SCHEME_V->tok = token (SCHEME_A); 4998 SCHEME_V->tok = token (SCHEME_A);
5368 4999
5369 switch (SCHEME_V->tok) 5000 switch (SCHEME_V->tok)
5370 { 5001 {
5371 case TOK_EOF: 5002 case TOK_EOF:
… …
5399 case OP_RDDOT: 5030 case OP_RDDOT:
5400 if (token (SCHEME_A) != TOK_RPAREN) 5031 if (token (SCHEME_A) != TOK_RPAREN)
5401 Error_0 ("syntax error: illegal dot expression"); 5032 Error_0 ("syntax error: illegal dot expression");
5402 5033
5403 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5034 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5404 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5035 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5405 5036
5406 case OP_RDQUOTE: 5037 case OP_RDQUOTE:
5407 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5038 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5408 5039
5409 case OP_RDQQUOTE: 5040 case OP_RDQQUOTE:
… …
5431 SCHEME_V->args = SCHEME_V->value; 5062 SCHEME_V->args = SCHEME_V->value;
5432 s_goto (OP_VECTOR); 5063 s_goto (OP_VECTOR);
5433 5064
5434 /* ========== printing part ========== */ 5065 /* ========== printing part ========== */
5435 case OP_P0LIST: 5066 case OP_P0LIST:
5436 if (is_vector (SCHEME_V->args)) 5067 if (is_vector (args))
5437 { 5068 {
5438 putstr (SCHEME_A_ "#("); 5069 putstr (SCHEME_A_ "#(");
5439 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5070 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5440 s_goto (OP_PVECFROM); 5071 s_goto (OP_PVECFROM);
5441 } 5072 }
5442 else if (is_environment (SCHEME_V->args)) 5073 else if (is_environment (args))
5443 { 5074 {
5444 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5075 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5445 s_return (S_T); 5076 s_return (S_T);
5446 } 5077 }
5447 else if (!is_pair (SCHEME_V->args)) 5078 else if (!is_pair (args))
5448 { 5079 {
5449 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5080 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5450 s_return (S_T); 5081 s_return (S_T);
5451 } 5082 }
5452 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5083 else
5453 { 5084 {
5085 pointer a = car (args);
5086 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b);
5089
5090 if (a == SCHEME_V->QUOTE && ok_abbr)
5454 putstr (SCHEME_A_ "'"); 5091 putstr (SCHEME_A_ "'");
5455 SCHEME_V->args = cadr (SCHEME_V->args); 5092 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`");
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ",");
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@");
5098 else
5099 {
5100 putstr (SCHEME_A_ "(");
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a;
5103 }
5104
5456 s_goto (OP_P0LIST); 5105 s_goto (OP_P0LIST);
5457 } 5106 }
5458 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5107
5108 case OP_P1LIST:
5109 if (is_pair (args))
5459 { 5110 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5460 putstr (SCHEME_A_ "`"); 5112 putstr (SCHEME_A_ " ");
5461 SCHEME_V->args = cadr (SCHEME_V->args); 5113 SCHEME_V->args = car (args);
5462 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5463 } 5115 }
5464 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5465 {
5466 putstr (SCHEME_A_ ",");
5467 SCHEME_V->args = cadr (SCHEME_V->args);
5468 s_goto (OP_P0LIST);
5469 }
5470 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5471 {
5472 putstr (SCHEME_A_ ",@");
5473 SCHEME_V->args = cadr (SCHEME_V->args);
5474 s_goto (OP_P0LIST);
5475 }
5476 else
5477 {
5478 putstr (SCHEME_A_ "(");
5479 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5480 SCHEME_V->args = car (SCHEME_V->args);
5481 s_goto (OP_P0LIST);
5482 }
5483
5484 case OP_P1LIST:
5485 if (is_pair (SCHEME_V->args))
5486 {
5487 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5488 putstr (SCHEME_A_ " ");
5489 SCHEME_V->args = car (SCHEME_V->args);
5490 s_goto (OP_P0LIST);
5491 }
5492 else if (is_vector (SCHEME_V->args)) 5116 else if (is_vector (args))
5493 { 5117 {
5494 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5118 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5495 putstr (SCHEME_A_ " . "); 5119 putstr (SCHEME_A_ " . ");
5496 s_goto (OP_P0LIST); 5120 s_goto (OP_P0LIST);
5497 } 5121 }
5498 else 5122 else
5499 { 5123 {
5500 if (SCHEME_V->args != NIL) 5124 if (args != NIL)
5501 { 5125 {
5502 putstr (SCHEME_A_ " . "); 5126 putstr (SCHEME_A_ " . ");
5503 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5504 } 5128 }
5505 5129
5506 putstr (SCHEME_A_ ")"); 5130 putstr (SCHEME_A_ ")");
5507 s_return (S_T); 5131 s_return (S_T);
5508 } 5132 }
5509 5133
5510 case OP_PVECFROM: 5134 case OP_PVECFROM:
5511 { 5135 {
5512 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5136 int i = ivalue_unchecked (cdr (args));
5513 pointer vec = car (SCHEME_V->args); 5137 pointer vec = car (args);
5514 int len = ivalue_unchecked (vec); 5138 int len = veclength (vec);
5515 5139
5516 if (i == len) 5140 if (i == len)
5517 { 5141 {
5518 putstr (SCHEME_A_ ")"); 5142 putstr (SCHEME_A_ ")");
5519 s_return (S_T); 5143 s_return (S_T);
5520 } 5144 }
5521 else 5145 else
5522 { 5146 {
5523 pointer elem = vector_elem (vec, i); 5147 pointer elem = vector_get (vec, i);
5524 5148
5525 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5149 ivalue_unchecked (cdr (args)) = i + 1;
5526 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5527 SCHEME_V->args = elem; 5151 SCHEME_V->args = elem;
5528 5152
5529 if (i > 0) 5153 if (i > 0)
5530 putstr (SCHEME_A_ " "); 5154 putstr (SCHEME_A_ " ");
5531 5155
5532 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5533 } 5157 }
5534 } 5158 }
5535 } 5159 }
5536 5160
5537 return S_T; 5161 if (USE_ERROR_CHECKING) abort ();
5538} 5162}
5539 5163
5540static pointer 5164static int
5541opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5165opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5542{ 5166{
5167 pointer args = SCHEME_V->args;
5168 pointer a = car (args);
5543 pointer x, y; 5169 pointer x, y;
5544 5170
5545 switch (op) 5171 switch (op)
5546 { 5172 {
5547 case OP_LIST_LENGTH: /* length *//* a.k */ 5173 case OP_LIST_LENGTH: /* length *//* a.k */
5548 { 5174 {
5549 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5175 long v = list_length (SCHEME_A_ a);
5550 5176
5551 if (v < 0) 5177 if (v < 0)
5552 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5178 Error_1 ("length: not a list:", a);
5553 5179
5554 s_return (mk_integer (SCHEME_A_ v)); 5180 s_return (mk_integer (SCHEME_A_ v));
5555 } 5181 }
5556 5182
5557 case OP_ASSQ: /* assq *//* a.k */ 5183 case OP_ASSQ: /* assq *//* a.k */
5558 x = car (SCHEME_V->args); 5184 x = a;
5559 5185
5560 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5186 for (y = cadr (args); is_pair (y); y = cdr (y))
5561 { 5187 {
5562 if (!is_pair (car (y))) 5188 if (!is_pair (car (y)))
5563 Error_0 ("unable to handle non pair element"); 5189 Error_0 ("unable to handle non pair element");
5564 5190
5565 if (x == caar (y)) 5191 if (x == caar (y))
… …
5571 else 5197 else
5572 s_return (S_F); 5198 s_return (S_F);
5573 5199
5574 5200
5575 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5201 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5576 SCHEME_V->args = car (SCHEME_V->args); 5202 SCHEME_V->args = a;
5577 5203
5578 if (SCHEME_V->args == NIL) 5204 if (SCHEME_V->args == NIL)
5579 s_return (S_F); 5205 s_return (S_F);
5580 else if (is_closure (SCHEME_V->args)) 5206 else if (is_closure (SCHEME_V->args))
5581 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5207 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5587 case OP_CLOSUREP: /* closure? */ 5213 case OP_CLOSUREP: /* closure? */
5588 /* 5214 /*
5589 * Note, macro object is also a closure. 5215 * Note, macro object is also a closure.
5590 * Therefore, (closure? <#MACRO>) ==> #t 5216 * Therefore, (closure? <#MACRO>) ==> #t
5591 */ 5217 */
5592 s_retbool (is_closure (car (SCHEME_V->args))); 5218 s_retbool (is_closure (a));
5593 5219
5594 case OP_MACROP: /* macro? */ 5220 case OP_MACROP: /* macro? */
5595 s_retbool (is_macro (car (SCHEME_V->args))); 5221 s_retbool (is_macro (a));
5596 } 5222 }
5597 5223
5598 return S_T; /* NOTREACHED */ 5224 if (USE_ERROR_CHECKING) abort ();
5599} 5225}
5600 5226
5227/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5601typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5602 5229
5603typedef int (*test_predicate) (pointer); 5230typedef int (*test_predicate)(pointer);
5604static int 5231static int
5605is_any (pointer p) 5232tst_any (pointer p)
5606{ 5233{
5607 return 1; 5234 return 1;
5608} 5235}
5609 5236
5610static int 5237static int
5611is_nonneg (pointer p) 5238tst_inonneg (pointer p)
5612{ 5239{
5613 return ivalue (p) >= 0 && is_integer (p); 5240 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241}
5242
5243static int
5244tst_is_list (SCHEME_P_ pointer p)
5245{
5246 return p == NIL || is_pair (p);
5614} 5247}
5615 5248
5616/* Correspond carefully with following defines! */ 5249/* Correspond carefully with following defines! */
5617static struct 5250static struct
5618{ 5251{
5619 test_predicate fct; 5252 test_predicate fct;
5620 const char *kind; 5253 const char *kind;
5621} tests[] = 5254} tests[] = {
5622{ 5255 { tst_any , 0 },
5623 { 0, 0}, /* unused */ 5256 { is_string , "string" },
5624 { is_any, 0}, 5257 { is_symbol , "symbol" },
5625 { is_string, "string" }, 5258 { is_port , "port" },
5626 { is_symbol, "symbol" },
5627 { is_port, "port" },
5628 { is_inport, "input port" }, 5259 { is_inport , "input port" },
5629 { is_outport, "output port" }, 5260 { is_outport , "output port" },
5630 { is_environment, "environment" }, 5261 { is_environment, "environment" },
5631 { is_pair, "pair" }, 5262 { is_pair , "pair" },
5632 { 0, "pair or '()" }, 5263 { 0 , "pair or '()" },
5633 { is_character, "character" }, 5264 { is_character , "character" },
5634 { is_vector, "vector" }, 5265 { is_vector , "vector" },
5635 { is_number, "number" }, 5266 { is_number , "number" },
5636 { is_integer, "integer" }, 5267 { is_integer , "integer" },
5637 { is_nonneg, "non-negative integer" } 5268 { tst_inonneg , "non-negative integer" }
5638}; 5269};
5639 5270
5640#define TST_NONE 0 5271#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5641#define TST_ANY "\001" 5272#define TST_ANY "\001"
5642#define TST_STRING "\002" 5273#define TST_STRING "\002"
5643#define TST_SYMBOL "\003" 5274#define TST_SYMBOL "\003"
5644#define TST_PORT "\004" 5275#define TST_PORT "\004"
5645#define TST_INPORT "\005" 5276#define TST_INPORT "\005"
5646#define TST_OUTPORT "\006" 5277#define TST_OUTPORT "\006"
5647#define TST_ENVIRONMENT "\007" 5278#define TST_ENVIRONMENT "\007"
5648#define TST_PAIR "\010" 5279#define TST_PAIR "\010"
5649#define TST_LIST "\011" 5280#define TST_LIST "\011"
5650#define TST_CHAR "\012" 5281#define TST_CHAR "\012"
5651#define TST_VECTOR "\013" 5282#define TST_VECTOR "\013"
5652#define TST_NUMBER "\014" 5283#define TST_NUMBER "\014"
5653#define TST_INTEGER "\015" 5284#define TST_INTEGER "\015"
5654#define TST_NATURAL "\016" 5285#define TST_NATURAL "\016"
5286
5287#define INF_ARG 0xff
5288#define UNNAMED_OP ""
5289
5290static const char opnames[] =
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h"
5293#undef OP_DEF
5294;
5295
5296static const char *
5297opname (int idx)
5298{
5299 const char *name = opnames;
5300
5301 /* should do this at compile time, but would require external program, right? */
5302 while (idx--)
5303 name += strlen (name) + 1;
5304
5305 return *name ? name : "ILLEGAL";
5306}
5307
5308static const char *
5309procname (pointer x)
5310{
5311 return opname (procnum (x));
5312}
5655 5313
5656typedef struct 5314typedef struct
5657{ 5315{
5658 dispatch_func func; 5316 uint8_t func;
5659 char *name; 5317 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5318 uint8_t builtin;
5319#if USE_ERROR_CHECKING
5660 int min_arity; 5320 uint8_t min_arity;
5661 int max_arity; 5321 uint8_t max_arity;
5662 char *arg_tests_encoding; 5322 char arg_tests_encoding[3];
5323#endif
5663} op_code_info; 5324} op_code_info;
5664 5325
5665#define INF_ARG 0xffff
5666
5667static op_code_info dispatch_table[] = { 5326static const op_code_info dispatch_table[] = {
5668#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5327#if USE_ERROR_CHECKING
5328#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5329#else
5330#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5331#endif
5669#include "opdefines.h" 5332#include "opdefines.h"
5333#undef OP_DEF
5670 {0} 5334 {0}
5671}; 5335};
5672 5336
5673static const char *
5674procname (pointer x)
5675{
5676 int n = procnum (x);
5677 const char *name = dispatch_table[n].name;
5678
5679 if (name == 0)
5680 name = "ILLEGAL!";
5681
5682 return name;
5683}
5684
5685/* kernel of this interpreter */ 5337/* kernel of this interpreter */
5686static void 5338static void ecb_hot
5687Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5688{ 5340{
5689 SCHEME_V->op = op; 5341 SCHEME_V->op = op;
5690 5342
5691 for (;;) 5343 for (;;)
5692 { 5344 {
5693 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5345 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5694 5346
5347#if USE_ERROR_CHECKING
5695 if (pcd->name) /* if built-in function, check arguments */ 5348 if (pcd->builtin) /* if built-in function, check arguments */
5696 { 5349 {
5697#if USE_ERROR_CHECKING
5698 char msg[STRBUFFSIZE]; 5350 char msg[STRBUFFSIZE];
5699 int ok = 1;
5700 int n = list_length (SCHEME_A_ SCHEME_V->args); 5351 int n = list_length (SCHEME_A_ SCHEME_V->args);
5701 5352
5702 /* Check number of arguments */ 5353 /* Check number of arguments */
5703 if (n < pcd->min_arity) 5354 if (ecb_expect_false (n < pcd->min_arity))
5704 { 5355 {
5705 ok = 0;
5706 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5356 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5707 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5357 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5358 xError_1 (SCHEME_A_ msg, 0);
5359 continue;
5708 } 5360 }
5709 5361 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5710 if (ok && n > pcd->max_arity)
5711 { 5362 {
5712 ok = 0;
5713 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5363 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5714 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5364 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5365 xError_1 (SCHEME_A_ msg, 0);
5366 continue;
5715 } 5367 }
5716#endif 5368 else
5717
5718 if (ok)
5719 { 5369 {
5720 if (pcd->arg_tests_encoding && USE_ERROR_CHECKING) 5370 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5721 { 5371 {
5722 int i = 0; 5372 int i = 0;
5723 int j; 5373 int j;
5724 const char *t = pcd->arg_tests_encoding; 5374 const char *t = pcd->arg_tests_encoding;
5725 pointer arglist = SCHEME_V->args; 5375 pointer arglist = SCHEME_V->args;
5726 5376
5727 do 5377 do
5728 { 5378 {
5729 pointer arg = car (arglist); 5379 pointer arg = car (arglist);
5730 5380
5731 j = (int) t[0]; 5381 j = t[0];
5732 5382
5383 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5733 if (j == TST_LIST[0]) 5384 if (j == TST_LIST[0])
5734 { 5385 {
5735 if (arg != NIL && !is_pair (arg)) 5386 if (!tst_is_list (SCHEME_A_ arg))
5736 break; 5387 break;
5737 } 5388 }
5738 else 5389 else
5739 { 5390 {
5740 if (!tests[j].fct (arg)) 5391 if (!tests[j - 1].fct (arg))
5741 break; 5392 break;
5742 } 5393 }
5743 5394
5744 if (t[1] != 0) /* last test is replicated as necessary */ 5395 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5745 t++; 5396 t++;
5746 5397
5747 arglist = cdr (arglist); 5398 arglist = cdr (arglist);
5748 i++; 5399 i++;
5749 } 5400 }
5750 while (i < n); 5401 while (i < n);
5751 5402
5752 if (i < n) 5403 if (i < n)
5753 { 5404 {
5754 ok = 0;
5755 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5405 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5406 xError_1 (SCHEME_A_ msg, 0);
5407 continue;
5756 } 5408 }
5757 } 5409 }
5758 } 5410 }
5759
5760 if (!ok)
5761 {
5762 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5763 return;
5764
5765 pcd = dispatch_table + SCHEME_V->op;
5766 }
5767 } 5411 }
5412#endif
5768 5413
5769 ok_to_freely_gc (SCHEME_A); 5414 ok_to_freely_gc (SCHEME_A);
5770 5415
5771 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5416 static const dispatch_func dispatch_funcs[] = {
5417 opexe_0,
5418 opexe_1,
5419 opexe_2,
5420 opexe_3,
5421 opexe_4,
5422 opexe_5,
5423 opexe_6,
5424 };
5425
5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5772 return; 5427 return;
5773 5428
5774#if USE_ERROR_CHECKING 5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5775 if (SCHEME_V->no_memory)
5776 { 5430 {
5777 xwrstr ("No memory!\n"); 5431 xwrstr ("No memory!\n");
5778 return; 5432 return;
5779 } 5433 }
5780#endif
5781 } 5434 }
5782} 5435}
5783 5436
5784/* ========== Initialization of internal keywords ========== */ 5437/* ========== Initialization of internal keywords ========== */
5785 5438
… …
5802mk_proc (SCHEME_P_ enum scheme_opcodes op) 5455mk_proc (SCHEME_P_ enum scheme_opcodes op)
5803{ 5456{
5804 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5457 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5805 set_typeflag (y, (T_PROC | T_ATOM)); 5458 set_typeflag (y, (T_PROC | T_ATOM));
5806 ivalue_unchecked (y) = op; 5459 ivalue_unchecked (y) = op;
5807 set_num_integer (y);
5808 return y; 5460 return y;
5809} 5461}
5810 5462
5811/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5812static int 5464static int
… …
5836 5488
5837 case 'd': 5489 case 'd':
5838 return OP_COND0; /* cond */ 5490 return OP_COND0; /* cond */
5839 5491
5840 case '*': 5492 case '*':
5841 return OP_LET0AST; /* let* */ 5493 return OP_LET0AST;/* let* */
5842 5494
5843 default: 5495 default:
5844 return OP_SET0; /* set! */ 5496 return OP_SET0; /* set! */
5845 } 5497 }
5846 5498
… …
5868 5520
5869 case 'f': 5521 case 'f':
5870 return OP_DEF0; /* define */ 5522 return OP_DEF0; /* define */
5871 5523
5872 default: 5524 default:
5873 return OP_LET0REC; /* letrec */ 5525 return OP_LET0REC;/* letrec */
5874 } 5526 }
5875 5527
5876 default: 5528 default:
5877 return OP_C0STREAM; /* cons-stream */ 5529 return OP_C0STREAM; /* cons-stream */
5878 } 5530 }
5879} 5531}
5880 5532
5881#if USE_MULTIPLICITY 5533#if USE_MULTIPLICITY
5882scheme * 5534ecb_cold scheme *
5883scheme_init_new () 5535scheme_init_new ()
5884{ 5536{
5885 scheme *sc = malloc (sizeof (scheme)); 5537 scheme *sc = malloc (sizeof (scheme));
5886 5538
5887 if (!scheme_init (SCHEME_A)) 5539 if (!scheme_init (SCHEME_A))
… …
5892 else 5544 else
5893 return sc; 5545 return sc;
5894} 5546}
5895#endif 5547#endif
5896 5548
5897int 5549ecb_cold int
5898scheme_init (SCHEME_P) 5550scheme_init (SCHEME_P)
5899{ 5551{
5900 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5901 pointer x; 5553 pointer x;
5902 5554
… …
5945 set_cdr (S_T, S_T); 5597 set_cdr (S_T, S_T);
5946 /* init F */ 5598 /* init F */
5947 set_typeflag (S_F, T_ATOM | T_MARK); 5599 set_typeflag (S_F, T_ATOM | T_MARK);
5948 set_car (S_F, S_F); 5600 set_car (S_F, S_F);
5949 set_cdr (S_F, S_F); 5601 set_cdr (S_F, S_F);
5602 /* init EOF_OBJ */
5603 set_typeflag (S_EOF, T_ATOM | T_MARK);
5604 set_car (S_EOF, S_EOF);
5605 set_cdr (S_EOF, S_EOF);
5950 /* init sink */ 5606 /* init sink */
5951 set_typeflag (S_SINK, T_PAIR | T_MARK); 5607 set_typeflag (S_SINK, T_PAIR | T_MARK);
5952 set_car (S_SINK, NIL); 5608 set_car (S_SINK, NIL);
5609
5953 /* init c_nest */ 5610 /* init c_nest */
5954 SCHEME_V->c_nest = NIL; 5611 SCHEME_V->c_nest = NIL;
5955 5612
5956 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5613 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5957 /* init global_env */ 5614 /* init global_env */
… …
5970 5627
5971 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5628 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5972 assign_syntax (SCHEME_A_ syntax_names[i]); 5629 assign_syntax (SCHEME_A_ syntax_names[i]);
5973 } 5630 }
5974 5631
5632 // TODO: should iterate via strlen, to avoid n² complexity
5975 for (i = 0; i < n; i++) 5633 for (i = 0; i < n; i++)
5976 if (dispatch_table[i].name != 0) 5634 if (dispatch_table[i].builtin)
5977 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5635 assign_proc (SCHEME_A_ i, opname (i));
5978 5636
5979 /* initialization of global pointers to special symbols */ 5637 /* initialization of global pointers to special symbols */
5980 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5638 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5981 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5639 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5982 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5640 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5983 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5641 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5984 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5642 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5985 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5643 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5986 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5644 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5987 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5645 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5988 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5646 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5989 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5647 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5990 5648
5991 return !SCHEME_V->no_memory; 5649 return !SCHEME_V->no_memory;
5992} 5650}
5993 5651
… …
6021scheme_set_external_data (SCHEME_P_ void *p) 5679scheme_set_external_data (SCHEME_P_ void *p)
6022{ 5680{
6023 SCHEME_V->ext_data = p; 5681 SCHEME_V->ext_data = p;
6024} 5682}
6025 5683
6026void 5684ecb_cold void
6027scheme_deinit (SCHEME_P) 5685scheme_deinit (SCHEME_P)
6028{ 5686{
6029 int i; 5687 int i;
6030 5688
6031#if SHOW_ERROR_LINE 5689#if SHOW_ERROR_LINE
… …
6123{ 5781{
6124 dump_stack_reset (SCHEME_A); 5782 dump_stack_reset (SCHEME_A);
6125 SCHEME_V->envir = SCHEME_V->global_env; 5783 SCHEME_V->envir = SCHEME_V->global_env;
6126 SCHEME_V->file_i = 0; 5784 SCHEME_V->file_i = 0;
6127 SCHEME_V->load_stack[0].kind = port_input | port_string; 5785 SCHEME_V->load_stack[0].kind = port_input | port_string;
6128 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5786 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6129 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5787 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6130 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6131#if USE_PORTS 5789#if USE_PORTS
6132 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6133#endif 5791#endif
6134 SCHEME_V->retcode = 0; 5792 SCHEME_V->retcode = 0;
6135 SCHEME_V->interactive_repl = 0; 5793 SCHEME_V->interactive_repl = 0;
… …
6240 5898
6241/* ========== Main ========== */ 5899/* ========== Main ========== */
6242 5900
6243#if STANDALONE 5901#if STANDALONE
6244 5902
6245# if defined(__APPLE__) && !defined (OSX)
6246int
6247main ()
6248{
6249 extern MacTS_main (int argc, char **argv);
6250 char **argv;
6251 int argc = ccommand (&argv);
6252
6253 MacTS_main (argc, argv);
6254 return 0;
6255}
6256
6257int
6258MacTS_main (int argc, char **argv)
6259{
6260# else
6261int 5903int
6262main (int argc, char **argv) 5904main (int argc, char **argv)
6263{ 5905{
6264# endif
6265# if USE_MULTIPLICITY 5906# if USE_MULTIPLICITY
6266 scheme ssc; 5907 scheme ssc;
6267 scheme *const SCHEME_V = &ssc; 5908 scheme *const SCHEME_V = &ssc;
6268# else 5909# else
6269# endif 5910# endif

Diff Legend

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