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

Diff Legend

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