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

Diff Legend

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