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.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC

… …
28#endif 28#endif
29#if USE_MATH 29#if USE_MATH
30# include <math.h> 30# include <math.h>
31#endif 31#endif
32 32
33#include "ecb.h"
34
33#include <sys/types.h> 35#include <sys/types.h>
34#include <sys/stat.h> 36#include <sys/stat.h>
35#include <fcntl.h> 37#include <fcntl.h>
36 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
37#include <string.h> 45#include <string.h>
38#include <stdlib.h>
39 46
40#include <limits.h> 47#include <limits.h>
41#include <inttypes.h> 48#include <inttypes.h>
42#include <float.h> 49#include <float.h>
43//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
44 59
45enum { 60enum {
46 TOK_EOF, 61 TOK_EOF,
47 TOK_LPAREN, 62 TOK_LPAREN,
48 TOK_RPAREN, 63 TOK_RPAREN,
49 TOK_DOT, 64 TOK_DOT,
50 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 68 TOK_QUOTE,
52 TOK_DQUOTE, 69 TOK_DQUOTE,
53 TOK_BQUOTE, 70 TOK_BQUOTE,
54 TOK_COMMA, 71 TOK_COMMA,
55 TOK_ATMARK, 72 TOK_ATMARK,
… …
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
67#define S_SINK (&SCHEME_V->xsink) 84#define S_SINK (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 85#define S_EOF (&SCHEME_V->xEOF_OBJ)
69 86
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76
77#if !USE_MULTIPLICITY 87#if !USE_MULTIPLICITY
78static scheme sc; 88static scheme sc;
79#endif 89#endif
80 90
81static void 91static void
… …
150 160
151#define toupper(c) xtoupper (c) 161#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 162#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 163#define isdigit(c) xisdigit (c)
154 164
155#if USE_STRLWR 165#if USE_IGNORECASE
156static const char * 166static const char *
157strlwr (char *s) 167xstrlwr (char *s)
158{ 168{
159 const char *p = s; 169 const char *p = s;
160 170
161 while (*s) 171 while (*s)
162 { 172 {
… …
164 s++; 174 s++;
165 } 175 }
166 176
167 return p; 177 return p;
168} 178}
169#endif
170 179
180#define stricmp(a,b) strcasecmp (a, b)
181#define strlwr(s) xstrlwr (s)
182
183#else
171#define stricmp(a,b) strcmp (a, b) 184# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 185# define strlwr(s) (s)
186#endif
173 187
174#ifndef prompt 188#ifndef prompt
175# define prompt "ts> " 189# define prompt "ts> "
176#endif 190#endif
177 191
… …
183# define FIRST_CELLSEGS 3 197# define FIRST_CELLSEGS 3
184#endif 198#endif
185 199
186enum scheme_types 200enum scheme_types
187{ 201{
202 T_INTEGER,
188 T_FREE, 203 T_REAL,
189 T_STRING, 204 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 205 T_SYMBOL,
192 T_PROC, 206 T_PROC,
193 T_PAIR, 207 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 208 T_CLOSURE,
195 T_CONTINUATION, 209 T_CONTINUATION,
196 T_FOREIGN, 210 T_FOREIGN,
197 T_CHARACTER, 211 T_CHARACTER,
198 T_PORT, 212 T_PORT,
… …
208#define T_SYNTAX 0x0010 222#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 223#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 224#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 225#define T_MARK 0x0080 /* only for gc */
212 226
213static num num_add (num a, num b); 227/* num, for generic arithmetic */
214static num num_mul (num a, num b); 228struct num
215static num num_div (num a, num b); 229{
230 IVALUE ivalue;
231#if USE_REAL
232 RVALUE rvalue;
233 char is_fixnum;
234#endif
235};
236
237#if USE_REAL
238# define num_is_fixnum(n) (n).is_fixnum
239# define num_set_fixnum(n,f) (n).is_fixnum = (f)
240# define num_ivalue(n) (n).ivalue
241# define num_rvalue(n) (n).rvalue
242# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
243# define num_set_rvalue(n,r) (n).rvalue = (r)
244#else
245# define num_is_fixnum(n) 1
246# define num_set_fixnum(n,f) 0
247# define num_ivalue(n) (n).ivalue
248# define num_rvalue(n) (n).ivalue
249# define num_set_ivalue(n,i) (n).ivalue = (i)
250# define num_set_rvalue(n,r) (n).ivalue = (r)
251#endif
252
253enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
254
255static num num_op (enum num_op op, num a, num b);
216static num num_intdiv (num a, num b); 256static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 257static num num_rem (num a, num b);
219static num num_mod (num a, num b); 258static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 259
226#if USE_MATH 260#if USE_MATH
227static double round_per_R5RS (double x); 261static double round_per_R5RS (double x);
228#endif 262#endif
229static int is_zero_rvalue (RVALUE x); 263static int is_zero_rvalue (RVALUE x);
230
231static INLINE int
232num_is_integer (pointer p)
233{
234 return num_is_fixnum (p->object.number);
235}
236 264
237static num num_zero; 265static num num_zero;
238static num num_one; 266static num num_one;
239 267
240/* macros for cell operations */ 268/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 269#define typeflag(p) ((p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 270#define set_typeflag(p,v) ((p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 271#define type(p) (typeflag (p) & T_MASKTYPE)
244 272
245INTERFACE INLINE int 273INTERFACE int
246is_string (pointer p) 274is_string (pointer p)
247{ 275{
248 return type (p) == T_STRING; 276 return type (p) == T_STRING;
249} 277}
250 278
251#define strvalue(p) ((p)->object.string.svalue) 279#define strvalue(p) ((p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 280#define strlength(p) ((p)->object.string.length)
253 281
254INTERFACE int is_list (SCHEME_P_ pointer p);
255INTERFACE INLINE int 282INTERFACE int
256is_vector (pointer p) 283is_vector (pointer p)
257{ 284{
258 return type (p) == T_VECTOR; 285 return type (p) == T_VECTOR;
259} 286}
260 287
261#define vecvalue(p) ((p)->object.vector.vvalue) 288#define vecvalue(p) ((p)->object.vector.vvalue)
262#define veclength(p) ((p)->object.vector.length) 289#define veclength(p) ((p)->object.vector.length)
263INTERFACE void fill_vector (pointer vec, pointer obj); 290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
264INTERFACE uint32_t vector_length (pointer vec);
265INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 291INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
266INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
267 293
268INTERFACE uint32_t 294INTERFACE int
269vector_length (pointer vec) 295is_integer (pointer p)
270{ 296{
271 return vec->object.vector.length; 297 return type (p) == T_INTEGER;
272} 298}
273 299
300/* not the same as in scheme, where integers are (correctly :) reals */
274INTERFACE INLINE int 301INTERFACE int
302is_real (pointer p)
303{
304 return type (p) == T_REAL;
305}
306
307INTERFACE int
275is_number (pointer p) 308is_number (pointer p)
276{ 309{
277 return type (p) == T_NUMBER; 310 return is_integer (p) || is_real (p);
278} 311}
279 312
280INTERFACE INLINE int 313INTERFACE int
281is_integer (pointer p)
282{
283 if (!is_number (p))
284 return 0;
285
286 if (num_is_integer (p) || ivalue (p) == rvalue (p))
287 return 1;
288
289 return 0;
290}
291
292INTERFACE INLINE int
293is_real (pointer p)
294{
295 return is_number (p) && !num_is_fixnum (p->object.number);
296}
297
298INTERFACE INLINE int
299is_character (pointer p) 314is_character (pointer p)
300{ 315{
301 return type (p) == T_CHARACTER; 316 return type (p) == T_CHARACTER;
302} 317}
303 318
304INTERFACE INLINE char * 319INTERFACE char *
305string_value (pointer p) 320string_value (pointer p)
306{ 321{
307 return strvalue (p); 322 return strvalue (p);
308} 323}
309 324
310INLINE num
311nvalue (pointer p)
312{
313 return (p)->object.number;
314}
315
316static IVALUE
317num_get_ivalue (const num n)
318{
319 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
320}
321
322static RVALUE
323num_get_rvalue (const num n)
324{
325 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
326}
327
328INTERFACE IVALUE
329ivalue (pointer p)
330{
331 return num_get_ivalue (p->object.number);
332}
333
334INTERFACE RVALUE
335rvalue (pointer p)
336{
337 return num_get_rvalue (p->object.number);
338}
339
340#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 325#define ivalue_unchecked(p) (p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v)
327
341#if USE_REAL 328#if USE_REAL
342# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 329#define rvalue_unchecked(p) (p)->object.rvalue
343# define set_num_integer(p) (p)->object.number.is_fixnum=1; 330#define set_rvalue(p,v) (p)->object.rvalue = (v)
344# define set_num_real(p) (p)->object.number.is_fixnum=0;
345#else 331#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 332#define rvalue_unchecked(p) (p)->object.ivalue
347# define set_num_integer(p) 0 333#define set_rvalue(p,v) (p)->object.ivalue = (v)
348# define set_num_real(p) 0
349#endif 334#endif
335
350INTERFACE long 336INTERFACE long
351charvalue (pointer p) 337charvalue (pointer p)
352{ 338{
353 return ivalue_unchecked (p); 339 return ivalue_unchecked (p);
354} 340}
355 341
356INTERFACE INLINE int 342INTERFACE int
357is_port (pointer p) 343is_port (pointer p)
358{ 344{
359 return type (p) == T_PORT; 345 return type (p) == T_PORT;
360} 346}
361 347
362INTERFACE INLINE int 348INTERFACE int
363is_inport (pointer p) 349is_inport (pointer p)
364{ 350{
365 return is_port (p) && p->object.port->kind & port_input; 351 return is_port (p) && p->object.port->kind & port_input;
366} 352}
367 353
368INTERFACE INLINE int 354INTERFACE int
369is_outport (pointer p) 355is_outport (pointer p)
370{ 356{
371 return is_port (p) && p->object.port->kind & port_output; 357 return is_port (p) && p->object.port->kind & port_output;
372} 358}
373 359
374INTERFACE INLINE int 360INTERFACE int
375is_pair (pointer p) 361is_pair (pointer p)
376{ 362{
377 return type (p) == T_PAIR; 363 return type (p) == T_PAIR;
378} 364}
379 365
380#define car(p) ((p)->object.cons.car + 0) 366#define car(p) ((p)->object.cons.car + 0)
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 367#define cdr(p) ((p)->object.cons.cdr + 0)
382 368
383#define caar(p) car (car (p)) 369static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 370static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 371static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 372static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 373
388#define cadar(p) car (cdr (car (p))) 374static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 375static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 376static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 377
392INTERFACE void 378INTERFACE void
393set_car (pointer p, pointer q) 379set_car (pointer p, pointer q)
394{ 380{
395 p->object.cons.car = q; 381 p->object.cons.car = q;
… …
411pair_cdr (pointer p) 397pair_cdr (pointer p)
412{ 398{
413 return cdr (p); 399 return cdr (p);
414} 400}
415 401
416INTERFACE INLINE int 402INTERFACE int
417is_symbol (pointer p) 403is_symbol (pointer p)
418{ 404{
419 return type (p) == T_SYMBOL; 405 return type (p) == T_SYMBOL;
420} 406}
421 407
422INTERFACE INLINE char * 408INTERFACE char *
423symname (pointer p) 409symname (pointer p)
424{ 410{
425 return strvalue (car (p)); 411 return strvalue (car (p));
426} 412}
427 413
428#if USE_PLIST 414#if USE_PLIST
429SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
430hasprop (pointer p) 416hasprop (pointer p)
431{ 417{
432 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
433} 419}
434 420
435# define symprop(p) cdr(p) 421# define symprop(p) cdr(p)
436#endif 422#endif
437 423
438INTERFACE INLINE int 424INTERFACE int
439is_syntax (pointer p) 425is_syntax (pointer p)
440{ 426{
441 return typeflag (p) & T_SYNTAX; 427 return typeflag (p) & T_SYNTAX;
442} 428}
443 429
444INTERFACE INLINE int 430INTERFACE int
445is_proc (pointer p) 431is_proc (pointer p)
446{ 432{
447 return type (p) == T_PROC; 433 return type (p) == T_PROC;
448} 434}
449 435
450INTERFACE INLINE int 436INTERFACE int
451is_foreign (pointer p) 437is_foreign (pointer p)
452{ 438{
453 return type (p) == T_FOREIGN; 439 return type (p) == T_FOREIGN;
454} 440}
455 441
456INTERFACE INLINE char * 442INTERFACE char *
457syntaxname (pointer p) 443syntaxname (pointer p)
458{ 444{
459 return strvalue (car (p)); 445 return strvalue (car (p));
460} 446}
461 447
462#define procnum(p) ivalue (p) 448#define procnum(p) ivalue_unchecked (p)
463static const char *procname (pointer x); 449static const char *procname (pointer x);
464 450
465INTERFACE INLINE int 451INTERFACE int
466is_closure (pointer p) 452is_closure (pointer p)
467{ 453{
468 return type (p) == T_CLOSURE; 454 return type (p) == T_CLOSURE;
469} 455}
470 456
471INTERFACE INLINE int 457INTERFACE int
472is_macro (pointer p) 458is_macro (pointer p)
473{ 459{
474 return type (p) == T_MACRO; 460 return type (p) == T_MACRO;
475} 461}
476 462
477INTERFACE INLINE pointer 463INTERFACE pointer
478closure_code (pointer p) 464closure_code (pointer p)
479{ 465{
480 return car (p); 466 return car (p);
481} 467}
482 468
483INTERFACE INLINE pointer 469INTERFACE pointer
484closure_env (pointer p) 470closure_env (pointer p)
485{ 471{
486 return cdr (p); 472 return cdr (p);
487} 473}
488 474
489INTERFACE INLINE int 475INTERFACE int
490is_continuation (pointer p) 476is_continuation (pointer p)
491{ 477{
492 return type (p) == T_CONTINUATION; 478 return type (p) == T_CONTINUATION;
493} 479}
494 480
495#define cont_dump(p) cdr (p) 481#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 482#define set_cont_dump(p,v) set_cdr ((p), (v))
497 483
498/* To do: promise should be forced ONCE only */ 484/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 485INTERFACE int
500is_promise (pointer p) 486is_promise (pointer p)
501{ 487{
502 return type (p) == T_PROMISE; 488 return type (p) == T_PROMISE;
503} 489}
504 490
505INTERFACE INLINE int 491INTERFACE int
506is_environment (pointer p) 492is_environment (pointer p)
507{ 493{
508 return type (p) == T_ENVIRONMENT; 494 return type (p) == T_ENVIRONMENT;
509} 495}
510 496
… …
516 502
517#define is_mark(p) (typeflag (p) & T_MARK) 503#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 504#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 505#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 506
521INTERFACE INLINE int 507INTERFACE int
522is_immutable (pointer p) 508is_immutable (pointer p)
523{ 509{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 510 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 511}
526 512
527INTERFACE INLINE void 513INTERFACE void
528setimmutable (pointer p) 514setimmutable (pointer p)
529{ 515{
530#if USE_ERROR_CHECKING 516#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 517 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 518#endif
533} 519}
534 520
521/* Result is:
522 proper list: length
523 circular list: -1
524 not even a pair: -2
525 dotted list: -2 minus length before dot
526*/
527INTERFACE int
528list_length (SCHEME_P_ pointer a)
529{
530 int i = 0;
531 pointer slow, fast;
532
533 slow = fast = a;
534
535 while (1)
536 {
537 if (fast == NIL)
538 return i;
539
540 if (!is_pair (fast))
541 return -2 - i;
542
543 fast = cdr (fast);
544 ++i;
545
546 if (fast == NIL)
547 return i;
548
549 if (!is_pair (fast))
550 return -2 - i;
551
552 ++i;
553 fast = cdr (fast);
554
555 /* Safe because we would have already returned if `fast'
556 encountered a non-pair. */
557 slow = cdr (slow);
558
559 if (fast == slow)
560 {
561 /* the fast pointer has looped back around and caught up
562 with the slow pointer, hence the structure is circular,
563 not of finite length, and therefore not a list */
564 return -1;
565 }
566 }
567}
568
569INTERFACE int
570is_list (SCHEME_P_ pointer a)
571{
572 return list_length (SCHEME_A_ a) >= 0;
573}
574
535#if USE_CHAR_CLASSIFIERS 575#if USE_CHAR_CLASSIFIERS
536static INLINE int 576ecb_inline int
537Cisalpha (int c) 577Cisalpha (int c)
538{ 578{
539 return isascii (c) && isalpha (c); 579 return isascii (c) && isalpha (c);
540} 580}
541 581
542static INLINE int 582ecb_inline int
543Cisdigit (int c) 583Cisdigit (int c)
544{ 584{
545 return isascii (c) && isdigit (c); 585 return isascii (c) && isdigit (c);
546} 586}
547 587
548static INLINE int 588ecb_inline int
549Cisspace (int c) 589Cisspace (int c)
550{ 590{
551 return isascii (c) && isspace (c); 591 return isascii (c) && isspace (c);
552} 592}
553 593
554static INLINE int 594ecb_inline int
555Cisupper (int c) 595Cisupper (int c)
556{ 596{
557 return isascii (c) && isupper (c); 597 return isascii (c) && isupper (c);
558} 598}
559 599
560static INLINE int 600ecb_inline int
561Cislower (int c) 601Cislower (int c)
562{ 602{
563 return isascii (c) && islower (c); 603 return isascii (c) && islower (c);
564} 604}
565#endif 605#endif
… …
626#endif 666#endif
627 667
628static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
636static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
637static pointer mk_number (SCHEME_P_ const num n); 677static pointer mk_number (SCHEME_P_ const num n);
638static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 678static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
653static void mark (pointer a); 693static void mark (pointer a);
654static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
655static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
659static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
660static INLINE int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 701static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
663static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
664static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 705static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 709static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 710static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 711static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 712static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 713static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
715static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 721static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 722static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 723static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 724static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 725
726static IVALUE
727ivalue (pointer x)
728{
729 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
730}
731
732static RVALUE
733rvalue (pointer x)
734{
735 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
736}
737
738INTERFACE num
739nvalue (pointer x)
740{
741 num n;
742
743 num_set_fixnum (n, is_integer (x));
744
745 if (num_is_fixnum (n))
746 num_set_ivalue (n, ivalue_unchecked (x));
747 else
748 num_set_rvalue (n, rvalue_unchecked (x));
749
750 return n;
751}
752
685static num 753static num
686num_add (num a, num b) 754num_op (enum num_op op, num a, num b)
687{ 755{
688 num ret; 756 num ret;
689 757
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
691 759
692 if (num_is_fixnum (ret)) 760 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 761 {
762 switch (op)
763 {
764 case NUM_ADD: a.ivalue += b.ivalue; break;
765 case NUM_SUB: a.ivalue -= b.ivalue; break;
766 case NUM_MUL: a.ivalue *= b.ivalue; break;
767 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
768 }
769
770 num_set_ivalue (ret, a.ivalue);
771 }
772#if USE_REAL
694 else 773 else
695 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 774 {
775 switch (op)
776 {
777 case NUM_ADD: a.rvalue += b.rvalue; break;
778 case NUM_SUB: a.rvalue -= b.rvalue; break;
779 case NUM_MUL: a.rvalue *= b.rvalue; break;
780 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
781 }
696 782
697 return ret; 783 num_set_rvalue (ret, a.rvalue);
698} 784 }
699 785#endif
700static num
701num_mul (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 786
712 return ret; 787 return ret;
713} 788}
714 789
715static num 790static num
716num_div (num a, num b) 791num_div (num a, num b)
717{ 792{
718 num ret; 793 num ret;
719 794
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 795 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
721 796
722 if (num_is_fixnum (ret)) 797 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 798 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
724 else 799 else
725 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 800 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
726
727 return ret;
728}
729
730static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756 801
757 return ret; 802 return ret;
758} 803}
759 804
760static num 805static num
… …
762{ 807{
763 num ret; 808 num ret;
764 long e1, e2, res; 809 long e1, e2, res;
765 810
766 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 811 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
767 e1 = num_get_ivalue (a); 812 e1 = num_ivalue (a);
768 e2 = num_get_ivalue (b); 813 e2 = num_ivalue (b);
769 res = e1 % e2; 814 res = e1 % e2;
770 815
771 /* remainder should have same sign as second operand */ 816 /* remainder should have same sign as second operand */
772 if (res > 0) 817 if (res > 0)
773 { 818 {
… …
789{ 834{
790 num ret; 835 num ret;
791 long e1, e2, res; 836 long e1, e2, res;
792 837
793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 838 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
794 e1 = num_get_ivalue (a); 839 e1 = num_ivalue (a);
795 e2 = num_get_ivalue (b); 840 e2 = num_ivalue (b);
796 res = e1 % e2; 841 res = e1 % e2;
797 842
798 /* modulo should have same sign as second operand */ 843 /* modulo should have same sign as second operand */
799 if (res * e2 < 0) 844 if (res * e2 < 0)
800 res += e2; 845 res += e2;
801 846
802 num_set_ivalue (ret, res); 847 num_set_ivalue (ret, res);
803 return ret; 848 return ret;
804} 849}
805 850
851/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 852static int
807num_eq (num a, num b) 853num_cmp (num a, num b)
808{ 854{
855 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 856 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 857
812 if (is_fixnum) 858 if (is_fixnum)
813 ret = num_get_ivalue (a) == num_get_ivalue (b); 859 {
860 IVALUE av = num_ivalue (a);
861 IVALUE bv = num_ivalue (b);
862
863 ret = av == bv ? 0 : av < bv ? -1 : +1;
864 }
814 else 865 else
815 ret = num_get_rvalue (a) == num_get_rvalue (b); 866 {
867 RVALUE av = num_rvalue (a);
868 RVALUE bv = num_rvalue (b);
869
870 ret = av == bv ? 0 : av < bv ? -1 : +1;
871 }
816 872
817 return ret; 873 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 874}
860 875
861#if USE_MATH 876#if USE_MATH
862 877
863/* Round to nearest. Round to even if midway */ 878/* Round to nearest. Round to even if midway */
… …
873 return ce; 888 return ce;
874 else if (dfl < dce) 889 else if (dfl < dce)
875 return fl; 890 return fl;
876 else 891 else
877 { 892 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 893 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 894 return fl;
880 else 895 else
881 return ce; 896 return ce;
882 } 897 }
883} 898}
884#endif 899#endif
885 900
886static int 901static int
887is_zero_rvalue (RVALUE x) 902is_zero_rvalue (RVALUE x)
888{ 903{
904 return x == 0;
905#if 0
889#if USE_REAL 906#if USE_REAL
890 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 907 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
891#else 908#else
892 return x == 0; 909 return x == 0;
910#endif
893#endif 911#endif
894} 912}
895 913
896/* allocate new cell segment */ 914/* allocate new cell segment */
897static int 915static int
… …
918 return k; 936 return k;
919 937
920 i = ++SCHEME_V->last_cell_seg; 938 i = ++SCHEME_V->last_cell_seg;
921 SCHEME_V->alloc_seg[i] = cp; 939 SCHEME_V->alloc_seg[i] = cp;
922 940
923 /* insert new segment in address order */
924 newp = (pointer)cp; 941 newp = (pointer)cp;
925 SCHEME_V->cell_seg[i] = newp; 942 SCHEME_V->cell_seg[i] = newp;
926 SCHEME_V->cell_segsize[i] = segsize; 943 SCHEME_V->cell_segsize[i] = segsize;
927
928 //TODO: insert, not swap
929 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
930 {
931 p = SCHEME_V->cell_seg[i];
932 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
933 SCHEME_V->cell_seg[i - 1] = p;
934
935 k = SCHEME_V->cell_segsize[i];
936 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
937 SCHEME_V->cell_segsize[i - 1] = k;
938
939 --i;
940 }
941
942 SCHEME_V->fcells += segsize; 944 SCHEME_V->fcells += segsize;
943 last = newp + segsize - 1; 945 last = newp + segsize - 1;
944 946
945 for (p = newp; p <= last; p++) 947 for (p = newp; p <= last; p++)
946 { 948 {
947 set_typeflag (p, T_FREE); 949 set_typeflag (p, T_PAIR);
948 set_car (p, NIL); 950 set_car (p, NIL);
949 set_cdr (p, p + 1); 951 set_cdr (p, p + 1);
950 } 952 }
951 953
952 /* insert new cells in address order on free list */
953 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
954 {
955 set_cdr (last, SCHEME_V->free_cell); 954 set_cdr (last, SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 955 SCHEME_V->free_cell = newp;
957 }
958 else
959 {
960 p = SCHEME_V->free_cell;
961
962 while (cdr (p) != NIL && newp > cdr (p))
963 p = cdr (p);
964
965 set_cdr (last, cdr (p));
966 set_cdr (p, newp);
967 }
968 } 956 }
969 957
970 return n; 958 return n;
971} 959}
972 960
973/* get new cell. parameter a, b is marked by gc. */ 961/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 962ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 963get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 964{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 965 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 966 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
… …
1051 /* Record it as a vector so that gc understands it. */ 1039 /* Record it as a vector so that gc understands it. */
1052 set_typeflag (v, T_VECTOR | T_ATOM); 1040 set_typeflag (v, T_VECTOR | T_ATOM);
1053 1041
1054 v->object.vector.vvalue = e; 1042 v->object.vector.vvalue = e;
1055 v->object.vector.length = len; 1043 v->object.vector.length = len;
1056 fill_vector (v, init); 1044 fill_vector (v, 0, init);
1057 push_recent_alloc (SCHEME_A_ v, NIL); 1045 push_recent_alloc (SCHEME_A_ v, NIL);
1058 1046
1059 return v; 1047 return v;
1060} 1048}
1061 1049
1062static INLINE void 1050ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1051ok_to_freely_gc (SCHEME_P)
1064{ 1052{
1065 set_car (S_SINK, NIL); 1053 set_car (S_SINK, NIL);
1066} 1054}
1067 1055
… …
1106 return x; 1094 return x;
1107} 1095}
1108 1096
1109/* ========== oblist implementation ========== */ 1097/* ========== oblist implementation ========== */
1110 1098
1099static pointer
1100generate_symbol (SCHEME_P_ const char *name)
1101{
1102 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL);
1106 return x;
1107}
1108
1111#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1112 1110
1111static int
1113static int hash_fn (const char *key, int table_size); 1112hash_fn (const char *key, int table_size)
1113{
1114 const unsigned char *p = key;
1115 uint32_t hash = 2166136261;
1116
1117 while (*p)
1118 hash = (hash ^ *p++) * 16777619;
1119
1120 return hash % table_size;
1121}
1114 1122
1115static pointer 1123static pointer
1116oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1117{ 1125{
1118 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1120 1128
1121/* returns the new symbol */ 1129/* returns the new symbol */
1122static pointer 1130static pointer
1123oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1124{ 1132{
1125 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1126
1127 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1128 set_typeflag (x, T_SYMBOL);
1129 setimmutable (car (x));
1130
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1132 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1133 return x; 1136 return x;
1134} 1137}
1135 1138
1136static INLINE pointer 1139ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1141{
1139 int location; 1142 int location;
1140 pointer x; 1143 pointer x;
1141 char *s; 1144 char *s;
1142 1145
1143 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1144 1147
1145 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1148 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1146 { 1149 {
1147 s = symname (car (x)); 1150 s = symname (car (x));
1148 1151
1149 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1150 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1160 int i; 1163 int i;
1161 pointer x; 1164 pointer x;
1162 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1163 1166
1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1165 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1168 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1166 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1167 1170
1168 return ob_list; 1171 return ob_list;
1169} 1172}
1170 1173
… …
1174oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1175{ 1178{
1176 return NIL; 1179 return NIL;
1177} 1180}
1178 1181
1179static INLINE pointer 1182ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1184{
1182 pointer x; 1185 pointer x;
1183 char *s; 1186 char *s;
1184 1187
… …
1196 1199
1197/* returns the new symbol */ 1200/* returns the new symbol */
1198static pointer 1201static pointer
1199oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1200{ 1203{
1201 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1202
1203 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1204 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1205 setimmutable (car (x)); 1206 setimmutable (x);
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1208 return x;
1208} 1209}
1209 1210
1210static pointer 1211static pointer
… …
1243mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1244{ 1245{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1247
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1248 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1249 set_num_integer (x); 1250
1250 return x; 1251 return x;
1251} 1252}
1252 1253
1253/* get number atom (integer) */ 1254/* get number atom (integer) */
1254INTERFACE pointer 1255INTERFACE pointer
1255mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1256{ 1257{
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1259
1259 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1260 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1261 set_num_integer (x); 1262
1262 return x; 1263 return x;
1263} 1264}
1264 1265
1265INTERFACE pointer 1266INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1267{ 1268{
1269#if USE_REAL
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1271
1270 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1271 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1272 set_num_real (x); 1274
1273 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1274} 1279}
1275 1280
1276static pointer 1281static pointer
1277mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1278{ 1283{
1284#if USE_REAL
1279 if (num_is_fixnum (n)) 1285 return num_is_fixnum (n)
1286 ? mk_integer (SCHEME_A_ num_ivalue (n))
1287 : mk_real (SCHEME_A_ num_rvalue (n));
1288#else
1280 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1281 else 1290#endif
1282 return mk_real (SCHEME_A_ num_get_rvalue (n));
1283} 1291}
1284 1292
1285/* allocate name to string area */ 1293/* allocate name to string area */
1286static char * 1294static char *
1287store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1293 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1294 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1295 } 1303 }
1296 1304
1297 if (str) 1305 if (str)
1298 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1299 int l = strlen (str);
1300
1301 if (l > len_str)
1302 l = len_str;
1303
1304 memcpy (q, str, l);
1305 q[l] = 0;
1306 }
1307 else 1307 else
1308 {
1309 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1310 q[len_str] = 0; 1310 q[len_str] = 0;
1311 }
1312 1311
1313 return q; 1312 return q;
1314} 1313}
1315 1314
1316INTERFACE pointer 1315INTERFACE pointer
… …
1330 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1331 1330
1332 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1334 strlength (x) = len; 1333 strlength (x) = len;
1334
1335 return x; 1335 return x;
1336} 1336}
1337 1337
1338INTERFACE pointer 1338INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
1346{ 1346{
1347 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1348} 1348}
1349 1349
1350INTERFACE void 1350INTERFACE void
1351fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1352{ 1352{
1353 int i; 1353 int i;
1354 1354
1355 for (i = 0; i < vec->object.vector.length; i++) 1355 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1356 vecvalue (vec)[i] = obj;
1357} 1357}
1358 1358
1359INTERFACE void
1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1361{
1362 uint32_t oldsize = veclength (vec);
1363 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1364 veclength (vec) = newsize;
1365 fill_vector (vec, oldsize, fill);
1366}
1367
1359INTERFACE pointer 1368INTERFACE pointer
1360vector_elem (pointer vec, uint32_t ielem) 1369vector_get (pointer vec, uint32_t ielem)
1361{ 1370{
1362 return vecvalue(vec)[ielem]; 1371 return vecvalue(vec)[ielem];
1363} 1372}
1364 1373
1365INTERFACE void 1374INTERFACE void
1366set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1367{ 1376{
1368 vecvalue(vec)[ielem] = a; 1377 vecvalue(vec)[ielem] = a;
1369} 1378}
1370 1379
1371/* get new symbol */ 1380/* get new symbol */
… …
1383 1392
1384INTERFACE pointer 1393INTERFACE pointer
1385gensym (SCHEME_P) 1394gensym (SCHEME_P)
1386{ 1395{
1387 pointer x; 1396 pointer x;
1388
1389 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1390 {
1391 char name[40] = "gensym-"; 1397 char name[40] = "gensym-";
1392 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, SCHEME_V->gensym_cnt);
1393 1399
1394 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1395 x = oblist_find_by_name (SCHEME_A_ name);
1396
1397 if (x == NIL)
1398 {
1399 x = oblist_add_by_name (SCHEME_A_ name);
1400 return x;
1401 }
1402 }
1403
1404 return NIL;
1405} 1401}
1406 1402
1407/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1408static pointer 1404static pointer
1409mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1463 } 1459 }
1464 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1465 { 1461 {
1466 if (!has_fp_exp) 1462 if (!has_fp_exp)
1467 { 1463 {
1468 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1469 from now on */
1470 p++; 1465 p++;
1471 1466
1472 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1473 continue; 1468 continue;
1474 } 1469 }
… …
1562 1557
1563 if (ecb_expect_false (is_vector (p))) 1558 if (ecb_expect_false (is_vector (p)))
1564 { 1559 {
1565 int i; 1560 int i;
1566 1561
1567 for (i = 0; i < p->object.vector.length; i++) 1562 for (i = 0; i < veclength (p); i++)
1568 mark (vecvalue (p)[i]); 1563 mark (vecvalue (p)[i]);
1569 } 1564 }
1570 1565
1571 if (is_atom (p)) 1566 if (is_atom (p))
1572 goto E6; 1567 goto E6;
… …
1670 if (is_mark (p)) 1665 if (is_mark (p))
1671 clrmark (p); 1666 clrmark (p);
1672 else 1667 else
1673 { 1668 {
1674 /* reclaim cell */ 1669 /* reclaim cell */
1675 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1676 { 1671 {
1677 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1678 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1679 set_car (p, NIL); 1674 set_car (p, NIL);
1680 } 1675 }
1681 1676
1682 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1683 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1685 } 1680 }
1686 } 1681 }
1687 } 1682 }
1688 1683
1689 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1690 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1691} 1688}
1692 1689
1693static void 1690static void
1694finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1695{ 1692{
… …
2124#endif 2121#endif
2125} 2122}
2126 2123
2127/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2128static char * 2125static char *
2129readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2130{ 2127{
2131 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2132 2129
2133 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2134 2131
2135 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2136 *p = 0; 2133 *p = 0;
… …
2143 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2144} 2141}
2145 2142
2146/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2147static pointer 2144static pointer
2148readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2149{ 2146{
2150 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2151 int c; 2148 int c;
2152 int c1 = 0; 2149 int c1 = 0;
2153 enum
2154 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2150 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2155 2151
2156 for (;;) 2152 for (;;)
2157 { 2153 {
2158 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2159 2155
… …
2161 return S_F; 2157 return S_F;
2162 2158
2163 switch (state) 2159 switch (state)
2164 { 2160 {
2165 case st_ok: 2161 case st_ok:
2166 switch (c) 2162 if (ecb_expect_false (c == delim))
2167 {
2168 case '\\':
2169 state = st_bsl;
2170 break;
2171
2172 case '"':
2173 *p = 0;
2174 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2163 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2175 2164
2176 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2177 *p++ = c; 2168 *p++ = c;
2178 break;
2179 }
2180 2169
2181 break; 2170 break;
2182 2171
2183 case st_bsl: 2172 case st_bsl:
2184 switch (c) 2173 switch (c)
… …
2214 case 'r': 2203 case 'r':
2215 *p++ = '\r'; 2204 *p++ = '\r';
2216 state = st_ok; 2205 state = st_ok;
2217 break; 2206 break;
2218 2207
2219 case '"':
2220 *p++ = '"';
2221 state = st_ok;
2222 break;
2223
2224 default: 2208 default:
2225 *p++ = c; 2209 *p++ = c;
2226 state = st_ok; 2210 state = st_ok;
2227 break; 2211 break;
2228 } 2212 }
2229 2213
2230 break; 2214 break;
2231 2215
2232 case st_x1: 2216 case st_x1:
2233 case st_x2: 2217 case st_x2:
2234 c = toupper (c); 2218 c = tolower (c);
2235 2219
2236 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2237 {
2238 if (c <= '9')
2239 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2240 else 2222 else if (c >= 'a' && c <= 'f')
2241 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2242
2243 if (state == st_x1)
2244 state = st_x2;
2245 else
2246 {
2247 *p++ = c1;
2248 state = st_ok;
2249 }
2250 }
2251 else 2224 else
2252 return S_F; 2225 return S_F;
2226
2227 if (state == st_x1)
2228 state = st_x2;
2229 else
2230 {
2231 *p++ = c1;
2232 state = st_ok;
2233 }
2253 2234
2254 break; 2235 break;
2255 2236
2256 case st_oct1: 2237 case st_oct1:
2257 case st_oct2: 2238 case st_oct2:
… …
2261 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2262 state = st_ok; 2243 state = st_ok;
2263 } 2244 }
2264 else 2245 else
2265 { 2246 {
2266 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2267 return S_F; 2248 return S_F;
2268 2249
2269 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2270 2251
2271 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2276 state = st_ok; 2257 state = st_ok;
2277 } 2258 }
2278 } 2259 }
2279 2260
2280 break; 2261 break;
2281
2282 } 2262 }
2283 } 2263 }
2284} 2264}
2285 2265
2286/* check c is in chars */ 2266/* check c is in chars */
2287static INLINE int 2267ecb_inline int
2288is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2289{ 2269{
2290 if (c == EOF) 2270 if (c == EOF)
2291 return 1; 2271 return 1;
2292 2272
2293 return !!strchr (s, c); 2273 return !!strchr (s, c);
2294} 2274}
2295 2275
2296/* skip white characters */ 2276/* skip white characters */
2297static INLINE int 2277ecb_inline int
2298skipspace (SCHEME_P) 2278skipspace (SCHEME_P)
2299{ 2279{
2300 int c, curr_line = 0; 2280 int c, curr_line = 0;
2301 2281
2302 do 2282 do
… …
2349 2329
2350 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (" \n\t", c))
2351 return TOK_DOT; 2331 return TOK_DOT;
2352 else 2332 else
2353 { 2333 {
2354 //TODO: ungetc twice in a row is not supported in C
2355 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2356 backchar (SCHEME_A_ '.');
2357 return TOK_ATOM; 2335 return TOK_DOTATOM;
2358 } 2336 }
2337
2338 case '|':
2339 return TOK_STRATOM;
2359 2340
2360 case '\'': 2341 case '\'':
2361 return TOK_QUOTE; 2342 return TOK_QUOTE;
2362 2343
2363 case ';': 2344 case ';':
… …
2530 { 2511 {
2531 p = SCHEME_V->strbuff; 2512 p = SCHEME_V->strbuff;
2532 2513
2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2514 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2534 { 2515 {
2535 if (num_is_integer (l)) 2516 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2517 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2518#if USE_REAL
2538 else 2519 else
2539 { 2520 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2521 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2795 return 0; 2776 return 0;
2796 } 2777 }
2797 else if (is_number (a)) 2778 else if (is_number (a))
2798 { 2779 {
2799 if (is_number (b)) 2780 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2781 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2782
2803 return 0; 2783 return 0;
2804 } 2784 }
2805 else if (is_character (a)) 2785 else if (is_character (a))
2806 { 2786 {
… …
2832/* () is #t in R5RS */ 2812/* () is #t in R5RS */
2833#define is_true(p) ((p) != S_F) 2813#define is_true(p) ((p) != S_F)
2834#define is_false(p) ((p) == S_F) 2814#define is_false(p) ((p) == S_F)
2835 2815
2836/* ========== Environment implementation ========== */ 2816/* ========== Environment implementation ========== */
2837
2838#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2839
2840static int
2841hash_fn (const char *key, int table_size)
2842{
2843 const unsigned char *p = key;
2844 uint32_t hash = 2166136261;
2845
2846 while (*p)
2847 hash = (hash ^ *p++) * 16777619;
2848
2849 return hash % table_size;
2850}
2851#endif
2852 2817
2853#ifndef USE_ALIST_ENV 2818#ifndef USE_ALIST_ENV
2854 2819
2855/* 2820/*
2856 * In this implementation, each frame of the environment may be 2821 * In this implementation, each frame of the environment may be
… …
2873 2838
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2839 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2840 setenvironment (SCHEME_V->envir);
2876} 2841}
2877 2842
2878static INLINE void 2843static uint32_t
2844sym_hash (pointer sym, uint32_t size)
2845{
2846 uintptr_t ptr = (uintptr_t)sym;
2847
2848#if 0
2849 /* table size is prime, so why mix */
2850 ptr += ptr >> 32;
2851 ptr += ptr >> 16;
2852 ptr += ptr >> 8;
2853#endif
2854
2855 return ptr % size;
2856}
2857
2858ecb_inline void
2879new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2880{ 2860{
2881 pointer slot = immutable_cons (variable, value); 2861 pointer slot = immutable_cons (variable, value);
2882 2862
2883 if (is_vector (car (env))) 2863 if (is_vector (car (env)))
2884 { 2864 {
2885 int location = hash_fn (symname (variable), veclength (car (env))); 2865 int location = sym_hash (variable, veclength (car (env)));
2886
2887 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2866 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2888 } 2867 }
2889 else 2868 else
2890 set_car (env, immutable_cons (slot, car (env))); 2869 set_car (env, immutable_cons (slot, car (env)));
2891} 2870}
2892 2871
2893static pointer 2872static pointer
2894find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2873find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2895{ 2874{
2896 pointer x, y; 2875 pointer x, y;
2897 int location;
2898 2876
2899 for (x = env; x != NIL; x = cdr (x)) 2877 for (x = env; x != NIL; x = cdr (x))
2900 { 2878 {
2901 if (is_vector (car (x))) 2879 if (is_vector (car (x)))
2902 { 2880 {
2903 location = hash_fn (symname (hdl), veclength (car (x))); 2881 int location = sym_hash (hdl, veclength (car (x)));
2904 y = vector_elem (car (x), location); 2882 y = vector_get (car (x), location);
2905 } 2883 }
2906 else 2884 else
2907 y = car (x); 2885 y = car (x);
2908 2886
2909 for (; y != NIL; y = cdr (y)) 2887 for (; y != NIL; y = cdr (y))
2910 if (caar (y) == hdl) 2888 if (caar (y) == hdl)
2911 break; 2889 break;
2912 2890
2913 if (y != NIL) 2891 if (y != NIL)
2892 return car (y);
2893
2894 if (!all)
2914 break; 2895 break;
2915
2916 if (!all)
2917 return NIL;
2918 } 2896 }
2919
2920 if (x != NIL)
2921 return car (y);
2922 2897
2923 return NIL; 2898 return NIL;
2924} 2899}
2925 2900
2926#else /* USE_ALIST_ENV */ 2901#else /* USE_ALIST_ENV */
2927 2902
2928static INLINE void 2903ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2904new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2905{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2906 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2907 setenvironment (SCHEME_V->envir);
2933} 2908}
2934 2909
2935static INLINE void 2910ecb_inline void
2936new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2911new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2937{ 2912{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2913 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2914}
2940 2915
… …
2948 for (y = car (x); y != NIL; y = cdr (y)) 2923 for (y = car (x); y != NIL; y = cdr (y))
2949 if (caar (y) == hdl) 2924 if (caar (y) == hdl)
2950 break; 2925 break;
2951 2926
2952 if (y != NIL) 2927 if (y != NIL)
2928 return car (y);
2953 break; 2929 break;
2954 2930
2955 if (!all) 2931 if (!all)
2956 return NIL; 2932 break;
2957 } 2933 }
2958
2959 if (x != NIL)
2960 return car (y);
2961 2934
2962 return NIL; 2935 return NIL;
2963} 2936}
2964 2937
2965#endif /* USE_ALIST_ENV else */ 2938#endif /* USE_ALIST_ENV else */
2966 2939
2967static INLINE void 2940ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2941new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2942{
2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2943 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2971} 2944}
2972 2945
2973static INLINE void 2946ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2947set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2948{
2976 set_cdr (slot, value); 2949 set_cdr (slot, value);
2977} 2950}
2978 2951
2979static INLINE pointer 2952ecb_inline pointer
2980slot_value_in_env (pointer slot) 2953slot_value_in_env (pointer slot)
2981{ 2954{
2982 return cdr (slot); 2955 return cdr (slot);
2983} 2956}
2984 2957
2985/* ========== Evaluation Cycle ========== */ 2958/* ========== Evaluation Cycle ========== */
2986 2959
2987static pointer 2960static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 2961xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 2962{
2990#if USE_ERROR_HOOK 2963#if USE_ERROR_HOOK
2991 pointer x; 2964 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 2965 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 3000 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 3001 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 3002 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 3003 SCHEME_V->op = OP_EVAL;
3031 3004
3032 return S_T; 3005 return 0;
3033 } 3006 }
3034#endif 3007#endif
3035 3008
3036 if (a) 3009 if (a)
3037 SCHEME_V->args = cons (a, NIL); 3010 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 3012 SCHEME_V->args = NIL;
3040 3013
3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3014 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3042 setimmutable (car (SCHEME_V->args)); 3015 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 3016 SCHEME_V->op = OP_ERR0;
3017
3044 return S_T; 3018 return 0;
3045} 3019}
3046 3020
3047#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3021#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3048#define Error_0(s) Error_1 (s, 0) 3022#define Error_0(s) Error_1 (s, 0)
3049 3023
3050/* Too small to turn into function */ 3024/* Too small to turn into function */
3051#define BEGIN do { 3025#define BEGIN do {
3052#define END } while (0) 3026#define END } while (0)
3053#define s_goto(a) BEGIN \ 3027#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 3028 SCHEME_V->op = a; \
3055 return S_T; END 3029 return 0; END
3056 3030
3057#define s_return(a) return xs_return (SCHEME_A_ a) 3031#define s_return(a) return xs_return (SCHEME_A_ a)
3058 3032
3059#ifndef USE_SCHEME_STACK 3033#ifndef USE_SCHEME_STACK
3060 3034
… …
3085 next_frame = SCHEME_V->dump_base + nframes; 3059 next_frame = SCHEME_V->dump_base + nframes;
3086 3060
3087 next_frame->op = op; 3061 next_frame->op = op;
3088 next_frame->args = args; 3062 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3063 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3064 next_frame->code = code;
3091 3065
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3066 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3067}
3094 3068
3095static pointer 3069static int
3096xs_return (SCHEME_P_ pointer a) 3070xs_return (SCHEME_P_ pointer a)
3097{ 3071{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3072 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3073 struct dump_stack_frame *frame;
3100 3074
3101 SCHEME_V->value = a; 3075 SCHEME_V->value = a;
3102 3076
3103 if (nframes <= 0) 3077 if (nframes <= 0)
3104 return NIL; 3078 return -1;
3105 3079
3106 frame = &SCHEME_V->dump_base[--nframes]; 3080 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3081 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3082 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3083 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3084 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3085 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3086
3113 return S_T; 3087 return 0;
3114} 3088}
3115 3089
3116static INLINE void 3090ecb_inline void
3117dump_stack_reset (SCHEME_P) 3091dump_stack_reset (SCHEME_P)
3118{ 3092{
3119 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3093 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3120 SCHEME_V->dump = (pointer)+0; 3094 SCHEME_V->dump = (pointer)+0;
3121} 3095}
3122 3096
3123static INLINE void 3097ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3098dump_stack_initialize (SCHEME_P)
3125{ 3099{
3126 SCHEME_V->dump_size = 0; 3100 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3101 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3102 dump_stack_reset (SCHEME_A);
… …
3181 int i = 0; 3155 int i = 0;
3182 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3156 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3183 3157
3184 while (cont != NIL) 3158 while (cont != NIL)
3185 { 3159 {
3186 frame->op = ivalue (car (cont)); cont = cdr (cont); 3160 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3187 frame->args = car (cont) ; cont = cdr (cont); 3161 frame->args = car (cont) ; cont = cdr (cont);
3188 frame->envir = car (cont) ; cont = cdr (cont); 3162 frame->envir = car (cont) ; cont = cdr (cont);
3189 frame->code = car (cont) ; cont = cdr (cont); 3163 frame->code = car (cont) ; cont = cdr (cont);
3190 3164
3191 ++frame; 3165 ++frame;
3192 ++i; 3166 ++i;
3193 } 3167 }
3194 3168
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3169 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3170}
3197 3171
3198#else 3172#else
3199 3173
3200static INLINE void 3174ecb_inline void
3201dump_stack_reset (SCHEME_P) 3175dump_stack_reset (SCHEME_P)
3202{ 3176{
3203 SCHEME_V->dump = NIL; 3177 SCHEME_V->dump = NIL;
3204} 3178}
3205 3179
3206static INLINE void 3180ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3181dump_stack_initialize (SCHEME_P)
3208{ 3182{
3209 dump_stack_reset (SCHEME_A); 3183 dump_stack_reset (SCHEME_A);
3210} 3184}
3211 3185
… …
3213dump_stack_free (SCHEME_P) 3187dump_stack_free (SCHEME_P)
3214{ 3188{
3215 SCHEME_V->dump = NIL; 3189 SCHEME_V->dump = NIL;
3216} 3190}
3217 3191
3218static pointer 3192static int
3219xs_return (SCHEME_P_ pointer a) 3193xs_return (SCHEME_P_ pointer a)
3220{ 3194{
3221 pointer dump = SCHEME_V->dump; 3195 pointer dump = SCHEME_V->dump;
3222 3196
3223 SCHEME_V->value = a; 3197 SCHEME_V->value = a;
3224 3198
3225 if (dump == NIL) 3199 if (dump == NIL)
3226 return NIL; 3200 return -1;
3227 3201
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3202 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3203 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3204 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3205 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3206
3233 SCHEME_V->dump = dump; 3207 SCHEME_V->dump = dump;
3234 3208
3235 return S_T; 3209 return 0;
3236} 3210}
3237 3211
3238static void 3212static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3213s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3214{
… …
3265 3239
3266#endif 3240#endif
3267 3241
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3242#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3243
3270static pointer 3244static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3245opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3246{
3247 pointer args = SCHEME_V->args;
3273 pointer x, y; 3248 pointer x, y;
3274 3249
3275 switch (op) 3250 switch (op)
3276 { 3251 {
3277 case OP_LOAD: /* load */ 3252 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3253 if (file_interactive (SCHEME_A))
3279 { 3254 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3255 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3256 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3257 }
3283 3258
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3259 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3260 Error_1 ("unable to open", car (args));
3286 else 3261 else
3287 { 3262 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3263 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3264 s_goto (OP_T0LVL);
3290 } 3265 }
… …
3364 case OP_EVAL: /* main part of evaluation */ 3339 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3340#if USE_TRACING
3366 if (SCHEME_V->tracing) 3341 if (SCHEME_V->tracing)
3367 { 3342 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3343 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3344 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3345 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3346 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3347 s_goto (OP_P0LIST);
3373 } 3348 }
3374 3349
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3393 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3394 s_goto (OP_E1ARGS);
3420 } 3395 }
3421 3396
3422 case OP_E1ARGS: /* eval arguments */ 3397 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3398 args = cons (SCHEME_V->value, args);
3424 3399
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3400 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3401 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3402 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3403 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3404 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3405 s_goto (OP_EVAL);
3431 } 3406 }
3432 else /* end */ 3407 else /* end */
3433 { 3408 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3409 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3410 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3411 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3412 s_goto (OP_APPLY);
3438 } 3413 }
3439 3414
3440#if USE_TRACING 3415#if USE_TRACING
3441 3416
3442 case OP_TRACING: 3417 case OP_TRACING:
3443 { 3418 {
3444 int tr = SCHEME_V->tracing; 3419 int tr = SCHEME_V->tracing;
3445 3420
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3421 SCHEME_V->tracing = ivalue_unchecked (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3422 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3423 }
3449 3424
3450#endif 3425#endif
3451 3426
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3427 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3428#if USE_TRACING
3454 if (SCHEME_V->tracing) 3429 if (SCHEME_V->tracing)
3455 { 3430 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3431 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3432 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3433 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3434 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3435 s_goto (OP_P0LIST);
3461 } 3436 }
3462 3437
3463 /* fall through */ 3438 /* fall through */
3464 3439
3465 case OP_REAL_APPLY: 3440 case OP_REAL_APPLY:
3466#endif 3441#endif
3467 if (is_proc (SCHEME_V->code)) 3442 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3443 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3444 else if (is_foreign (SCHEME_V->code))
3472 { 3445 {
3473 /* Keep nested calls from GC'ing the arglist */ 3446 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3447 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3448 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3476 3449
3477 s_return (x); 3450 s_return (x);
3478 } 3451 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3452 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3453 {
3481 /* Should not accept promise */ 3454 /* Should not accept promise */
3482 /* make environment */ 3455 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3456 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3457
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3458 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3459 {
3487 if (y == NIL) 3460 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3461 Error_0 ("not enough arguments");
3489 else 3462 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3463 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3481 s_goto (OP_BEGIN);
3509 } 3482 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3483 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3484 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3485 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3486 s_return (args != NIL ? car (args) : NIL);
3514 } 3487 }
3515 else 3488 else
3516 Error_0 ("illegal function"); 3489 Error_0 ("illegal function");
3517 3490
3518 case OP_DOMACRO: /* do macro */ 3491 case OP_DOMACRO: /* do macro */
… …
3527 { 3500 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3501 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3502
3530 if (f != NIL) 3503 if (f != NIL)
3531 { 3504 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3505 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3506 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3507 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3508 s_goto (OP_APPLY);
3536 } 3509 }
3537 3510
… …
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3521 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549 3522
3550#endif 3523#endif
3551 3524
3552 case OP_MKCLOSURE: /* make-closure */ 3525 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3526 x = car (args);
3554 3527
3555 if (car (x) == SCHEME_V->LAMBDA) 3528 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3529 x = cdr (x);
3557 3530
3558 if (cdr (SCHEME_V->args) == NIL) 3531 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3532 y = SCHEME_V->envir;
3560 else 3533 else
3561 y = cadr (SCHEME_V->args); 3534 y = cadr (args);
3562 3535
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3536 s_return (mk_closure (SCHEME_A_ x, y));
3564 3537
3565 case OP_QUOTE: /* quote */ 3538 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3539 s_return (car (SCHEME_V->code));
… …
3598 3571
3599 3572
3600 case OP_DEFP: /* defined? */ 3573 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3574 x = SCHEME_V->envir;
3602 3575
3603 if (cdr (SCHEME_V->args) != NIL) 3576 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3577 x = cadr (args);
3605 3578
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3579 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3580
3608 case OP_SET0: /* set! */ 3581 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3582 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3583 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3584
… …
3642 3615
3643 case OP_IF1: /* if */ 3616 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3617 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3618 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3619 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3620 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3621 s_goto (OP_EVAL);
3651 3622
3652 case OP_LET0: /* let */ 3623 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3624 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3625 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3626 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3627 s_goto (OP_LET1);
3657 3628
3658 case OP_LET1: /* let (calculate parameters) */ 3629 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3630 args = cons (SCHEME_V->value, args);
3660 3631
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3632 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3633 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3634 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3664 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3635 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3636
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3637 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3638 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3639 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3640 s_goto (OP_EVAL);
3670 } 3641 }
3671 else /* end */ 3642 else /* end */
3672 { 3643 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3644 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3645 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3646 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3647 s_goto (OP_LET2);
3677 } 3648 }
3678 3649
3679 case OP_LET2: /* let */ 3650 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3651 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3652
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3653 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3654 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3655 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3656
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3657 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3658 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3659 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3660 {
3690 if (!is_pair (x)) 3661 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3662 Error_1 ("Bad syntax of binding in let :", x);
3692 3663
3693 if (!is_list (SCHEME_A_ car (x))) 3664 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3665 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3666
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3667 args = cons (caar (x), args);
3697 } 3668 }
3698 3669
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3670 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3671 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3672 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3673 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3674 }
3706 else 3675 else
3707 { 3676 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3677 SCHEME_V->code = cdr (SCHEME_V->code);
3678 }
3679
3709 SCHEME_V->args = NIL; 3680 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3681 s_goto (OP_BEGIN);
3713 3682
3714 case OP_LET0AST: /* let* */ 3683 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3684 if (car (SCHEME_V->code) == NIL)
3716 { 3685 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3703 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3704 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3705
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3706 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3707 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3708 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3709 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3710 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3711 s_goto (OP_EVAL);
3743 } 3712 }
3744 else /* end */ 3713 else /* end */
3745 { 3714 {
3746 SCHEME_V->code = SCHEME_V->args; 3715 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3716 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3717 s_goto (OP_BEGIN);
3749 } 3718 }
3750 3719
3751 case OP_LET0REC: /* letrec */ 3720 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3723 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3724 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3725 s_goto (OP_LET1REC);
3757 3726
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3727 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3728 args = cons (SCHEME_V->value, args);
3760 3729
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3730 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3731 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3732 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3764 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3733 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3734
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3735 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3736 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3737 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3738 s_goto (OP_EVAL);
3770 } 3739 }
3771 else /* end */ 3740 else /* end */
3772 { 3741 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3742 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3743 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3744 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3745 s_goto (OP_LET2REC);
3777 } 3746 }
3778 3747
3779 case OP_LET2REC: /* letrec */ 3748 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3749 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3750 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3751
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3752 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3754 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3840 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3841 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3842 s_goto (OP_EVAL);
3874 3843
3875 case OP_C1STREAM: /* cons-stream */ 3844 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3845 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3877 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3846 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3847 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3848 s_return (cons (args, x));
3880 3849
3881 case OP_MACRO0: /* macro */ 3850 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3851 if (is_pair (car (SCHEME_V->code)))
3883 { 3852 {
3884 x = caar (SCHEME_V->code); 3853 x = caar (SCHEME_V->code);
… …
3917 { 3886 {
3918 if (!is_pair (y = caar (x))) 3887 if (!is_pair (y = caar (x)))
3919 break; 3888 break;
3920 3889
3921 for (; y != NIL; y = cdr (y)) 3890 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3891 if (eqv (car (y), SCHEME_V->value))
3924 break; 3892 break;
3925 }
3926 3893
3927 if (y != NIL) 3894 if (y != NIL)
3928 break; 3895 break;
3929 } 3896 }
3930 3897
… …
3950 s_goto (OP_BEGIN); 3917 s_goto (OP_BEGIN);
3951 else 3918 else
3952 s_return (NIL); 3919 s_return (NIL);
3953 3920
3954 case OP_PAPPLY: /* apply */ 3921 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 3922 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3923 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3924 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 3925 s_goto (OP_APPLY);
3959 3926
3960 case OP_PEVAL: /* eval */ 3927 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 3928 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 3929 SCHEME_V->envir = cadr (args);
3963 3930
3964 SCHEME_V->code = car (SCHEME_V->args); 3931 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 3932 s_goto (OP_EVAL);
3966 3933
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 3934 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 3935 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3936 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 3937 s_goto (OP_APPLY);
3971 } 3938 }
3972 3939
3973 return S_T; 3940 if (USE_ERROR_CHECKING) abort ();
3974} 3941}
3975 3942
3976static pointer 3943static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3944opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 3945{
3979 pointer x; 3946 pointer args = SCHEME_V->args;
3947 pointer x = car (args);
3980 num v; 3948 num v;
3981 3949
3950 switch (op)
3951 {
3982#if USE_MATH 3952#if USE_MATH
3983 RVALUE dd;
3984#endif
3985
3986 switch (op)
3987 {
3988#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 3953 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args); 3954 {
3992
3993 if (num_is_integer (x)) 3955 if (is_integer (x))
3994 s_return (x); 3956 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3957
3958 RVALUE r = rvalue_unchecked (x);
3959
3960 if (r == (RVALUE)(IVALUE)r)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3961 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3997 else 3962 else
3998 Error_1 ("inexact->exact: not integral:", x); 3963 Error_1 ("inexact->exact: not integral:", x);
3964 }
3999 3965
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3966 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3967 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3968 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3969 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3970 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3971 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3972 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 3973
4028 case OP_ATAN: 3974 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 3975 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3976 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 3977 else
4034 { 3978 {
4035 pointer y = cadr (SCHEME_V->args); 3979 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3980 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 3981 }
4039 3982
4040 case OP_SQRT: 3983 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3984 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 3985
4044 case OP_EXPT: 3986 case OP_EXPT:
4045 { 3987 {
4046 RVALUE result; 3988 RVALUE result;
4047 int real_result = 1; 3989 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 3990 pointer y = cadr (args);
4049 3991
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 3992 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 3993 real_result = 0;
4054 3994
4055 /* This 'if' is an R5RS compatibility fix. */ 3995 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 3996 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 3997 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 3998 result = 0;
4059 else 3999 else
4060 result = pow (rvalue (x), rvalue (y)); 4000 result = pow (rvalue (x), rvalue (y));
4061 4001
4062 /* Before returning integer result make sure we can. */ 4002 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 4003 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 4004 if (!real_result)
4065 { 4005 {
4066 long result_as_long = (long) result; 4006 long result_as_long = result;
4067 4007
4068 if (result != (RVALUE) result_as_long) 4008 if (result != result_as_long)
4069 real_result = 1; 4009 real_result = 1;
4070 } 4010 }
4071 4011
4072 if (real_result) 4012 if (real_result)
4073 s_return (mk_real (SCHEME_A_ result)); 4013 s_return (mk_real (SCHEME_A_ result));
4074 else 4014 else
4075 s_return (mk_integer (SCHEME_A_ result)); 4015 s_return (mk_integer (SCHEME_A_ result));
4076 } 4016 }
4077 4017
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4018 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4019 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 4020
4086 case OP_TRUNCATE: 4021 case OP_TRUNCATE:
4087 { 4022 {
4088 RVALUE rvalue_of_x; 4023 RVALUE n = rvalue (x);
4089
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x);
4092
4093 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4024 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4095 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4025 }
4098 4026
4099 case OP_ROUND: 4027 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4028 if (is_integer (x))
4103 s_return (x); 4029 s_return (x);
4104 4030
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4031 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4032#endif
4107 4033
4108 case OP_ADD: /* + */ 4034 case OP_ADD: /* + */
4109 v = num_zero; 4035 v = num_zero;
4110 4036
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4037 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4038 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4039
4114 s_return (mk_number (SCHEME_A_ v)); 4040 s_return (mk_number (SCHEME_A_ v));
4115 4041
4116 case OP_MUL: /* * */ 4042 case OP_MUL: /* * */
4117 v = num_one; 4043 v = num_one;
4118 4044
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4045 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4046 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4047
4122 s_return (mk_number (SCHEME_A_ v)); 4048 s_return (mk_number (SCHEME_A_ v));
4123 4049
4124 case OP_SUB: /* - */ 4050 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4051 if (cdr (args) == NIL)
4126 { 4052 {
4127 x = SCHEME_V->args; 4053 x = args;
4128 v = num_zero; 4054 v = num_zero;
4129 } 4055 }
4130 else 4056 else
4131 { 4057 {
4132 x = cdr (SCHEME_V->args); 4058 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4059 v = nvalue (car (args));
4134 } 4060 }
4135 4061
4136 for (; x != NIL; x = cdr (x)) 4062 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4063 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4064
4139 s_return (mk_number (SCHEME_A_ v)); 4065 s_return (mk_number (SCHEME_A_ v));
4140 4066
4141 case OP_DIV: /* / */ 4067 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4068 if (cdr (args) == NIL)
4143 { 4069 {
4144 x = SCHEME_V->args; 4070 x = args;
4145 v = num_one; 4071 v = num_one;
4146 } 4072 }
4147 else 4073 else
4148 { 4074 {
4149 x = cdr (SCHEME_V->args); 4075 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4076 v = nvalue (car (args));
4151 } 4077 }
4152 4078
4153 for (; x != NIL; x = cdr (x)) 4079 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4080 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4081 v = num_div (v, nvalue (car (x)));
4157 else 4082 else
4158 Error_0 ("/: division by zero"); 4083 Error_0 ("/: division by zero");
4159 }
4160 4084
4161 s_return (mk_number (SCHEME_A_ v)); 4085 s_return (mk_number (SCHEME_A_ v));
4162 4086
4163 case OP_INTDIV: /* quotient */ 4087 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4088 if (cdr (args) == NIL)
4165 { 4089 {
4166 x = SCHEME_V->args; 4090 x = args;
4167 v = num_one; 4091 v = num_one;
4168 } 4092 }
4169 else 4093 else
4170 { 4094 {
4171 x = cdr (SCHEME_V->args); 4095 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4096 v = nvalue (car (args));
4173 } 4097 }
4174 4098
4175 for (; x != NIL; x = cdr (x)) 4099 for (; x != NIL; x = cdr (x))
4176 { 4100 {
4177 if (ivalue (car (x)) != 0) 4101 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4102 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4103 else
4180 Error_0 ("quotient: division by zero"); 4104 Error_0 ("quotient: division by zero");
4181 } 4105 }
4182 4106
4183 s_return (mk_number (SCHEME_A_ v)); 4107 s_return (mk_number (SCHEME_A_ v));
4184 4108
4185 case OP_REM: /* remainder */ 4109 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4110 v = nvalue (x);
4187 4111
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4112 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4113 v = num_rem (v, nvalue (cadr (args)));
4190 else 4114 else
4191 Error_0 ("remainder: division by zero"); 4115 Error_0 ("remainder: division by zero");
4192 4116
4193 s_return (mk_number (SCHEME_A_ v)); 4117 s_return (mk_number (SCHEME_A_ v));
4194 4118
4195 case OP_MOD: /* modulo */ 4119 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4120 v = nvalue (x);
4197 4121
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4122 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4123 v = num_mod (v, nvalue (cadr (args)));
4200 else 4124 else
4201 Error_0 ("modulo: division by zero"); 4125 Error_0 ("modulo: division by zero");
4202 4126
4203 s_return (mk_number (SCHEME_A_ v)); 4127 s_return (mk_number (SCHEME_A_ v));
4204 4128
4205 case OP_CAR: /* car */ 4129 case OP_CAR: /* car */
4206 s_return (caar (SCHEME_V->args)); 4130 s_return (caar (args));
4207 4131
4208 case OP_CDR: /* cdr */ 4132 case OP_CDR: /* cdr */
4209 s_return (cdar (SCHEME_V->args)); 4133 s_return (cdar (args));
4210 4134
4211 case OP_CONS: /* cons */ 4135 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4136 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4137 s_return (args);
4214 4138
4215 case OP_SETCAR: /* set-car! */ 4139 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4140 if (!is_immutable (x))
4217 { 4141 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4142 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4143 s_return (car (args));
4220 } 4144 }
4221 else 4145 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4146 Error_0 ("set-car!: unable to alter immutable pair");
4223 4147
4224 case OP_SETCDR: /* set-cdr! */ 4148 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4149 if (!is_immutable (x))
4226 { 4150 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4151 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4152 s_return (car (args));
4229 } 4153 }
4230 else 4154 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4155 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4156
4233 case OP_CHAR2INT: /* char->integer */ 4157 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4158 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4235 4159
4236 case OP_INT2CHAR: /* integer->char */ 4160 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4161 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4238 4162
4239 case OP_CHARUPCASE: 4163 case OP_CHARUPCASE:
4240 { 4164 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4165 unsigned char c = ivalue_unchecked (x);
4242 c = toupper (c); 4166 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4167 s_return (mk_character (SCHEME_A_ c));
4244 } 4168 }
4245 4169
4246 case OP_CHARDNCASE: 4170 case OP_CHARDNCASE:
4247 { 4171 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4172 unsigned char c = ivalue_unchecked (x);
4249 c = tolower (c); 4173 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4174 s_return (mk_character (SCHEME_A_ c));
4251 } 4175 }
4252 4176
4253 case OP_STR2SYM: /* string->symbol */ 4177 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4178 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4179
4256 case OP_STR2ATOM: /* string->atom */ 4180 case OP_STR2ATOM: /* string->atom */
4257 { 4181 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4182 char *s = strvalue (x);
4259 long pf = 0; 4183 long pf = 0;
4260 4184
4261 if (cdr (SCHEME_V->args) != NIL) 4185 if (cdr (args) != NIL)
4262 { 4186 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4187 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4188 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4189 pf = ivalue_unchecked (cadr (args));
4266 4190
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4191 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4192 {
4269 /* base is OK */ 4193 /* base is OK */
4270 } 4194 }
4271 else 4195 else
4272 pf = -1; 4196 pf = -1;
4273 } 4197 }
4274 4198
4275 if (pf < 0) 4199 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4200 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4201 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4202 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4203 else
4280 { 4204 {
4281 if (pf == 0 || pf == 10) 4205 if (pf == 0 || pf == 10)
… …
4292 } 4216 }
4293 } 4217 }
4294 } 4218 }
4295 4219
4296 case OP_SYM2STR: /* symbol->string */ 4220 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4221 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4222 setimmutable (x);
4299 s_return (x); 4223 s_return (x);
4300 4224
4301 case OP_ATOM2STR: /* atom->string */ 4225 case OP_ATOM2STR: /* atom->string */
4302 { 4226 {
4303 long pf = 0; 4227 long pf = 0;
4304 4228
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4229 if (cdr (args) != NIL)
4308 { 4230 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4231 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4232 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4233 pf = ivalue_unchecked (cadr (args));
4312 4234
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4235 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4236 {
4315 /* base is OK */ 4237 /* base is OK */
4316 } 4238 }
4317 else 4239 else
4318 pf = -1; 4240 pf = -1;
4319 } 4241 }
4320 4242
4321 if (pf < 0) 4243 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4244 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4245 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4246 {
4325 char *p; 4247 char *p;
4326 int len; 4248 int len;
4327 4249
… …
4332 Error_1 ("atom->string: not an atom:", x); 4254 Error_1 ("atom->string: not an atom:", x);
4333 } 4255 }
4334 4256
4335 case OP_MKSTRING: /* make-string */ 4257 case OP_MKSTRING: /* make-string */
4336 { 4258 {
4337 int fill = ' '; 4259 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4338 int len; 4260 int len = ivalue_unchecked (x);
4339 4261
4340 len = ivalue (car (SCHEME_V->args));
4341
4342 if (cdr (SCHEME_V->args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args));
4344
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4262 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4263 }
4347 4264
4348 case OP_STRLEN: /* string-length */ 4265 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4266 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4267
4351 case OP_STRREF: /* string-ref */ 4268 case OP_STRREF: /* string-ref */
4352 { 4269 {
4353 char *str; 4270 char *str = strvalue (x);
4354 int index;
4355
4356 str = strvalue (car (SCHEME_V->args));
4357
4358 index = ivalue (cadr (SCHEME_V->args)); 4271 int index = ivalue_unchecked (cadr (args));
4359 4272
4360 if (index >= strlength (car (SCHEME_V->args))) 4273 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4274 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4275
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4276 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4277 }
4365 4278
4366 case OP_STRSET: /* string-set! */ 4279 case OP_STRSET: /* string-set! */
4367 { 4280 {
4368 char *str; 4281 char *str = strvalue (x);
4369 int index; 4282 int index = ivalue_unchecked (cadr (args));
4370 int c; 4283 int c;
4371 4284
4372 if (is_immutable (car (SCHEME_V->args))) 4285 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4286 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4287
4375 str = strvalue (car (SCHEME_V->args));
4376
4377 index = ivalue (cadr (SCHEME_V->args));
4378
4379 if (index >= strlength (car (SCHEME_V->args))) 4288 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4289 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4290
4382 c = charvalue (caddr (SCHEME_V->args)); 4291 c = charvalue (caddr (args));
4383 4292
4384 str[index] = (char) c; 4293 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4294 s_return (car (args));
4386 } 4295 }
4387 4296
4388 case OP_STRAPPEND: /* string-append */ 4297 case OP_STRAPPEND: /* string-append */
4389 { 4298 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4299 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4300 int len = 0;
4392 pointer newstr; 4301 pointer newstr;
4393 char *pos; 4302 char *pos;
4394 4303
4395 /* compute needed length for new string */ 4304 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4305 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4306 len += strlength (car (x));
4398 4307
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4308 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4309
4401 /* store the contents of the argument strings into the new string */ 4310 /* store the contents of the argument strings into the new string */
4402 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4311 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4312 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4313
4405 s_return (newstr); 4314 s_return (newstr);
4406 } 4315 }
4407 4316
4408 case OP_SUBSTR: /* substring */ 4317 case OP_SUBSTR: /* substring */
4409 { 4318 {
4410 char *str; 4319 char *str = strvalue (x);
4411 int index0; 4320 int index0 = ivalue_unchecked (cadr (args));
4412 int index1; 4321 int index1;
4413 int len; 4322 int len;
4414 4323
4415 str = strvalue (car (SCHEME_V->args));
4416
4417 index0 = ivalue (cadr (SCHEME_V->args));
4418
4419 if (index0 > strlength (car (SCHEME_V->args))) 4324 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4325 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4326
4422 if (cddr (SCHEME_V->args) != NIL) 4327 if (cddr (args) != NIL)
4423 { 4328 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4329 index1 = ivalue_unchecked (caddr (args));
4425 4330
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4331 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4332 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4333 }
4429 else 4334 else
4430 index1 = strlength (car (SCHEME_V->args)); 4335 index1 = strlength (x);
4431 4336
4432 len = index1 - index0; 4337 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4338 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4339 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4340 strvalue (x)[len] = 0;
… …
4439 4344
4440 case OP_VECTOR: /* vector */ 4345 case OP_VECTOR: /* vector */
4441 { 4346 {
4442 int i; 4347 int i;
4443 pointer vec; 4348 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4349 int len = list_length (SCHEME_A_ args);
4445 4350
4446 if (len < 0) 4351 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4352 Error_1 ("vector: not a proper list:", args);
4448 4353
4449 vec = mk_vector (SCHEME_A_ len); 4354 vec = mk_vector (SCHEME_A_ len);
4450 4355
4451#if USE_ERROR_CHECKING 4356#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4357 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4358 s_return (S_SINK);
4454#endif 4359#endif
4455 4360
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4361 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4362 vector_set (vec, i, car (x));
4458 4363
4459 s_return (vec); 4364 s_return (vec);
4460 } 4365 }
4461 4366
4462 case OP_MKVECTOR: /* make-vector */ 4367 case OP_MKVECTOR: /* make-vector */
4463 { 4368 {
4464 pointer fill = NIL; 4369 pointer fill = NIL;
4465 int len;
4466 pointer vec; 4370 pointer vec;
4371 int len = ivalue_unchecked (x);
4467 4372
4468 len = ivalue (car (SCHEME_V->args));
4469
4470 if (cdr (SCHEME_V->args) != NIL) 4373 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4374 fill = cadr (args);
4472 4375
4473 vec = mk_vector (SCHEME_A_ len); 4376 vec = mk_vector (SCHEME_A_ len);
4474 4377
4475#if USE_ERROR_CHECKING 4378#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4379 if (SCHEME_V->no_memory)
4477 s_return (S_SINK); 4380 s_return (S_SINK);
4478#endif 4381#endif
4479 4382
4480 if (fill != NIL) 4383 if (fill != NIL)
4481 fill_vector (vec, fill); 4384 fill_vector (vec, 0, fill);
4482 4385
4483 s_return (vec); 4386 s_return (vec);
4484 } 4387 }
4485 4388
4486 case OP_VECLEN: /* vector-length */ 4389 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4390 s_return (mk_integer (SCHEME_A_ veclength (x)));
4391
4392 case OP_VECRESIZE:
4393 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4394 s_return (x);
4488 4395
4489 case OP_VECREF: /* vector-ref */ 4396 case OP_VECREF: /* vector-ref */
4490 { 4397 {
4491 int index;
4492
4493 index = ivalue (cadr (SCHEME_V->args)); 4398 int index = ivalue_unchecked (cadr (args));
4494 4399
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4401 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4402
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4403 s_return (vector_get (x, index));
4499 } 4404 }
4500 4405
4501 case OP_VECSET: /* vector-set! */ 4406 case OP_VECSET: /* vector-set! */
4502 { 4407 {
4503 int index; 4408 int index = ivalue_unchecked (cadr (args));
4504 4409
4505 if (is_immutable (car (SCHEME_V->args))) 4410 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4411 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4412
4508 index = ivalue (cadr (SCHEME_V->args));
4509
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4413 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4414 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4415
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4416 vector_set (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4417 s_return (x);
4515 } 4418 }
4516 } 4419 }
4517 4420
4518 return S_T; 4421 if (USE_ERROR_CHECKING) abort ();
4519} 4422}
4520 4423
4521INTERFACE int 4424static int
4522is_list (SCHEME_P_ pointer a) 4425opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4426{
4524 return list_length (SCHEME_A_ a) >= 0; 4427 pointer x = SCHEME_V->args;
4525}
4526 4428
4527/* Result is: 4429 for (;;)
4528 proper list: length
4529 circular list: -1
4530 not even a pair: -2
4531 dotted list: -2 minus length before dot
4532*/
4533INTERFACE int
4534list_length (SCHEME_P_ pointer a)
4535{
4536 int i = 0;
4537 pointer slow, fast;
4538
4539 slow = fast = a;
4540
4541 while (1)
4542 { 4430 {
4431 num v = nvalue (car (x));
4432 x = cdr (x);
4433
4543 if (fast == NIL) 4434 if (x == NIL)
4544 return i; 4435 break;
4545 4436
4546 if (!is_pair (fast)) 4437 int r = num_cmp (v, nvalue (car (x)));
4547 return -2 - i;
4548 4438
4549 fast = cdr (fast); 4439 switch (op)
4550 ++i;
4551
4552 if (fast == NIL)
4553 return i;
4554
4555 if (!is_pair (fast))
4556 return -2 - i;
4557
4558 ++i;
4559 fast = cdr (fast);
4560
4561 /* Safe because we would have already returned if `fast'
4562 encountered a non-pair. */
4563 slow = cdr (slow);
4564
4565 if (fast == slow)
4566 { 4440 {
4567 /* the fast pointer has looped back around and caught up 4441 case OP_NUMEQ: r = r == 0; break;
4568 with the slow pointer, hence the structure is circular, 4442 case OP_LESS: r = r < 0; break;
4569 not of finite length, and therefore not a list */ 4443 case OP_GRE: r = r > 0; break;
4570 return -1; 4444 case OP_LEQ: r = r <= 0; break;
4445 case OP_GEQ: r = r >= 0; break;
4571 } 4446 }
4572 }
4573}
4574 4447
4448 if (!r)
4449 s_return (S_F);
4450 }
4451
4452 s_return (S_T);
4453}
4454
4575static pointer 4455static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4456opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4457{
4578 pointer x; 4458 pointer args = SCHEME_V->args;
4579 num v; 4459 pointer a = car (args);
4580 int (*comp_func) (num, num); 4460 pointer d = cdr (args);
4461 int r;
4581 4462
4582 switch (op) 4463 switch (op)
4583 { 4464 {
4584 case OP_NOT: /* not */ 4465 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4475
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4476#if USE_CHAR_CLASSIFIERS
4656 4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4657 case OP_CHARAP: /* char-alphabetic? */ 4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4659 4480 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4660 case OP_CHARNP: /* char-numeric? */ 4481 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4482#endif
4483
4672#if USE_PORTS 4484#if USE_PORTS
4673 4485 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4486 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4487 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4488#endif
4683 4489
4684 case OP_PROCP: /* procedure? */ 4490 case OP_PROCP: /* procedure? */
4685 4491
4686 /*-- 4492 /*--
4687 * continuation should be procedure by the example 4493 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4494 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4495 * in R^3 report sec. 6.9
4690 */ 4496 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4497 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4498 break;
4693 4499
4694 case OP_PAIRP: /* pair? */ 4500 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4501 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4502 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4503 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4504 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4505 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4506 }
4712 4507
4713 return S_T; 4508 s_retbool (r);
4714} 4509}
4715 4510
4716static pointer 4511static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4512opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4513{
4514 pointer args = SCHEME_V->args;
4515 pointer a = car (args);
4719 pointer x, y; 4516 pointer x, y;
4720 4517
4721 switch (op) 4518 switch (op)
4722 { 4519 {
4723 case OP_FORCE: /* force */ 4520 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4521 SCHEME_V->code = a;
4725 4522
4726 if (is_promise (SCHEME_V->code)) 4523 if (is_promise (SCHEME_V->code))
4727 { 4524 {
4728 /* Should change type to closure here */ 4525 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4526 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4547 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4548 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4549 }
4753 } 4550 }
4754 4551
4755 SCHEME_V->args = car (SCHEME_V->args); 4552 SCHEME_V->args = a;
4756 4553
4757 if (op == OP_WRITE) 4554 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4555 SCHEME_V->print_flag = 1;
4759 else 4556 else
4760 SCHEME_V->print_flag = 0; 4557 SCHEME_V->print_flag = 0;
4761 4558
4762 s_goto (OP_P0LIST); 4559 s_goto (OP_P0LIST);
4763 4560
4764 case OP_NEWLINE: /* newline */ 4561 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4562 if (is_pair (args))
4766 { 4563 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4564 if (a != SCHEME_V->outport)
4768 { 4565 {
4769 x = cons (SCHEME_V->outport, NIL); 4566 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4568 SCHEME_V->outport = a;
4772 } 4569 }
4773 } 4570 }
4774 4571
4775 putstr (SCHEME_A_ "\n"); 4572 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4573 s_return (S_T);
4777#endif 4574#endif
4778 4575
4779 case OP_ERR0: /* error */ 4576 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4577 SCHEME_V->retcode = -1;
4781 4578
4782 if (!is_string (car (SCHEME_V->args))) 4579 if (!is_string (a))
4783 { 4580 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4581 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4582 setimmutable (car (args));
4786 } 4583 }
4787 4584
4788 putstr (SCHEME_A_ "Error: "); 4585 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4586 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4587 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4588 s_goto (OP_ERR1);
4792 4589
4793 case OP_ERR1: /* error */ 4590 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4591 putstr (SCHEME_A_ " ");
4795 4592
4796 if (SCHEME_V->args != NIL) 4593 if (args != NIL)
4797 { 4594 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4596 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4598 s_goto (OP_P0LIST);
4802 } 4599 }
4803 else 4600 else
4804 { 4601 {
4805 putstr (SCHEME_A_ "\n"); 4602 putstr (SCHEME_A_ "\n");
4806 4603
4807 if (SCHEME_V->interactive_repl) 4604 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4605 s_goto (OP_T0LVL);
4809 else 4606 else
4810 return NIL; 4607 return -1;
4811 } 4608 }
4812 4609
4813 case OP_REVERSE: /* reverse */ 4610 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4611 s_return (reverse (SCHEME_A_ a));
4815 4612
4816 case OP_LIST_STAR: /* list* */ 4613 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4614 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4615
4819 case OP_APPEND: /* append */ 4616 case OP_APPEND: /* append */
4820 x = NIL; 4617 x = NIL;
4821 y = SCHEME_V->args; 4618 y = args;
4822 4619
4823 if (y == x) 4620 if (y == x)
4824 s_return (x); 4621 s_return (x);
4825 4622
4826 /* cdr() in the while condition is not a typo. If car() */ 4623 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4634 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4635
4839#if USE_PLIST 4636#if USE_PLIST
4840 4637
4841 case OP_PUT: /* put */ 4638 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4639 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4640 Error_0 ("illegal use of put");
4844 4641
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4642 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4643 {
4847 if (caar (x) == y) 4644 if (caar (x) == y)
4848 break; 4645 break;
4849 } 4646 }
4850 4647
4851 if (x != NIL) 4648 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4649 cdar (x) = caddr (args);
4853 else 4650 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4651 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4652
4856 s_return (S_T); 4653 s_return (S_T);
4857 4654
4858 case OP_GET: /* get */ 4655 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4656 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4657 Error_0 ("illegal use of get");
4861 4658
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4659 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4660 if (caar (x) == y)
4864 break; 4661 break;
4865 4662
4866 if (x != NIL) 4663 if (x != NIL)
4867 s_return (cdar (x)); 4664 s_return (cdar (x));
… …
4869 s_return (NIL); 4666 s_return (NIL);
4870 4667
4871#endif /* USE_PLIST */ 4668#endif /* USE_PLIST */
4872 4669
4873 case OP_QUIT: /* quit */ 4670 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4671 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4672 SCHEME_V->retcode = ivalue (a);
4876 4673
4877 return NIL; 4674 return -1;
4878 4675
4879 case OP_GC: /* gc */ 4676 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4677 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4678 s_return (S_T);
4882 4679
4883 case OP_GCVERB: /* gc-verbose */ 4680 case OP_GCVERB: /* gc-verbose */
4884 { 4681 {
4885 int was = SCHEME_V->gc_verbose; 4682 int was = SCHEME_V->gc_verbose;
4886 4683
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4684 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4685 s_retbool (was);
4889 } 4686 }
4890 4687
4891 case OP_NEWSEGMENT: /* new-segment */ 4688 case OP_NEWSEGMENT: /* new-segment */
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4689 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4690 Error_0 ("new-segment: argument must be a number");
4894 4691
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4692 alloc_cellseg (SCHEME_A_ ivalue (a));
4896 4693
4897 s_return (S_T); 4694 s_return (S_T);
4898 4695
4899 case OP_OBLIST: /* oblist */ 4696 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4697 s_return (oblist_all_symbols (SCHEME_A));
… …
4927 case OP_OPEN_INOUTFILE: 4724 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4725 prop = port_input | port_output;
4929 break; 4726 break;
4930 } 4727 }
4931 4728
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4729 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4730
4934 if (p == NIL) 4731 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4732 }
4939 4733
4940# if USE_STRING_PORTS 4734# if USE_STRING_PORTS
4941 4735
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4736 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4748 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4749 prop = port_input | port_output;
4956 break; 4750 break;
4957 } 4751 }
4958 4752
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4753 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4754 strvalue (a) + strlength (a), prop);
4961 4755
4962 if (p == NIL) 4756 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4757 }
4967 4758
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4759 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4760 {
4970 pointer p; 4761 pointer p;
4971 4762
4972 if (car (SCHEME_V->args) == NIL) 4763 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4764 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4765 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4766 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4767 strvalue (a) + strlength (a), port_output);
4983 4768
4984 if (p == NIL) 4769 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4770 }
4990 4771
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4772 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4773 {
4993 port *p; 4774 port *p;
4994 4775
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4776 if ((p = a->object.port)->kind & port_string)
4996 { 4777 {
4997 off_t size; 4778 off_t size;
4998 char *str; 4779 char *str;
4999 4780
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4781 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4797 }
5017 4798
5018# endif 4799# endif
5019 4800
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4801 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4802 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4803 s_return (S_T);
5023 4804
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4805 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4806 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4807 s_return (S_T);
5027#endif 4808#endif
5028 4809
5029 case OP_INT_ENV: /* interaction-environment */ 4810 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4811 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4813 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4814 s_return (SCHEME_V->envir);
5034 4815
5035 } 4816 }
5036 4817
5037 return S_T; 4818 if (USE_ERROR_CHECKING) abort ();
5038} 4819}
5039 4820
5040static pointer 4821static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4822opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4823{
4824 pointer args = SCHEME_V->args;
5043 pointer x; 4825 pointer x;
5044 4826
5045 if (SCHEME_V->nesting != 0) 4827 if (SCHEME_V->nesting != 0)
5046 { 4828 {
5047 int n = SCHEME_V->nesting; 4829 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4836 switch (op)
5055 { 4837 {
5056 /* ========== reading part ========== */ 4838 /* ========== reading part ========== */
5057#if USE_PORTS 4839#if USE_PORTS
5058 case OP_READ: 4840 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4841 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4842 s_goto (OP_READ_INTERNAL);
5061 4843
5062 if (!is_inport (car (SCHEME_V->args))) 4844 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4845 Error_1 ("read: not an input port:", car (args));
5064 4846
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4847 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4848 s_goto (OP_READ_INTERNAL);
5067 4849
5068 x = SCHEME_V->inport; 4850 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4851 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4852 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4853 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4854 s_goto (OP_READ_INTERNAL);
5073 4855
5074 case OP_READ_CHAR: /* read-char */ 4856 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4857 case OP_PEEK_CHAR: /* peek-char */
5076 { 4858 {
5077 int c; 4859 int c;
5078 4860
5079 if (is_pair (SCHEME_V->args)) 4861 if (is_pair (args))
5080 { 4862 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4863 if (car (args) != SCHEME_V->inport)
5082 { 4864 {
5083 x = SCHEME_V->inport; 4865 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4866 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4867 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4868 SCHEME_V->inport = car (args);
5087 } 4869 }
5088 } 4870 }
5089 4871
5090 c = inchar (SCHEME_A); 4872 c = inchar (SCHEME_A);
5091 4873
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4883 case OP_CHAR_READY: /* char-ready? */
5102 { 4884 {
5103 pointer p = SCHEME_V->inport; 4885 pointer p = SCHEME_V->inport;
5104 int res; 4886 int res;
5105 4887
5106 if (is_pair (SCHEME_V->args)) 4888 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4889 p = car (args);
5108 4890
5109 res = p->object.port->kind & port_string; 4891 res = p->object.port->kind & port_string;
5110 4892
5111 s_retbool (res); 4893 s_retbool (res);
5112 } 4894 }
5113 4895
5114 case OP_SET_INPORT: /* set-input-port */ 4896 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 4897 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 4898 s_return (SCHEME_V->value);
5117 4899
5118 case OP_SET_OUTPORT: /* set-output-port */ 4900 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 4901 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 4902 s_return (SCHEME_V->value);
5121#endif 4903#endif
5122 4904
5123 case OP_RDSEXPR: 4905 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 4906 switch (SCHEME_V->tok)
… …
5173 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4955 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5174 SCHEME_V->tok = token (SCHEME_A); 4956 SCHEME_V->tok = token (SCHEME_A);
5175 s_goto (OP_RDSEXPR); 4957 s_goto (OP_RDSEXPR);
5176 4958
5177 case TOK_ATOM: 4959 case TOK_ATOM:
5178 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4960 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4961
4962 case TOK_DOTATOM:
4963 SCHEME_V->strbuff[0] = '.';
4964 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4965
4966 case TOK_STRATOM:
4967 x = readstrexp (SCHEME_A_ '|');
4968 //TODO: haven't checked whether the garbage collector could interfere
4969 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5179 4970
5180 case TOK_DQUOTE: 4971 case TOK_DQUOTE:
5181 x = readstrexp (SCHEME_A); 4972 x = readstrexp (SCHEME_A_ '"');
5182 4973
5183 if (x == S_F) 4974 if (x == S_F)
5184 Error_0 ("Error reading string"); 4975 Error_0 ("Error reading string");
5185 4976
5186 setimmutable (x); 4977 setimmutable (x);
… …
5198 s_goto (OP_EVAL); 4989 s_goto (OP_EVAL);
5199 } 4990 }
5200 } 4991 }
5201 4992
5202 case TOK_SHARP_CONST: 4993 case TOK_SHARP_CONST:
5203 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4994 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5204 Error_0 ("undefined sharp expression"); 4995 Error_0 ("undefined sharp expression");
5205 else 4996 else
5206 s_return (x); 4997 s_return (x);
5207 4998
5208 default: 4999 default:
… …
5210 } 5001 }
5211 5002
5212 break; 5003 break;
5213 5004
5214 case OP_RDLIST: 5005 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5006 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5007 SCHEME_V->tok = token (SCHEME_A);
5217 5008
5218 switch (SCHEME_V->tok) 5009 switch (SCHEME_V->tok)
5219 { 5010 {
5220 case TOK_EOF: 5011 case TOK_EOF:
… …
5248 case OP_RDDOT: 5039 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5040 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5041 Error_0 ("syntax error: illegal dot expression");
5251 5042
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5043 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5044 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5045
5255 case OP_RDQUOTE: 5046 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5047 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5048
5258 case OP_RDQQUOTE: 5049 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5071 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5072 s_goto (OP_VECTOR);
5282 5073
5283 /* ========== printing part ========== */ 5074 /* ========== printing part ========== */
5284 case OP_P0LIST: 5075 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5076 if (is_vector (args))
5286 { 5077 {
5287 putstr (SCHEME_A_ "#("); 5078 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5079 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5080 s_goto (OP_PVECFROM);
5290 } 5081 }
5291 else if (is_environment (SCHEME_V->args)) 5082 else if (is_environment (args))
5292 { 5083 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5084 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5085 s_return (S_T);
5295 } 5086 }
5296 else if (!is_pair (SCHEME_V->args)) 5087 else if (!is_pair (args))
5297 { 5088 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5089 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5090 s_return (S_T);
5300 } 5091 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5092 else
5302 { 5093 {
5094 pointer a = car (args);
5095 pointer b = cdr (args);
5096 int ok_abbr = ok_abbrev (b);
5097 SCHEME_V->args = car (b);
5098
5099 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5100 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5101 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5102 putstr (SCHEME_A_ "`");
5103 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5104 putstr (SCHEME_A_ ",");
5105 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5106 putstr (SCHEME_A_ ",@");
5107 else
5108 {
5109 putstr (SCHEME_A_ "(");
5110 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5111 SCHEME_V->args = a;
5112 }
5113
5305 s_goto (OP_P0LIST); 5114 s_goto (OP_P0LIST);
5306 } 5115 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5116
5117 case OP_P1LIST:
5118 if (is_pair (args))
5308 { 5119 {
5120 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5121 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5122 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5123 s_goto (OP_P0LIST);
5312 } 5124 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5125 else if (is_vector (args))
5342 { 5126 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5127 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5128 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5129 s_goto (OP_P0LIST);
5346 } 5130 }
5347 else 5131 else
5348 { 5132 {
5349 if (SCHEME_V->args != NIL) 5133 if (args != NIL)
5350 { 5134 {
5351 putstr (SCHEME_A_ " . "); 5135 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5136 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5137 }
5354 5138
5355 putstr (SCHEME_A_ ")"); 5139 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5140 s_return (S_T);
5357 } 5141 }
5358 5142
5359 case OP_PVECFROM: 5143 case OP_PVECFROM:
5360 { 5144 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5145 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5146 pointer vec = car (args);
5363 int len = veclength (vec); 5147 int len = veclength (vec);
5364 5148
5365 if (i == len) 5149 if (i == len)
5366 { 5150 {
5367 putstr (SCHEME_A_ ")"); 5151 putstr (SCHEME_A_ ")");
5368 s_return (S_T); 5152 s_return (S_T);
5369 } 5153 }
5370 else 5154 else
5371 { 5155 {
5372 pointer elem = vector_elem (vec, i); 5156 pointer elem = vector_get (vec, i);
5373 5157
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5158 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5159 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5160 SCHEME_V->args = elem;
5377 5161
5378 if (i > 0) 5162 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5163 putstr (SCHEME_A_ " ");
5380 5164
5381 s_goto (OP_P0LIST); 5165 s_goto (OP_P0LIST);
5382 } 5166 }
5383 } 5167 }
5384 } 5168 }
5385 5169
5386 return S_T; 5170 if (USE_ERROR_CHECKING) abort ();
5387} 5171}
5388 5172
5389static pointer 5173static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5174opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5175{
5176 pointer args = SCHEME_V->args;
5177 pointer a = car (args);
5392 pointer x, y; 5178 pointer x, y;
5393 5179
5394 switch (op) 5180 switch (op)
5395 { 5181 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5182 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5183 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5184 long v = list_length (SCHEME_A_ a);
5399 5185
5400 if (v < 0) 5186 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5187 Error_1 ("length: not a list:", a);
5402 5188
5403 s_return (mk_integer (SCHEME_A_ v)); 5189 s_return (mk_integer (SCHEME_A_ v));
5404 } 5190 }
5405 5191
5406 case OP_ASSQ: /* assq *//* a.k */ 5192 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5193 x = a;
5408 5194
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5195 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5196 {
5411 if (!is_pair (car (y))) 5197 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5198 Error_0 ("unable to handle non pair element");
5413 5199
5414 if (x == caar (y)) 5200 if (x == caar (y))
… …
5420 else 5206 else
5421 s_return (S_F); 5207 s_return (S_F);
5422 5208
5423 5209
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5210 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5211 SCHEME_V->args = a;
5426 5212
5427 if (SCHEME_V->args == NIL) 5213 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5214 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5215 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5216 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5436 case OP_CLOSUREP: /* closure? */ 5222 case OP_CLOSUREP: /* closure? */
5437 /* 5223 /*
5438 * Note, macro object is also a closure. 5224 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5225 * Therefore, (closure? <#MACRO>) ==> #t
5440 */ 5226 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5227 s_retbool (is_closure (a));
5442 5228
5443 case OP_MACROP: /* macro? */ 5229 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5230 s_retbool (is_macro (a));
5445 } 5231 }
5446 5232
5447 return S_T; /* NOTREACHED */ 5233 if (USE_ERROR_CHECKING) abort ();
5448} 5234}
5449 5235
5236/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5237typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5238
5452typedef int (*test_predicate) (pointer); 5239typedef int (*test_predicate)(pointer);
5453static int 5240static int
5454is_any (pointer p) 5241tst_any (pointer p)
5455{ 5242{
5456 return 1; 5243 return 1;
5457} 5244}
5458 5245
5459static int 5246static int
5460is_nonneg (pointer p) 5247tst_inonneg (pointer p)
5461{ 5248{
5462 return ivalue (p) >= 0 && is_integer (p); 5249 return is_integer (p) && ivalue_unchecked (p) >= 0;
5250}
5251
5252static int
5253tst_is_list (SCHEME_P_ pointer p)
5254{
5255 return p == NIL || is_pair (p);
5463} 5256}
5464 5257
5465/* Correspond carefully with following defines! */ 5258/* Correspond carefully with following defines! */
5466static struct 5259static struct
5467{ 5260{
5468 test_predicate fct; 5261 test_predicate fct;
5469 const char *kind; 5262 const char *kind;
5470} tests[] = 5263} tests[] = {
5471{ 5264 { tst_any , 0 },
5472 { 0, 0}, /* unused */ 5265 { is_string , "string" },
5473 { is_any, 0}, 5266 { is_symbol , "symbol" },
5474 { is_string, "string" }, 5267 { is_port , "port" },
5475 { is_symbol, "symbol" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5268 { is_inport , "input port" },
5478 { is_outport, "output port" }, 5269 { is_outport , "output port" },
5479 { is_environment, "environment" }, 5270 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5271 { is_pair , "pair" },
5481 { 0, "pair or '()" }, 5272 { 0 , "pair or '()" },
5482 { is_character, "character" }, 5273 { is_character , "character" },
5483 { is_vector, "vector" }, 5274 { is_vector , "vector" },
5484 { is_number, "number" }, 5275 { is_number , "number" },
5485 { is_integer, "integer" }, 5276 { is_integer , "integer" },
5486 { is_nonneg, "non-negative integer" } 5277 { tst_inonneg , "non-negative integer" }
5487}; 5278};
5488 5279
5489#define TST_NONE 0 5280#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5281#define TST_ANY "\001"
5491#define TST_STRING "\002" 5282#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5283#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5284#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5285#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5286#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5287#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5288#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5289#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5290#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5291#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5292#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5293#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5294#define TST_NATURAL "\016"
5295
5296#define INF_ARG 0xff
5297#define UNNAMED_OP ""
5298
5299static const char opnames[] =
5300#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5301#include "opdefines.h"
5302#undef OP_DEF
5303;
5304
5305static const char *
5306opname (int idx)
5307{
5308 const char *name = opnames;
5309
5310 /* should do this at compile time, but would require external program, right? */
5311 while (idx--)
5312 name += strlen (name) + 1;
5313
5314 return *name ? name : "ILLEGAL";
5315}
5316
5317static const char *
5318procname (pointer x)
5319{
5320 return opname (procnum (x));
5321}
5504 5322
5505typedef struct 5323typedef struct
5506{ 5324{
5507 dispatch_func func; 5325 uint8_t func;
5508 char *name; 5326 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5327 uint8_t builtin;
5328#if USE_ERROR_CHECKING
5509 int min_arity; 5329 uint8_t min_arity;
5510 int max_arity; 5330 uint8_t max_arity;
5511 char *arg_tests_encoding; 5331 char arg_tests_encoding[3];
5332#endif
5512} op_code_info; 5333} op_code_info;
5513 5334
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5335static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5336#if USE_ERROR_CHECKING
5337#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5338#else
5339#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5340#endif
5518#include "opdefines.h" 5341#include "opdefines.h"
5342#undef OP_DEF
5519 {0} 5343 {0}
5520}; 5344};
5521 5345
5522static const char *
5523procname (pointer x)
5524{
5525 int n = procnum (x);
5526 const char *name = dispatch_table[n].name;
5527
5528 if (name == 0)
5529 name = "ILLEGAL!";
5530
5531 return name;
5532}
5533
5534/* kernel of this interpreter */ 5346/* kernel of this interpreter */
5535static void 5347static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5348Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5349{
5538 SCHEME_V->op = op; 5350 SCHEME_V->op = op;
5539 5351
5540 for (;;) 5352 for (;;)
5541 { 5353 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5354 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5355
5544#if USE_ERROR_CHECKING 5356#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5357 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5358 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5359 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5360 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5361
5551 /* Check number of arguments */ 5362 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5363 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5364 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5365 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5366 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5367 xError_1 (SCHEME_A_ msg, 0);
5368 continue;
5557 } 5369 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5370 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5371 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5372 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5373 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5374 xError_1 (SCHEME_A_ msg, 0);
5375 continue;
5563 } 5376 }
5564 5377 else
5565 if (ecb_expect_false (ok))
5566 { 5378 {
5567 if (pcd->arg_tests_encoding) 5379 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5380 {
5569 int i = 0; 5381 int i = 0;
5570 int j; 5382 int j;
5571 const char *t = pcd->arg_tests_encoding; 5383 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5384 pointer arglist = SCHEME_V->args;
5573 5385
5574 do 5386 do
5575 { 5387 {
5576 pointer arg = car (arglist); 5388 pointer arg = car (arglist);
5577 5389
5578 j = (int) t[0]; 5390 j = t[0];
5579 5391
5392 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5580 if (j == TST_LIST[0]) 5393 if (j == TST_LIST[0])
5581 { 5394 {
5582 if (arg != NIL && !is_pair (arg)) 5395 if (!tst_is_list (SCHEME_A_ arg))
5583 break; 5396 break;
5584 } 5397 }
5585 else 5398 else
5586 { 5399 {
5587 if (!tests[j].fct (arg)) 5400 if (!tests[j - 1].fct (arg))
5588 break; 5401 break;
5589 } 5402 }
5590 5403
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5404 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5592 t++; 5405 t++;
5593 5406
5594 arglist = cdr (arglist); 5407 arglist = cdr (arglist);
5595 i++; 5408 i++;
5596 } 5409 }
5597 while (i < n); 5410 while (i < n);
5598 5411
5599 if (i < n) 5412 if (i < n)
5600 { 5413 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5414 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5415 xError_1 (SCHEME_A_ msg, 0);
5416 continue;
5603 } 5417 }
5604 } 5418 }
5605 } 5419 }
5606
5607 if (!ok)
5608 {
5609 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5610 return;
5611
5612 pcd = dispatch_table + SCHEME_V->op;
5613 }
5614 } 5420 }
5615#endif 5421#endif
5616 5422
5617 ok_to_freely_gc (SCHEME_A); 5423 ok_to_freely_gc (SCHEME_A);
5618 5424
5425 static const dispatch_func dispatch_funcs[] = {
5426 opexe_0,
5427 opexe_1,
5428 opexe_2,
5429 opexe_3,
5430 opexe_4,
5431 opexe_5,
5432 opexe_6,
5433 };
5434
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5435 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5436 return;
5621 5437
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5438 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5439 {
5624 xwrstr ("No memory!\n"); 5440 xwrstr ("No memory!\n");
… …
5648mk_proc (SCHEME_P_ enum scheme_opcodes op) 5464mk_proc (SCHEME_P_ enum scheme_opcodes op)
5649{ 5465{
5650 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5466 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5651 set_typeflag (y, (T_PROC | T_ATOM)); 5467 set_typeflag (y, (T_PROC | T_ATOM));
5652 ivalue_unchecked (y) = op; 5468 ivalue_unchecked (y) = op;
5653 set_num_integer (y);
5654 return y; 5469 return y;
5655} 5470}
5656 5471
5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5472/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5658static int 5473static int
… …
5723 return OP_C0STREAM; /* cons-stream */ 5538 return OP_C0STREAM; /* cons-stream */
5724 } 5539 }
5725} 5540}
5726 5541
5727#if USE_MULTIPLICITY 5542#if USE_MULTIPLICITY
5728scheme * 5543ecb_cold scheme *
5729scheme_init_new () 5544scheme_init_new ()
5730{ 5545{
5731 scheme *sc = malloc (sizeof (scheme)); 5546 scheme *sc = malloc (sizeof (scheme));
5732 5547
5733 if (!scheme_init (SCHEME_A)) 5548 if (!scheme_init (SCHEME_A))
… …
5738 else 5553 else
5739 return sc; 5554 return sc;
5740} 5555}
5741#endif 5556#endif
5742 5557
5743int 5558ecb_cold int
5744scheme_init (SCHEME_P) 5559scheme_init (SCHEME_P)
5745{ 5560{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5561 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5562 pointer x;
5748 5563
… …
5821 5636
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5637 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5638 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5639 }
5825 5640
5641 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5642 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5643 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5644 assign_proc (SCHEME_A_ i, opname (i));
5829 5645
5830 /* initialization of global pointers to special symbols */ 5646 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5647 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5648 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5649 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5688scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5689{
5874 SCHEME_V->ext_data = p; 5690 SCHEME_V->ext_data = p;
5875} 5691}
5876 5692
5877void 5693ecb_cold void
5878scheme_deinit (SCHEME_P) 5694scheme_deinit (SCHEME_P)
5879{ 5695{
5880 int i; 5696 int i;
5881 5697
5882#if SHOW_ERROR_LINE 5698#if SHOW_ERROR_LINE
… …
5974{ 5790{
5975 dump_stack_reset (SCHEME_A); 5791 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5792 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5793 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5794 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5795 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5796 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5797 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5798#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5799 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5800#endif
5985 SCHEME_V->retcode = 0; 5801 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5802 SCHEME_V->interactive_repl = 0;

Diff Legend

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