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

Comparing microscheme/scheme.c (file contents):
Revision 1.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC

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

Diff Legend

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