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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.31 by root, Sat Nov 28 10:54:41 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
… …
1202 1169
1203/* returns the new symbol */ 1170/* returns the new symbol */
1204static pointer 1171static pointer
1205oblist_add_by_name (SCHEME_P_ const char *name) 1172oblist_add_by_name (SCHEME_P_ const char *name)
1206{ 1173{
1207 pointer x; 1174 pointer x = mk_string (SCHEME_A_ name);
1208
1209 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1210 set_typeflag (x, T_SYMBOL); 1175 set_typeflag (x, T_SYMBOL);
1211 setimmutable (car (x)); 1176 setimmutable (x);
1212 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1177 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1213 return x; 1178 return x;
1214} 1179}
1215 1180
1216static pointer 1181static pointer
… …
1249mk_character (SCHEME_P_ int c) 1214mk_character (SCHEME_P_ int c)
1250{ 1215{
1251 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1216 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1252 1217
1253 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1218 set_typeflag (x, (T_CHARACTER | T_ATOM));
1254 ivalue_unchecked (x) = c & 0xff; 1219 set_ivalue (x, c & 0xff);
1255 set_num_integer (x); 1220
1256 return x; 1221 return x;
1257} 1222}
1258 1223
1259/* get number atom (integer) */ 1224/* get number atom (integer) */
1260INTERFACE pointer 1225INTERFACE pointer
1261mk_integer (SCHEME_P_ long num) 1226mk_integer (SCHEME_P_ long n)
1262{ 1227{
1263 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1264 1229
1265 set_typeflag (x, (T_NUMBER | T_ATOM)); 1230 set_typeflag (x, (T_INTEGER | T_ATOM));
1266 ivalue_unchecked (x) = num; 1231 set_ivalue (x, n);
1267 set_num_integer (x); 1232
1268 return x; 1233 return x;
1269} 1234}
1270 1235
1271INTERFACE pointer 1236INTERFACE pointer
1272mk_real (SCHEME_P_ RVALUE n) 1237mk_real (SCHEME_P_ RVALUE n)
1273{ 1238{
1239#if USE_REAL
1274 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1240 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1275 1241
1276 set_typeflag (x, (T_NUMBER | T_ATOM)); 1242 set_typeflag (x, (T_REAL | T_ATOM));
1277 rvalue_unchecked (x) = n; 1243 set_rvalue (x, n);
1278 set_num_real (x); 1244
1279 return x; 1245 return x;
1246#else
1247 return mk_integer (SCHEME_A_ n);
1248#endif
1280} 1249}
1281 1250
1282static pointer 1251static pointer
1283mk_number (SCHEME_P_ const num n) 1252mk_number (SCHEME_P_ const num n)
1284{ 1253{
1254#if USE_REAL
1285 if (num_is_fixnum (n)) 1255 return num_is_fixnum (n)
1256 ? mk_integer (SCHEME_A_ num_ivalue (n))
1257 : mk_real (SCHEME_A_ num_rvalue (n));
1258#else
1286 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1259 return mk_integer (SCHEME_A_ num_ivalue (n));
1287 else 1260#endif
1288 return mk_real (SCHEME_A_ num_get_rvalue (n));
1289} 1261}
1290 1262
1291/* allocate name to string area */ 1263/* allocate name to string area */
1292static char * 1264static char *
1293store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1265store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1317 } 1289 }
1318 1290
1319 return q; 1291 return q;
1320} 1292}
1321 1293
1322/* get new string */
1323INTERFACE pointer 1294INTERFACE pointer
1324mk_string (SCHEME_P_ const char *str) 1295mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1325{ 1296{
1326 return mk_counted_string (SCHEME_A_ str, strlen (str)); 1297 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1298
1299 set_typeflag (x, T_STRING | T_ATOM);
1300 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1301 strlength (x) = len;
1302 return x;
1327} 1303}
1328 1304
1329INTERFACE pointer 1305INTERFACE pointer
1330mk_counted_string (SCHEME_P_ const char *str, uint32_t len) 1306mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1331{ 1307{
… …
1336 strlength (x) = len; 1312 strlength (x) = len;
1337 return x; 1313 return x;
1338} 1314}
1339 1315
1340INTERFACE pointer 1316INTERFACE pointer
1341mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1317mk_string (SCHEME_P_ const char *str)
1342{ 1318{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1319 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} 1320}
1350 1321
1351INTERFACE pointer 1322INTERFACE pointer
1352mk_vector (SCHEME_P_ uint32_t len) 1323mk_vector (SCHEME_P_ uint32_t len)
1353{ 1324{
1354 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1355} 1326}
1356 1327
1357INTERFACE void 1328INTERFACE void
1358fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1359{ 1330{
1360 int i; 1331 int i;
1361 1332
1362 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1363 vec->object.vector.vvalue[i] = obj; 1334 vecvalue (vec)[i] = obj;
1364} 1335}
1365 1336
1366INTERFACE pointer 1337INTERFACE pointer
1367vector_elem (pointer vec, uint32_t ielem) 1338vector_get (pointer vec, uint32_t ielem)
1368{ 1339{
1369 return vec->object.vector.vvalue[ielem]; 1340 return vecvalue(vec)[ielem];
1370} 1341}
1371 1342
1372INTERFACE void 1343INTERFACE void
1373set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1344vector_set (pointer vec, uint32_t ielem, pointer a)
1374{ 1345{
1375 vec->object.vector.vvalue[ielem] = a; 1346 vecvalue(vec)[ielem] = a;
1376} 1347}
1377 1348
1378/* get new symbol */ 1349/* get new symbol */
1379INTERFACE pointer 1350INTERFACE pointer
1380mk_symbol (SCHEME_P_ const char *name) 1351mk_symbol (SCHEME_P_ const char *name)
… …
1390 1361
1391INTERFACE pointer 1362INTERFACE pointer
1392gensym (SCHEME_P) 1363gensym (SCHEME_P)
1393{ 1364{
1394 pointer x; 1365 pointer x;
1395 char name[40];
1396 1366
1397 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++) 1367 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1398 { 1368 {
1399 strcpy (name, "gensym-"); 1369 char name[40] = "gensym-";
1400 xnum (name + 7, SCHEME_V->gensym_cnt); 1370 xnum (name + 7, SCHEME_V->gensym_cnt);
1401 1371
1402 /* first check oblist */ 1372 /* first check oblist */
1403 x = oblist_find_by_name (SCHEME_A_ name); 1373 x = oblist_find_by_name (SCHEME_A_ name);
1404 1374
1405 if (x != NIL) 1375 if (x == NIL)
1406 continue;
1407 else
1408 { 1376 {
1409 x = oblist_add_by_name (SCHEME_A_ name); 1377 x = oblist_add_by_name (SCHEME_A_ name);
1410 return x; 1378 return x;
1411 } 1379 }
1412 } 1380 }
… …
1421 char c, *p; 1389 char c, *p;
1422 int has_dec_point = 0; 1390 int has_dec_point = 0;
1423 int has_fp_exp = 0; 1391 int has_fp_exp = 0;
1424 1392
1425#if USE_COLON_HOOK 1393#if USE_COLON_HOOK
1426
1427 if ((p = strstr (q, "::")) != 0) 1394 if ((p = strstr (q, "::")) != 0)
1428 { 1395 {
1429 *p = 0; 1396 *p = 0;
1430 return cons (SCHEME_V->COLON_HOOK, 1397 return cons (SCHEME_V->COLON_HOOK,
1431 cons (cons (SCHEME_V->QUOTE, 1398 cons (cons (SCHEME_V->QUOTE,
1432 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1399 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1433 } 1400 }
1434
1435#endif 1401#endif
1436 1402
1437 p = q; 1403 p = q;
1438 c = *p++; 1404 c = *p++;
1439 1405
… …
1475 } 1441 }
1476 else if ((c == 'e') || (c == 'E')) 1442 else if ((c == 'e') || (c == 'E'))
1477 { 1443 {
1478 if (!has_fp_exp) 1444 if (!has_fp_exp)
1479 { 1445 {
1480 has_dec_point = 1; /* decimal point illegal 1446 has_dec_point = 1; /* decimal point illegal from now on */
1481 from now on */
1482 p++; 1447 p++;
1483 1448
1484 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1449 if ((*p == '-') || (*p == '+') || isdigit (*p))
1485 continue; 1450 continue;
1486 } 1451 }
… …
1488 1453
1489 return mk_symbol (SCHEME_A_ strlwr (q)); 1454 return mk_symbol (SCHEME_A_ strlwr (q));
1490 } 1455 }
1491 } 1456 }
1492 1457
1493#if USE_FLOAT 1458#if USE_REAL
1494 if (has_dec_point) 1459 if (has_dec_point)
1495 return mk_real (SCHEME_A_ atof (q)); 1460 return mk_real (SCHEME_A_ atof (q));
1496#endif 1461#endif
1497 1462
1498 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1463 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1500 1465
1501/* make constant */ 1466/* make constant */
1502static pointer 1467static pointer
1503mk_sharp_const (SCHEME_P_ char *name) 1468mk_sharp_const (SCHEME_P_ char *name)
1504{ 1469{
1505 long x;
1506 char tmp[STRBUFFSIZE];
1507
1508 if (!strcmp (name, "t")) 1470 if (!strcmp (name, "t"))
1509 return S_T; 1471 return S_T;
1510 else if (!strcmp (name, "f")) 1472 else if (!strcmp (name, "f"))
1511 return S_F; 1473 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) */ 1474 else if (*name == '\\') /* #\w (character) */
1533 { 1475 {
1534 int c = 0; 1476 int c;
1535 1477
1536 if (stricmp (name + 1, "space") == 0) 1478 if (stricmp (name + 1, "space") == 0)
1537 c = ' '; 1479 c = ' ';
1538 else if (stricmp (name + 1, "newline") == 0) 1480 else if (stricmp (name + 1, "newline") == 0)
1539 c = '\n'; 1481 c = '\n';
… …
1541 c = '\r'; 1483 c = '\r';
1542 else if (stricmp (name + 1, "tab") == 0) 1484 else if (stricmp (name + 1, "tab") == 0)
1543 c = '\t'; 1485 c = '\t';
1544 else if (name[1] == 'x' && name[2] != 0) 1486 else if (name[1] == 'x' && name[2] != 0)
1545 { 1487 {
1546 int c1 = strtol (name + 2, 0, 16); 1488 long c1 = strtol (name + 2, 0, 16);
1547 1489
1548 if (c1 <= UCHAR_MAX) 1490 if (0 <= c1 && c1 <= UCHAR_MAX)
1549 c = c1; 1491 c = c1;
1550 else 1492 else
1551 return NIL; 1493 return NIL;
1552 1494 }
1553#if USE_ASCII_NAMES 1495#if USE_ASCII_NAMES
1554 }
1555 else if (is_ascii_name (name + 1, &c)) 1496 else if (is_ascii_name (name + 1, &c))
1556 {
1557 /* nothing */ 1497 /* nothing */;
1558#endif 1498#endif
1559 }
1560 else if (name[2] == 0) 1499 else if (name[2] == 0)
1561 c = name[1]; 1500 c = name[1];
1562 else 1501 else
1563 return NIL; 1502 return NIL;
1564 1503
1565 return mk_character (SCHEME_A_ c); 1504 return mk_character (SCHEME_A_ c);
1566 } 1505 }
1567 else 1506 else
1507 {
1508 /* identify base by string index */
1509 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1510 char *base = strchr (baseidx, *name);
1511
1512 if (base)
1513 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1514
1568 return NIL; 1515 return NIL;
1516 }
1569} 1517}
1570 1518
1571/* ========== garbage collector ========== */ 1519/* ========== garbage collector ========== */
1572 1520
1573/*-- 1521/*--
1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1522 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1523 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1576 * for marking. 1524 * for marking.
1525 *
1526 * The exception is vectors - vectors are currently marked recursively,
1527 * which is inherited form tinyscheme and could be fixed by having another
1528 * word of context in the vector
1577 */ 1529 */
1578static void 1530static void
1579mark (pointer a) 1531mark (pointer a)
1580{ 1532{
1581 pointer t, q, p; 1533 pointer t, q, p;
… …
1583 t = 0; 1535 t = 0;
1584 p = a; 1536 p = a;
1585E2: 1537E2:
1586 setmark (p); 1538 setmark (p);
1587 1539
1588 if (is_vector (p)) 1540 if (ecb_expect_false (is_vector (p)))
1589 { 1541 {
1590 int i; 1542 int i;
1591 1543
1592 for (i = 0; i < p->object.vector.length; i++) 1544 for (i = 0; i < veclength (p); i++)
1593 mark (p->object.vector.vvalue[i]); 1545 mark (vecvalue (p)[i]);
1594 } 1546 }
1595 1547
1596 if (is_atom (p)) 1548 if (is_atom (p))
1597 goto E6; 1549 goto E6;
1598 1550
… …
1695 if (is_mark (p)) 1647 if (is_mark (p))
1696 clrmark (p); 1648 clrmark (p);
1697 else 1649 else
1698 { 1650 {
1699 /* reclaim cell */ 1651 /* reclaim cell */
1700 if (typeflag (p) != T_FREE) 1652 if (typeflag (p) != T_PAIR)
1701 { 1653 {
1702 finalize_cell (SCHEME_A_ p); 1654 finalize_cell (SCHEME_A_ p);
1703 set_typeflag (p, T_FREE); 1655 set_typeflag (p, T_PAIR);
1704 set_car (p, NIL); 1656 set_car (p, NIL);
1705 } 1657 }
1706 1658
1707 ++SCHEME_V->fcells; 1659 ++SCHEME_V->fcells;
1708 set_cdr (p, SCHEME_V->free_cell); 1660 set_cdr (p, SCHEME_V->free_cell);
… …
1710 } 1662 }
1711 } 1663 }
1712 } 1664 }
1713 1665
1714 if (SCHEME_V->gc_verbose) 1666 if (SCHEME_V->gc_verbose)
1667 {
1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1668 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1669 }
1716} 1670}
1717 1671
1718static void 1672static void
1719finalize_cell (SCHEME_P_ pointer a) 1673finalize_cell (SCHEME_P_ pointer a)
1720{ 1674{
1675 /* TODO, fast bitmap check? */
1721 if (is_string (a)) 1676 if (is_string (a))
1722 free (strvalue (a)); 1677 free (strvalue (a));
1723 else if (is_vector (a)) 1678 else if (is_vector (a))
1724 free (a->object.vector.vvalue); 1679 free (vecvalue (a));
1725#if USE_PORTS 1680#if USE_PORTS
1726 else if (is_port (a)) 1681 else if (is_port (a))
1727 { 1682 {
1728 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1683 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1729 port_close (SCHEME_A_ a, port_input | port_output); 1684 port_close (SCHEME_A_ a, port_input | port_output);
… …
2306 } 2261 }
2307 } 2262 }
2308} 2263}
2309 2264
2310/* check c is in chars */ 2265/* check c is in chars */
2311static INLINE int 2266ecb_inline int
2312is_one_of (char *s, int c) 2267is_one_of (char *s, int c)
2313{ 2268{
2314 if (c == EOF) 2269 if (c == EOF)
2315 return 1; 2270 return 1;
2316 2271
2317 return !!strchr (s, c); 2272 return !!strchr (s, c);
2318} 2273}
2319 2274
2320/* skip white characters */ 2275/* skip white characters */
2321static INLINE int 2276ecb_inline int
2322skipspace (SCHEME_P) 2277skipspace (SCHEME_P)
2323{ 2278{
2324 int c, curr_line = 0; 2279 int c, curr_line = 0;
2325 2280
2326 do 2281 do
… …
2554 { 2509 {
2555 p = SCHEME_V->strbuff; 2510 p = SCHEME_V->strbuff;
2556 2511
2557 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2512 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2558 { 2513 {
2559 if (num_is_integer (l)) 2514 if (is_integer (l))
2560 xnum (p, ivalue_unchecked (l)); 2515 xnum (p, ivalue_unchecked (l));
2561#if USE_FLOAT 2516#if USE_REAL
2562 else 2517 else
2563 { 2518 {
2564 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2519 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2565 /* r5rs says there must be a '.' (unless 'e'?) */ 2520 /* r5rs says there must be a '.' (unless 'e'?) */
2566 f = strcspn (p, ".e"); 2521 f = strcspn (p, ".e");
… …
2819 return 0; 2774 return 0;
2820 } 2775 }
2821 else if (is_number (a)) 2776 else if (is_number (a))
2822 { 2777 {
2823 if (is_number (b)) 2778 if (is_number (b))
2824 if (num_is_integer (a) == num_is_integer (b))
2825 return num_eq (nvalue (a), nvalue (b)); 2779 return num_cmp (nvalue (a), nvalue (b)) == 0;
2826 2780
2827 return 0; 2781 return 0;
2828 } 2782 }
2829 else if (is_character (a)) 2783 else if (is_character (a))
2830 { 2784 {
… …
2897 2851
2898 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2852 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2899 setenvironment (SCHEME_V->envir); 2853 setenvironment (SCHEME_V->envir);
2900} 2854}
2901 2855
2902static INLINE void 2856static uint32_t
2857sym_hash (pointer sym, uint32_t size)
2858{
2859 uintptr_t ptr = (uintptr_t)sym;
2860
2861#if 0
2862 /* tqable size is prime, so why mix */
2863 ptr += ptr >> 32;
2864 ptr += ptr >> 16;
2865 ptr += ptr >> 8;
2866#endif
2867
2868 return ptr % size;
2869}
2870
2871ecb_inline void
2903new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2872new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2904{ 2873{
2905 pointer slot = immutable_cons (variable, value); 2874 pointer slot = immutable_cons (variable, value);
2906 2875
2907 if (is_vector (car (env))) 2876 if (is_vector (car (env)))
2908 { 2877 {
2909 int location = hash_fn (symname (variable), vector_length (car (env))); 2878 int location = sym_hash (variable, veclength (car (env)));
2910
2911 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2879 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2912 } 2880 }
2913 else 2881 else
2914 set_car (env, immutable_cons (slot, car (env))); 2882 set_car (env, immutable_cons (slot, car (env)));
2915} 2883}
2916 2884
2917static pointer 2885static pointer
2918find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2886find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2919{ 2887{
2920 pointer x, y; 2888 pointer x, y;
2921 int location;
2922 2889
2923 for (x = env; x != NIL; x = cdr (x)) 2890 for (x = env; x != NIL; x = cdr (x))
2924 { 2891 {
2925 if (is_vector (car (x))) 2892 if (is_vector (car (x)))
2926 { 2893 {
2927 location = hash_fn (symname (hdl), vector_length (car (x))); 2894 int location = sym_hash (hdl, veclength (car (x)));
2928 y = vector_elem (car (x), location); 2895 y = vector_get (car (x), location);
2929 } 2896 }
2930 else 2897 else
2931 y = car (x); 2898 y = car (x);
2932 2899
2933 for (; y != NIL; y = cdr (y)) 2900 for (; y != NIL; y = cdr (y))
2934 if (caar (y) == hdl) 2901 if (caar (y) == hdl)
2935 break; 2902 break;
2936 2903
2937 if (y != NIL) 2904 if (y != NIL)
2905 return car (y);
2906
2907 if (!all)
2938 break; 2908 break;
2939
2940 if (!all)
2941 return NIL;
2942 } 2909 }
2943
2944 if (x != NIL)
2945 return car (y);
2946 2910
2947 return NIL; 2911 return NIL;
2948} 2912}
2949 2913
2950#else /* USE_ALIST_ENV */ 2914#else /* USE_ALIST_ENV */
2951 2915
2952static INLINE void 2916ecb_inline void
2953new_frame_in_env (SCHEME_P_ pointer old_env) 2917new_frame_in_env (SCHEME_P_ pointer old_env)
2954{ 2918{
2955 SCHEME_V->envir = immutable_cons (NIL, old_env); 2919 SCHEME_V->envir = immutable_cons (NIL, old_env);
2956 setenvironment (SCHEME_V->envir); 2920 setenvironment (SCHEME_V->envir);
2957} 2921}
2958 2922
2959static INLINE void 2923ecb_inline void
2960new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2924new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2961{ 2925{
2962 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2926 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2963} 2927}
2964 2928
… …
2986 return NIL; 2950 return NIL;
2987} 2951}
2988 2952
2989#endif /* USE_ALIST_ENV else */ 2953#endif /* USE_ALIST_ENV else */
2990 2954
2991static INLINE void 2955ecb_inline void
2992new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2956new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2993{ 2957{
2994 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2958 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2995} 2959}
2996 2960
2997static INLINE void 2961ecb_inline void
2998set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2962set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2999{ 2963{
3000 set_cdr (slot, value); 2964 set_cdr (slot, value);
3001} 2965}
3002 2966
3003static INLINE pointer 2967ecb_inline pointer
3004slot_value_in_env (pointer slot) 2968slot_value_in_env (pointer slot)
3005{ 2969{
3006 return cdr (slot); 2970 return cdr (slot);
3007} 2971}
3008 2972
3009/* ========== Evaluation Cycle ========== */ 2973/* ========== Evaluation Cycle ========== */
3010 2974
3011static pointer 2975static int
3012xError_1 (SCHEME_P_ const char *s, pointer a) 2976xError_1 (SCHEME_P_ const char *s, pointer a)
3013{ 2977{
3014#if USE_ERROR_HOOK 2978#if USE_ERROR_HOOK
3015 pointer x; 2979 pointer x;
3016 pointer hdl = SCHEME_V->ERROR_HOOK; 2980 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3042#if USE_ERROR_HOOK 3006#if USE_ERROR_HOOK
3043 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 3007 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3044 3008
3045 if (x != NIL) 3009 if (x != NIL)
3046 { 3010 {
3047 if (a) 3011 pointer code = a
3048 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 3012 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3049 else 3013 : NIL;
3050 SCHEME_V->code = NIL;
3051 3014
3052 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 3015 code = cons (mk_string (SCHEME_A_ s), code);
3053 setimmutable (car (SCHEME_V->code)); 3016 setimmutable (car (code));
3054 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 3017 SCHEME_V->code = cons (slot_value_in_env (x), code);
3055 SCHEME_V->op = OP_EVAL; 3018 SCHEME_V->op = OP_EVAL;
3056 3019
3057 return S_T; 3020 return 0;
3058 } 3021 }
3059#endif 3022#endif
3060 3023
3061 if (a) 3024 if (a)
3062 SCHEME_V->args = cons (a, NIL); 3025 SCHEME_V->args = cons (a, NIL);
… …
3064 SCHEME_V->args = NIL; 3027 SCHEME_V->args = NIL;
3065 3028
3066 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3029 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3067 setimmutable (car (SCHEME_V->args)); 3030 setimmutable (car (SCHEME_V->args));
3068 SCHEME_V->op = OP_ERR0; 3031 SCHEME_V->op = OP_ERR0;
3032
3069 return S_T; 3033 return 0;
3070} 3034}
3071 3035
3072#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3036#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3073#define Error_0(s) Error_1 (s, 0) 3037#define Error_0(s) Error_1 (s, 0)
3074 3038
3075/* Too small to turn into function */ 3039/* Too small to turn into function */
3076#define BEGIN do { 3040#define BEGIN do {
3077#define END } while (0) 3041#define END } while (0)
3078#define s_goto(a) BEGIN \ 3042#define s_goto(a) BEGIN \
3079 SCHEME_V->op = a; \ 3043 SCHEME_V->op = a; \
3080 return S_T; END 3044 return 0; END
3081 3045
3082#define s_return(a) return xs_return (SCHEME_A_ a) 3046#define s_return(a) return xs_return (SCHEME_A_ a)
3083 3047
3084#ifndef USE_SCHEME_STACK 3048#ifndef USE_SCHEME_STACK
3085 3049
… …
3110 next_frame = SCHEME_V->dump_base + nframes; 3074 next_frame = SCHEME_V->dump_base + nframes;
3111 3075
3112 next_frame->op = op; 3076 next_frame->op = op;
3113 next_frame->args = args; 3077 next_frame->args = args;
3114 next_frame->envir = SCHEME_V->envir; 3078 next_frame->envir = SCHEME_V->envir;
3115 next_frame->code = code; 3079 next_frame->code = code;
3116 3080
3117 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3081 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3118} 3082}
3119 3083
3120static pointer 3084static int
3121xs_return (SCHEME_P_ pointer a) 3085xs_return (SCHEME_P_ pointer a)
3122{ 3086{
3123 int nframes = (uintptr_t)SCHEME_V->dump; 3087 int nframes = (uintptr_t)SCHEME_V->dump;
3124 struct dump_stack_frame *frame; 3088 struct dump_stack_frame *frame;
3125 3089
3126 SCHEME_V->value = a; 3090 SCHEME_V->value = a;
3127 3091
3128 if (nframes <= 0) 3092 if (nframes <= 0)
3129 return NIL; 3093 return -1;
3130 3094
3131 frame = &SCHEME_V->dump_base[--nframes]; 3095 frame = &SCHEME_V->dump_base[--nframes];
3132 SCHEME_V->op = frame->op; 3096 SCHEME_V->op = frame->op;
3133 SCHEME_V->args = frame->args; 3097 SCHEME_V->args = frame->args;
3134 SCHEME_V->envir = frame->envir; 3098 SCHEME_V->envir = frame->envir;
3135 SCHEME_V->code = frame->code; 3099 SCHEME_V->code = frame->code;
3136 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3100 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3137 3101
3138 return S_T; 3102 return 0;
3139} 3103}
3140 3104
3141static INLINE void 3105ecb_inline void
3142dump_stack_reset (SCHEME_P) 3106dump_stack_reset (SCHEME_P)
3143{ 3107{
3144 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3108 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3145 SCHEME_V->dump = (pointer)+0; 3109 SCHEME_V->dump = (pointer)+0;
3146} 3110}
3147 3111
3148static INLINE void 3112ecb_inline void
3149dump_stack_initialize (SCHEME_P) 3113dump_stack_initialize (SCHEME_P)
3150{ 3114{
3151 SCHEME_V->dump_size = 0; 3115 SCHEME_V->dump_size = 0;
3152 SCHEME_V->dump_base = 0; 3116 SCHEME_V->dump_base = 0;
3153 dump_stack_reset (SCHEME_A); 3117 dump_stack_reset (SCHEME_A);
… …
3206 int i = 0; 3170 int i = 0;
3207 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3171 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3208 3172
3209 while (cont != NIL) 3173 while (cont != NIL)
3210 { 3174 {
3211 frame->op = ivalue (car (cont)); cont = cdr (cont); 3175 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3212 frame->args = car (cont) ; cont = cdr (cont); 3176 frame->args = car (cont) ; cont = cdr (cont);
3213 frame->envir = car (cont) ; cont = cdr (cont); 3177 frame->envir = car (cont) ; cont = cdr (cont);
3214 frame->code = car (cont) ; cont = cdr (cont); 3178 frame->code = car (cont) ; cont = cdr (cont);
3215 3179
3216 ++frame; 3180 ++frame;
3217 ++i; 3181 ++i;
3218 } 3182 }
3219 3183
3220 SCHEME_V->dump = (pointer)(uintptr_t)i; 3184 SCHEME_V->dump = (pointer)(uintptr_t)i;
3221} 3185}
3222 3186
3223#else 3187#else
3224 3188
3225static INLINE void 3189ecb_inline void
3226dump_stack_reset (SCHEME_P) 3190dump_stack_reset (SCHEME_P)
3227{ 3191{
3228 SCHEME_V->dump = NIL; 3192 SCHEME_V->dump = NIL;
3229} 3193}
3230 3194
3231static INLINE void 3195ecb_inline void
3232dump_stack_initialize (SCHEME_P) 3196dump_stack_initialize (SCHEME_P)
3233{ 3197{
3234 dump_stack_reset (SCHEME_A); 3198 dump_stack_reset (SCHEME_A);
3235} 3199}
3236 3200
… …
3238dump_stack_free (SCHEME_P) 3202dump_stack_free (SCHEME_P)
3239{ 3203{
3240 SCHEME_V->dump = NIL; 3204 SCHEME_V->dump = NIL;
3241} 3205}
3242 3206
3243static pointer 3207static int
3244xs_return (SCHEME_P_ pointer a) 3208xs_return (SCHEME_P_ pointer a)
3245{ 3209{
3246 pointer dump = SCHEME_V->dump; 3210 pointer dump = SCHEME_V->dump;
3247 3211
3248 SCHEME_V->value = a; 3212 SCHEME_V->value = a;
3249 3213
3250 if (dump == NIL) 3214 if (dump == NIL)
3251 return NIL; 3215 return -1;
3252 3216
3253 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3217 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3254 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3218 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3255 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3219 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3256 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3220 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3257 3221
3258 SCHEME_V->dump = dump; 3222 SCHEME_V->dump = dump;
3259 3223
3260 return S_T; 3224 return 0;
3261} 3225}
3262 3226
3263static void 3227static void
3264s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3228s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3265{ 3229{
… …
3290 3254
3291#endif 3255#endif
3292 3256
3293#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3257#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3294 3258
3295static pointer 3259static int
3296opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3260opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3297{ 3261{
3262 pointer args = SCHEME_V->args;
3298 pointer x, y; 3263 pointer x, y;
3299 3264
3300 switch (op) 3265 switch (op)
3301 { 3266 {
3302 case OP_LOAD: /* load */ 3267 case OP_LOAD: /* load */
3303 if (file_interactive (SCHEME_A)) 3268 if (file_interactive (SCHEME_A))
3304 { 3269 {
3305 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3270 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))); 3271 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3307 } 3272 }
3308 3273
3309 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3274 if (!file_push (SCHEME_A_ strvalue (car (args))))
3310 Error_1 ("unable to open", car (SCHEME_V->args)); 3275 Error_1 ("unable to open", car (args));
3311 else 3276 else
3312 { 3277 {
3313 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3278 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3314 s_goto (OP_T0LVL); 3279 s_goto (OP_T0LVL);
3315 } 3280 }
… …
3350 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3315 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3351 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3316 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3352 s_goto (OP_READ_INTERNAL); 3317 s_goto (OP_READ_INTERNAL);
3353 3318
3354 case OP_T1LVL: /* top level */ 3319 case OP_T1LVL: /* top level */
3355 SCHEME_V->code = SCHEME_V->value; 3320 SCHEME_V->code = SCHEME_V->value;
3356 SCHEME_V->inport = SCHEME_V->save_inport; 3321 SCHEME_V->inport = SCHEME_V->save_inport;
3357 s_goto (OP_EVAL); 3322 s_goto (OP_EVAL);
3358 3323
3359 case OP_READ_INTERNAL: /* internal read */ 3324 case OP_READ_INTERNAL: /* internal read */
3360 SCHEME_V->tok = token (SCHEME_A); 3325 SCHEME_V->tok = token (SCHEME_A);
… …
3389 case OP_EVAL: /* main part of evaluation */ 3354 case OP_EVAL: /* main part of evaluation */
3390#if USE_TRACING 3355#if USE_TRACING
3391 if (SCHEME_V->tracing) 3356 if (SCHEME_V->tracing)
3392 { 3357 {
3393 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3358 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3394 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3359 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3395 SCHEME_V->args = SCHEME_V->code; 3360 SCHEME_V->args = SCHEME_V->code;
3396 putstr (SCHEME_A_ "\nEval: "); 3361 putstr (SCHEME_A_ "\nEval: ");
3397 s_goto (OP_P0LIST); 3362 s_goto (OP_P0LIST);
3398 } 3363 }
3399 3364
… …
3410 else 3375 else
3411 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3376 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3412 } 3377 }
3413 else if (is_pair (SCHEME_V->code)) 3378 else if (is_pair (SCHEME_V->code))
3414 { 3379 {
3380 x = car (SCHEME_V->code);
3381
3415 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3382 if (is_syntax (x)) /* SYNTAX */
3416 { 3383 {
3417 SCHEME_V->code = cdr (SCHEME_V->code); 3384 SCHEME_V->code = cdr (SCHEME_V->code);
3418 s_goto (syntaxnum (x)); 3385 s_goto (syntaxnum (x));
3419 } 3386 }
3420 else /* first, eval top element and eval arguments */ 3387 else /* first, eval top element and eval arguments */
3421 { 3388 {
3422 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3389 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)); */ 3390 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3424 SCHEME_V->code = car (SCHEME_V->code); 3391 SCHEME_V->code = x;
3425 s_goto (OP_EVAL); 3392 s_goto (OP_EVAL);
3426 } 3393 }
3427 } 3394 }
3428 else 3395 else
3429 s_return (SCHEME_V->code); 3396 s_return (SCHEME_V->code);
… …
3441 SCHEME_V->code = cdr (SCHEME_V->code); 3408 SCHEME_V->code = cdr (SCHEME_V->code);
3442 s_goto (OP_E1ARGS); 3409 s_goto (OP_E1ARGS);
3443 } 3410 }
3444 3411
3445 case OP_E1ARGS: /* eval arguments */ 3412 case OP_E1ARGS: /* eval arguments */
3446 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3413 args = cons (SCHEME_V->value, args);
3447 3414
3448 if (is_pair (SCHEME_V->code)) /* continue */ 3415 if (is_pair (SCHEME_V->code)) /* continue */
3449 { 3416 {
3450 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3417 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3451 SCHEME_V->code = car (SCHEME_V->code); 3418 SCHEME_V->code = car (SCHEME_V->code);
3452 SCHEME_V->args = NIL; 3419 SCHEME_V->args = NIL;
3453 s_goto (OP_EVAL); 3420 s_goto (OP_EVAL);
3454 } 3421 }
3455 else /* end */ 3422 else /* end */
3456 { 3423 {
3457 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3424 args = reverse_in_place (SCHEME_A_ NIL, args);
3458 SCHEME_V->code = car (SCHEME_V->args); 3425 SCHEME_V->code = car (args);
3459 SCHEME_V->args = cdr (SCHEME_V->args); 3426 SCHEME_V->args = cdr (args);
3460 s_goto (OP_APPLY); 3427 s_goto (OP_APPLY);
3461 } 3428 }
3462 3429
3463#if USE_TRACING 3430#if USE_TRACING
3464 3431
3465 case OP_TRACING: 3432 case OP_TRACING:
3466 { 3433 {
3467 int tr = SCHEME_V->tracing; 3434 int tr = SCHEME_V->tracing;
3468 3435
3469 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3436 SCHEME_V->tracing = ivalue_unchecked (car (args));
3470 s_return (mk_integer (SCHEME_A_ tr)); 3437 s_return (mk_integer (SCHEME_A_ tr));
3471 } 3438 }
3472 3439
3473#endif 3440#endif
3474 3441
3475 case OP_APPLY: /* apply 'code' to 'args' */ 3442 case OP_APPLY: /* apply 'code' to 'args' */
3476#if USE_TRACING 3443#if USE_TRACING
3477 if (SCHEME_V->tracing) 3444 if (SCHEME_V->tracing)
3478 { 3445 {
3479 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3446 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3480 SCHEME_V->print_flag = 1; 3447 SCHEME_V->print_flag = 1;
3481 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3448 /* args=cons(SCHEME_V->code,args); */
3482 putstr (SCHEME_A_ "\nApply to: "); 3449 putstr (SCHEME_A_ "\nApply to: ");
3483 s_goto (OP_P0LIST); 3450 s_goto (OP_P0LIST);
3484 } 3451 }
3485 3452
3486 /* fall through */ 3453 /* fall through */
3487 3454
3488 case OP_REAL_APPLY: 3455 case OP_REAL_APPLY:
3489#endif 3456#endif
3490 if (is_proc (SCHEME_V->code)) 3457 if (is_proc (SCHEME_V->code))
3491 {
3492 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3458 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3493 }
3494 else if (is_foreign (SCHEME_V->code)) 3459 else if (is_foreign (SCHEME_V->code))
3495 { 3460 {
3496 /* Keep nested calls from GC'ing the arglist */ 3461 /* Keep nested calls from GC'ing the arglist */
3497 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3462 push_recent_alloc (SCHEME_A_ args, NIL);
3498 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3463 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3499 3464
3500 s_return (x); 3465 s_return (x);
3501 } 3466 }
3502 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3467 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3503 { 3468 {
3504 /* Should not accept promise */ 3469 /* Should not accept promise */
3505 /* make environment */ 3470 /* make environment */
3506 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3471 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3507 3472
3508 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3473 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3509 { 3474 {
3510 if (y == NIL) 3475 if (y == NIL)
3511 Error_0 ("not enough arguments"); 3476 Error_0 ("not enough arguments");
3512 else 3477 else
3513 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3478 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3531 s_goto (OP_BEGIN); 3496 s_goto (OP_BEGIN);
3532 } 3497 }
3533 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3498 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3534 { 3499 {
3535 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3500 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3536 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3501 s_return (args != NIL ? car (args) : NIL);
3537 } 3502 }
3538 else 3503 else
3539 Error_0 ("illegal function"); 3504 Error_0 ("illegal function");
3540 3505
3541 case OP_DOMACRO: /* do macro */ 3506 case OP_DOMACRO: /* do macro */
… …
3550 { 3515 {
3551 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3516 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3552 3517
3553 if (f != NIL) 3518 if (f != NIL)
3554 { 3519 {
3555 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3520 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3556 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3521 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3557 SCHEME_V->code = slot_value_in_env (f); 3522 SCHEME_V->code = slot_value_in_env (f);
3558 s_goto (OP_APPLY); 3523 s_goto (OP_APPLY);
3559 } 3524 }
3560 3525
… …
3571 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3536 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3572 3537
3573#endif 3538#endif
3574 3539
3575 case OP_MKCLOSURE: /* make-closure */ 3540 case OP_MKCLOSURE: /* make-closure */
3576 x = car (SCHEME_V->args); 3541 x = car (args);
3577 3542
3578 if (car (x) == SCHEME_V->LAMBDA) 3543 if (car (x) == SCHEME_V->LAMBDA)
3579 x = cdr (x); 3544 x = cdr (x);
3580 3545
3581 if (cdr (SCHEME_V->args) == NIL) 3546 if (cdr (args) == NIL)
3582 y = SCHEME_V->envir; 3547 y = SCHEME_V->envir;
3583 else 3548 else
3584 y = cadr (SCHEME_V->args); 3549 y = cadr (args);
3585 3550
3586 s_return (mk_closure (SCHEME_A_ x, y)); 3551 s_return (mk_closure (SCHEME_A_ x, y));
3587 3552
3588 case OP_QUOTE: /* quote */ 3553 case OP_QUOTE: /* quote */
3589 s_return (car (SCHEME_V->code)); 3554 s_return (car (SCHEME_V->code));
… …
3621 3586
3622 3587
3623 case OP_DEFP: /* defined? */ 3588 case OP_DEFP: /* defined? */
3624 x = SCHEME_V->envir; 3589 x = SCHEME_V->envir;
3625 3590
3626 if (cdr (SCHEME_V->args) != NIL) 3591 if (cdr (args) != NIL)
3627 x = cadr (SCHEME_V->args); 3592 x = cadr (args);
3628 3593
3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3594 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3630 3595
3631 case OP_SET0: /* set! */ 3596 case OP_SET0: /* set! */
3632 if (is_immutable (car (SCHEME_V->code))) 3597 if (is_immutable (car (SCHEME_V->code)))
3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3598 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3634 3599
… …
3665 3630
3666 case OP_IF1: /* if */ 3631 case OP_IF1: /* if */
3667 if (is_true (SCHEME_V->value)) 3632 if (is_true (SCHEME_V->value))
3668 SCHEME_V->code = car (SCHEME_V->code); 3633 SCHEME_V->code = car (SCHEME_V->code);
3669 else 3634 else
3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3635 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3671
3672 * car(NIL) = NIL */
3673 s_goto (OP_EVAL); 3636 s_goto (OP_EVAL);
3674 3637
3675 case OP_LET0: /* let */ 3638 case OP_LET0: /* let */
3676 SCHEME_V->args = NIL; 3639 SCHEME_V->args = NIL;
3677 SCHEME_V->value = SCHEME_V->code; 3640 SCHEME_V->value = SCHEME_V->code;
3678 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3641 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3679 s_goto (OP_LET1); 3642 s_goto (OP_LET1);
3680 3643
3681 case OP_LET1: /* let (calculate parameters) */ 3644 case OP_LET1: /* let (calculate parameters) */
3682 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3645 args = cons (SCHEME_V->value, args);
3683 3646
3684 if (is_pair (SCHEME_V->code)) /* continue */ 3647 if (is_pair (SCHEME_V->code)) /* continue */
3685 { 3648 {
3686 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3649 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)); 3650 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3688 3651
3689 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3652 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3690 SCHEME_V->code = cadar (SCHEME_V->code); 3653 SCHEME_V->code = cadar (SCHEME_V->code);
3691 SCHEME_V->args = NIL; 3654 SCHEME_V->args = NIL;
3692 s_goto (OP_EVAL); 3655 s_goto (OP_EVAL);
3693 } 3656 }
3694 else /* end */ 3657 else /* end */
3695 { 3658 {
3696 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3659 args = reverse_in_place (SCHEME_A_ NIL, args);
3697 SCHEME_V->code = car (SCHEME_V->args); 3660 SCHEME_V->code = car (args);
3698 SCHEME_V->args = cdr (SCHEME_V->args); 3661 SCHEME_V->args = cdr (args);
3699 s_goto (OP_LET2); 3662 s_goto (OP_LET2);
3700 } 3663 }
3701 3664
3702 case OP_LET2: /* let */ 3665 case OP_LET2: /* let */
3703 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3666 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3704 3667
3705 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3668 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)) 3669 y != NIL; x = cdr (x), y = cdr (y))
3707 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3670 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3708 3671
3709 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3672 if (is_symbol (car (SCHEME_V->code))) /* named let */
3710 { 3673 {
3711 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3674 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3712 { 3675 {
3713 if (!is_pair (x)) 3676 if (!is_pair (x))
3714 Error_1 ("Bad syntax of binding in let :", x); 3677 Error_1 ("Bad syntax of binding in let :", x);
3715 3678
3716 if (!is_list (SCHEME_A_ car (x))) 3679 if (!is_list (SCHEME_A_ car (x)))
3717 Error_1 ("Bad syntax of binding in let :", car (x)); 3680 Error_1 ("Bad syntax of binding in let :", car (x));
3718 3681
3719 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3682 args = cons (caar (x), args);
3720 } 3683 }
3721 3684
3722 x =
3723 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3685 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3724 SCHEME_V->envir); 3686 SCHEME_V->envir);
3725 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3687 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3726 SCHEME_V->code = cddr (SCHEME_V->code); 3688 SCHEME_V->code = cddr (SCHEME_V->code);
3727 SCHEME_V->args = NIL;
3728 } 3689 }
3729 else 3690 else
3730 { 3691 {
3731 SCHEME_V->code = cdr (SCHEME_V->code); 3692 SCHEME_V->code = cdr (SCHEME_V->code);
3693 }
3694
3732 SCHEME_V->args = NIL; 3695 SCHEME_V->args = NIL;
3733 }
3734
3735 s_goto (OP_BEGIN); 3696 s_goto (OP_BEGIN);
3736 3697
3737 case OP_LET0AST: /* let* */ 3698 case OP_LET0AST: /* let* */
3738 if (car (SCHEME_V->code) == NIL) 3699 if (car (SCHEME_V->code) == NIL)
3739 { 3700 {
… …
3757 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3718 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3758 SCHEME_V->code = cdr (SCHEME_V->code); 3719 SCHEME_V->code = cdr (SCHEME_V->code);
3759 3720
3760 if (is_pair (SCHEME_V->code)) /* continue */ 3721 if (is_pair (SCHEME_V->code)) /* continue */
3761 { 3722 {
3762 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3723 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3763 SCHEME_V->code = cadar (SCHEME_V->code); 3724 SCHEME_V->code = cadar (SCHEME_V->code);
3764 SCHEME_V->args = NIL; 3725 SCHEME_V->args = NIL;
3765 s_goto (OP_EVAL); 3726 s_goto (OP_EVAL);
3766 } 3727 }
3767 else /* end */ 3728 else /* end */
3768 { 3729 {
3769 SCHEME_V->code = SCHEME_V->args; 3730 SCHEME_V->code = args;
3770 SCHEME_V->args = NIL; 3731 SCHEME_V->args = NIL;
3771 s_goto (OP_BEGIN); 3732 s_goto (OP_BEGIN);
3772 } 3733 }
3773 3734
3774 case OP_LET0REC: /* letrec */ 3735 case OP_LET0REC: /* letrec */
… …
3777 SCHEME_V->value = SCHEME_V->code; 3738 SCHEME_V->value = SCHEME_V->code;
3778 SCHEME_V->code = car (SCHEME_V->code); 3739 SCHEME_V->code = car (SCHEME_V->code);
3779 s_goto (OP_LET1REC); 3740 s_goto (OP_LET1REC);
3780 3741
3781 case OP_LET1REC: /* letrec (calculate parameters) */ 3742 case OP_LET1REC: /* letrec (calculate parameters) */
3782 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3743 args = cons (SCHEME_V->value, args);
3783 3744
3784 if (is_pair (SCHEME_V->code)) /* continue */ 3745 if (is_pair (SCHEME_V->code)) /* continue */
3785 { 3746 {
3786 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3747 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)); 3748 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3788 3749
3789 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3750 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3790 SCHEME_V->code = cadar (SCHEME_V->code); 3751 SCHEME_V->code = cadar (SCHEME_V->code);
3791 SCHEME_V->args = NIL; 3752 SCHEME_V->args = NIL;
3792 s_goto (OP_EVAL); 3753 s_goto (OP_EVAL);
3793 } 3754 }
3794 else /* end */ 3755 else /* end */
3795 { 3756 {
3796 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3757 args = reverse_in_place (SCHEME_A_ NIL, args);
3797 SCHEME_V->code = car (SCHEME_V->args); 3758 SCHEME_V->code = car (args);
3798 SCHEME_V->args = cdr (SCHEME_V->args); 3759 SCHEME_V->args = cdr (args);
3799 s_goto (OP_LET2REC); 3760 s_goto (OP_LET2REC);
3800 } 3761 }
3801 3762
3802 case OP_LET2REC: /* letrec */ 3763 case OP_LET2REC: /* letrec */
3803 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3764 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)); 3765 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3805 3766
3806 SCHEME_V->code = cdr (SCHEME_V->code); 3767 SCHEME_V->code = cdr (SCHEME_V->code);
3807 SCHEME_V->args = NIL; 3768 SCHEME_V->args = NIL;
3808 s_goto (OP_BEGIN); 3769 s_goto (OP_BEGIN);
… …
3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3855 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3895 SCHEME_V->code = car (SCHEME_V->code); 3856 SCHEME_V->code = car (SCHEME_V->code);
3896 s_goto (OP_EVAL); 3857 s_goto (OP_EVAL);
3897 3858
3898 case OP_C1STREAM: /* cons-stream */ 3859 case OP_C1STREAM: /* cons-stream */
3899 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3860 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); 3861 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3901 set_typeflag (x, T_PROMISE); 3862 set_typeflag (x, T_PROMISE);
3902 s_return (cons (SCHEME_V->args, x)); 3863 s_return (cons (args, x));
3903 3864
3904 case OP_MACRO0: /* macro */ 3865 case OP_MACRO0: /* macro */
3905 if (is_pair (car (SCHEME_V->code))) 3866 if (is_pair (car (SCHEME_V->code)))
3906 { 3867 {
3907 x = caar (SCHEME_V->code); 3868 x = caar (SCHEME_V->code);
… …
3940 { 3901 {
3941 if (!is_pair (y = caar (x))) 3902 if (!is_pair (y = caar (x)))
3942 break; 3903 break;
3943 3904
3944 for (; y != NIL; y = cdr (y)) 3905 for (; y != NIL; y = cdr (y))
3945 {
3946 if (eqv (car (y), SCHEME_V->value)) 3906 if (eqv (car (y), SCHEME_V->value))
3947 break; 3907 break;
3948 }
3949 3908
3950 if (y != NIL) 3909 if (y != NIL)
3951 break; 3910 break;
3952 } 3911 }
3953 3912
… …
3973 s_goto (OP_BEGIN); 3932 s_goto (OP_BEGIN);
3974 else 3933 else
3975 s_return (NIL); 3934 s_return (NIL);
3976 3935
3977 case OP_PAPPLY: /* apply */ 3936 case OP_PAPPLY: /* apply */
3978 SCHEME_V->code = car (SCHEME_V->args); 3937 SCHEME_V->code = car (args);
3979 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3938 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3980 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3939 /*SCHEME_V->args = cadr(args); */
3981 s_goto (OP_APPLY); 3940 s_goto (OP_APPLY);
3982 3941
3983 case OP_PEVAL: /* eval */ 3942 case OP_PEVAL: /* eval */
3984 if (cdr (SCHEME_V->args) != NIL) 3943 if (cdr (args) != NIL)
3985 SCHEME_V->envir = cadr (SCHEME_V->args); 3944 SCHEME_V->envir = cadr (args);
3986 3945
3987 SCHEME_V->code = car (SCHEME_V->args); 3946 SCHEME_V->code = car (args);
3988 s_goto (OP_EVAL); 3947 s_goto (OP_EVAL);
3989 3948
3990 case OP_CONTINUATION: /* call-with-current-continuation */ 3949 case OP_CONTINUATION: /* call-with-current-continuation */
3991 SCHEME_V->code = car (SCHEME_V->args); 3950 SCHEME_V->code = car (args);
3992 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3951 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3993 s_goto (OP_APPLY); 3952 s_goto (OP_APPLY);
3994 } 3953 }
3995 3954
3996 return S_T; 3955 if (USE_ERROR_CHECKING) abort ();
3997} 3956}
3998 3957
3999static pointer 3958static int
4000opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3959opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4001{ 3960{
4002 pointer x; 3961 pointer args = SCHEME_V->args;
3962 pointer x = car (args);
4003 num v; 3963 num v;
4004 3964
3965 switch (op)
3966 {
4005#if USE_MATH 3967#if USE_MATH
4006 RVALUE dd;
4007#endif
4008
4009 switch (op)
4010 {
4011#if USE_MATH
4012
4013 case OP_INEX2EX: /* inexact->exact */ 3968 case OP_INEX2EX: /* inexact->exact */
4014 x = car (SCHEME_V->args); 3969 {
4015
4016 if (num_is_integer (x)) 3970 if (is_integer (x))
4017 s_return (x); 3971 s_return (x);
4018 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3972
3973 RVALUE r = rvalue_unchecked (x);
3974
3975 if (r == (RVALUE)(IVALUE)r)
4019 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3976 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4020 else 3977 else
4021 Error_1 ("inexact->exact: not integral:", x); 3978 Error_1 ("inexact->exact: not integral:", x);
3979 }
4022 3980
4023 case OP_EXP:
4024 x = car (SCHEME_V->args);
4025 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3981 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)))); 3982 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)))); 3983 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)))); 3984 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)))); 3985 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)))); 3986 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)))); 3987 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4050 3988
4051 case OP_ATAN: 3989 case OP_ATAN:
4052 x = car (SCHEME_V->args);
4053
4054 if (cdr (SCHEME_V->args) == NIL) 3990 if (cdr (args) == NIL)
4055 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3991 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4056 else 3992 else
4057 { 3993 {
4058 pointer y = cadr (SCHEME_V->args); 3994 pointer y = cadr (args);
4059
4060 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3995 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4061 } 3996 }
4062 3997
4063 case OP_SQRT: 3998 case OP_SQRT:
4064 x = car (SCHEME_V->args);
4065 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3999 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4066 4000
4067 case OP_EXPT: 4001 case OP_EXPT:
4068 { 4002 {
4069 RVALUE result; 4003 RVALUE result;
4070 int real_result = 1; 4004 int real_result = 1;
4071 pointer y = cadr (SCHEME_V->args); 4005 pointer y = cadr (args);
4072 4006
4073 x = car (SCHEME_V->args);
4074
4075 if (num_is_integer (x) && num_is_integer (y)) 4007 if (is_integer (x) && is_integer (y))
4076 real_result = 0; 4008 real_result = 0;
4077 4009
4078 /* This 'if' is an R5RS compatibility fix. */ 4010 /* This 'if' is an R5RS compatibility fix. */
4079 /* NOTE: Remove this 'if' fix for R6RS. */ 4011 /* NOTE: Remove this 'if' fix for R6RS. */
4080 if (rvalue (x) == 0 && rvalue (y) < 0) 4012 if (rvalue (x) == 0 && rvalue (y) < 0)
4081 result = 0.0; 4013 result = 0;
4082 else 4014 else
4083 result = pow (rvalue (x), rvalue (y)); 4015 result = pow (rvalue (x), rvalue (y));
4084 4016
4085 /* Before returning integer result make sure we can. */ 4017 /* Before returning integer result make sure we can. */
4086 /* If the test fails, result is too big for integer. */ 4018 /* If the test fails, result is too big for integer. */
4087 if (!real_result) 4019 if (!real_result)
4088 { 4020 {
4089 long result_as_long = (long) result; 4021 long result_as_long = result;
4090 4022
4091 if (result != (RVALUE) result_as_long) 4023 if (result != result_as_long)
4092 real_result = 1; 4024 real_result = 1;
4093 } 4025 }
4094 4026
4095 if (real_result) 4027 if (real_result)
4096 s_return (mk_real (SCHEME_A_ result)); 4028 s_return (mk_real (SCHEME_A_ result));
4097 else 4029 else
4098 s_return (mk_integer (SCHEME_A_ result)); 4030 s_return (mk_integer (SCHEME_A_ result));
4099 } 4031 }
4100 4032
4101 case OP_FLOOR:
4102 x = car (SCHEME_V->args);
4103 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4033 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)))); 4034 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4108 4035
4109 case OP_TRUNCATE: 4036 case OP_TRUNCATE:
4110 { 4037 {
4111 RVALUE rvalue_of_x; 4038 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))); 4039 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 } 4040 }
4121 4041
4122 case OP_ROUND: 4042 case OP_ROUND:
4123 x = car (SCHEME_V->args);
4124
4125 if (num_is_integer (x)) 4043 if (is_integer (x))
4126 s_return (x); 4044 s_return (x);
4127 4045
4128 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4046 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4129#endif 4047#endif
4130 4048
4131 case OP_ADD: /* + */ 4049 case OP_ADD: /* + */
4132 v = num_zero; 4050 v = num_zero;
4133 4051
4134 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4052 for (x = args; x != NIL; x = cdr (x))
4135 v = num_add (v, nvalue (car (x))); 4053 v = num_op (NUM_ADD, v, nvalue (car (x)));
4136 4054
4137 s_return (mk_number (SCHEME_A_ v)); 4055 s_return (mk_number (SCHEME_A_ v));
4138 4056
4139 case OP_MUL: /* * */ 4057 case OP_MUL: /* * */
4140 v = num_one; 4058 v = num_one;
4141 4059
4142 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4060 for (x = args; x != NIL; x = cdr (x))
4143 v = num_mul (v, nvalue (car (x))); 4061 v = num_op (NUM_MUL, v, nvalue (car (x)));
4144 4062
4145 s_return (mk_number (SCHEME_A_ v)); 4063 s_return (mk_number (SCHEME_A_ v));
4146 4064
4147 case OP_SUB: /* - */ 4065 case OP_SUB: /* - */
4148 if (cdr (SCHEME_V->args) == NIL) 4066 if (cdr (args) == NIL)
4149 { 4067 {
4150 x = SCHEME_V->args; 4068 x = args;
4151 v = num_zero; 4069 v = num_zero;
4152 } 4070 }
4153 else 4071 else
4154 { 4072 {
4155 x = cdr (SCHEME_V->args); 4073 x = cdr (args);
4156 v = nvalue (car (SCHEME_V->args)); 4074 v = nvalue (car (args));
4157 } 4075 }
4158 4076
4159 for (; x != NIL; x = cdr (x)) 4077 for (; x != NIL; x = cdr (x))
4160 v = num_sub (v, nvalue (car (x))); 4078 v = num_op (NUM_SUB, v, nvalue (car (x)));
4161 4079
4162 s_return (mk_number (SCHEME_A_ v)); 4080 s_return (mk_number (SCHEME_A_ v));
4163 4081
4164 case OP_DIV: /* / */ 4082 case OP_DIV: /* / */
4165 if (cdr (SCHEME_V->args) == NIL) 4083 if (cdr (args) == NIL)
4166 { 4084 {
4167 x = SCHEME_V->args; 4085 x = args;
4168 v = num_one; 4086 v = num_one;
4169 } 4087 }
4170 else 4088 else
4171 { 4089 {
4172 x = cdr (SCHEME_V->args); 4090 x = cdr (args);
4173 v = nvalue (car (SCHEME_V->args)); 4091 v = nvalue (car (args));
4174 } 4092 }
4175 4093
4176 for (; x != NIL; x = cdr (x)) 4094 for (; x != NIL; x = cdr (x))
4177 {
4178 if (!is_zero_rvalue (rvalue (car (x)))) 4095 if (!is_zero_rvalue (rvalue (car (x))))
4179 v = num_div (v, nvalue (car (x))); 4096 v = num_div (v, nvalue (car (x)));
4180 else 4097 else
4181 Error_0 ("/: division by zero"); 4098 Error_0 ("/: division by zero");
4182 }
4183 4099
4184 s_return (mk_number (SCHEME_A_ v)); 4100 s_return (mk_number (SCHEME_A_ v));
4185 4101
4186 case OP_INTDIV: /* quotient */ 4102 case OP_INTDIV: /* quotient */
4187 if (cdr (SCHEME_V->args) == NIL) 4103 if (cdr (args) == NIL)
4188 { 4104 {
4189 x = SCHEME_V->args; 4105 x = args;
4190 v = num_one; 4106 v = num_one;
4191 } 4107 }
4192 else 4108 else
4193 { 4109 {
4194 x = cdr (SCHEME_V->args); 4110 x = cdr (args);
4195 v = nvalue (car (SCHEME_V->args)); 4111 v = nvalue (car (args));
4196 } 4112 }
4197 4113
4198 for (; x != NIL; x = cdr (x)) 4114 for (; x != NIL; x = cdr (x))
4199 { 4115 {
4200 if (ivalue (car (x)) != 0) 4116 if (ivalue (car (x)) != 0)
4201 v = num_intdiv (v, nvalue (car (x))); 4117 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4202 else 4118 else
4203 Error_0 ("quotient: division by zero"); 4119 Error_0 ("quotient: division by zero");
4204 } 4120 }
4205 4121
4206 s_return (mk_number (SCHEME_A_ v)); 4122 s_return (mk_number (SCHEME_A_ v));
4207 4123
4208 case OP_REM: /* remainder */ 4124 case OP_REM: /* remainder */
4209 v = nvalue (car (SCHEME_V->args)); 4125 v = nvalue (x);
4210 4126
4211 if (ivalue (cadr (SCHEME_V->args)) != 0) 4127 if (ivalue (cadr (args)) != 0)
4212 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4128 v = num_rem (v, nvalue (cadr (args)));
4213 else 4129 else
4214 Error_0 ("remainder: division by zero"); 4130 Error_0 ("remainder: division by zero");
4215 4131
4216 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4217 4133
4218 case OP_MOD: /* modulo */ 4134 case OP_MOD: /* modulo */
4219 v = nvalue (car (SCHEME_V->args)); 4135 v = nvalue (x);
4220 4136
4221 if (ivalue (cadr (SCHEME_V->args)) != 0) 4137 if (ivalue (cadr (args)) != 0)
4222 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4138 v = num_mod (v, nvalue (cadr (args)));
4223 else 4139 else
4224 Error_0 ("modulo: division by zero"); 4140 Error_0 ("modulo: division by zero");
4225 4141
4226 s_return (mk_number (SCHEME_A_ v)); 4142 s_return (mk_number (SCHEME_A_ v));
4227 4143
4228 case OP_CAR: /* car */ 4144 case OP_CAR: /* car */
4229 s_return (caar (SCHEME_V->args)); 4145 s_return (caar (args));
4230 4146
4231 case OP_CDR: /* cdr */ 4147 case OP_CDR: /* cdr */
4232 s_return (cdar (SCHEME_V->args)); 4148 s_return (cdar (args));
4233 4149
4234 case OP_CONS: /* cons */ 4150 case OP_CONS: /* cons */
4235 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4151 set_cdr (args, cadr (args));
4236 s_return (SCHEME_V->args); 4152 s_return (args);
4237 4153
4238 case OP_SETCAR: /* set-car! */ 4154 case OP_SETCAR: /* set-car! */
4239 if (!is_immutable (car (SCHEME_V->args))) 4155 if (!is_immutable (x))
4240 { 4156 {
4241 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4157 set_car (x, cadr (args));
4242 s_return (car (SCHEME_V->args)); 4158 s_return (car (args));
4243 } 4159 }
4244 else 4160 else
4245 Error_0 ("set-car!: unable to alter immutable pair"); 4161 Error_0 ("set-car!: unable to alter immutable pair");
4246 4162
4247 case OP_SETCDR: /* set-cdr! */ 4163 case OP_SETCDR: /* set-cdr! */
4248 if (!is_immutable (car (SCHEME_V->args))) 4164 if (!is_immutable (x))
4249 { 4165 {
4250 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4166 set_cdr (x, cadr (args));
4251 s_return (car (SCHEME_V->args)); 4167 s_return (car (args));
4252 } 4168 }
4253 else 4169 else
4254 Error_0 ("set-cdr!: unable to alter immutable pair"); 4170 Error_0 ("set-cdr!: unable to alter immutable pair");
4255 4171
4256 case OP_CHAR2INT: /* char->integer */ 4172 case OP_CHAR2INT: /* char->integer */
4257 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4173 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4258 4174
4259 case OP_INT2CHAR: /* integer->char */ 4175 case OP_INT2CHAR: /* integer->char */
4260 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4176 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4261 4177
4262 case OP_CHARUPCASE: 4178 case OP_CHARUPCASE:
4263 { 4179 {
4264 unsigned char c = ivalue (car (SCHEME_V->args)); 4180 unsigned char c = ivalue_unchecked (x);
4265 c = toupper (c); 4181 c = toupper (c);
4266 s_return (mk_character (SCHEME_A_ c)); 4182 s_return (mk_character (SCHEME_A_ c));
4267 } 4183 }
4268 4184
4269 case OP_CHARDNCASE: 4185 case OP_CHARDNCASE:
4270 { 4186 {
4271 unsigned char c = ivalue (car (SCHEME_V->args)); 4187 unsigned char c = ivalue_unchecked (x);
4272 c = tolower (c); 4188 c = tolower (c);
4273 s_return (mk_character (SCHEME_A_ c)); 4189 s_return (mk_character (SCHEME_A_ c));
4274 } 4190 }
4275 4191
4276 case OP_STR2SYM: /* string->symbol */ 4192 case OP_STR2SYM: /* string->symbol */
4277 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4193 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4278 4194
4279 case OP_STR2ATOM: /* string->atom */ 4195 case OP_STR2ATOM: /* string->atom */
4280 { 4196 {
4281 char *s = strvalue (car (SCHEME_V->args)); 4197 char *s = strvalue (x);
4282 long pf = 0; 4198 long pf = 0;
4283 4199
4284 if (cdr (SCHEME_V->args) != NIL) 4200 if (cdr (args) != NIL)
4285 { 4201 {
4286 /* we know cadr(SCHEME_V->args) is a natural number */ 4202 /* we know cadr(args) is a natural number */
4287 /* see if it is 2, 8, 10, or 16, or error */ 4203 /* see if it is 2, 8, 10, or 16, or error */
4288 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4204 pf = ivalue_unchecked (cadr (args));
4289 4205
4290 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4206 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4291 { 4207 {
4292 /* base is OK */ 4208 /* base is OK */
4293 } 4209 }
4294 else 4210 else
4295 pf = -1; 4211 pf = -1;
4296 } 4212 }
4297 4213
4298 if (pf < 0) 4214 if (pf < 0)
4299 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4215 Error_1 ("string->atom: bad base:", cadr (args));
4300 else if (*s == '#') /* no use of base! */ 4216 else if (*s == '#') /* no use of base! */
4301 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4217 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4302 else 4218 else
4303 { 4219 {
4304 if (pf == 0 || pf == 10) 4220 if (pf == 0 || pf == 10)
… …
4315 } 4231 }
4316 } 4232 }
4317 } 4233 }
4318 4234
4319 case OP_SYM2STR: /* symbol->string */ 4235 case OP_SYM2STR: /* symbol->string */
4320 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4236 x = mk_string (SCHEME_A_ symname (x));
4321 setimmutable (x); 4237 setimmutable (x);
4322 s_return (x); 4238 s_return (x);
4323 4239
4324 case OP_ATOM2STR: /* atom->string */ 4240 case OP_ATOM2STR: /* atom->string */
4325 { 4241 {
4326 long pf = 0; 4242 long pf = 0;
4327 4243
4328 x = car (SCHEME_V->args);
4329
4330 if (cdr (SCHEME_V->args) != NIL) 4244 if (cdr (args) != NIL)
4331 { 4245 {
4332 /* we know cadr(SCHEME_V->args) is a natural number */ 4246 /* we know cadr(args) is a natural number */
4333 /* see if it is 2, 8, 10, or 16, or error */ 4247 /* see if it is 2, 8, 10, or 16, or error */
4334 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4248 pf = ivalue_unchecked (cadr (args));
4335 4249
4336 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4250 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4337 { 4251 {
4338 /* base is OK */ 4252 /* base is OK */
4339 } 4253 }
4340 else 4254 else
4341 pf = -1; 4255 pf = -1;
4342 } 4256 }
4343 4257
4344 if (pf < 0) 4258 if (pf < 0)
4345 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4259 Error_1 ("atom->string: bad base:", cadr (args));
4346 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4260 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4347 { 4261 {
4348 char *p; 4262 char *p;
4349 int len; 4263 int len;
4350 4264
… …
4355 Error_1 ("atom->string: not an atom:", x); 4269 Error_1 ("atom->string: not an atom:", x);
4356 } 4270 }
4357 4271
4358 case OP_MKSTRING: /* make-string */ 4272 case OP_MKSTRING: /* make-string */
4359 { 4273 {
4360 int fill = ' '; 4274 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4361 int len; 4275 int len = ivalue_unchecked (x);
4362 4276
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)); 4277 s_return (mk_empty_string (SCHEME_A_ len, fill));
4369 } 4278 }
4370 4279
4371 case OP_STRLEN: /* string-length */ 4280 case OP_STRLEN: /* string-length */
4372 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4281 s_return (mk_integer (SCHEME_A_ strlength (x)));
4373 4282
4374 case OP_STRREF: /* string-ref */ 4283 case OP_STRREF: /* string-ref */
4375 { 4284 {
4376 char *str; 4285 char *str = strvalue (x);
4377 int index;
4378
4379 str = strvalue (car (SCHEME_V->args));
4380
4381 index = ivalue (cadr (SCHEME_V->args)); 4286 int index = ivalue_unchecked (cadr (args));
4382 4287
4383 if (index >= strlength (car (SCHEME_V->args))) 4288 if (index >= strlength (x))
4384 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4289 Error_1 ("string-ref: out of bounds:", cadr (args));
4385 4290
4386 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4291 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4387 } 4292 }
4388 4293
4389 case OP_STRSET: /* string-set! */ 4294 case OP_STRSET: /* string-set! */
4390 { 4295 {
4391 char *str; 4296 char *str = strvalue (x);
4392 int index; 4297 int index = ivalue_unchecked (cadr (args));
4393 int c; 4298 int c;
4394 4299
4395 if (is_immutable (car (SCHEME_V->args))) 4300 if (is_immutable (x))
4396 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4301 Error_1 ("string-set!: unable to alter immutable string:", x);
4397 4302
4398 str = strvalue (car (SCHEME_V->args));
4399
4400 index = ivalue (cadr (SCHEME_V->args));
4401
4402 if (index >= strlength (car (SCHEME_V->args))) 4303 if (index >= strlength (x))
4403 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4304 Error_1 ("string-set!: out of bounds:", cadr (args));
4404 4305
4405 c = charvalue (caddr (SCHEME_V->args)); 4306 c = charvalue (caddr (args));
4406 4307
4407 str[index] = (char) c; 4308 str[index] = c;
4408 s_return (car (SCHEME_V->args)); 4309 s_return (car (args));
4409 } 4310 }
4410 4311
4411 case OP_STRAPPEND: /* string-append */ 4312 case OP_STRAPPEND: /* string-append */
4412 { 4313 {
4413 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4314 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4414 int len = 0; 4315 int len = 0;
4415 pointer newstr; 4316 pointer newstr;
4416 char *pos; 4317 char *pos;
4417 4318
4418 /* compute needed length for new string */ 4319 /* compute needed length for new string */
4419 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4320 for (x = args; x != NIL; x = cdr (x))
4420 len += strlength (car (x)); 4321 len += strlength (car (x));
4421 4322
4422 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4323 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4423 4324
4424 /* store the contents of the argument strings into the new string */ 4325 /* 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)) 4326 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4426 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4327 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4427 4328
4428 s_return (newstr); 4329 s_return (newstr);
4429 } 4330 }
4430 4331
4431 case OP_SUBSTR: /* substring */ 4332 case OP_SUBSTR: /* substring */
4432 { 4333 {
4433 char *str; 4334 char *str = strvalue (x);
4434 int index0; 4335 int index0 = ivalue_unchecked (cadr (args));
4435 int index1; 4336 int index1;
4436 int len; 4337 int len;
4437 4338
4438 str = strvalue (car (SCHEME_V->args));
4439
4440 index0 = ivalue (cadr (SCHEME_V->args));
4441
4442 if (index0 > strlength (car (SCHEME_V->args))) 4339 if (index0 > strlength (x))
4443 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4340 Error_1 ("substring: start out of bounds:", cadr (args));
4444 4341
4445 if (cddr (SCHEME_V->args) != NIL) 4342 if (cddr (args) != NIL)
4446 { 4343 {
4447 index1 = ivalue (caddr (SCHEME_V->args)); 4344 index1 = ivalue_unchecked (caddr (args));
4448 4345
4449 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4346 if (index1 > strlength (x) || index1 < index0)
4450 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4347 Error_1 ("substring: end out of bounds:", caddr (args));
4451 } 4348 }
4452 else 4349 else
4453 index1 = strlength (car (SCHEME_V->args)); 4350 index1 = strlength (x);
4454 4351
4455 len = index1 - index0; 4352 len = index1 - index0;
4456 x = mk_empty_string (SCHEME_A_ len, ' '); 4353 x = mk_empty_string (SCHEME_A_ len, ' ');
4457 memcpy (strvalue (x), str + index0, len); 4354 memcpy (strvalue (x), str + index0, len);
4458 strvalue (x)[len] = 0; 4355 strvalue (x)[len] = 0;
… …
4462 4359
4463 case OP_VECTOR: /* vector */ 4360 case OP_VECTOR: /* vector */
4464 { 4361 {
4465 int i; 4362 int i;
4466 pointer vec; 4363 pointer vec;
4467 int len = list_length (SCHEME_A_ SCHEME_V->args); 4364 int len = list_length (SCHEME_A_ args);
4468 4365
4469 if (len < 0) 4366 if (len < 0)
4470 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4367 Error_1 ("vector: not a proper list:", args);
4471 4368
4472 vec = mk_vector (SCHEME_A_ len); 4369 vec = mk_vector (SCHEME_A_ len);
4473 4370
4474#if USE_ERROR_CHECKING 4371#if USE_ERROR_CHECKING
4475 if (SCHEME_V->no_memory) 4372 if (SCHEME_V->no_memory)
4476 s_return (S_SINK); 4373 s_return (S_SINK);
4477#endif 4374#endif
4478 4375
4479 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4376 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4480 set_vector_elem (vec, i, car (x)); 4377 vector_set (vec, i, car (x));
4481 4378
4482 s_return (vec); 4379 s_return (vec);
4483 } 4380 }
4484 4381
4485 case OP_MKVECTOR: /* make-vector */ 4382 case OP_MKVECTOR: /* make-vector */
4486 { 4383 {
4487 pointer fill = NIL; 4384 pointer fill = NIL;
4488 int len;
4489 pointer vec; 4385 pointer vec;
4386 int len = ivalue_unchecked (x);
4490 4387
4491 len = ivalue (car (SCHEME_V->args));
4492
4493 if (cdr (SCHEME_V->args) != NIL) 4388 if (cdr (args) != NIL)
4494 fill = cadr (SCHEME_V->args); 4389 fill = cadr (args);
4495 4390
4496 vec = mk_vector (SCHEME_A_ len); 4391 vec = mk_vector (SCHEME_A_ len);
4497 4392
4498#if USE_ERROR_CHECKING 4393#if USE_ERROR_CHECKING
4499 if (SCHEME_V->no_memory) 4394 if (SCHEME_V->no_memory)
4500 s_return (S_SINK); 4395 s_return (S_SINK);
4501#endif 4396#endif
4502 4397
4503 if (fill != NIL) 4398 if (fill != NIL)
4504 fill_vector (vec, fill); 4399 fill_vector (vec, 0, fill);
4505 4400
4506 s_return (vec); 4401 s_return (vec);
4507 } 4402 }
4508 4403
4509 case OP_VECLEN: /* vector-length */ 4404 case OP_VECLEN: /* vector-length */
4510 s_return (mk_integer (SCHEME_A_ vector_length (car (SCHEME_V->args)))); 4405 s_return (mk_integer (SCHEME_A_ veclength (x)));
4511 4406
4512 case OP_VECREF: /* vector-ref */ 4407 case OP_VECREF: /* vector-ref */
4513 { 4408 {
4514 int index;
4515
4516 index = ivalue (cadr (SCHEME_V->args)); 4409 int index = ivalue_unchecked (cadr (args));
4517 4410
4518 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4411 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4519 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4412 Error_1 ("vector-ref: out of bounds:", cadr (args));
4520 4413
4521 s_return (vector_elem (car (SCHEME_V->args), index)); 4414 s_return (vector_get (x, index));
4522 } 4415 }
4523 4416
4524 case OP_VECSET: /* vector-set! */ 4417 case OP_VECSET: /* vector-set! */
4525 { 4418 {
4526 int index; 4419 int index = ivalue_unchecked (cadr (args));
4527 4420
4528 if (is_immutable (car (SCHEME_V->args))) 4421 if (is_immutable (x))
4529 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4422 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4530 4423
4531 index = ivalue (cadr (SCHEME_V->args));
4532
4533 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4424 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4534 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4425 Error_1 ("vector-set!: out of bounds:", cadr (args));
4535 4426
4536 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4427 vector_set (x, index, caddr (args));
4537 s_return (car (SCHEME_V->args)); 4428 s_return (x);
4538 } 4429 }
4539 } 4430 }
4540 4431
4541 return S_T; 4432 if (USE_ERROR_CHECKING) abort ();
4542} 4433}
4543 4434
4544INTERFACE int 4435static int
4545is_list (SCHEME_P_ pointer a) 4436opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4546{ 4437{
4547 return list_length (SCHEME_A_ a) >= 0; 4438 pointer x = SCHEME_V->args;
4548}
4549 4439
4550/* Result is: 4440 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 { 4441 {
4442 num v = nvalue (car (x));
4443 x = cdr (x);
4444
4566 if (fast == NIL) 4445 if (x == NIL)
4567 return i; 4446 break;
4568 4447
4569 if (!is_pair (fast)) 4448 int r = num_cmp (v, nvalue (car (x)));
4570 return -2 - i;
4571 4449
4572 fast = cdr (fast); 4450 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 { 4451 {
4590 /* the fast pointer has looped back around and caught up 4452 case OP_NUMEQ: r = r == 0; break;
4591 with the slow pointer, hence the structure is circular, 4453 case OP_LESS: r = r < 0; break;
4592 not of finite length, and therefore not a list */ 4454 case OP_GRE: r = r > 0; break;
4593 return -1; 4455 case OP_LEQ: r = r <= 0; break;
4456 case OP_GEQ: r = r >= 0; break;
4594 } 4457 }
4595 }
4596}
4597 4458
4459 if (!r)
4460 s_return (S_F);
4461 }
4462
4463 s_return (S_T);
4464}
4465
4598static pointer 4466static int
4599opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4467opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4600{ 4468{
4601 pointer x; 4469 pointer args = SCHEME_V->args;
4602 num v; 4470 pointer a = car (args);
4603 int (*comp_func) (num, num); 4471 pointer d = cdr (args);
4472 int r;
4604 4473
4605 switch (op) 4474 switch (op)
4606 { 4475 {
4607 case OP_NOT: /* not */ 4476 case OP_NOT: /* not */ r = is_false (a) ; break;
4608 s_retbool (is_false (car (SCHEME_V->args))); 4477 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4478 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4479 case OP_NULLP: /* null? */ r = a == NIL ; break;
4480 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4481 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4482 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4483 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4484 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4485 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4609 4486
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 4487#if USE_CHAR_CLASSIFIERS
4679 4488 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4680 case OP_CHARAP: /* char-alphabetic? */ 4489 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4681 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4490 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4682 4491 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4683 case OP_CHARNP: /* char-numeric? */ 4492 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 4493#endif
4494
4695#if USE_PORTS 4495#if USE_PORTS
4696 4496 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? */ 4497 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? */ 4498 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4704 s_retbool (is_outport (car (SCHEME_V->args)));
4705#endif 4499#endif
4706 4500
4707 case OP_PROCP: /* procedure? */ 4501 case OP_PROCP: /* procedure? */
4708 4502
4709 /*-- 4503 /*--
4710 * continuation should be procedure by the example 4504 * continuation should be procedure by the example
4711 * (call-with-current-continuation procedure?) ==> #t 4505 * (call-with-current-continuation procedure?) ==> #t
4712 * in R^3 report sec. 6.9 4506 * in R^3 report sec. 6.9
4713 */ 4507 */
4714 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4508 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))); 4509 break;
4716 4510
4717 case OP_PAIRP: /* pair? */ 4511 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4718 s_retbool (is_pair (car (SCHEME_V->args))); 4512 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4719 4513 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4720 case OP_LISTP: /* list? */ 4514 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4721 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4515 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4722 4516 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 } 4517 }
4735 4518
4736 return S_T; 4519 s_retbool (r);
4737} 4520}
4738 4521
4739static pointer 4522static int
4740opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4523opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4741{ 4524{
4525 pointer args = SCHEME_V->args;
4526 pointer a = car (args);
4742 pointer x, y; 4527 pointer x, y;
4743 4528
4744 switch (op) 4529 switch (op)
4745 { 4530 {
4746 case OP_FORCE: /* force */ 4531 case OP_FORCE: /* force */
4747 SCHEME_V->code = car (SCHEME_V->args); 4532 SCHEME_V->code = a;
4748 4533
4749 if (is_promise (SCHEME_V->code)) 4534 if (is_promise (SCHEME_V->code))
4750 { 4535 {
4751 /* Should change type to closure here */ 4536 /* Should change type to closure here */
4752 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4537 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4773 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4558 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4774 SCHEME_V->outport = cadr (SCHEME_V->args); 4559 SCHEME_V->outport = cadr (SCHEME_V->args);
4775 } 4560 }
4776 } 4561 }
4777 4562
4778 SCHEME_V->args = car (SCHEME_V->args); 4563 SCHEME_V->args = a;
4779 4564
4780 if (op == OP_WRITE) 4565 if (op == OP_WRITE)
4781 SCHEME_V->print_flag = 1; 4566 SCHEME_V->print_flag = 1;
4782 else 4567 else
4783 SCHEME_V->print_flag = 0; 4568 SCHEME_V->print_flag = 0;
4784 4569
4785 s_goto (OP_P0LIST); 4570 s_goto (OP_P0LIST);
4786 4571
4787 case OP_NEWLINE: /* newline */ 4572 case OP_NEWLINE: /* newline */
4788 if (is_pair (SCHEME_V->args)) 4573 if (is_pair (args))
4789 { 4574 {
4790 if (car (SCHEME_V->args) != SCHEME_V->outport) 4575 if (a != SCHEME_V->outport)
4791 { 4576 {
4792 x = cons (SCHEME_V->outport, NIL); 4577 x = cons (SCHEME_V->outport, NIL);
4793 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4578 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4794 SCHEME_V->outport = car (SCHEME_V->args); 4579 SCHEME_V->outport = a;
4795 } 4580 }
4796 } 4581 }
4797 4582
4798 putstr (SCHEME_A_ "\n"); 4583 putstr (SCHEME_A_ "\n");
4799 s_return (S_T); 4584 s_return (S_T);
4800#endif 4585#endif
4801 4586
4802 case OP_ERR0: /* error */ 4587 case OP_ERR0: /* error */
4803 SCHEME_V->retcode = -1; 4588 SCHEME_V->retcode = -1;
4804 4589
4805 if (!is_string (car (SCHEME_V->args))) 4590 if (!is_string (a))
4806 { 4591 {
4807 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4592 args = cons (mk_string (SCHEME_A_ " -- "), args);
4808 setimmutable (car (SCHEME_V->args)); 4593 setimmutable (car (args));
4809 } 4594 }
4810 4595
4811 putstr (SCHEME_A_ "Error: "); 4596 putstr (SCHEME_A_ "Error: ");
4812 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4597 putstr (SCHEME_A_ strvalue (car (args)));
4813 SCHEME_V->args = cdr (SCHEME_V->args); 4598 SCHEME_V->args = cdr (args);
4814 s_goto (OP_ERR1); 4599 s_goto (OP_ERR1);
4815 4600
4816 case OP_ERR1: /* error */ 4601 case OP_ERR1: /* error */
4817 putstr (SCHEME_A_ " "); 4602 putstr (SCHEME_A_ " ");
4818 4603
4819 if (SCHEME_V->args != NIL) 4604 if (args != NIL)
4820 { 4605 {
4821 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4606 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4822 SCHEME_V->args = car (SCHEME_V->args); 4607 SCHEME_V->args = a;
4823 SCHEME_V->print_flag = 1; 4608 SCHEME_V->print_flag = 1;
4824 s_goto (OP_P0LIST); 4609 s_goto (OP_P0LIST);
4825 } 4610 }
4826 else 4611 else
4827 { 4612 {
4828 putstr (SCHEME_A_ "\n"); 4613 putstr (SCHEME_A_ "\n");
4829 4614
4830 if (SCHEME_V->interactive_repl) 4615 if (SCHEME_V->interactive_repl)
4831 s_goto (OP_T0LVL); 4616 s_goto (OP_T0LVL);
4832 else 4617 else
4833 return NIL; 4618 return -1;
4834 } 4619 }
4835 4620
4836 case OP_REVERSE: /* reverse */ 4621 case OP_REVERSE: /* reverse */
4837 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4622 s_return (reverse (SCHEME_A_ a));
4838 4623
4839 case OP_LIST_STAR: /* list* */ 4624 case OP_LIST_STAR: /* list* */
4840 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4625 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4841 4626
4842 case OP_APPEND: /* append */ 4627 case OP_APPEND: /* append */
4843 x = NIL; 4628 x = NIL;
4844 y = SCHEME_V->args; 4629 y = args;
4845 4630
4846 if (y == x) 4631 if (y == x)
4847 s_return (x); 4632 s_return (x);
4848 4633
4849 /* cdr() in the while condition is not a typo. If car() */ 4634 /* cdr() in the while condition is not a typo. If car() */
… …
4860 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4645 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4861 4646
4862#if USE_PLIST 4647#if USE_PLIST
4863 4648
4864 case OP_PUT: /* put */ 4649 case OP_PUT: /* put */
4865 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4650 if (!hasprop (a) || !hasprop (cadr (args)))
4866 Error_0 ("illegal use of put"); 4651 Error_0 ("illegal use of put");
4867 4652
4868 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4653 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4869 { 4654 {
4870 if (caar (x) == y) 4655 if (caar (x) == y)
4871 break; 4656 break;
4872 } 4657 }
4873 4658
4874 if (x != NIL) 4659 if (x != NIL)
4875 cdar (x) = caddr (SCHEME_V->args); 4660 cdar (x) = caddr (args);
4876 else 4661 else
4877 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4662 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4878 4663
4879 s_return (S_T); 4664 s_return (S_T);
4880 4665
4881 case OP_GET: /* get */ 4666 case OP_GET: /* get */
4882 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4667 if (!hasprop (a) || !hasprop (cadr (args)))
4883 Error_0 ("illegal use of get"); 4668 Error_0 ("illegal use of get");
4884 4669
4885 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4670 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4886 if (caar (x) == y) 4671 if (caar (x) == y)
4887 break; 4672 break;
4888 4673
4889 if (x != NIL) 4674 if (x != NIL)
4890 s_return (cdar (x)); 4675 s_return (cdar (x));
… …
4892 s_return (NIL); 4677 s_return (NIL);
4893 4678
4894#endif /* USE_PLIST */ 4679#endif /* USE_PLIST */
4895 4680
4896 case OP_QUIT: /* quit */ 4681 case OP_QUIT: /* quit */
4897 if (is_pair (SCHEME_V->args)) 4682 if (is_pair (args))
4898 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4683 SCHEME_V->retcode = ivalue (a);
4899 4684
4900 return NIL; 4685 return -1;
4901 4686
4902 case OP_GC: /* gc */ 4687 case OP_GC: /* gc */
4903 gc (SCHEME_A_ NIL, NIL); 4688 gc (SCHEME_A_ NIL, NIL);
4904 s_return (S_T); 4689 s_return (S_T);
4905 4690
4906 case OP_GCVERB: /* gc-verbose */ 4691 case OP_GCVERB: /* gc-verbose */
4907 { 4692 {
4908 int was = SCHEME_V->gc_verbose; 4693 int was = SCHEME_V->gc_verbose;
4909 4694
4910 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4695 SCHEME_V->gc_verbose = (a != S_F);
4911 s_retbool (was); 4696 s_retbool (was);
4912 } 4697 }
4913 4698
4914 case OP_NEWSEGMENT: /* new-segment */ 4699 case OP_NEWSEGMENT: /* new-segment */
4915 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4700 if (!is_pair (args) || !is_number (a))
4916 Error_0 ("new-segment: argument must be a number"); 4701 Error_0 ("new-segment: argument must be a number");
4917 4702
4918 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4703 alloc_cellseg (SCHEME_A_ ivalue (a));
4919 4704
4920 s_return (S_T); 4705 s_return (S_T);
4921 4706
4922 case OP_OBLIST: /* oblist */ 4707 case OP_OBLIST: /* oblist */
4923 s_return (oblist_all_symbols (SCHEME_A)); 4708 s_return (oblist_all_symbols (SCHEME_A));
… …
4950 case OP_OPEN_INOUTFILE: 4735 case OP_OPEN_INOUTFILE:
4951 prop = port_input | port_output; 4736 prop = port_input | port_output;
4952 break; 4737 break;
4953 } 4738 }
4954 4739
4955 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4740 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4956 4741
4957 if (p == NIL) 4742 s_return (p == NIL ? S_F : p);
4958 s_return (S_F);
4959
4960 s_return (p);
4961 } 4743 }
4962 4744
4963# if USE_STRING_PORTS 4745# if USE_STRING_PORTS
4964 4746
4965 case OP_OPEN_INSTRING: /* open-input-string */ 4747 case OP_OPEN_INSTRING: /* open-input-string */
… …
4977 case OP_OPEN_INOUTSTRING: 4759 case OP_OPEN_INOUTSTRING:
4978 prop = port_input | port_output; 4760 prop = port_input | port_output;
4979 break; 4761 break;
4980 } 4762 }
4981 4763
4982 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4764 p = port_from_string (SCHEME_A_ strvalue (a),
4983 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4765 strvalue (a) + strlength (a), prop);
4984 4766
4985 if (p == NIL) 4767 s_return (p == NIL ? S_F : p);
4986 s_return (S_F);
4987
4988 s_return (p);
4989 } 4768 }
4990 4769
4991 case OP_OPEN_OUTSTRING: /* open-output-string */ 4770 case OP_OPEN_OUTSTRING: /* open-output-string */
4992 { 4771 {
4993 pointer p; 4772 pointer p;
4994 4773
4995 if (car (SCHEME_V->args) == NIL) 4774 if (a == NIL)
4996 {
4997 p = port_from_scratch (SCHEME_A); 4775 p = port_from_scratch (SCHEME_A);
4998
4999 if (p == NIL)
5000 s_return (S_F);
5001 }
5002 else 4776 else
5003 {
5004 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4777 p = port_from_string (SCHEME_A_ strvalue (a),
5005 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4778 strvalue (a) + strlength (a), port_output);
5006 4779
5007 if (p == NIL) 4780 s_return (p == NIL ? S_F : p);
5008 s_return (S_F);
5009 }
5010
5011 s_return (p);
5012 } 4781 }
5013 4782
5014 case OP_GET_OUTSTRING: /* get-output-string */ 4783 case OP_GET_OUTSTRING: /* get-output-string */
5015 { 4784 {
5016 port *p; 4785 port *p;
5017 4786
5018 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4787 if ((p = a->object.port)->kind & port_string)
5019 { 4788 {
5020 off_t size; 4789 off_t size;
5021 char *str; 4790 char *str;
5022 4791
5023 size = p->rep.string.curr - p->rep.string.start + 1; 4792 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5039 } 4808 }
5040 4809
5041# endif 4810# endif
5042 4811
5043 case OP_CLOSE_INPORT: /* close-input-port */ 4812 case OP_CLOSE_INPORT: /* close-input-port */
5044 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4813 port_close (SCHEME_A_ a, port_input);
5045 s_return (S_T); 4814 s_return (S_T);
5046 4815
5047 case OP_CLOSE_OUTPORT: /* close-output-port */ 4816 case OP_CLOSE_OUTPORT: /* close-output-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4817 port_close (SCHEME_A_ a, port_output);
5049 s_return (S_T); 4818 s_return (S_T);
5050#endif 4819#endif
5051 4820
5052 case OP_INT_ENV: /* interaction-environment */ 4821 case OP_INT_ENV: /* interaction-environment */
5053 s_return (SCHEME_V->global_env); 4822 s_return (SCHEME_V->global_env);
… …
5055 case OP_CURR_ENV: /* current-environment */ 4824 case OP_CURR_ENV: /* current-environment */
5056 s_return (SCHEME_V->envir); 4825 s_return (SCHEME_V->envir);
5057 4826
5058 } 4827 }
5059 4828
5060 return S_T; 4829 if (USE_ERROR_CHECKING) abort ();
5061} 4830}
5062 4831
5063static pointer 4832static int
5064opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4833opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5065{ 4834{
4835 pointer args = SCHEME_V->args;
5066 pointer x; 4836 pointer x;
5067 4837
5068 if (SCHEME_V->nesting != 0) 4838 if (SCHEME_V->nesting != 0)
5069 { 4839 {
5070 int n = SCHEME_V->nesting; 4840 int n = SCHEME_V->nesting;
… …
5077 switch (op) 4847 switch (op)
5078 { 4848 {
5079 /* ========== reading part ========== */ 4849 /* ========== reading part ========== */
5080#if USE_PORTS 4850#if USE_PORTS
5081 case OP_READ: 4851 case OP_READ:
5082 if (!is_pair (SCHEME_V->args)) 4852 if (!is_pair (args))
5083 s_goto (OP_READ_INTERNAL); 4853 s_goto (OP_READ_INTERNAL);
5084 4854
5085 if (!is_inport (car (SCHEME_V->args))) 4855 if (!is_inport (car (args)))
5086 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4856 Error_1 ("read: not an input port:", car (args));
5087 4857
5088 if (car (SCHEME_V->args) == SCHEME_V->inport) 4858 if (car (args) == SCHEME_V->inport)
5089 s_goto (OP_READ_INTERNAL); 4859 s_goto (OP_READ_INTERNAL);
5090 4860
5091 x = SCHEME_V->inport; 4861 x = SCHEME_V->inport;
5092 SCHEME_V->inport = car (SCHEME_V->args); 4862 SCHEME_V->inport = car (args);
5093 x = cons (x, NIL); 4863 x = cons (x, NIL);
5094 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4864 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5095 s_goto (OP_READ_INTERNAL); 4865 s_goto (OP_READ_INTERNAL);
5096 4866
5097 case OP_READ_CHAR: /* read-char */ 4867 case OP_READ_CHAR: /* read-char */
5098 case OP_PEEK_CHAR: /* peek-char */ 4868 case OP_PEEK_CHAR: /* peek-char */
5099 { 4869 {
5100 int c; 4870 int c;
5101 4871
5102 if (is_pair (SCHEME_V->args)) 4872 if (is_pair (args))
5103 { 4873 {
5104 if (car (SCHEME_V->args) != SCHEME_V->inport) 4874 if (car (args) != SCHEME_V->inport)
5105 { 4875 {
5106 x = SCHEME_V->inport; 4876 x = SCHEME_V->inport;
5107 x = cons (x, NIL); 4877 x = cons (x, NIL);
5108 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4878 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5109 SCHEME_V->inport = car (SCHEME_V->args); 4879 SCHEME_V->inport = car (args);
5110 } 4880 }
5111 } 4881 }
5112 4882
5113 c = inchar (SCHEME_A); 4883 c = inchar (SCHEME_A);
5114 4884
… …
5124 case OP_CHAR_READY: /* char-ready? */ 4894 case OP_CHAR_READY: /* char-ready? */
5125 { 4895 {
5126 pointer p = SCHEME_V->inport; 4896 pointer p = SCHEME_V->inport;
5127 int res; 4897 int res;
5128 4898
5129 if (is_pair (SCHEME_V->args)) 4899 if (is_pair (args))
5130 p = car (SCHEME_V->args); 4900 p = car (args);
5131 4901
5132 res = p->object.port->kind & port_string; 4902 res = p->object.port->kind & port_string;
5133 4903
5134 s_retbool (res); 4904 s_retbool (res);
5135 } 4905 }
5136 4906
5137 case OP_SET_INPORT: /* set-input-port */ 4907 case OP_SET_INPORT: /* set-input-port */
5138 SCHEME_V->inport = car (SCHEME_V->args); 4908 SCHEME_V->inport = car (args);
5139 s_return (SCHEME_V->value); 4909 s_return (SCHEME_V->value);
5140 4910
5141 case OP_SET_OUTPORT: /* set-output-port */ 4911 case OP_SET_OUTPORT: /* set-output-port */
5142 SCHEME_V->outport = car (SCHEME_V->args); 4912 SCHEME_V->outport = car (args);
5143 s_return (SCHEME_V->value); 4913 s_return (SCHEME_V->value);
5144#endif 4914#endif
5145 4915
5146 case OP_RDSEXPR: 4916 case OP_RDSEXPR:
5147 switch (SCHEME_V->tok) 4917 switch (SCHEME_V->tok)
… …
5233 } 5003 }
5234 5004
5235 break; 5005 break;
5236 5006
5237 case OP_RDLIST: 5007 case OP_RDLIST:
5238 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5008 SCHEME_V->args = cons (SCHEME_V->value, args);
5239 SCHEME_V->tok = token (SCHEME_A); 5009 SCHEME_V->tok = token (SCHEME_A);
5240 5010
5241 switch (SCHEME_V->tok) 5011 switch (SCHEME_V->tok)
5242 { 5012 {
5243 case TOK_EOF: 5013 case TOK_EOF:
… …
5271 case OP_RDDOT: 5041 case OP_RDDOT:
5272 if (token (SCHEME_A) != TOK_RPAREN) 5042 if (token (SCHEME_A) != TOK_RPAREN)
5273 Error_0 ("syntax error: illegal dot expression"); 5043 Error_0 ("syntax error: illegal dot expression");
5274 5044
5275 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5045 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5276 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5046 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5277 5047
5278 case OP_RDQUOTE: 5048 case OP_RDQUOTE:
5279 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5049 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5280 5050
5281 case OP_RDQQUOTE: 5051 case OP_RDQQUOTE:
… …
5303 SCHEME_V->args = SCHEME_V->value; 5073 SCHEME_V->args = SCHEME_V->value;
5304 s_goto (OP_VECTOR); 5074 s_goto (OP_VECTOR);
5305 5075
5306 /* ========== printing part ========== */ 5076 /* ========== printing part ========== */
5307 case OP_P0LIST: 5077 case OP_P0LIST:
5308 if (is_vector (SCHEME_V->args)) 5078 if (is_vector (args))
5309 { 5079 {
5310 putstr (SCHEME_A_ "#("); 5080 putstr (SCHEME_A_ "#(");
5311 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5081 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5312 s_goto (OP_PVECFROM); 5082 s_goto (OP_PVECFROM);
5313 } 5083 }
5314 else if (is_environment (SCHEME_V->args)) 5084 else if (is_environment (args))
5315 { 5085 {
5316 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5086 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5317 s_return (S_T); 5087 s_return (S_T);
5318 } 5088 }
5319 else if (!is_pair (SCHEME_V->args)) 5089 else if (!is_pair (args))
5320 { 5090 {
5321 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5091 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5322 s_return (S_T); 5092 s_return (S_T);
5323 } 5093 }
5324 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5094 else
5325 { 5095 {
5096 pointer a = car (args);
5097 pointer b = cdr (args);
5098 int ok_abbr = ok_abbrev (b);
5099 SCHEME_V->args = car (b);
5100
5101 if (a == SCHEME_V->QUOTE && ok_abbr)
5326 putstr (SCHEME_A_ "'"); 5102 putstr (SCHEME_A_ "'");
5327 SCHEME_V->args = cadr (SCHEME_V->args); 5103 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ "`");
5105 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5106 putstr (SCHEME_A_ ",");
5107 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5108 putstr (SCHEME_A_ ",@");
5109 else
5110 {
5111 putstr (SCHEME_A_ "(");
5112 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5113 SCHEME_V->args = a;
5114 }
5115
5328 s_goto (OP_P0LIST); 5116 s_goto (OP_P0LIST);
5329 } 5117 }
5330 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5118
5119 case OP_P1LIST:
5120 if (is_pair (args))
5331 { 5121 {
5122 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5332 putstr (SCHEME_A_ "`"); 5123 putstr (SCHEME_A_ " ");
5333 SCHEME_V->args = cadr (SCHEME_V->args); 5124 SCHEME_V->args = car (args);
5334 s_goto (OP_P0LIST); 5125 s_goto (OP_P0LIST);
5335 } 5126 }
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)) 5127 else if (is_vector (args))
5365 { 5128 {
5366 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5129 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5367 putstr (SCHEME_A_ " . "); 5130 putstr (SCHEME_A_ " . ");
5368 s_goto (OP_P0LIST); 5131 s_goto (OP_P0LIST);
5369 } 5132 }
5370 else 5133 else
5371 { 5134 {
5372 if (SCHEME_V->args != NIL) 5135 if (args != NIL)
5373 { 5136 {
5374 putstr (SCHEME_A_ " . "); 5137 putstr (SCHEME_A_ " . ");
5375 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5138 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5376 } 5139 }
5377 5140
5378 putstr (SCHEME_A_ ")"); 5141 putstr (SCHEME_A_ ")");
5379 s_return (S_T); 5142 s_return (S_T);
5380 } 5143 }
5381 5144
5382 case OP_PVECFROM: 5145 case OP_PVECFROM:
5383 { 5146 {
5384 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5147 int i = ivalue_unchecked (cdr (args));
5385 pointer vec = car (SCHEME_V->args); 5148 pointer vec = car (args);
5386 int len = vector_length (vec); 5149 int len = veclength (vec);
5387 5150
5388 if (i == len) 5151 if (i == len)
5389 { 5152 {
5390 putstr (SCHEME_A_ ")"); 5153 putstr (SCHEME_A_ ")");
5391 s_return (S_T); 5154 s_return (S_T);
5392 } 5155 }
5393 else 5156 else
5394 { 5157 {
5395 pointer elem = vector_elem (vec, i); 5158 pointer elem = vector_get (vec, i);
5396 5159
5397 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5160 ivalue_unchecked (cdr (args)) = i + 1;
5398 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5161 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5399 SCHEME_V->args = elem; 5162 SCHEME_V->args = elem;
5400 5163
5401 if (i > 0) 5164 if (i > 0)
5402 putstr (SCHEME_A_ " "); 5165 putstr (SCHEME_A_ " ");
5403 5166
5404 s_goto (OP_P0LIST); 5167 s_goto (OP_P0LIST);
5405 } 5168 }
5406 } 5169 }
5407 } 5170 }
5408 5171
5409 return S_T; 5172 if (USE_ERROR_CHECKING) abort ();
5410} 5173}
5411 5174
5412static pointer 5175static int
5413opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5176opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5414{ 5177{
5178 pointer args = SCHEME_V->args;
5179 pointer a = car (args);
5415 pointer x, y; 5180 pointer x, y;
5416 5181
5417 switch (op) 5182 switch (op)
5418 { 5183 {
5419 case OP_LIST_LENGTH: /* length *//* a.k */ 5184 case OP_LIST_LENGTH: /* length *//* a.k */
5420 { 5185 {
5421 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5186 long v = list_length (SCHEME_A_ a);
5422 5187
5423 if (v < 0) 5188 if (v < 0)
5424 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5189 Error_1 ("length: not a list:", a);
5425 5190
5426 s_return (mk_integer (SCHEME_A_ v)); 5191 s_return (mk_integer (SCHEME_A_ v));
5427 } 5192 }
5428 5193
5429 case OP_ASSQ: /* assq *//* a.k */ 5194 case OP_ASSQ: /* assq *//* a.k */
5430 x = car (SCHEME_V->args); 5195 x = a;
5431 5196
5432 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5197 for (y = cadr (args); is_pair (y); y = cdr (y))
5433 { 5198 {
5434 if (!is_pair (car (y))) 5199 if (!is_pair (car (y)))
5435 Error_0 ("unable to handle non pair element"); 5200 Error_0 ("unable to handle non pair element");
5436 5201
5437 if (x == caar (y)) 5202 if (x == caar (y))
… …
5443 else 5208 else
5444 s_return (S_F); 5209 s_return (S_F);
5445 5210
5446 5211
5447 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5212 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5448 SCHEME_V->args = car (SCHEME_V->args); 5213 SCHEME_V->args = a;
5449 5214
5450 if (SCHEME_V->args == NIL) 5215 if (SCHEME_V->args == NIL)
5451 s_return (S_F); 5216 s_return (S_F);
5452 else if (is_closure (SCHEME_V->args)) 5217 else if (is_closure (SCHEME_V->args))
5453 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5218 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5459 case OP_CLOSUREP: /* closure? */ 5224 case OP_CLOSUREP: /* closure? */
5460 /* 5225 /*
5461 * Note, macro object is also a closure. 5226 * Note, macro object is also a closure.
5462 * Therefore, (closure? <#MACRO>) ==> #t 5227 * Therefore, (closure? <#MACRO>) ==> #t
5463 */ 5228 */
5464 s_retbool (is_closure (car (SCHEME_V->args))); 5229 s_retbool (is_closure (a));
5465 5230
5466 case OP_MACROP: /* macro? */ 5231 case OP_MACROP: /* macro? */
5467 s_retbool (is_macro (car (SCHEME_V->args))); 5232 s_retbool (is_macro (a));
5468 } 5233 }
5469 5234
5470 return S_T; /* NOTREACHED */ 5235 if (USE_ERROR_CHECKING) abort ();
5471} 5236}
5472 5237
5238/* 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); 5239typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5474 5240
5475typedef int (*test_predicate) (pointer); 5241typedef int (*test_predicate)(pointer);
5476static int 5242static int
5477is_any (pointer p) 5243tst_any (pointer p)
5478{ 5244{
5479 return 1; 5245 return 1;
5480} 5246}
5481 5247
5482static int 5248static int
5483is_nonneg (pointer p) 5249tst_inonneg (pointer p)
5484{ 5250{
5485 return ivalue (p) >= 0 && is_integer (p); 5251 return is_integer (p) && ivalue_unchecked (p) >= 0;
5252}
5253
5254static int
5255tst_is_list (SCHEME_P_ pointer p)
5256{
5257 return p == NIL || is_pair (p);
5486} 5258}
5487 5259
5488/* Correspond carefully with following defines! */ 5260/* Correspond carefully with following defines! */
5489static struct 5261static struct
5490{ 5262{
5491 test_predicate fct; 5263 test_predicate fct;
5492 const char *kind; 5264 const char *kind;
5493} tests[] = 5265} tests[] = {
5494{ 5266 { tst_any , 0 },
5495 { 0, 0}, /* unused */ 5267 { is_string , "string" },
5496 { is_any, 0}, 5268 { is_symbol , "symbol" },
5497 { is_string, "string" }, 5269 { is_port , "port" },
5498 { is_symbol, "symbol" },
5499 { is_port, "port" },
5500 { is_inport, "input port" }, 5270 { is_inport , "input port" },
5501 { is_outport, "output port" }, 5271 { is_outport , "output port" },
5502 { is_environment, "environment" }, 5272 { is_environment, "environment" },
5503 { is_pair, "pair" }, 5273 { is_pair , "pair" },
5504 { 0, "pair or '()" }, 5274 { 0 , "pair or '()" },
5505 { is_character, "character" }, 5275 { is_character , "character" },
5506 { is_vector, "vector" }, 5276 { is_vector , "vector" },
5507 { is_number, "number" }, 5277 { is_number , "number" },
5508 { is_integer, "integer" }, 5278 { is_integer , "integer" },
5509 { is_nonneg, "non-negative integer" } 5279 { tst_inonneg , "non-negative integer" }
5510}; 5280};
5511 5281
5512#define TST_NONE 0 5282#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5513#define TST_ANY "\001" 5283#define TST_ANY "\001"
5514#define TST_STRING "\002" 5284#define TST_STRING "\002"
5515#define TST_SYMBOL "\003" 5285#define TST_SYMBOL "\003"
5516#define TST_PORT "\004" 5286#define TST_PORT "\004"
5517#define TST_INPORT "\005" 5287#define TST_INPORT "\005"
5518#define TST_OUTPORT "\006" 5288#define TST_OUTPORT "\006"
5519#define TST_ENVIRONMENT "\007" 5289#define TST_ENVIRONMENT "\007"
5520#define TST_PAIR "\010" 5290#define TST_PAIR "\010"
5521#define TST_LIST "\011" 5291#define TST_LIST "\011"
5522#define TST_CHAR "\012" 5292#define TST_CHAR "\012"
5523#define TST_VECTOR "\013" 5293#define TST_VECTOR "\013"
5524#define TST_NUMBER "\014" 5294#define TST_NUMBER "\014"
5525#define TST_INTEGER "\015" 5295#define TST_INTEGER "\015"
5526#define TST_NATURAL "\016" 5296#define TST_NATURAL "\016"
5297
5298#define INF_ARG 0xff
5299#define UNNAMED_OP ""
5300
5301static const char opnames[] =
5302#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5303#include "opdefines.h"
5304#undef OP_DEF
5305;
5306
5307static const char *
5308opname (int idx)
5309{
5310 const char *name = opnames;
5311
5312 /* should do this at compile time, but would require external program, right? */
5313 while (idx--)
5314 name += strlen (name) + 1;
5315
5316 return *name ? name : "ILLEGAL";
5317}
5318
5319static const char *
5320procname (pointer x)
5321{
5322 return opname (procnum (x));
5323}
5527 5324
5528typedef struct 5325typedef struct
5529{ 5326{
5530 dispatch_func func; 5327 uint8_t func;
5531 char *name; 5328 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5329 uint8_t builtin;
5330#if USE_ERROR_CHECKING
5532 int min_arity; 5331 uint8_t min_arity;
5533 int max_arity; 5332 uint8_t max_arity;
5534 char *arg_tests_encoding; 5333 char arg_tests_encoding[3];
5334#endif
5535} op_code_info; 5335} op_code_info;
5536 5336
5537#define INF_ARG 0xffff
5538
5539static op_code_info dispatch_table[] = { 5337static const op_code_info dispatch_table[] = {
5540#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5338#if USE_ERROR_CHECKING
5339#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5340#else
5341#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5342#endif
5541#include "opdefines.h" 5343#include "opdefines.h"
5344#undef OP_DEF
5542 {0} 5345 {0}
5543}; 5346};
5544 5347
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 */ 5348/* kernel of this interpreter */
5558static void 5349static void ecb_hot
5559Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5350Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5560{ 5351{
5561 SCHEME_V->op = op; 5352 SCHEME_V->op = op;
5562 5353
5563 for (;;) 5354 for (;;)
5564 { 5355 {
5565 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5356 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5566 5357
5567#if USE_ERROR_CHECKING 5358#if USE_ERROR_CHECKING
5568 if (pcd->name) /* if built-in function, check arguments */ 5359 if (pcd->builtin) /* if built-in function, check arguments */
5569 { 5360 {
5570 int ok = 1;
5571 char msg[STRBUFFSIZE]; 5361 char msg[STRBUFFSIZE];
5572 int n = list_length (SCHEME_A_ SCHEME_V->args); 5362 int n = list_length (SCHEME_A_ SCHEME_V->args);
5573 5363
5574 /* Check number of arguments */ 5364 /* Check number of arguments */
5575 if (n < pcd->min_arity) 5365 if (ecb_expect_false (n < pcd->min_arity))
5576 { 5366 {
5577 ok = 0;
5578 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5367 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5579 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5368 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5369 xError_1 (SCHEME_A_ msg, 0);
5370 continue;
5580 } 5371 }
5581 5372 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5582 if (ok && n > pcd->max_arity)
5583 { 5373 {
5584 ok = 0;
5585 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5374 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5586 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5375 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5376 xError_1 (SCHEME_A_ msg, 0);
5377 continue;
5587 } 5378 }
5588 5379 else
5589 if (ok)
5590 { 5380 {
5591 if (pcd->arg_tests_encoding) 5381 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5592 { 5382 {
5593 int i = 0; 5383 int i = 0;
5594 int j; 5384 int j;
5595 const char *t = pcd->arg_tests_encoding; 5385 const char *t = pcd->arg_tests_encoding;
5596 pointer arglist = SCHEME_V->args; 5386 pointer arglist = SCHEME_V->args;
5597 5387
5598 do 5388 do
5599 { 5389 {
5600 pointer arg = car (arglist); 5390 pointer arg = car (arglist);
5601 5391
5602 j = (int) t[0]; 5392 j = t[0];
5603 5393
5394 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5604 if (j == TST_LIST[0]) 5395 if (j == TST_LIST[0])
5605 { 5396 {
5606 if (arg != NIL && !is_pair (arg)) 5397 if (!tst_is_list (SCHEME_A_ arg))
5607 break; 5398 break;
5608 } 5399 }
5609 else 5400 else
5610 { 5401 {
5611 if (!tests[j].fct (arg)) 5402 if (!tests[j - 1].fct (arg))
5612 break; 5403 break;
5613 } 5404 }
5614 5405
5615 if (t[1] != 0) /* last test is replicated as necessary */ 5406 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5616 t++; 5407 t++;
5617 5408
5618 arglist = cdr (arglist); 5409 arglist = cdr (arglist);
5619 i++; 5410 i++;
5620 } 5411 }
5621 while (i < n); 5412 while (i < n);
5622 5413
5623 if (i < n) 5414 if (i < n)
5624 { 5415 {
5625 ok = 0;
5626 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5416 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5417 xError_1 (SCHEME_A_ msg, 0);
5418 continue;
5627 } 5419 }
5628 } 5420 }
5629 } 5421 }
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 } 5422 }
5639#endif 5423#endif
5640 5424
5641 ok_to_freely_gc (SCHEME_A); 5425 ok_to_freely_gc (SCHEME_A);
5642 5426
5643 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5427 static const dispatch_func dispatch_funcs[] = {
5428 opexe_0,
5429 opexe_1,
5430 opexe_2,
5431 opexe_3,
5432 opexe_4,
5433 opexe_5,
5434 opexe_6,
5435 };
5436
5437 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5644 return; 5438 return;
5645 5439
5646#if USE_ERROR_CHECKING 5440 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5647 if (SCHEME_V->no_memory)
5648 { 5441 {
5649 xwrstr ("No memory!\n"); 5442 xwrstr ("No memory!\n");
5650 return; 5443 return;
5651 } 5444 }
5652#endif
5653 } 5445 }
5654} 5446}
5655 5447
5656/* ========== Initialization of internal keywords ========== */ 5448/* ========== Initialization of internal keywords ========== */
5657 5449
… …
5674mk_proc (SCHEME_P_ enum scheme_opcodes op) 5466mk_proc (SCHEME_P_ enum scheme_opcodes op)
5675{ 5467{
5676 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5468 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5677 set_typeflag (y, (T_PROC | T_ATOM)); 5469 set_typeflag (y, (T_PROC | T_ATOM));
5678 ivalue_unchecked (y) = op; 5470 ivalue_unchecked (y) = op;
5679 set_num_integer (y);
5680 return y; 5471 return y;
5681} 5472}
5682 5473
5683/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5474/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5684static int 5475static int
… …
5708 5499
5709 case 'd': 5500 case 'd':
5710 return OP_COND0; /* cond */ 5501 return OP_COND0; /* cond */
5711 5502
5712 case '*': 5503 case '*':
5713 return OP_LET0AST; /* let* */ 5504 return OP_LET0AST;/* let* */
5714 5505
5715 default: 5506 default:
5716 return OP_SET0; /* set! */ 5507 return OP_SET0; /* set! */
5717 } 5508 }
5718 5509
… …
5740 5531
5741 case 'f': 5532 case 'f':
5742 return OP_DEF0; /* define */ 5533 return OP_DEF0; /* define */
5743 5534
5744 default: 5535 default:
5745 return OP_LET0REC; /* letrec */ 5536 return OP_LET0REC;/* letrec */
5746 } 5537 }
5747 5538
5748 default: 5539 default:
5749 return OP_C0STREAM; /* cons-stream */ 5540 return OP_C0STREAM; /* cons-stream */
5750 } 5541 }
5751} 5542}
5752 5543
5753#if USE_MULTIPLICITY 5544#if USE_MULTIPLICITY
5754scheme * 5545ecb_cold scheme *
5755scheme_init_new () 5546scheme_init_new ()
5756{ 5547{
5757 scheme *sc = malloc (sizeof (scheme)); 5548 scheme *sc = malloc (sizeof (scheme));
5758 5549
5759 if (!scheme_init (SCHEME_A)) 5550 if (!scheme_init (SCHEME_A))
… …
5764 else 5555 else
5765 return sc; 5556 return sc;
5766} 5557}
5767#endif 5558#endif
5768 5559
5769int 5560ecb_cold int
5770scheme_init (SCHEME_P) 5561scheme_init (SCHEME_P)
5771{ 5562{
5772 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5563 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5773 pointer x; 5564 pointer x;
5774 5565
… …
5817 set_cdr (S_T, S_T); 5608 set_cdr (S_T, S_T);
5818 /* init F */ 5609 /* init F */
5819 set_typeflag (S_F, T_ATOM | T_MARK); 5610 set_typeflag (S_F, T_ATOM | T_MARK);
5820 set_car (S_F, S_F); 5611 set_car (S_F, S_F);
5821 set_cdr (S_F, S_F); 5612 set_cdr (S_F, S_F);
5613 /* init EOF_OBJ */
5614 set_typeflag (S_EOF, T_ATOM | T_MARK);
5615 set_car (S_EOF, S_EOF);
5616 set_cdr (S_EOF, S_EOF);
5822 /* init sink */ 5617 /* init sink */
5823 set_typeflag (S_SINK, T_PAIR | T_MARK); 5618 set_typeflag (S_SINK, T_PAIR | T_MARK);
5824 set_car (S_SINK, NIL); 5619 set_car (S_SINK, NIL);
5620
5825 /* init c_nest */ 5621 /* init c_nest */
5826 SCHEME_V->c_nest = NIL; 5622 SCHEME_V->c_nest = NIL;
5827 5623
5828 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5624 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5829 /* init global_env */ 5625 /* init global_env */
… …
5842 5638
5843 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5639 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5844 assign_syntax (SCHEME_A_ syntax_names[i]); 5640 assign_syntax (SCHEME_A_ syntax_names[i]);
5845 } 5641 }
5846 5642
5643 // TODO: should iterate via strlen, to avoid n² complexity
5847 for (i = 0; i < n; i++) 5644 for (i = 0; i < n; i++)
5848 if (dispatch_table[i].name != 0) 5645 if (dispatch_table[i].builtin)
5849 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5646 assign_proc (SCHEME_A_ i, opname (i));
5850 5647
5851 /* initialization of global pointers to special symbols */ 5648 /* initialization of global pointers to special symbols */
5852 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5649 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5853 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5650 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5854 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5651 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5855 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5652 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5856 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5653 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5857 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5654 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5858 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5655 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5859 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5656 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5860 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5657 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5861 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5658 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5862 5659
5863 return !SCHEME_V->no_memory; 5660 return !SCHEME_V->no_memory;
5864} 5661}
5865 5662
… …
5893scheme_set_external_data (SCHEME_P_ void *p) 5690scheme_set_external_data (SCHEME_P_ void *p)
5894{ 5691{
5895 SCHEME_V->ext_data = p; 5692 SCHEME_V->ext_data = p;
5896} 5693}
5897 5694
5898void 5695ecb_cold void
5899scheme_deinit (SCHEME_P) 5696scheme_deinit (SCHEME_P)
5900{ 5697{
5901 int i; 5698 int i;
5902 5699
5903#if SHOW_ERROR_LINE 5700#if SHOW_ERROR_LINE
… …
5995{ 5792{
5996 dump_stack_reset (SCHEME_A); 5793 dump_stack_reset (SCHEME_A);
5997 SCHEME_V->envir = SCHEME_V->global_env; 5794 SCHEME_V->envir = SCHEME_V->global_env;
5998 SCHEME_V->file_i = 0; 5795 SCHEME_V->file_i = 0;
5999 SCHEME_V->load_stack[0].kind = port_input | port_string; 5796 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 */ 5797 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); 5798 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; 5799 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6003#if USE_PORTS 5800#if USE_PORTS
6004 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5801 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6005#endif 5802#endif
6006 SCHEME_V->retcode = 0; 5803 SCHEME_V->retcode = 0;
6007 SCHEME_V->interactive_repl = 0; 5804 SCHEME_V->interactive_repl = 0;
… …
6112 5909
6113/* ========== Main ========== */ 5910/* ========== Main ========== */
6114 5911
6115#if STANDALONE 5912#if STANDALONE
6116 5913
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 5914int
6134main (int argc, char **argv) 5915main (int argc, char **argv)
6135{ 5916{
6136# endif
6137# if USE_MULTIPLICITY 5917# if USE_MULTIPLICITY
6138 scheme ssc; 5918 scheme ssc;
6139 scheme *const SCHEME_V = &ssc; 5919 scheme *const SCHEME_V = &ssc;
6140# else 5920# else
6141# endif 5921# endif

Diff Legend

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