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.2 by root, Wed Nov 25 10:01:39 2015 UTC vs.
Revision 1.40 by root, Mon Nov 30 05:19:01 2015 UTC

1 1/*
2/* T I N Y S C H E M E 1 . 4 1 2 * µscheme
3 *
4 * Copyright (C) 2015 Marc Alexander Lehmann <uscheme@schmorp.de>
5 * do as you want with this, attribution appreciated.
6 *
7 * Based opn tinyscheme-1.41 (original credits follow)
3 * Dimitrios Souflis (dsouflis@acm.org) 8 * Dimitrios Souflis (dsouflis@acm.org)
4 * Based on MiniScheme (original credits follow) 9 * Based on MiniScheme (original credits follow)
5 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989) 10 * (MINISCM) coded by Atsushi Moriwaki (11/5/1989)
6 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp 11 * (MINISCM) E-MAIL : moriwaki@kurims.kurims.kyoto-u.ac.jp
7 * (MINISCM) This version has been modified by R.C. Secrist. 12 * (MINISCM) This version has been modified by R.C. Secrist.
… …
23#endif 28#endif
24#if USE_MATH 29#if USE_MATH
25# include <math.h> 30# include <math.h>
26#endif 31#endif
27 32
33#include "ecb.h"
34
28#include <sys/types.h> 35#include <sys/types.h>
29#include <sys/stat.h> 36#include <sys/stat.h>
30#include <fcntl.h> 37#include <fcntl.h>
31 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
32#include <string.h> 45#include <string.h>
33#include <stdlib.h>
34 46
35#include <limits.h> 47#include <limits.h>
36#include <inttypes.h> 48#include <inttypes.h>
37#include <float.h> 49#include <float.h>
38//#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
39 59
40enum { 60enum {
41 TOK_EOF, 61 TOK_EOF,
42 TOK_LPAREN, 62 TOK_LPAREN,
43 TOK_RPAREN, 63 TOK_RPAREN,
44 TOK_DOT, 64 TOK_DOT,
45 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
46 TOK_QUOTE, 68 TOK_QUOTE,
47 TOK_DQUOTE, 69 TOK_DQUOTE,
48 TOK_BQUOTE, 70 TOK_BQUOTE,
49 TOK_COMMA, 71 TOK_COMMA,
50 TOK_ATMARK, 72 TOK_ATMARK,
… …
52 TOK_SHARP_CONST, 74 TOK_SHARP_CONST,
53 TOK_VEC 75 TOK_VEC
54}; 76};
55 77
56#define BACKQUOTE '`' 78#define BACKQUOTE '`'
57#define DELIMITERS "()\";\f\t\v\n\r " 79#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE
58 81
59#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
60#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
61#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
62#define S_SINK (&SCHEME_V->xsink) 85#define S_SINK (&SCHEME_V->xsink)
… …
128 c += 'a' - 'A'; 151 c += 'a' - 'A';
129 152
130 return c; 153 return c;
131} 154}
132 155
133#if USE_STRLWR 156static int
157xisdigit (char c)
158{
159 return c >= '0' && c <= '9';
160}
161
162#define toupper(c) xtoupper (c)
163#define tolower(c) xtolower (c)
164#define isdigit(c) xisdigit (c)
165
166#if USE_IGNORECASE
134static const char * 167static const char *
135strlwr (char *s) 168xstrlwr (char *s)
136{ 169{
137 const char *p = s; 170 const char *p = s;
138 171
139 while (*s) 172 while (*s)
140 { 173 {
… …
142 s++; 175 s++;
143 } 176 }
144 177
145 return p; 178 return p;
146} 179}
147#endif
148 180
181#define stricmp(a,b) strcasecmp (a, b)
182#define strlwr(s) xstrlwr (s)
183
184#else
149#define stricmp(a,b) strcmp (a, b) 185# define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 186# define strlwr(s) (s)
151#define toupper(c) xtoupper(c) 187#endif
152#define tolower(c) xtolower(c)
153 188
154#ifndef prompt 189#ifndef prompt
155# define prompt "ts> " 190# define prompt "ts> "
156#endif 191#endif
157 192
… …
163# define FIRST_CELLSEGS 3 198# define FIRST_CELLSEGS 3
164#endif 199#endif
165 200
166enum scheme_types 201enum scheme_types
167{ 202{
203 T_INTEGER,
168 T_FREE, 204 T_REAL,
169 T_STRING, 205 T_STRING,
170 T_NUMBER,
171 T_SYMBOL, 206 T_SYMBOL,
172 T_PROC, 207 T_PROC,
173 T_PAIR, 208 T_PAIR, /* also used for free cells */
174 T_CLOSURE, 209 T_CLOSURE,
175 T_CONTINUATION, 210 T_CONTINUATION,
176 T_FOREIGN, 211 T_FOREIGN,
177 T_CHARACTER, 212 T_CHARACTER,
178 T_PORT, 213 T_PORT,
… …
188#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
192 227
193static num num_add (num a, num b); 228/* num, for generic arithmetic */
194static num num_mul (num a, num b); 229struct num
195static num num_div (num a, num b); 230{
231 IVALUE ivalue;
232#if USE_REAL
233 RVALUE rvalue;
234 char is_fixnum;
235#endif
236};
237
238#if USE_REAL
239# define num_is_fixnum(n) (n).is_fixnum
240# define num_set_fixnum(n,f) (n).is_fixnum = (f)
241# define num_ivalue(n) (n).ivalue
242# define num_rvalue(n) (n).rvalue
243# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
244# define num_set_rvalue(n,r) (n).rvalue = (r)
245#else
246# define num_is_fixnum(n) 1
247# define num_set_fixnum(n,f) 0
248# define num_ivalue(n) (n).ivalue
249# define num_rvalue(n) (n).ivalue
250# define num_set_ivalue(n,i) (n).ivalue = (i)
251# define num_set_rvalue(n,r) (n).ivalue = (r)
252#endif
253
254enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
255
256static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 258static num num_rem (num a, num b);
199static num num_mod (num a, num b); 259static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 260
206#if USE_MATH 261#if USE_MATH
207static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
208#endif 263#endif
209static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
210
211static INLINE int
212num_is_integer (pointer p)
213{
214 return num_is_fixnum (p->object.number);
215}
216 265
217static num num_zero; 266static num num_zero;
218static num num_one; 267static num num_one;
219 268
220/* macros for cell operations */ 269/* macros for cell operations */
221#define typeflag(p) ((p)->flag + 0) 270#define typeflag(p) ((p)->flag + 0)
222#define set_typeflag(p,v) ((p)->flag = (v)) 271#define set_typeflag(p,v) ((p)->flag = (v))
223#define type(p) (typeflag (p) & T_MASKTYPE) 272#define type(p) (typeflag (p) & T_MASKTYPE)
224 273
225INTERFACE INLINE int 274INTERFACE int
226is_string (pointer p) 275is_string (pointer p)
227{ 276{
228 return type (p) == T_STRING; 277 return type (p) == T_STRING;
229} 278}
230 279
231#define strvalue(p) ((p)->object.string.svalue) 280#define strvalue(p) ((p)->object.string.svalue)
232#define strlength(p) ((p)->object.string.length) 281#define strlength(p) ((p)->object.string.length)
233 282
234INTERFACE int is_list (SCHEME_P_ pointer p);
235INTERFACE INLINE int 283INTERFACE int
236is_vector (pointer p) 284is_vector (pointer p)
237{ 285{
238 return type (p) == T_VECTOR; 286 return type (p) == T_VECTOR;
239} 287}
240 288
289#define vecvalue(p) ((p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
242INTERFACE pointer vector_elem (pointer vec, int ielem); 292INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
243INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
244 294
245INTERFACE INLINE int 295INTERFACE int
296is_integer (pointer p)
297{
298 return type (p) == T_INTEGER;
299}
300
301/* not the same as in scheme, where integers are (correctly :) reals */
302INTERFACE int
303is_real (pointer p)
304{
305 return type (p) == T_REAL;
306}
307
308INTERFACE int
246is_number (pointer p) 309is_number (pointer p)
247{ 310{
248 return type (p) == T_NUMBER; 311 return is_integer (p) || is_real (p);
249} 312}
250 313
251INTERFACE INLINE int 314INTERFACE int
252is_integer (pointer p)
253{
254 if (!is_number (p))
255 return 0;
256
257 if (num_is_integer (p) || ivalue (p) == rvalue (p))
258 return 1;
259
260 return 0;
261}
262
263INTERFACE INLINE int
264is_real (pointer p)
265{
266 return is_number (p) && !num_is_fixnum (p->object.number);
267}
268
269INTERFACE INLINE int
270is_character (pointer p) 315is_character (pointer p)
271{ 316{
272 return type (p) == T_CHARACTER; 317 return type (p) == T_CHARACTER;
273} 318}
274 319
275INTERFACE INLINE char * 320INTERFACE char *
276string_value (pointer p) 321string_value (pointer p)
277{ 322{
278 return strvalue (p); 323 return strvalue (p);
279} 324}
280 325
281INLINE num
282nvalue (pointer p)
283{
284 return (p)->object.number;
285}
286
287static IVALUE
288num_get_ivalue (const num n)
289{
290 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
291}
292
293static RVALUE
294num_get_rvalue (const num n)
295{
296 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
297}
298
299INTERFACE IVALUE
300ivalue (pointer p)
301{
302 return num_get_ivalue (p->object.number);
303}
304
305INTERFACE RVALUE
306rvalue (pointer p)
307{
308 return num_get_rvalue (p->object.number);
309}
310
311#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 326#define ivalue_unchecked(p) (p)->object.ivalue
312#if USE_FLOAT 327#define set_ivalue(p,v) (p)->object.ivalue = (v)
328
329#if USE_REAL
313# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 330#define rvalue_unchecked(p) (p)->object.rvalue
314# define set_num_integer(p) (p)->object.number.is_fixnum=1; 331#define set_rvalue(p,v) (p)->object.rvalue = (v)
315# define set_num_real(p) (p)->object.number.is_fixnum=0;
316#else 332#else
317# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 333#define rvalue_unchecked(p) (p)->object.ivalue
318# define set_num_integer(p) 0 334#define set_rvalue(p,v) (p)->object.ivalue = (v)
319# define set_num_real(p) 0
320#endif 335#endif
336
321INTERFACE long 337INTERFACE long
322charvalue (pointer p) 338charvalue (pointer p)
323{ 339{
324 return ivalue_unchecked (p); 340 return ivalue_unchecked (p);
325} 341}
326 342
327INTERFACE INLINE int 343INTERFACE int
328is_port (pointer p) 344is_port (pointer p)
329{ 345{
330 return type (p) == T_PORT; 346 return type (p) == T_PORT;
331} 347}
332 348
333INTERFACE INLINE int 349INTERFACE int
334is_inport (pointer p) 350is_inport (pointer p)
335{ 351{
336 return is_port (p) && p->object.port->kind & port_input; 352 return is_port (p) && p->object.port->kind & port_input;
337} 353}
338 354
339INTERFACE INLINE int 355INTERFACE int
340is_outport (pointer p) 356is_outport (pointer p)
341{ 357{
342 return is_port (p) && p->object.port->kind & port_output; 358 return is_port (p) && p->object.port->kind & port_output;
343} 359}
344 360
345INTERFACE INLINE int 361INTERFACE int
346is_pair (pointer p) 362is_pair (pointer p)
347{ 363{
348 return type (p) == T_PAIR; 364 return type (p) == T_PAIR;
349} 365}
350 366
351#define car(p) ((p)->object.cons.car + 0) 367#define car(p) ((p)->object.cons.car + 0)
352#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 368#define cdr(p) ((p)->object.cons.cdr + 0)
353 369
354#define caar(p) car (car (p)) 370static pointer caar (pointer p) { return car (car (p)); }
355#define cadr(p) car (cdr (p)) 371static pointer cadr (pointer p) { return car (cdr (p)); }
356#define cdar(p) cdr (car (p)) 372static pointer cdar (pointer p) { return cdr (car (p)); }
357#define cddr(p) cdr (cdr (p)) 373static pointer cddr (pointer p) { return cdr (cdr (p)); }
358 374
359#define cadar(p) car (cdr (car (p))) 375static pointer cadar (pointer p) { return car (cdr (car (p))); }
360#define caddr(p) car (cdr (cdr (p))) 376static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
361#define cdaar(p) cdr (car (car (p))) 377static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 378
363INTERFACE void 379INTERFACE void
364set_car (pointer p, pointer q) 380set_car (pointer p, pointer q)
365{ 381{
366 p->object.cons.car = q; 382 p->object.cons.car = q;
… …
382pair_cdr (pointer p) 398pair_cdr (pointer p)
383{ 399{
384 return cdr (p); 400 return cdr (p);
385} 401}
386 402
387INTERFACE INLINE int 403INTERFACE int
388is_symbol (pointer p) 404is_symbol (pointer p)
389{ 405{
390 return type (p) == T_SYMBOL; 406 return type (p) == T_SYMBOL;
391} 407}
392 408
393INTERFACE INLINE char * 409INTERFACE char *
394symname (pointer p) 410symname (pointer p)
395{ 411{
396 return strvalue (car (p)); 412 return strvalue (p);
397} 413}
398 414
399#if USE_PLIST 415#if USE_PLIST
400SCHEME_EXPORT INLINE int 416SCHEME_EXPORT int
401hasprop (pointer p) 417hasprop (pointer p)
402{ 418{
403 return typeflag (p) & T_SYMBOL; 419 return typeflag (p) & T_SYMBOL;
404} 420}
405 421
406# define symprop(p) cdr(p) 422# define symprop(p) cdr(p)
407#endif 423#endif
408 424
409INTERFACE INLINE int 425INTERFACE int
410is_syntax (pointer p) 426is_syntax (pointer p)
411{ 427{
412 return typeflag (p) & T_SYNTAX; 428 return typeflag (p) & T_SYNTAX;
413} 429}
414 430
415INTERFACE INLINE int 431INTERFACE int
416is_proc (pointer p) 432is_proc (pointer p)
417{ 433{
418 return type (p) == T_PROC; 434 return type (p) == T_PROC;
419} 435}
420 436
421INTERFACE INLINE int 437INTERFACE int
422is_foreign (pointer p) 438is_foreign (pointer p)
423{ 439{
424 return type (p) == T_FOREIGN; 440 return type (p) == T_FOREIGN;
425} 441}
426 442
427INTERFACE INLINE char * 443INTERFACE char *
428syntaxname (pointer p) 444syntaxname (pointer p)
429{ 445{
430 return strvalue (car (p)); 446 return strvalue (p);
431} 447}
432 448
433#define procnum(p) ivalue (p) 449#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 450static const char *procname (pointer x);
435 451
436INTERFACE INLINE int 452INTERFACE int
437is_closure (pointer p) 453is_closure (pointer p)
438{ 454{
439 return type (p) == T_CLOSURE; 455 return type (p) == T_CLOSURE;
440} 456}
441 457
442INTERFACE INLINE int 458INTERFACE int
443is_macro (pointer p) 459is_macro (pointer p)
444{ 460{
445 return type (p) == T_MACRO; 461 return type (p) == T_MACRO;
446} 462}
447 463
448INTERFACE INLINE pointer 464INTERFACE pointer
449closure_code (pointer p) 465closure_code (pointer p)
450{ 466{
451 return car (p); 467 return car (p);
452} 468}
453 469
454INTERFACE INLINE pointer 470INTERFACE pointer
455closure_env (pointer p) 471closure_env (pointer p)
456{ 472{
457 return cdr (p); 473 return cdr (p);
458} 474}
459 475
460INTERFACE INLINE int 476INTERFACE int
461is_continuation (pointer p) 477is_continuation (pointer p)
462{ 478{
463 return type (p) == T_CONTINUATION; 479 return type (p) == T_CONTINUATION;
464} 480}
465 481
466#define cont_dump(p) cdr (p) 482#define cont_dump(p) cdr (p)
467#define set_cont_dump(p,v) set_cdr ((p), (v)) 483#define set_cont_dump(p,v) set_cdr ((p), (v))
468 484
469/* To do: promise should be forced ONCE only */ 485/* To do: promise should be forced ONCE only */
470INTERFACE INLINE int 486INTERFACE int
471is_promise (pointer p) 487is_promise (pointer p)
472{ 488{
473 return type (p) == T_PROMISE; 489 return type (p) == T_PROMISE;
474} 490}
475 491
476INTERFACE INLINE int 492INTERFACE int
477is_environment (pointer p) 493is_environment (pointer p)
478{ 494{
479 return type (p) == T_ENVIRONMENT; 495 return type (p) == T_ENVIRONMENT;
480} 496}
481 497
482#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 498#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
483 499
484#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
485#define is_atom(p) (typeflag (p) & T_ATOM) 500#define is_atom(p) (typeflag (p) & T_ATOM)
486#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 501#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
487#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 502#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
488 503
489#define is_mark(p) (typeflag (p) & T_MARK) 504#define is_mark(p) (typeflag (p) & T_MARK)
490#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
491#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
492 507
493#if 0
494static int
495is_atom(pointer p)
496{
497 if (!is_atom1(p) != !is_atom2(p))
498 printf ("atoms disagree %x\n", typeflag(p));
499
500 return is_atom2(p);
501}
502#endif
503
504INTERFACE INLINE int 508INTERFACE int
505is_immutable (pointer p) 509is_immutable (pointer p)
506{ 510{
507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
508} 512}
509 513
510INTERFACE INLINE void 514INTERFACE void
511setimmutable (pointer p) 515setimmutable (pointer p)
512{ 516{
513#if USE_ERROR_CHECKING 517#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 518 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 519#endif
516} 520}
517 521
522/* Result is:
523 proper list: length
524 circular list: -1
525 not even a pair: -2
526 dotted list: -2 minus length before dot
527*/
528INTERFACE int
529list_length (SCHEME_P_ pointer a)
530{
531 int i = 0;
532 pointer slow, fast;
533
534 slow = fast = a;
535
536 while (1)
537 {
538 if (fast == NIL)
539 return i;
540
541 if (!is_pair (fast))
542 return -2 - i;
543
544 fast = cdr (fast);
545 ++i;
546
547 if (fast == NIL)
548 return i;
549
550 if (!is_pair (fast))
551 return -2 - i;
552
553 ++i;
554 fast = cdr (fast);
555
556 /* Safe because we would have already returned if `fast'
557 encountered a non-pair. */
558 slow = cdr (slow);
559
560 if (fast == slow)
561 {
562 /* the fast pointer has looped back around and caught up
563 with the slow pointer, hence the structure is circular,
564 not of finite length, and therefore not a list */
565 return -1;
566 }
567 }
568}
569
570INTERFACE int
571is_list (SCHEME_P_ pointer a)
572{
573 return list_length (SCHEME_A_ a) >= 0;
574}
575
518#if USE_CHAR_CLASSIFIERS 576#if USE_CHAR_CLASSIFIERS
519static INLINE int 577ecb_inline int
520Cisalpha (int c) 578Cisalpha (int c)
521{ 579{
522 return isascii (c) && isalpha (c); 580 return isascii (c) && isalpha (c);
523} 581}
524 582
525static INLINE int 583ecb_inline int
526Cisdigit (int c) 584Cisdigit (int c)
527{ 585{
528 return isascii (c) && isdigit (c); 586 return isascii (c) && isdigit (c);
529} 587}
530 588
531static INLINE int 589ecb_inline int
532Cisspace (int c) 590Cisspace (int c)
533{ 591{
534 return isascii (c) && isspace (c); 592 return isascii (c) && isspace (c);
535} 593}
536 594
537static INLINE int 595ecb_inline int
538Cisupper (int c) 596Cisupper (int c)
539{ 597{
540 return isascii (c) && isupper (c); 598 return isascii (c) && isupper (c);
541} 599}
542 600
543static INLINE int 601ecb_inline int
544Cislower (int c) 602Cislower (int c)
545{ 603{
546 return isascii (c) && islower (c); 604 return isascii (c) && islower (c);
547} 605}
548#endif 606#endif
… …
609#endif 667#endif
610 668
611static int file_push (SCHEME_P_ const char *fname); 669static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 670static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 671static int file_interactive (SCHEME_P);
614static INLINE int is_one_of (char *s, int c); 672ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 673static int alloc_cellseg (SCHEME_P_ int n);
616static long binary_decode (const char *s);
617static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
618static pointer reserve_cells (SCHEME_P_ int n);
619static pointer get_consecutive_cells (SCHEME_P_ int n);
620static pointer find_consecutive_cells (SCHEME_P_ int n);
621static void finalize_cell (SCHEME_P_ pointer a); 675static void finalize_cell (SCHEME_P_ pointer a);
622static int count_consecutive_cells (pointer x, int needed); 676static int count_consecutive_cells (pointer x, int needed);
623static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
624static pointer mk_number (SCHEME_P_ const num n); 678static pointer mk_number (SCHEME_P_ const num n);
625static char *store_string (SCHEME_P_ int len, const char *str, char fill); 679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
626static pointer mk_vector (SCHEME_P_ int len); 680static pointer mk_vector (SCHEME_P_ uint32_t len);
627static pointer mk_atom (SCHEME_P_ char *q); 681static pointer mk_atom (SCHEME_P_ char *q);
628static pointer mk_sharp_const (SCHEME_P_ char *name); 682static pointer mk_sharp_const (SCHEME_P_ char *name);
629 683
630#if USE_PORTS 684#if USE_PORTS
631static pointer mk_port (SCHEME_P_ port *p); 685static pointer mk_port (SCHEME_P_ port *p);
… …
640static void mark (pointer a); 694static void mark (pointer a);
641static void gc (SCHEME_P_ pointer a, pointer b); 695static void gc (SCHEME_P_ pointer a, pointer b);
642static int basic_inchar (port *pt); 696static int basic_inchar (port *pt);
643static int inchar (SCHEME_P); 697static int inchar (SCHEME_P);
644static void backchar (SCHEME_P_ int c); 698static void backchar (SCHEME_P_ int c);
645static char *readstr_upto (SCHEME_P_ char *delim); 699static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
646static pointer readstrexp (SCHEME_P); 700static pointer readstrexp (SCHEME_P_ char delim);
647static INLINE int skipspace (SCHEME_P); 701ecb_inline int skipspace (SCHEME_P);
648static int token (SCHEME_P); 702static int token (SCHEME_P);
649static void printslashstring (SCHEME_P_ char *s, int len); 703static void printslashstring (SCHEME_P_ char *s, int len);
650static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
651static void printatom (SCHEME_P_ pointer l, int f); 705static void printatom (SCHEME_P_ pointer l, int f);
652static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
656static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 710static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
657static pointer revappend (SCHEME_P_ pointer a, pointer b); 711static pointer revappend (SCHEME_P_ pointer a, pointer b);
658static pointer ss_get_cont (SCHEME_P); 712static pointer ss_get_cont (SCHEME_P);
659static void ss_set_cont (SCHEME_P_ pointer cont); 713static void ss_set_cont (SCHEME_P_ pointer cont);
660static void dump_stack_mark (SCHEME_P); 714static void dump_stack_mark (SCHEME_P);
661static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
716static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
662static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
663static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
664static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 719static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
665static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 720static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
667static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 722static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
668static void assign_syntax (SCHEME_P_ const char *name); 723static void assign_syntax (SCHEME_P_ const char *name);
669static int syntaxnum (pointer p); 724static int syntaxnum (pointer p);
670static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 725static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
671 726
727static IVALUE
728ivalue (pointer x)
729{
730 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
731}
732
733static RVALUE
734rvalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739INTERFACE num
740nvalue (pointer x)
741{
742 num n;
743
744 num_set_fixnum (n, is_integer (x));
745
746 if (num_is_fixnum (n))
747 num_set_ivalue (n, ivalue_unchecked (x));
748 else
749 num_set_rvalue (n, rvalue_unchecked (x));
750
751 return n;
752}
753
672static num 754static num
673num_add (num a, num b) 755num_op (enum num_op op, num a, num b)
674{ 756{
675 num ret; 757 num ret;
676 758
677 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 759 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
678 760
679 if (num_is_fixnum (ret)) 761 if (num_is_fixnum (ret))
680 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 762 {
763 switch (op)
764 {
765 case NUM_ADD: a.ivalue += b.ivalue; break;
766 case NUM_SUB: a.ivalue -= b.ivalue; break;
767 case NUM_MUL: a.ivalue *= b.ivalue; break;
768 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
769 }
770
771 num_set_ivalue (ret, a.ivalue);
772 }
773#if USE_REAL
681 else 774 else
682 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 775 {
776 switch (op)
777 {
778 case NUM_ADD: a.rvalue += b.rvalue; break;
779 case NUM_SUB: a.rvalue -= b.rvalue; break;
780 case NUM_MUL: a.rvalue *= b.rvalue; break;
781 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
782 }
683 783
684 return ret; 784 num_set_rvalue (ret, a.rvalue);
685} 785 }
686 786#endif
687static num
688num_mul (num a, num b)
689{
690 num ret;
691
692 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
693
694 if (num_is_fixnum (ret))
695 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
696 else
697 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
698 787
699 return ret; 788 return ret;
700} 789}
701 790
702static num 791static num
703num_div (num a, num b) 792num_div (num a, num b)
704{ 793{
705 num ret; 794 num ret;
706 795
707 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 796 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
708 797
709 if (num_is_fixnum (ret)) 798 if (num_is_fixnum (ret))
710 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 799 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
711 else 800 else
712 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 801 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
713
714 return ret;
715}
716
717static num
718num_intdiv (num a, num b)
719{
720 num ret;
721
722 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
723
724 if (num_is_fixnum (ret))
725 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
726 else
727 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
728
729 return ret;
730}
731
732static num
733num_sub (num a, num b)
734{
735 num ret;
736
737 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
738
739 if (num_is_fixnum (ret))
740 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
741 else
742 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
743 802
744 return ret; 803 return ret;
745} 804}
746 805
747static num 806static num
… …
749{ 808{
750 num ret; 809 num ret;
751 long e1, e2, res; 810 long e1, e2, res;
752 811
753 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 812 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
754 e1 = num_get_ivalue (a); 813 e1 = num_ivalue (a);
755 e2 = num_get_ivalue (b); 814 e2 = num_ivalue (b);
756 res = e1 % e2; 815 res = e1 % e2;
757 816
758 /* remainder should have same sign as second operand */ 817 /* remainder should have same sign as second operand */
759 if (res > 0) 818 if (res > 0)
760 { 819 {
… …
776{ 835{
777 num ret; 836 num ret;
778 long e1, e2, res; 837 long e1, e2, res;
779 838
780 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 839 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
781 e1 = num_get_ivalue (a); 840 e1 = num_ivalue (a);
782 e2 = num_get_ivalue (b); 841 e2 = num_ivalue (b);
783 res = e1 % e2; 842 res = e1 % e2;
784 843
785 /* modulo should have same sign as second operand */ 844 /* modulo should have same sign as second operand */
786 if (res * e2 < 0) 845 if (res * e2 < 0)
787 res += e2; 846 res += e2;
788 847
789 num_set_ivalue (ret, res); 848 num_set_ivalue (ret, res);
790 return ret; 849 return ret;
791} 850}
792 851
852/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
793static int 853static int
794num_eq (num a, num b) 854num_cmp (num a, num b)
795{ 855{
856 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796 int ret; 857 int ret;
797 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
798 858
799 if (is_fixnum) 859 if (is_fixnum)
800 ret = num_get_ivalue (a) == num_get_ivalue (b); 860 {
861 IVALUE av = num_ivalue (a);
862 IVALUE bv = num_ivalue (b);
863
864 ret = av == bv ? 0 : av < bv ? -1 : +1;
865 }
801 else 866 else
802 ret = num_get_rvalue (a) == num_get_rvalue (b); 867 {
868 RVALUE av = num_rvalue (a);
869 RVALUE bv = num_rvalue (b);
870
871 ret = av == bv ? 0 : av < bv ? -1 : +1;
872 }
803 873
804 return ret; 874 return ret;
805}
806
807
808static int
809num_gt (num a, num b)
810{
811 int ret;
812 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
813
814 if (is_fixnum)
815 ret = num_get_ivalue (a) > num_get_ivalue (b);
816 else
817 ret = num_get_rvalue (a) > num_get_rvalue (b);
818
819 return ret;
820}
821
822static int
823num_ge (num a, num b)
824{
825 return !num_lt (a, b);
826}
827
828static int
829num_lt (num a, num b)
830{
831 int ret;
832 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
833
834 if (is_fixnum)
835 ret = num_get_ivalue (a) < num_get_ivalue (b);
836 else
837 ret = num_get_rvalue (a) < num_get_rvalue (b);
838
839 return ret;
840}
841
842static int
843num_le (num a, num b)
844{
845 return !num_gt (a, b);
846} 875}
847 876
848#if USE_MATH 877#if USE_MATH
849 878
850/* Round to nearest. Round to even if midway */ 879/* Round to nearest. Round to even if midway */
… …
860 return ce; 889 return ce;
861 else if (dfl < dce) 890 else if (dfl < dce)
862 return fl; 891 return fl;
863 else 892 else
864 { 893 {
865 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 894 if (fmod (fl, 2) == 0) /* I imagine this holds */
866 return fl; 895 return fl;
867 else 896 else
868 return ce; 897 return ce;
869 } 898 }
870} 899}
871#endif 900#endif
872 901
873static int 902static int
874is_zero_rvalue (RVALUE x) 903is_zero_rvalue (RVALUE x)
875{ 904{
876#if USE_FLOAT 905 return x == 0;
906#if 0
907#if USE_REAL
877 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 908 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
878#else 909#else
879 return x == 0; 910 return x == 0;
880#endif 911#endif
881} 912#endif
882
883static long
884binary_decode (const char *s)
885{
886 long x = 0;
887
888 while (*s != 0 && (*s == '1' || *s == '0'))
889 {
890 x <<= 1;
891 x += *s - '0';
892 s++;
893 }
894
895 return x;
896} 913}
897 914
898/* allocate new cell segment */ 915/* allocate new cell segment */
899static int 916static int
900alloc_cellseg (SCHEME_P_ int n) 917alloc_cellseg (SCHEME_P_ int n)
… …
920 return k; 937 return k;
921 938
922 i = ++SCHEME_V->last_cell_seg; 939 i = ++SCHEME_V->last_cell_seg;
923 SCHEME_V->alloc_seg[i] = cp; 940 SCHEME_V->alloc_seg[i] = cp;
924 941
925 /* insert new segment in address order */
926 newp = (pointer)cp; 942 newp = (pointer)cp;
927 SCHEME_V->cell_seg[i] = newp; 943 SCHEME_V->cell_seg[i] = newp;
928 SCHEME_V->cell_segsize[i] = segsize; 944 SCHEME_V->cell_segsize[i] = segsize;
929
930 //TODO: insert, not swap
931 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
932 {
933 p = SCHEME_V->cell_seg[i];
934 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
935 SCHEME_V->cell_seg[i - 1] = p;
936
937 k = SCHEME_V->cell_segsize[i];
938 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
939 SCHEME_V->cell_segsize[i - 1] = k;
940
941 --i;
942 }
943
944 SCHEME_V->fcells += segsize; 945 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 946 last = newp + segsize - 1;
946 947
947 for (p = newp; p <= last; p++) 948 for (p = newp; p <= last; p++)
948 { 949 {
949 set_typeflag (p, T_FREE); 950 set_typeflag (p, T_PAIR);
950 set_car (p, NIL); 951 set_car (p, NIL);
951 set_cdr (p, p + 1); 952 set_cdr (p, p + 1);
952 } 953 }
953 954
954 /* insert new cells in address order on free list */
955 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
956 {
957 set_cdr (last, SCHEME_V->free_cell); 955 set_cdr (last, SCHEME_V->free_cell);
958 SCHEME_V->free_cell = newp; 956 SCHEME_V->free_cell = newp;
959 }
960 else
961 {
962 p = SCHEME_V->free_cell;
963
964 while (cdr (p) != NIL && newp > cdr (p))
965 p = cdr (p);
966
967 set_cdr (last, cdr (p));
968 set_cdr (p, newp);
969 }
970 } 957 }
971 958
972 return n; 959 return n;
973} 960}
974 961
975/* get new cell. parameter a, b is marked by gc. */ 962/* get new cell. parameter a, b is marked by gc. */
976static INLINE pointer 963ecb_inline pointer
977get_cell_x (SCHEME_P_ pointer a, pointer b) 964get_cell_x (SCHEME_P_ pointer a, pointer b)
978{ 965{
979 if (SCHEME_V->free_cell == NIL) 966 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
980 { 967 {
981 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
982 return S_SINK; 969 return S_SINK;
983 970
984 if (SCHEME_V->free_cell == NIL) 971 if (SCHEME_V->free_cell == NIL)
… …
1008 --SCHEME_V->fcells; 995 --SCHEME_V->fcells;
1009 return x; 996 return x;
1010 } 997 }
1011} 998}
1012 999
1013/* make sure that there is a given number of cells free */
1014static pointer
1015reserve_cells (SCHEME_P_ int n)
1016{
1017 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1018 return NIL;
1019
1020 /* Are there enough cells available? */
1021 if (SCHEME_V->fcells < n)
1022 {
1023 /* If not, try gc'ing some */
1024 gc (SCHEME_A_ NIL, NIL);
1025
1026 if (SCHEME_V->fcells < n)
1027 {
1028 /* If there still aren't, try getting more heap */
1029 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1030 {
1031 SCHEME_V->no_memory = 1;
1032 return NIL;
1033 }
1034 }
1035
1036 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1037 {
1038 /* If all fail, report failure */
1039 SCHEME_V->no_memory = 1;
1040 return NIL;
1041 }
1042 }
1043
1044 return S_T;
1045}
1046
1047static pointer
1048get_consecutive_cells (SCHEME_P_ int n)
1049{
1050 pointer x;
1051
1052 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1053 return S_SINK;
1054
1055 /* Are there any cells available? */
1056 x = find_consecutive_cells (SCHEME_A_ n);
1057
1058 if (x != NIL)
1059 return x;
1060
1061 /* If not, try gc'ing some */
1062 gc (SCHEME_A_ NIL, NIL);
1063
1064 for (;;)
1065 {
1066 x = find_consecutive_cells (SCHEME_A_ n);
1067
1068 if (x != NIL)
1069 return x;
1070
1071 /* If there still aren't, try getting more heap */
1072 if (!alloc_cellseg (SCHEME_A_ 1))
1073 {
1074#if USE_ERROR_CHECKING
1075 SCHEME_V->no_memory = 1;
1076 return S_SINK;
1077#endif
1078 }
1079 }
1080}
1081
1082static int
1083count_consecutive_cells (pointer x, int needed)
1084{
1085 int n = 1;
1086
1087 while (cdr (x) == x + 1)
1088 {
1089 x = cdr (x);
1090 n++;
1091
1092 if (n >= needed)
1093 break;
1094 }
1095
1096 return n;
1097}
1098
1099static pointer
1100find_consecutive_cells (SCHEME_P_ int n)
1101{
1102 pointer *pp = &SCHEME_V->free_cell;
1103
1104 while (*pp != NIL)
1105 {
1106 int cnt = count_consecutive_cells (*pp, n);
1107
1108 if (cnt >= n)
1109 {
1110 pointer x = *pp;
1111
1112 *pp = cdr (*pp + n - 1);
1113 SCHEME_V->fcells -= n;
1114 return x;
1115 }
1116
1117 pp = &cdr (*pp + cnt - 1);
1118 }
1119
1120 return NIL;
1121}
1122
1123/* To retain recent allocs before interpreter knows about them - 1000/* To retain recent allocs before interpreter knows about them -
1124 Tehom */ 1001 Tehom */
1125 1002
1126static void 1003static void
1127push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
… …
1150 1027
1151 return cell; 1028 return cell;
1152} 1029}
1153 1030
1154static pointer 1031static pointer
1155get_vector_object (SCHEME_P_ int len, pointer init) 1032get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1156{ 1033{
1157 pointer cells = get_consecutive_cells (SCHEME_A_ len / 2 + len % 2 + 1); 1034 pointer v = get_cell_x (SCHEME_A_ 0, 0);
1035 pointer *e = malloc (len * sizeof (pointer));
1158 1036
1159#if USE_ERROR_CHECKING 1037 if (!e && USE_ERROR_CHECKING)
1160 if (SCHEME_V->no_memory)
1161 return S_SINK; 1038 return S_SINK;
1162#endif
1163 1039
1164 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1165 set_typeflag (cells, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1166 ivalue_unchecked (cells) = len; 1042
1167 set_num_integer (cells); 1043 v->object.vector.vvalue = e;
1044 v->object.vector.length = len;
1168 fill_vector (cells, init); 1045 fill_vector (v, 0, init);
1169 push_recent_alloc (SCHEME_A_ cells, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1170 1047
1171 return cells; 1048 return v;
1172} 1049}
1173 1050
1174static INLINE void 1051ecb_inline void
1175ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1176{ 1053{
1177 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1178} 1055}
1179 1056
… …
1212 if (immutable) 1089 if (immutable)
1213 setimmutable (x); 1090 setimmutable (x);
1214 1091
1215 set_car (x, a); 1092 set_car (x, a);
1216 set_cdr (x, b); 1093 set_cdr (x, b);
1094
1217 return x; 1095 return x;
1218} 1096}
1219 1097
1220/* ========== oblist implementation ========== */ 1098/* ========== oblist implementation ========== */
1221 1099
1100static pointer
1101generate_symbol (SCHEME_P_ const char *name)
1102{
1103 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x;
1107}
1108
1222#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1223 1110
1111static int
1224static 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}
1225 1122
1226static pointer 1123static pointer
1227oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1228{ 1125{
1229 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1231 1128
1232/* returns the new symbol */ 1129/* returns the new symbol */
1233static pointer 1130static pointer
1234oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1235{ 1132{
1236 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1237
1238 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1239 set_typeflag (x, T_SYMBOL);
1240 setimmutable (car (x));
1241
1242 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1243 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)));
1244 return x; 1136 return x;
1245} 1137}
1246 1138
1247static INLINE pointer 1139ecb_inline pointer
1248oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1249{ 1141{
1250 int location; 1142 int location;
1251 pointer x; 1143 pointer x;
1252 char *s; 1144 char *s;
1253 1145
1254 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1255 1147
1256 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))
1257 { 1149 {
1258 s = symname (car (x)); 1150 s = symname (car (x));
1259 1151
1260 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1261 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1270{ 1162{
1271 int i; 1163 int i;
1272 pointer x; 1164 pointer x;
1273 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1274 1166
1275 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1276 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))
1277 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1278 1170
1279 return ob_list; 1171 return ob_list;
1280} 1172}
1281 1173
… …
1285oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1286{ 1178{
1287 return NIL; 1179 return NIL;
1288} 1180}
1289 1181
1290static INLINE pointer 1182ecb_inline pointer
1291oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1292{ 1184{
1293 pointer x; 1185 pointer x;
1294 char *s; 1186 char *s;
1295 1187
… …
1307 1199
1308/* returns the new symbol */ 1200/* returns the new symbol */
1309static pointer 1201static pointer
1310oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1311{ 1203{
1312 pointer x; 1204 pointer x = mk_string (SCHEME_A_ name);
1313
1314 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1315 set_typeflag (x, T_SYMBOL); 1205 set_typeflag (x, T_SYMBOL);
1316 setimmutable (car (x)); 1206 setimmutable (x);
1317 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1318 return x; 1208 return x;
1319} 1209}
1320 1210
1321static pointer 1211static pointer
… …
1354mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1355{ 1245{
1356 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1357 1247
1358 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, (T_CHARACTER | T_ATOM));
1359 ivalue_unchecked (x) = c & 0xff; 1249 set_ivalue (x, c & 0xff);
1360 set_num_integer (x); 1250
1361 return x; 1251 return x;
1362} 1252}
1363 1253
1364/* get number atom (integer) */ 1254/* get number atom (integer) */
1365INTERFACE pointer 1255INTERFACE pointer
1366mk_integer (SCHEME_P_ long num) 1256mk_integer (SCHEME_P_ long n)
1367{ 1257{
1368 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1258 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1369 1259
1370 set_typeflag (x, (T_NUMBER | T_ATOM)); 1260 set_typeflag (x, (T_INTEGER | T_ATOM));
1371 ivalue_unchecked (x) = num; 1261 set_ivalue (x, n);
1372 set_num_integer (x); 1262
1373 return x; 1263 return x;
1374} 1264}
1375 1265
1376INTERFACE pointer 1266INTERFACE pointer
1377mk_real (SCHEME_P_ RVALUE n) 1267mk_real (SCHEME_P_ RVALUE n)
1378{ 1268{
1269#if USE_REAL
1379 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1270 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1380 1271
1381 set_typeflag (x, (T_NUMBER | T_ATOM)); 1272 set_typeflag (x, (T_REAL | T_ATOM));
1382 rvalue_unchecked (x) = n; 1273 set_rvalue (x, n);
1383 set_num_real (x); 1274
1384 return x; 1275 return x;
1276#else
1277 return mk_integer (SCHEME_A_ n);
1278#endif
1385} 1279}
1386 1280
1387static pointer 1281static pointer
1388mk_number (SCHEME_P_ const num n) 1282mk_number (SCHEME_P_ const num n)
1389{ 1283{
1284#if USE_REAL
1390 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
1391 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1289 return mk_integer (SCHEME_A_ num_ivalue (n));
1392 else 1290#endif
1393 return mk_real (SCHEME_A_ num_get_rvalue (n));
1394} 1291}
1395 1292
1396/* allocate name to string area */ 1293/* allocate name to string area */
1397static char * 1294static char *
1398store_string (SCHEME_P_ int len_str, const char *str, char fill) 1295store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1399{ 1296{
1400 char *q = malloc (len_str + 1); 1297 char *q = malloc (len_str + 1);
1401 1298
1402 if (q == 0 && USE_ERROR_CHECKING) 1299 if (q == 0 && USE_ERROR_CHECKING)
1403 { 1300 {
1404 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1405 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1406 } 1303 }
1407 1304
1408 if (str) 1305 if (str)
1409 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1410 int l = strlen (str);
1411
1412 if (l > len_str)
1413 l = len_str;
1414
1415 memcpy (q, str, l);
1416 q[l] = 0;
1417 }
1418 else 1307 else
1419 {
1420 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1421 q[len_str] = 0; 1310 q[len_str] = 0;
1422 }
1423 1311
1424 return q; 1312 return q;
1425} 1313}
1426 1314
1427/* get new string */
1428INTERFACE pointer 1315INTERFACE pointer
1429mk_string (SCHEME_P_ const char *str)
1430{
1431 return mk_counted_string (SCHEME_A_ str, strlen (str));
1432}
1433
1434INTERFACE pointer
1435mk_counted_string (SCHEME_P_ const char *str, int len)
1436{
1437 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1438
1439 set_typeflag (x, T_STRING | T_ATOM);
1440 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1441 strlength (x) = len;
1442 return x;
1443}
1444
1445INTERFACE pointer
1446mk_empty_string (SCHEME_P_ int len, char fill) 1316mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1447{ 1317{
1448 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1318 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1449 1319
1450 set_typeflag (x, T_STRING | T_ATOM); 1320 set_typeflag (x, T_STRING | T_ATOM);
1451 strvalue (x) = store_string (SCHEME_A_ len, 0, fill); 1321 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1452 strlength (x) = len; 1322 strlength (x) = len;
1453 return x; 1323 return x;
1454} 1324}
1455 1325
1456INTERFACE pointer 1326INTERFACE pointer
1327mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1328{
1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1330
1331 set_typeflag (x, T_STRING | T_ATOM);
1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1333 strlength (x) = len;
1334
1335 return x;
1336}
1337
1338INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str)
1340{
1341 return mk_counted_string (SCHEME_A_ str, strlen (str));
1342}
1343
1344INTERFACE pointer
1457mk_vector (SCHEME_P_ int len) 1345mk_vector (SCHEME_P_ uint32_t len)
1458{ 1346{
1459 return get_vector_object (SCHEME_A_ len, NIL); 1347 return get_vector_object (SCHEME_A_ len, NIL);
1460} 1348}
1461 1349
1462INTERFACE void 1350INTERFACE void
1463fill_vector (pointer vec, pointer obj) 1351fill_vector (pointer vec, uint32_t start, pointer obj)
1464{ 1352{
1465 int i; 1353 int i;
1466 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1467 1354
1468 for (i = 0; i < num; i++) 1355 for (i = start; i < veclength (vec); i++)
1469 { 1356 vecvalue (vec)[i] = obj;
1470 set_typeflag (vec + 1 + i, T_PAIR); 1357}
1471 setimmutable (vec + 1 + i); 1358
1472 set_car (vec + 1 + i, obj); 1359INTERFACE void
1473 set_cdr (vec + 1 + i, obj); 1360vector_resize (pointer vec, uint32_t newsize, pointer fill)
1474 } 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);
1475} 1366}
1476 1367
1477INTERFACE pointer 1368INTERFACE pointer
1478vector_elem (pointer vec, int ielem) 1369vector_get (pointer vec, uint32_t ielem)
1479{ 1370{
1480 int n = ielem / 2; 1371 return vecvalue(vec)[ielem];
1481
1482 if (ielem % 2 == 0)
1483 return car (vec + 1 + n);
1484 else
1485 return cdr (vec + 1 + n);
1486} 1372}
1487 1373
1488INTERFACE void 1374INTERFACE void
1489set_vector_elem (pointer vec, int ielem, pointer a) 1375vector_set (pointer vec, uint32_t ielem, pointer a)
1490{ 1376{
1491 int n = ielem / 2; 1377 vecvalue(vec)[ielem] = a;
1492
1493 if (ielem % 2 == 0)
1494 set_car (vec + 1 + n, a);
1495 else
1496 set_cdr (vec + 1 + n, a);
1497} 1378}
1498 1379
1499/* get new symbol */ 1380/* get new symbol */
1500INTERFACE pointer 1381INTERFACE pointer
1501mk_symbol (SCHEME_P_ const char *name) 1382mk_symbol (SCHEME_P_ const char *name)
… …
1511 1392
1512INTERFACE pointer 1393INTERFACE pointer
1513gensym (SCHEME_P) 1394gensym (SCHEME_P)
1514{ 1395{
1515 pointer x; 1396 pointer x;
1516 char name[40]; 1397 char name[40] = "gensym-";
1517
1518 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1519 {
1520 strcpy (name, "gensym-");
1521 xnum (name + 7, SCHEME_V->gensym_cnt); 1398 xnum (name + 7, SCHEME_V->gensym_cnt);
1522 1399
1523 /* first check oblist */ 1400 return generate_symbol (SCHEME_A_ name);
1524 x = oblist_find_by_name (SCHEME_A_ name);
1525
1526 if (x != NIL)
1527 continue;
1528 else
1529 {
1530 x = oblist_add_by_name (SCHEME_A_ name);
1531 return x;
1532 }
1533 }
1534
1535 return NIL;
1536} 1401}
1537 1402
1538/* make symbol or number atom from string */ 1403/* make symbol or number atom from string */
1539static pointer 1404static pointer
1540mk_atom (SCHEME_P_ char *q) 1405mk_atom (SCHEME_P_ char *q)
… …
1542 char c, *p; 1407 char c, *p;
1543 int has_dec_point = 0; 1408 int has_dec_point = 0;
1544 int has_fp_exp = 0; 1409 int has_fp_exp = 0;
1545 1410
1546#if USE_COLON_HOOK 1411#if USE_COLON_HOOK
1547
1548 if ((p = strstr (q, "::")) != 0) 1412 if ((p = strstr (q, "::")) != 0)
1549 { 1413 {
1550 *p = 0; 1414 *p = 0;
1551 return cons (SCHEME_V->COLON_HOOK, 1415 return cons (SCHEME_V->COLON_HOOK,
1552 cons (cons (SCHEME_V->QUOTE, 1416 cons (cons (SCHEME_V->QUOTE,
1553 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1417 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1554 } 1418 }
1555
1556#endif 1419#endif
1557 1420
1558 p = q; 1421 p = q;
1559 c = *p++; 1422 c = *p++;
1560 1423
… …
1596 } 1459 }
1597 else if ((c == 'e') || (c == 'E')) 1460 else if ((c == 'e') || (c == 'E'))
1598 { 1461 {
1599 if (!has_fp_exp) 1462 if (!has_fp_exp)
1600 { 1463 {
1601 has_dec_point = 1; /* decimal point illegal 1464 has_dec_point = 1; /* decimal point illegal from now on */
1602 from now on */
1603 p++; 1465 p++;
1604 1466
1605 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1467 if ((*p == '-') || (*p == '+') || isdigit (*p))
1606 continue; 1468 continue;
1607 } 1469 }
… …
1609 1471
1610 return mk_symbol (SCHEME_A_ strlwr (q)); 1472 return mk_symbol (SCHEME_A_ strlwr (q));
1611 } 1473 }
1612 } 1474 }
1613 1475
1614#if USE_FLOAT 1476#if USE_REAL
1615 if (has_dec_point) 1477 if (has_dec_point)
1616 return mk_real (SCHEME_A_ atof (q)); 1478 return mk_real (SCHEME_A_ atof (q));
1617#endif 1479#endif
1618 1480
1619 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1621 1483
1622/* make constant */ 1484/* make constant */
1623static pointer 1485static pointer
1624mk_sharp_const (SCHEME_P_ char *name) 1486mk_sharp_const (SCHEME_P_ char *name)
1625{ 1487{
1626 long x;
1627 char tmp[STRBUFFSIZE];
1628
1629 if (!strcmp (name, "t")) 1488 if (!strcmp (name, "t"))
1630 return S_T; 1489 return S_T;
1631 else if (!strcmp (name, "f")) 1490 else if (!strcmp (name, "f"))
1632 return S_F; 1491 return S_F;
1633 else if (*name == 'o') /* #o (octal) */
1634 {
1635 x = strtol (name + 1, 0, 8);
1636 return mk_integer (SCHEME_A_ x);
1637 }
1638 else if (*name == 'd') /* #d (decimal) */
1639 {
1640 x = strtol (name + 1, 0, 10);
1641 return mk_integer (SCHEME_A_ x);
1642 }
1643 else if (*name == 'x') /* #x (hex) */
1644 {
1645 x = strtol (name + 1, 0, 16);
1646 return mk_integer (SCHEME_A_ x);
1647 }
1648 else if (*name == 'b') /* #b (binary) */
1649 {
1650 x = binary_decode (name + 1);
1651 return mk_integer (SCHEME_A_ x);
1652 }
1653 else if (*name == '\\') /* #\w (character) */ 1492 else if (*name == '\\') /* #\w (character) */
1654 { 1493 {
1655 int c = 0; 1494 int c;
1656 1495
1657 if (stricmp (name + 1, "space") == 0) 1496 if (stricmp (name + 1, "space") == 0)
1658 c = ' '; 1497 c = ' ';
1659 else if (stricmp (name + 1, "newline") == 0) 1498 else if (stricmp (name + 1, "newline") == 0)
1660 c = '\n'; 1499 c = '\n';
… …
1662 c = '\r'; 1501 c = '\r';
1663 else if (stricmp (name + 1, "tab") == 0) 1502 else if (stricmp (name + 1, "tab") == 0)
1664 c = '\t'; 1503 c = '\t';
1665 else if (name[1] == 'x' && name[2] != 0) 1504 else if (name[1] == 'x' && name[2] != 0)
1666 { 1505 {
1667 int c1 = strtol (name + 2, 0, 16); 1506 long c1 = strtol (name + 2, 0, 16);
1668 1507
1669 if (c1 <= UCHAR_MAX) 1508 if (0 <= c1 && c1 <= UCHAR_MAX)
1670 c = c1; 1509 c = c1;
1671 else 1510 else
1672 return NIL; 1511 return NIL;
1673 1512 }
1674#if USE_ASCII_NAMES 1513#if USE_ASCII_NAMES
1675 }
1676 else if (is_ascii_name (name + 1, &c)) 1514 else if (is_ascii_name (name + 1, &c))
1677 {
1678 /* nothing */ 1515 /* nothing */;
1679#endif 1516#endif
1680 }
1681 else if (name[2] == 0) 1517 else if (name[2] == 0)
1682 c = name[1]; 1518 c = name[1];
1683 else 1519 else
1684 return NIL; 1520 return NIL;
1685 1521
1686 return mk_character (SCHEME_A_ c); 1522 return mk_character (SCHEME_A_ c);
1687 } 1523 }
1688 else 1524 else
1525 {
1526 /* identify base by string index */
1527 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1528 char *base = strchr (baseidx, *name);
1529
1530 if (base)
1531 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1532
1689 return NIL; 1533 return NIL;
1534 }
1690} 1535}
1691 1536
1692/* ========== garbage collector ========== */ 1537/* ========== garbage collector ========== */
1693 1538
1694/*-- 1539/*--
1695 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1696 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1697 * for marking. 1542 * for marking.
1543 *
1544 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector
1698 */ 1547 */
1699static void 1548static void
1700mark (pointer a) 1549mark (pointer a)
1701{ 1550{
1702 pointer t, q, p; 1551 pointer t, q, p;
… …
1704 t = 0; 1553 t = 0;
1705 p = a; 1554 p = a;
1706E2: 1555E2:
1707 setmark (p); 1556 setmark (p);
1708 1557
1709 if (is_vector (p)) 1558 if (ecb_expect_false (is_vector (p)))
1710 { 1559 {
1711 int i; 1560 int i;
1712 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1713 1561
1714 for (i = 0; i < num; i++) 1562 for (i = 0; i < veclength (p); i++)
1715 { 1563 mark (vecvalue (p)[i]);
1716 /* Vector cells will be treated like ordinary cells */
1717 mark (p + 1 + i);
1718 }
1719 } 1564 }
1720 1565
1721 if (is_atom (p)) 1566 if (is_atom (p))
1722 goto E6; 1567 goto E6;
1723 1568
… …
1820 if (is_mark (p)) 1665 if (is_mark (p))
1821 clrmark (p); 1666 clrmark (p);
1822 else 1667 else
1823 { 1668 {
1824 /* reclaim cell */ 1669 /* reclaim cell */
1825 if (typeflag (p) != T_FREE) 1670 if (typeflag (p) != T_PAIR)
1826 { 1671 {
1827 finalize_cell (SCHEME_A_ p); 1672 finalize_cell (SCHEME_A_ p);
1828 set_typeflag (p, T_FREE); 1673 set_typeflag (p, T_PAIR);
1829 set_car (p, NIL); 1674 set_car (p, NIL);
1830 } 1675 }
1831 1676
1832 ++SCHEME_V->fcells; 1677 ++SCHEME_V->fcells;
1833 set_cdr (p, SCHEME_V->free_cell); 1678 set_cdr (p, SCHEME_V->free_cell);
… …
1835 } 1680 }
1836 } 1681 }
1837 } 1682 }
1838 1683
1839 if (SCHEME_V->gc_verbose) 1684 if (SCHEME_V->gc_verbose)
1685 {
1840 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1841} 1688}
1842 1689
1843static void 1690static void
1844finalize_cell (SCHEME_P_ pointer a) 1691finalize_cell (SCHEME_P_ pointer a)
1845{ 1692{
1846 if (is_string (a)) 1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1847 free (strvalue (a)); 1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1848#if USE_PORTS 1698#if USE_PORTS
1849 else if (is_port (a)) 1699 else if (is_port (a))
1850 { 1700 {
1851 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1852 port_close (SCHEME_A_ a, port_input | port_output); 1702 port_close (SCHEME_A_ a, port_input | port_output);
… …
2271#endif 2121#endif
2272} 2122}
2273 2123
2274/* read characters up to delimiter, but cater to character constants */ 2124/* read characters up to delimiter, but cater to character constants */
2275static char * 2125static char *
2276readstr_upto (SCHEME_P_ char *delim) 2126readstr_upto (SCHEME_P_ int skip, const char *delim)
2277{ 2127{
2278 char *p = SCHEME_V->strbuff; 2128 char *p = SCHEME_V->strbuff + skip;
2279 2129
2280 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))));
2281 2131
2282 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2132 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2283 *p = 0; 2133 *p = 0;
… …
2290 return SCHEME_V->strbuff; 2140 return SCHEME_V->strbuff;
2291} 2141}
2292 2142
2293/* read string expression "xxx...xxx" */ 2143/* read string expression "xxx...xxx" */
2294static pointer 2144static pointer
2295readstrexp (SCHEME_P) 2145readstrexp (SCHEME_P_ char delim)
2296{ 2146{
2297 char *p = SCHEME_V->strbuff; 2147 char *p = SCHEME_V->strbuff;
2298 int c; 2148 int c;
2299 int c1 = 0; 2149 int c1 = 0;
2300 enum
2301 { 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;
2302 2151
2303 for (;;) 2152 for (;;)
2304 { 2153 {
2305 c = inchar (SCHEME_A); 2154 c = inchar (SCHEME_A);
2306 2155
… …
2308 return S_F; 2157 return S_F;
2309 2158
2310 switch (state) 2159 switch (state)
2311 { 2160 {
2312 case st_ok: 2161 case st_ok:
2313 switch (c) 2162 if (ecb_expect_false (c == delim))
2314 {
2315 case '\\':
2316 state = st_bsl;
2317 break;
2318
2319 case '"':
2320 *p = 0;
2321 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);
2322 2164
2323 default: 2165 if (ecb_expect_false (c == '\\'))
2166 state = st_bsl;
2167 else
2324 *p++ = c; 2168 *p++ = c;
2325 break;
2326 }
2327 2169
2328 break; 2170 break;
2329 2171
2330 case st_bsl: 2172 case st_bsl:
2331 switch (c) 2173 switch (c)
… …
2361 case 'r': 2203 case 'r':
2362 *p++ = '\r'; 2204 *p++ = '\r';
2363 state = st_ok; 2205 state = st_ok;
2364 break; 2206 break;
2365 2207
2366 case '"':
2367 *p++ = '"';
2368 state = st_ok;
2369 break;
2370
2371 default: 2208 default:
2372 *p++ = c; 2209 *p++ = c;
2373 state = st_ok; 2210 state = st_ok;
2374 break; 2211 break;
2375 } 2212 }
2376 2213
2377 break; 2214 break;
2378 2215
2379 case st_x1: 2216 case st_x1:
2380 case st_x2: 2217 case st_x2:
2381 c = toupper (c); 2218 c = tolower (c);
2382 2219
2383 if (c >= '0' && c <= 'F') 2220 if (c >= '0' && c <= '9')
2384 {
2385 if (c <= '9')
2386 c1 = (c1 << 4) + c - '0'; 2221 c1 = (c1 << 4) + c - '0';
2387 else 2222 else if (c >= 'a' && c <= 'f')
2388 c1 = (c1 << 4) + c - 'A' + 10; 2223 c1 = (c1 << 4) + c - 'a' + 10;
2389
2390 if (state == st_x1)
2391 state = st_x2;
2392 else
2393 {
2394 *p++ = c1;
2395 state = st_ok;
2396 }
2397 }
2398 else 2224 else
2399 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 }
2400 2234
2401 break; 2235 break;
2402 2236
2403 case st_oct1: 2237 case st_oct1:
2404 case st_oct2: 2238 case st_oct2:
… …
2408 backchar (SCHEME_A_ c); 2242 backchar (SCHEME_A_ c);
2409 state = st_ok; 2243 state = st_ok;
2410 } 2244 }
2411 else 2245 else
2412 { 2246 {
2413 if (state == st_oct2 && c1 >= 32) 2247 if (state == st_oct2 && c1 >= ' ')
2414 return S_F; 2248 return S_F;
2415 2249
2416 c1 = (c1 << 3) + (c - '0'); 2250 c1 = (c1 << 3) + (c - '0');
2417 2251
2418 if (state == st_oct1) 2252 if (state == st_oct1)
… …
2423 state = st_ok; 2257 state = st_ok;
2424 } 2258 }
2425 } 2259 }
2426 2260
2427 break; 2261 break;
2428
2429 } 2262 }
2430 } 2263 }
2431} 2264}
2432 2265
2433/* check c is in chars */ 2266/* check c is in chars */
2434static INLINE int 2267ecb_inline int
2435is_one_of (char *s, int c) 2268is_one_of (const char *s, int c)
2436{ 2269{
2437 if (c == EOF)
2438 return 1;
2439
2440 return !!strchr (s, c); 2270 return c == EOF || !!strchr (s, c);
2441} 2271}
2442 2272
2443/* skip white characters */ 2273/* skip white characters */
2444static INLINE int 2274ecb_inline int
2445skipspace (SCHEME_P) 2275skipspace (SCHEME_P)
2446{ 2276{
2447 int c, curr_line = 0; 2277 int c, curr_line = 0;
2448 2278
2449 do 2279 do
… …
2452#if SHOW_ERROR_LINE 2282#if SHOW_ERROR_LINE
2453 if (c == '\n') 2283 if (c == '\n')
2454 curr_line++; 2284 curr_line++;
2455#endif 2285#endif
2456 } 2286 }
2457 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2287 while (is_one_of (WHITESPACE, c));
2458 2288
2459 /* record it */ 2289 /* record it */
2460#if SHOW_ERROR_LINE 2290#if SHOW_ERROR_LINE
2461 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2462 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
… …
2492 return TOK_RPAREN; 2322 return TOK_RPAREN;
2493 2323
2494 case '.': 2324 case '.':
2495 c = inchar (SCHEME_A); 2325 c = inchar (SCHEME_A);
2496 2326
2497 if (is_one_of (" \n\t", c)) 2327 if (is_one_of (WHITESPACE, c))
2498 return TOK_DOT; 2328 return TOK_DOT;
2499 else 2329 else
2500 { 2330 {
2501 //TODO: ungetc twice in a row is not supported in C
2502 backchar (SCHEME_A_ c); 2331 backchar (SCHEME_A_ c);
2503 backchar (SCHEME_A_ '.');
2504 return TOK_ATOM; 2332 return TOK_DOTATOM;
2505 } 2333 }
2334
2335 case '|':
2336 return TOK_STRATOM;
2506 2337
2507 case '\'': 2338 case '\'':
2508 return TOK_QUOTE; 2339 return TOK_QUOTE;
2509 2340
2510 case ';': 2341 case ';':
… …
2642 } 2473 }
2643 2474
2644 putcharacter (SCHEME_A_ '"'); 2475 putcharacter (SCHEME_A_ '"');
2645} 2476}
2646 2477
2647
2648/* print atoms */ 2478/* print atoms */
2649static void 2479static void
2650printatom (SCHEME_P_ pointer l, int f) 2480printatom (SCHEME_P_ pointer l, int f)
2651{ 2481{
2652 char *p; 2482 char *p;
2653 int len; 2483 int len;
2654 2484
2655 atom2str (SCHEME_A_ l, f, &p, &len); 2485 atom2str (SCHEME_A_ l, f, &p, &len);
2656 putchars (SCHEME_A_ p, len); 2486 putchars (SCHEME_A_ p, len);
2657} 2487}
2658
2659 2488
2660/* Uses internal buffer unless string pointer is already available */ 2489/* Uses internal buffer unless string pointer is already available */
2661static void 2490static void
2662atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2663{ 2492{
… …
2677 { 2506 {
2678 p = SCHEME_V->strbuff; 2507 p = SCHEME_V->strbuff;
2679 2508
2680 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2509 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2681 { 2510 {
2682 if (num_is_integer (l)) 2511 if (is_integer (l))
2683 xnum (p, ivalue_unchecked (l)); 2512 xnum (p, ivalue_unchecked (l));
2684#if USE_FLOAT 2513#if USE_REAL
2685 else 2514 else
2686 { 2515 {
2687 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2516 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2688 /* r5rs says there must be a '.' (unless 'e'?) */ 2517 /* r5rs says there must be a '.' (unless 'e'?) */
2689 f = strcspn (p, ".e"); 2518 f = strcspn (p, ".e");
… …
2824#endif 2653#endif
2825 } 2654 }
2826 else if (is_continuation (l)) 2655 else if (is_continuation (l))
2827 p = "#<CONTINUATION>"; 2656 p = "#<CONTINUATION>";
2828 else 2657 else
2658 {
2659#if USE_PRINTF
2660 p = SCHEME_V->strbuff;
2661 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2662#else
2829 p = "#<ERROR>"; 2663 p = "#<ERROR>";
2664#endif
2665 }
2830 2666
2831 *pp = p; 2667 *pp = p;
2832 *plen = strlen (p); 2668 *plen = strlen (p);
2833} 2669}
2834 2670
… …
2942 return 0; 2778 return 0;
2943 } 2779 }
2944 else if (is_number (a)) 2780 else if (is_number (a))
2945 { 2781 {
2946 if (is_number (b)) 2782 if (is_number (b))
2947 if (num_is_integer (a) == num_is_integer (b))
2948 return num_eq (nvalue (a), nvalue (b)); 2783 return num_cmp (nvalue (a), nvalue (b)) == 0;
2949 2784
2950 return 0; 2785 return 0;
2951 } 2786 }
2952 else if (is_character (a)) 2787 else if (is_character (a))
2953 { 2788 {
… …
2979/* () is #t in R5RS */ 2814/* () is #t in R5RS */
2980#define is_true(p) ((p) != S_F) 2815#define is_true(p) ((p) != S_F)
2981#define is_false(p) ((p) == S_F) 2816#define is_false(p) ((p) == S_F)
2982 2817
2983/* ========== Environment implementation ========== */ 2818/* ========== Environment implementation ========== */
2984
2985#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2986
2987static int
2988hash_fn (const char *key, int table_size)
2989{
2990 unsigned int hashed = 0;
2991 const char *c;
2992 int bits_per_int = sizeof (unsigned int) * 8;
2993
2994 for (c = key; *c; c++)
2995 {
2996 /* letters have about 5 bits in them */
2997 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
2998 hashed ^= *c;
2999 }
3000
3001 return hashed % table_size;
3002}
3003#endif
3004 2819
3005#ifndef USE_ALIST_ENV 2820#ifndef USE_ALIST_ENV
3006 2821
3007/* 2822/*
3008 * In this implementation, each frame of the environment may be 2823 * In this implementation, each frame of the environment may be
… …
3025 2840
3026 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2841 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3027 setenvironment (SCHEME_V->envir); 2842 setenvironment (SCHEME_V->envir);
3028} 2843}
3029 2844
3030static INLINE void 2845static uint32_t
2846sym_hash (pointer sym, uint32_t size)
2847{
2848 uintptr_t ptr = (uintptr_t)sym;
2849
2850#if 0
2851 /* table size is prime, so why mix */
2852 ptr += ptr >> 32;
2853 ptr += ptr >> 16;
2854 ptr += ptr >> 8;
2855#endif
2856
2857 return ptr % size;
2858}
2859
2860ecb_inline void
3031new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2861new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3032{ 2862{
3033 pointer slot = immutable_cons (variable, value); 2863 pointer slot = immutable_cons (variable, value);
3034 2864
3035 if (is_vector (car (env))) 2865 if (is_vector (car (env)))
3036 { 2866 {
3037 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2867 int location = sym_hash (variable, veclength (car (env)));
3038
3039 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2868 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
3040 } 2869 }
3041 else 2870 else
3042 set_car (env, immutable_cons (slot, car (env))); 2871 set_car (env, immutable_cons (slot, car (env)));
3043} 2872}
3044 2873
3045static pointer 2874static pointer
3046find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
3047{ 2876{
3048 pointer x, y; 2877 pointer x, y;
3049 int location;
3050 2878
3051 for (x = env; x != NIL; x = cdr (x)) 2879 for (x = env; x != NIL; x = cdr (x))
3052 { 2880 {
3053 if (is_vector (car (x))) 2881 if (is_vector (car (x)))
3054 { 2882 {
3055 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2883 int location = sym_hash (hdl, veclength (car (x)));
3056 y = vector_elem (car (x), location); 2884 y = vector_get (car (x), location);
3057 } 2885 }
3058 else 2886 else
3059 y = car (x); 2887 y = car (x);
3060 2888
3061 for (; y != NIL; y = cdr (y)) 2889 for (; y != NIL; y = cdr (y))
3062 if (caar (y) == hdl) 2890 if (caar (y) == hdl)
3063 break; 2891 break;
3064 2892
3065 if (y != NIL) 2893 if (y != NIL)
2894 return car (y);
2895
2896 if (!all)
3066 break; 2897 break;
3067
3068 if (!all)
3069 return NIL;
3070 } 2898 }
3071
3072 if (x != NIL)
3073 return car (y);
3074 2899
3075 return NIL; 2900 return NIL;
3076} 2901}
3077 2902
3078#else /* USE_ALIST_ENV */ 2903#else /* USE_ALIST_ENV */
3079 2904
3080static INLINE void 2905ecb_inline void
3081new_frame_in_env (SCHEME_P_ pointer old_env) 2906new_frame_in_env (SCHEME_P_ pointer old_env)
3082{ 2907{
3083 SCHEME_V->envir = immutable_cons (NIL, old_env); 2908 SCHEME_V->envir = immutable_cons (NIL, old_env);
3084 setenvironment (SCHEME_V->envir); 2909 setenvironment (SCHEME_V->envir);
3085} 2910}
3086 2911
3087static INLINE void 2912ecb_inline void
3088new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
3089{ 2914{
3090 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3091} 2916}
3092 2917
… …
3100 for (y = car (x); y != NIL; y = cdr (y)) 2925 for (y = car (x); y != NIL; y = cdr (y))
3101 if (caar (y) == hdl) 2926 if (caar (y) == hdl)
3102 break; 2927 break;
3103 2928
3104 if (y != NIL) 2929 if (y != NIL)
2930 return car (y);
3105 break; 2931 break;
3106 2932
3107 if (!all) 2933 if (!all)
3108 return NIL; 2934 break;
3109 } 2935 }
3110
3111 if (x != NIL)
3112 return car (y);
3113 2936
3114 return NIL; 2937 return NIL;
3115} 2938}
3116 2939
3117#endif /* USE_ALIST_ENV else */ 2940#endif /* USE_ALIST_ENV else */
3118 2941
3119static INLINE void 2942ecb_inline void
3120new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3121{ 2944{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
3122 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2946 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
3123} 2947}
3124 2948
3125static INLINE void 2949ecb_inline void
3126set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3127{ 2951{
3128 set_cdr (slot, value); 2952 set_cdr (slot, value);
3129} 2953}
3130 2954
3131static INLINE pointer 2955ecb_inline pointer
3132slot_value_in_env (pointer slot) 2956slot_value_in_env (pointer slot)
3133{ 2957{
3134 return cdr (slot); 2958 return cdr (slot);
3135} 2959}
3136 2960
3137/* ========== Evaluation Cycle ========== */ 2961/* ========== Evaluation Cycle ========== */
3138 2962
3139static pointer 2963static int
3140xError_1 (SCHEME_P_ const char *s, pointer a) 2964xError_1 (SCHEME_P_ const char *s, pointer a)
3141{ 2965{
3142#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
3143 pointer x; 2967 pointer x;
3144 pointer hdl = SCHEME_V->ERROR_HOOK; 2968 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3170#if USE_ERROR_HOOK 2994#if USE_ERROR_HOOK
3171 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2995 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3172 2996
3173 if (x != NIL) 2997 if (x != NIL)
3174 { 2998 {
3175 if (a) 2999 pointer code = a
3176 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 3000 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3177 else 3001 : NIL;
3178 SCHEME_V->code = NIL;
3179 3002
3180 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 3003 code = cons (mk_string (SCHEME_A_ s), code);
3181 setimmutable (car (SCHEME_V->code)); 3004 setimmutable (car (code));
3182 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 3005 SCHEME_V->code = cons (slot_value_in_env (x), code);
3183 SCHEME_V->op = OP_EVAL; 3006 SCHEME_V->op = OP_EVAL;
3184 3007
3185 return S_T; 3008 return 0;
3186 } 3009 }
3187#endif 3010#endif
3188 3011
3189 if (a) 3012 if (a)
3190 SCHEME_V->args = cons (a, NIL); 3013 SCHEME_V->args = cons (a, NIL);
… …
3192 SCHEME_V->args = NIL; 3015 SCHEME_V->args = NIL;
3193 3016
3194 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3017 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3195 setimmutable (car (SCHEME_V->args)); 3018 setimmutable (car (SCHEME_V->args));
3196 SCHEME_V->op = OP_ERR0; 3019 SCHEME_V->op = OP_ERR0;
3020
3197 return S_T; 3021 return 0;
3198} 3022}
3199 3023
3200#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3024#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3201#define Error_0(s) Error_1 (s, 0) 3025#define Error_0(s) Error_1 (s, 0)
3202 3026
3203/* Too small to turn into function */ 3027/* Too small to turn into function */
3204#define BEGIN do { 3028#define BEGIN do {
3205#define END } while (0) 3029#define END } while (0)
3206#define s_goto(a) BEGIN \ 3030#define s_goto(a) BEGIN \
3207 SCHEME_V->op = a; \ 3031 SCHEME_V->op = a; \
3208 return S_T; END 3032 return 0; END
3209 3033
3210#define s_return(a) return xs_return (SCHEME_A_ a) 3034#define s_return(a) return xs_return (SCHEME_A_ a)
3211 3035
3212#ifndef USE_SCHEME_STACK 3036#ifndef USE_SCHEME_STACK
3213 3037
… …
3238 next_frame = SCHEME_V->dump_base + nframes; 3062 next_frame = SCHEME_V->dump_base + nframes;
3239 3063
3240 next_frame->op = op; 3064 next_frame->op = op;
3241 next_frame->args = args; 3065 next_frame->args = args;
3242 next_frame->envir = SCHEME_V->envir; 3066 next_frame->envir = SCHEME_V->envir;
3243 next_frame->code = code; 3067 next_frame->code = code;
3244 3068
3245 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3246} 3070}
3247 3071
3248static pointer 3072static int
3249xs_return (SCHEME_P_ pointer a) 3073xs_return (SCHEME_P_ pointer a)
3250{ 3074{
3251 int nframes = (uintptr_t)SCHEME_V->dump; 3075 int nframes = (uintptr_t)SCHEME_V->dump;
3252 struct dump_stack_frame *frame; 3076 struct dump_stack_frame *frame;
3253 3077
3254 SCHEME_V->value = a; 3078 SCHEME_V->value = a;
3255 3079
3256 if (nframes <= 0) 3080 if (nframes <= 0)
3257 return NIL; 3081 return -1;
3258 3082
3259 frame = &SCHEME_V->dump_base[--nframes]; 3083 frame = &SCHEME_V->dump_base[--nframes];
3260 SCHEME_V->op = frame->op; 3084 SCHEME_V->op = frame->op;
3261 SCHEME_V->args = frame->args; 3085 SCHEME_V->args = frame->args;
3262 SCHEME_V->envir = frame->envir; 3086 SCHEME_V->envir = frame->envir;
3263 SCHEME_V->code = frame->code; 3087 SCHEME_V->code = frame->code;
3264 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3265 3089
3266 return S_T; 3090 return 0;
3267} 3091}
3268 3092
3269static INLINE void 3093ecb_inline void
3270dump_stack_reset (SCHEME_P) 3094dump_stack_reset (SCHEME_P)
3271{ 3095{
3272 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3096 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3273 SCHEME_V->dump = (pointer)+0; 3097 SCHEME_V->dump = (pointer)+0;
3274} 3098}
3275 3099
3276static INLINE void 3100ecb_inline void
3277dump_stack_initialize (SCHEME_P) 3101dump_stack_initialize (SCHEME_P)
3278{ 3102{
3279 SCHEME_V->dump_size = 0; 3103 SCHEME_V->dump_size = 0;
3280 SCHEME_V->dump_base = 0; 3104 SCHEME_V->dump_base = 0;
3281 dump_stack_reset (SCHEME_A); 3105 dump_stack_reset (SCHEME_A);
… …
3334 int i = 0; 3158 int i = 0;
3335 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3159 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3336 3160
3337 while (cont != NIL) 3161 while (cont != NIL)
3338 { 3162 {
3339 frame->op = ivalue (car (cont)); cont = cdr (cont); 3163 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3340 frame->args = car (cont) ; cont = cdr (cont); 3164 frame->args = car (cont) ; cont = cdr (cont);
3341 frame->envir = car (cont) ; cont = cdr (cont); 3165 frame->envir = car (cont) ; cont = cdr (cont);
3342 frame->code = car (cont) ; cont = cdr (cont); 3166 frame->code = car (cont) ; cont = cdr (cont);
3343 3167
3344 ++frame; 3168 ++frame;
3345 ++i; 3169 ++i;
3346 } 3170 }
3347 3171
3348 SCHEME_V->dump = (pointer)(uintptr_t)i; 3172 SCHEME_V->dump = (pointer)(uintptr_t)i;
3349} 3173}
3350 3174
3351#else 3175#else
3352 3176
3353static INLINE void 3177ecb_inline void
3354dump_stack_reset (SCHEME_P) 3178dump_stack_reset (SCHEME_P)
3355{ 3179{
3356 SCHEME_V->dump = NIL; 3180 SCHEME_V->dump = NIL;
3357} 3181}
3358 3182
3359static INLINE void 3183ecb_inline void
3360dump_stack_initialize (SCHEME_P) 3184dump_stack_initialize (SCHEME_P)
3361{ 3185{
3362 dump_stack_reset (SCHEME_A); 3186 dump_stack_reset (SCHEME_A);
3363} 3187}
3364 3188
… …
3366dump_stack_free (SCHEME_P) 3190dump_stack_free (SCHEME_P)
3367{ 3191{
3368 SCHEME_V->dump = NIL; 3192 SCHEME_V->dump = NIL;
3369} 3193}
3370 3194
3371static pointer 3195static int
3372xs_return (SCHEME_P_ pointer a) 3196xs_return (SCHEME_P_ pointer a)
3373{ 3197{
3374 pointer dump = SCHEME_V->dump; 3198 pointer dump = SCHEME_V->dump;
3375 3199
3376 SCHEME_V->value = a; 3200 SCHEME_V->value = a;
3377 3201
3378 if (dump == NIL) 3202 if (dump == NIL)
3379 return NIL; 3203 return -1;
3380 3204
3381 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3205 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3382 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3206 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3383 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3207 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3384 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3208 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3385 3209
3386 SCHEME_V->dump = dump; 3210 SCHEME_V->dump = dump;
3387 3211
3388 return S_T; 3212 return 0;
3389} 3213}
3390 3214
3391static void 3215static void
3392s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3393{ 3217{
… …
3418 3242
3419#endif 3243#endif
3420 3244
3421#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3422 3246
3247#if 1
3423static pointer 3248static int
3249debug (SCHEME_P_ int indent, pointer x)
3250{
3251 int c;
3252
3253 if (is_syntax (x))
3254 {
3255 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3256 return 8 + 8;
3257 }
3258
3259 if (x == NIL)
3260 {
3261 printf ("%*sNIL\n", indent, "");
3262 return 3;
3263 }
3264
3265 switch (type (x))
3266 {
3267 case T_INTEGER:
3268 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3269 return 32+8;
3270
3271 case T_SYMBOL:
3272 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8;
3274
3275 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3279
3280 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1;
3285
3286 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8;
3289
3290 case T_VECTOR:
3291 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8;
3293
3294 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3297
3298 default:
3299 printf ("unhandled type %d\n", type (x));
3300 break;
3301 }
3302}
3303#endif
3304
3305static int
3424opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3306opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3425{ 3307{
3308 pointer args = SCHEME_V->args;
3426 pointer x, y; 3309 pointer x, y;
3427 3310
3428 switch (op) 3311 switch (op)
3429 { 3312 {
3313#if 1 //D
3314 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3316 printf ("\n");
3317 s_return (S_T);
3318#endif
3430 case OP_LOAD: /* load */ 3319 case OP_LOAD: /* load */
3431 if (file_interactive (SCHEME_A)) 3320 if (file_interactive (SCHEME_A))
3432 { 3321 {
3433 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3434 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3435 } 3324 }
3436 3325
3437 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3326 if (!file_push (SCHEME_A_ strvalue (car (args))))
3438 Error_1 ("unable to open", car (SCHEME_V->args)); 3327 Error_1 ("unable to open", car (args));
3439 else 3328 else
3440 { 3329 {
3441 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3330 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3442 s_goto (OP_T0LVL); 3331 s_goto (OP_T0LVL);
3443 } 3332 }
… …
3478 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3367 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3479 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3368 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3480 s_goto (OP_READ_INTERNAL); 3369 s_goto (OP_READ_INTERNAL);
3481 3370
3482 case OP_T1LVL: /* top level */ 3371 case OP_T1LVL: /* top level */
3483 SCHEME_V->code = SCHEME_V->value; 3372 SCHEME_V->code = SCHEME_V->value;
3484 SCHEME_V->inport = SCHEME_V->save_inport; 3373 SCHEME_V->inport = SCHEME_V->save_inport;
3485 s_goto (OP_EVAL); 3374 s_goto (OP_EVAL);
3486 3375
3487 case OP_READ_INTERNAL: /* internal read */ 3376 case OP_READ_INTERNAL: /* internal read */
3488 SCHEME_V->tok = token (SCHEME_A); 3377 SCHEME_V->tok = token (SCHEME_A);
… …
3517 case OP_EVAL: /* main part of evaluation */ 3406 case OP_EVAL: /* main part of evaluation */
3518#if USE_TRACING 3407#if USE_TRACING
3519 if (SCHEME_V->tracing) 3408 if (SCHEME_V->tracing)
3520 { 3409 {
3521 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3410 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3522 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3411 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3523 SCHEME_V->args = SCHEME_V->code; 3412 SCHEME_V->args = SCHEME_V->code;
3524 putstr (SCHEME_A_ "\nEval: "); 3413 putstr (SCHEME_A_ "\nEval: ");
3525 s_goto (OP_P0LIST); 3414 s_goto (OP_P0LIST);
3526 } 3415 }
3527 3416
… …
3538 else 3427 else
3539 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3428 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3540 } 3429 }
3541 else if (is_pair (SCHEME_V->code)) 3430 else if (is_pair (SCHEME_V->code))
3542 { 3431 {
3432 x = car (SCHEME_V->code);
3433
3543 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3434 if (is_syntax (x)) /* SYNTAX */
3544 { 3435 {
3545 SCHEME_V->code = cdr (SCHEME_V->code); 3436 SCHEME_V->code = cdr (SCHEME_V->code);
3546 s_goto (syntaxnum (x)); 3437 s_goto (syntaxnum (x));
3547 } 3438 }
3548 else /* first, eval top element and eval arguments */ 3439 else /* first, eval top element and eval arguments */
3549 { 3440 {
3550 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3441 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3551 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3442 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3552 SCHEME_V->code = car (SCHEME_V->code); 3443 SCHEME_V->code = x;
3553 s_goto (OP_EVAL); 3444 s_goto (OP_EVAL);
3554 } 3445 }
3555 } 3446 }
3556 else 3447 else
3557 s_return (SCHEME_V->code); 3448 s_return (SCHEME_V->code);
3558 3449
3559 case OP_E0ARGS: /* eval arguments */ 3450 case OP_E0ARGS: /* eval arguments */
3560 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3561 { 3452 {
3562 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3563 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3454 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3564 SCHEME_V->code = SCHEME_V->value; 3455 SCHEME_V->code = SCHEME_V->value;
3565 s_goto (OP_APPLY); 3456 s_goto (OP_APPLY);
… …
3569 SCHEME_V->code = cdr (SCHEME_V->code); 3460 SCHEME_V->code = cdr (SCHEME_V->code);
3570 s_goto (OP_E1ARGS); 3461 s_goto (OP_E1ARGS);
3571 } 3462 }
3572 3463
3573 case OP_E1ARGS: /* eval arguments */ 3464 case OP_E1ARGS: /* eval arguments */
3574 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3465 args = cons (SCHEME_V->value, args);
3575 3466
3576 if (is_pair (SCHEME_V->code)) /* continue */ 3467 if (is_pair (SCHEME_V->code)) /* continue */
3577 { 3468 {
3578 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3469 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3579 SCHEME_V->code = car (SCHEME_V->code); 3470 SCHEME_V->code = car (SCHEME_V->code);
3580 SCHEME_V->args = NIL; 3471 SCHEME_V->args = NIL;
3581 s_goto (OP_EVAL); 3472 s_goto (OP_EVAL);
3582 } 3473 }
3583 else /* end */ 3474 else /* end */
3584 { 3475 {
3585 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3476 args = reverse_in_place (SCHEME_A_ NIL, args);
3586 SCHEME_V->code = car (SCHEME_V->args); 3477 SCHEME_V->code = car (args);
3587 SCHEME_V->args = cdr (SCHEME_V->args); 3478 SCHEME_V->args = cdr (args);
3588 s_goto (OP_APPLY); 3479 s_goto (OP_APPLY);
3589 } 3480 }
3590 3481
3591#if USE_TRACING 3482#if USE_TRACING
3592 3483
3593 case OP_TRACING: 3484 case OP_TRACING:
3594 { 3485 {
3595 int tr = SCHEME_V->tracing; 3486 int tr = SCHEME_V->tracing;
3596 3487
3597 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3488 SCHEME_V->tracing = ivalue_unchecked (car (args));
3598 s_return (mk_integer (SCHEME_A_ tr)); 3489 s_return (mk_integer (SCHEME_A_ tr));
3599 } 3490 }
3600 3491
3601#endif 3492#endif
3602 3493
3603 case OP_APPLY: /* apply 'code' to 'args' */ 3494 case OP_APPLY: /* apply 'code' to 'args' */
3604#if USE_TRACING 3495#if USE_TRACING
3605 if (SCHEME_V->tracing) 3496 if (SCHEME_V->tracing)
3606 { 3497 {
3607 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3498 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3608 SCHEME_V->print_flag = 1; 3499 SCHEME_V->print_flag = 1;
3609 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3500 /* args=cons(SCHEME_V->code,args); */
3610 putstr (SCHEME_A_ "\nApply to: "); 3501 putstr (SCHEME_A_ "\nApply to: ");
3611 s_goto (OP_P0LIST); 3502 s_goto (OP_P0LIST);
3612 } 3503 }
3613 3504
3614 /* fall through */ 3505 /* fall through */
3615 3506
3616 case OP_REAL_APPLY: 3507 case OP_REAL_APPLY:
3617#endif 3508#endif
3618 if (is_proc (SCHEME_V->code)) 3509 if (is_proc (SCHEME_V->code))
3619 {
3620 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3621 }
3622 else if (is_foreign (SCHEME_V->code)) 3511 else if (is_foreign (SCHEME_V->code))
3623 { 3512 {
3624 /* Keep nested calls from GC'ing the arglist */ 3513 /* Keep nested calls from GC'ing the arglist */
3625 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3514 push_recent_alloc (SCHEME_A_ args, NIL);
3626 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3627 3516
3628 s_return (x); 3517 s_return (x);
3629 } 3518 }
3630 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3631 { 3520 {
3632 /* Should not accept promise */ 3521 /* Should not accept promise */
3633 /* make environment */ 3522 /* make environment */
3634 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3523 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3635 3524
3636 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3525 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3637 { 3526 {
3638 if (y == NIL) 3527 if (y == NIL)
3639 Error_0 ("not enough arguments"); 3528 Error_0 ("not enough arguments");
3640 else 3529 else
3641 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3530 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3659 s_goto (OP_BEGIN); 3548 s_goto (OP_BEGIN);
3660 } 3549 }
3661 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3550 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3662 { 3551 {
3663 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3552 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3664 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3553 s_return (args != NIL ? car (args) : NIL);
3665 } 3554 }
3666 else 3555 else
3667 Error_0 ("illegal function"); 3556 Error_0 ("illegal function");
3668 3557
3669 case OP_DOMACRO: /* do macro */ 3558 case OP_DOMACRO: /* do macro */
… …
3678 { 3567 {
3679 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3568 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3680 3569
3681 if (f != NIL) 3570 if (f != NIL)
3682 { 3571 {
3683 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3572 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3684 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3573 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3685 SCHEME_V->code = slot_value_in_env (f); 3574 SCHEME_V->code = slot_value_in_env (f);
3686 s_goto (OP_APPLY); 3575 s_goto (OP_APPLY);
3687 } 3576 }
3688 3577
… …
3699 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir)); 3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3700 3589
3701#endif 3590#endif
3702 3591
3703 case OP_MKCLOSURE: /* make-closure */ 3592 case OP_MKCLOSURE: /* make-closure */
3704 x = car (SCHEME_V->args); 3593 x = car (args);
3705 3594
3706 if (car (x) == SCHEME_V->LAMBDA) 3595 if (car (x) == SCHEME_V->LAMBDA)
3707 x = cdr (x); 3596 x = cdr (x);
3708 3597
3709 if (cdr (SCHEME_V->args) == NIL) 3598 if (cdr (args) == NIL)
3710 y = SCHEME_V->envir; 3599 y = SCHEME_V->envir;
3711 else 3600 else
3712 y = cadr (SCHEME_V->args); 3601 y = cadr (args);
3713 3602
3714 s_return (mk_closure (SCHEME_A_ x, y)); 3603 s_return (mk_closure (SCHEME_A_ x, y));
3715 3604
3716 case OP_QUOTE: /* quote */ 3605 case OP_QUOTE: /* quote */
3717 s_return (car (SCHEME_V->code)); 3606 s_return (car (SCHEME_V->code));
… …
3749 3638
3750 3639
3751 case OP_DEFP: /* defined? */ 3640 case OP_DEFP: /* defined? */
3752 x = SCHEME_V->envir; 3641 x = SCHEME_V->envir;
3753 3642
3754 if (cdr (SCHEME_V->args) != NIL) 3643 if (cdr (args) != NIL)
3755 x = cadr (SCHEME_V->args); 3644 x = cadr (args);
3756 3645
3757 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3646 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3758 3647
3759 case OP_SET0: /* set! */ 3648 case OP_SET0: /* set! */
3760 if (is_immutable (car (SCHEME_V->code))) 3649 if (is_immutable (car (SCHEME_V->code)))
3761 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3650 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3762 3651
… …
3793 3682
3794 case OP_IF1: /* if */ 3683 case OP_IF1: /* if */
3795 if (is_true (SCHEME_V->value)) 3684 if (is_true (SCHEME_V->value))
3796 SCHEME_V->code = car (SCHEME_V->code); 3685 SCHEME_V->code = car (SCHEME_V->code);
3797 else 3686 else
3798 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3799
3800 * car(NIL) = NIL */
3801 s_goto (OP_EVAL); 3688 s_goto (OP_EVAL);
3802 3689
3803 case OP_LET0: /* let */ 3690 case OP_LET0: /* let */
3804 SCHEME_V->args = NIL; 3691 SCHEME_V->args = NIL;
3805 SCHEME_V->value = SCHEME_V->code; 3692 SCHEME_V->value = SCHEME_V->code;
3806 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3693 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3807 s_goto (OP_LET1); 3694 s_goto (OP_LET1);
3808 3695
3809 case OP_LET1: /* let (calculate parameters) */ 3696 case OP_LET1: /* let (calculate parameters) */
3810 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3697 args = cons (SCHEME_V->value, args);
3811 3698
3812 if (is_pair (SCHEME_V->code)) /* continue */ 3699 if (is_pair (SCHEME_V->code)) /* continue */
3813 { 3700 {
3814 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3701 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3815 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3702 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3816 3703
3817 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3704 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3818 SCHEME_V->code = cadar (SCHEME_V->code); 3705 SCHEME_V->code = cadar (SCHEME_V->code);
3819 SCHEME_V->args = NIL; 3706 SCHEME_V->args = NIL;
3820 s_goto (OP_EVAL); 3707 s_goto (OP_EVAL);
3821 } 3708 }
3822 else /* end */ 3709 else /* end */
3823 { 3710 {
3824 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3711 args = reverse_in_place (SCHEME_A_ NIL, args);
3825 SCHEME_V->code = car (SCHEME_V->args); 3712 SCHEME_V->code = car (args);
3826 SCHEME_V->args = cdr (SCHEME_V->args); 3713 SCHEME_V->args = cdr (args);
3827 s_goto (OP_LET2); 3714 s_goto (OP_LET2);
3828 } 3715 }
3829 3716
3830 case OP_LET2: /* let */ 3717 case OP_LET2: /* let */
3831 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3718 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3832 3719
3833 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3720 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3834 y != NIL; x = cdr (x), y = cdr (y)) 3721 y != NIL; x = cdr (x), y = cdr (y))
3835 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3722 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3836 3723
3837 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3724 if (is_symbol (car (SCHEME_V->code))) /* named let */
3838 { 3725 {
3839 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3726 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3840 { 3727 {
3841 if (!is_pair (x)) 3728 if (!is_pair (x))
3842 Error_1 ("Bad syntax of binding in let :", x); 3729 Error_1 ("Bad syntax of binding in let :", x);
3843 3730
3844 if (!is_list (SCHEME_A_ car (x))) 3731 if (!is_list (SCHEME_A_ car (x)))
3845 Error_1 ("Bad syntax of binding in let :", car (x)); 3732 Error_1 ("Bad syntax of binding in let :", car (x));
3846 3733
3847 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3734 args = cons (caar (x), args);
3848 } 3735 }
3849 3736
3850 x =
3851 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3737 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3852 SCHEME_V->envir); 3738 SCHEME_V->envir);
3853 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3739 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3854 SCHEME_V->code = cddr (SCHEME_V->code); 3740 SCHEME_V->code = cddr (SCHEME_V->code);
3855 SCHEME_V->args = NIL;
3856 } 3741 }
3857 else 3742 else
3858 { 3743 {
3859 SCHEME_V->code = cdr (SCHEME_V->code); 3744 SCHEME_V->code = cdr (SCHEME_V->code);
3745 }
3746
3860 SCHEME_V->args = NIL; 3747 SCHEME_V->args = NIL;
3861 }
3862
3863 s_goto (OP_BEGIN); 3748 s_goto (OP_BEGIN);
3864 3749
3865 case OP_LET0AST: /* let* */ 3750 case OP_LET0AST: /* let* */
3866 if (car (SCHEME_V->code) == NIL) 3751 if (car (SCHEME_V->code) == NIL)
3867 { 3752 {
… …
3885 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3770 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3886 SCHEME_V->code = cdr (SCHEME_V->code); 3771 SCHEME_V->code = cdr (SCHEME_V->code);
3887 3772
3888 if (is_pair (SCHEME_V->code)) /* continue */ 3773 if (is_pair (SCHEME_V->code)) /* continue */
3889 { 3774 {
3890 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3775 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3891 SCHEME_V->code = cadar (SCHEME_V->code); 3776 SCHEME_V->code = cadar (SCHEME_V->code);
3892 SCHEME_V->args = NIL; 3777 SCHEME_V->args = NIL;
3893 s_goto (OP_EVAL); 3778 s_goto (OP_EVAL);
3894 } 3779 }
3895 else /* end */ 3780 else /* end */
3896 { 3781 {
3897 SCHEME_V->code = SCHEME_V->args; 3782 SCHEME_V->code = args;
3898 SCHEME_V->args = NIL; 3783 SCHEME_V->args = NIL;
3899 s_goto (OP_BEGIN); 3784 s_goto (OP_BEGIN);
3900 } 3785 }
3901 3786
3902 case OP_LET0REC: /* letrec */ 3787 case OP_LET0REC: /* letrec */
… …
3905 SCHEME_V->value = SCHEME_V->code; 3790 SCHEME_V->value = SCHEME_V->code;
3906 SCHEME_V->code = car (SCHEME_V->code); 3791 SCHEME_V->code = car (SCHEME_V->code);
3907 s_goto (OP_LET1REC); 3792 s_goto (OP_LET1REC);
3908 3793
3909 case OP_LET1REC: /* letrec (calculate parameters) */ 3794 case OP_LET1REC: /* letrec (calculate parameters) */
3910 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3795 args = cons (SCHEME_V->value, args);
3911 3796
3912 if (is_pair (SCHEME_V->code)) /* continue */ 3797 if (is_pair (SCHEME_V->code)) /* continue */
3913 { 3798 {
3914 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3799 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3915 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3800 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3916 3801
3917 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3802 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3918 SCHEME_V->code = cadar (SCHEME_V->code); 3803 SCHEME_V->code = cadar (SCHEME_V->code);
3919 SCHEME_V->args = NIL; 3804 SCHEME_V->args = NIL;
3920 s_goto (OP_EVAL); 3805 s_goto (OP_EVAL);
3921 } 3806 }
3922 else /* end */ 3807 else /* end */
3923 { 3808 {
3924 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3809 args = reverse_in_place (SCHEME_A_ NIL, args);
3925 SCHEME_V->code = car (SCHEME_V->args); 3810 SCHEME_V->code = car (args);
3926 SCHEME_V->args = cdr (SCHEME_V->args); 3811 SCHEME_V->args = cdr (args);
3927 s_goto (OP_LET2REC); 3812 s_goto (OP_LET2REC);
3928 } 3813 }
3929 3814
3930 case OP_LET2REC: /* letrec */ 3815 case OP_LET2REC: /* letrec */
3931 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3816 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3932 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3817 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3933 3818
3934 SCHEME_V->code = cdr (SCHEME_V->code); 3819 SCHEME_V->code = cdr (SCHEME_V->code);
3935 SCHEME_V->args = NIL; 3820 SCHEME_V->args = NIL;
3936 s_goto (OP_BEGIN); 3821 s_goto (OP_BEGIN);
… …
4022 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3907 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4023 SCHEME_V->code = car (SCHEME_V->code); 3908 SCHEME_V->code = car (SCHEME_V->code);
4024 s_goto (OP_EVAL); 3909 s_goto (OP_EVAL);
4025 3910
4026 case OP_C1STREAM: /* cons-stream */ 3911 case OP_C1STREAM: /* cons-stream */
4027 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3912 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
4028 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3913 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
4029 set_typeflag (x, T_PROMISE); 3914 set_typeflag (x, T_PROMISE);
4030 s_return (cons (SCHEME_V->args, x)); 3915 s_return (cons (args, x));
4031 3916
4032 case OP_MACRO0: /* macro */ 3917 case OP_MACRO0: /* macro */
4033 if (is_pair (car (SCHEME_V->code))) 3918 if (is_pair (car (SCHEME_V->code)))
4034 { 3919 {
4035 x = caar (SCHEME_V->code); 3920 x = caar (SCHEME_V->code);
… …
4068 { 3953 {
4069 if (!is_pair (y = caar (x))) 3954 if (!is_pair (y = caar (x)))
4070 break; 3955 break;
4071 3956
4072 for (; y != NIL; y = cdr (y)) 3957 for (; y != NIL; y = cdr (y))
4073 {
4074 if (eqv (car (y), SCHEME_V->value)) 3958 if (eqv (car (y), SCHEME_V->value))
4075 break; 3959 break;
4076 }
4077 3960
4078 if (y != NIL) 3961 if (y != NIL)
4079 break; 3962 break;
4080 } 3963 }
4081 3964
… …
4101 s_goto (OP_BEGIN); 3984 s_goto (OP_BEGIN);
4102 else 3985 else
4103 s_return (NIL); 3986 s_return (NIL);
4104 3987
4105 case OP_PAPPLY: /* apply */ 3988 case OP_PAPPLY: /* apply */
4106 SCHEME_V->code = car (SCHEME_V->args); 3989 SCHEME_V->code = car (args);
4107 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3990 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4108 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3991 /*SCHEME_V->args = cadr(args); */
4109 s_goto (OP_APPLY); 3992 s_goto (OP_APPLY);
4110 3993
4111 case OP_PEVAL: /* eval */ 3994 case OP_PEVAL: /* eval */
4112 if (cdr (SCHEME_V->args) != NIL) 3995 if (cdr (args) != NIL)
4113 SCHEME_V->envir = cadr (SCHEME_V->args); 3996 SCHEME_V->envir = cadr (args);
4114 3997
4115 SCHEME_V->code = car (SCHEME_V->args); 3998 SCHEME_V->code = car (args);
4116 s_goto (OP_EVAL); 3999 s_goto (OP_EVAL);
4117 4000
4118 case OP_CONTINUATION: /* call-with-current-continuation */ 4001 case OP_CONTINUATION: /* call-with-current-continuation */
4119 SCHEME_V->code = car (SCHEME_V->args); 4002 SCHEME_V->code = car (args);
4120 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 4003 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
4121 s_goto (OP_APPLY); 4004 s_goto (OP_APPLY);
4122 } 4005 }
4123 4006
4124 return S_T; 4007 if (USE_ERROR_CHECKING) abort ();
4125} 4008}
4126 4009
4127static pointer 4010static int
4128opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4011opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4129{ 4012{
4130 pointer x; 4013 pointer args = SCHEME_V->args;
4014 pointer x = car (args);
4131 num v; 4015 num v;
4132 4016
4017 switch (op)
4018 {
4133#if USE_MATH 4019#if USE_MATH
4134 RVALUE dd;
4135#endif
4136
4137 switch (op)
4138 {
4139#if USE_MATH
4140
4141 case OP_INEX2EX: /* inexact->exact */ 4020 case OP_INEX2EX: /* inexact->exact */
4142 x = car (SCHEME_V->args); 4021 {
4143
4144 if (num_is_integer (x)) 4022 if (is_integer (x))
4145 s_return (x); 4023 s_return (x);
4146 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4024
4025 RVALUE r = rvalue_unchecked (x);
4026
4027 if (r == (RVALUE)(IVALUE)r)
4147 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
4148 else 4029 else
4149 Error_1 ("inexact->exact: not integral:", x); 4030 Error_1 ("inexact->exact: not integral:", x);
4031 }
4150 4032
4151 case OP_EXP:
4152 x = car (SCHEME_V->args);
4153 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4033 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4154
4155 case OP_LOG:
4156 x = car (SCHEME_V->args);
4157 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4034 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4158
4159 case OP_SIN:
4160 x = car (SCHEME_V->args);
4161 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4035 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4162
4163 case OP_COS:
4164 x = car (SCHEME_V->args);
4165 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4166
4167 case OP_TAN:
4168 x = car (SCHEME_V->args);
4169 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4037 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4170
4171 case OP_ASIN:
4172 x = car (SCHEME_V->args);
4173 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4038 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4174
4175 case OP_ACOS:
4176 x = car (SCHEME_V->args);
4177 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4039 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4178 4040
4179 case OP_ATAN: 4041 case OP_ATAN:
4180 x = car (SCHEME_V->args);
4181
4182 if (cdr (SCHEME_V->args) == NIL) 4042 if (cdr (args) == NIL)
4183 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4043 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4184 else 4044 else
4185 { 4045 {
4186 pointer y = cadr (SCHEME_V->args); 4046 pointer y = cadr (args);
4187
4188 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4047 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4189 } 4048 }
4190 4049
4191 case OP_SQRT: 4050 case OP_SQRT:
4192 x = car (SCHEME_V->args);
4193 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4051 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4194 4052
4195 case OP_EXPT: 4053 case OP_EXPT:
4196 { 4054 {
4197 RVALUE result; 4055 RVALUE result;
4198 int real_result = 1; 4056 int real_result = 1;
4199 pointer y = cadr (SCHEME_V->args); 4057 pointer y = cadr (args);
4200 4058
4201 x = car (SCHEME_V->args);
4202
4203 if (num_is_integer (x) && num_is_integer (y)) 4059 if (is_integer (x) && is_integer (y))
4204 real_result = 0; 4060 real_result = 0;
4205 4061
4206 /* This 'if' is an R5RS compatibility fix. */ 4062 /* This 'if' is an R5RS compatibility fix. */
4207 /* NOTE: Remove this 'if' fix for R6RS. */ 4063 /* NOTE: Remove this 'if' fix for R6RS. */
4208 if (rvalue (x) == 0 && rvalue (y) < 0) 4064 if (rvalue (x) == 0 && rvalue (y) < 0)
4209 result = 0.0; 4065 result = 0;
4210 else 4066 else
4211 result = pow (rvalue (x), rvalue (y)); 4067 result = pow (rvalue (x), rvalue (y));
4212 4068
4213 /* Before returning integer result make sure we can. */ 4069 /* Before returning integer result make sure we can. */
4214 /* If the test fails, result is too big for integer. */ 4070 /* If the test fails, result is too big for integer. */
4215 if (!real_result) 4071 if (!real_result)
4216 { 4072 {
4217 long result_as_long = (long) result; 4073 long result_as_long = result;
4218 4074
4219 if (result != (RVALUE) result_as_long) 4075 if (result != result_as_long)
4220 real_result = 1; 4076 real_result = 1;
4221 } 4077 }
4222 4078
4223 if (real_result) 4079 if (real_result)
4224 s_return (mk_real (SCHEME_A_ result)); 4080 s_return (mk_real (SCHEME_A_ result));
4225 else 4081 else
4226 s_return (mk_integer (SCHEME_A_ result)); 4082 s_return (mk_integer (SCHEME_A_ result));
4227 } 4083 }
4228 4084
4229 case OP_FLOOR:
4230 x = car (SCHEME_V->args);
4231 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4085 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4232
4233 case OP_CEILING:
4234 x = car (SCHEME_V->args);
4235 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4236 4087
4237 case OP_TRUNCATE: 4088 case OP_TRUNCATE:
4238 { 4089 {
4239 RVALUE rvalue_of_x; 4090 RVALUE n = rvalue (x);
4240
4241 x = car (SCHEME_V->args);
4242 rvalue_of_x = rvalue (x);
4243
4244 if (rvalue_of_x > 0)
4245 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4091 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4246 else
4247 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4248 } 4092 }
4249 4093
4250 case OP_ROUND: 4094 case OP_ROUND:
4251 x = car (SCHEME_V->args);
4252
4253 if (num_is_integer (x)) 4095 if (is_integer (x))
4254 s_return (x); 4096 s_return (x);
4255 4097
4256 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4257#endif 4099#endif
4258 4100
4259 case OP_ADD: /* + */ 4101 case OP_ADD: /* + */
4260 v = num_zero; 4102 v = num_zero;
4261 4103
4262 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4104 for (x = args; x != NIL; x = cdr (x))
4263 v = num_add (v, nvalue (car (x))); 4105 v = num_op (NUM_ADD, v, nvalue (car (x)));
4264 4106
4265 s_return (mk_number (SCHEME_A_ v)); 4107 s_return (mk_number (SCHEME_A_ v));
4266 4108
4267 case OP_MUL: /* * */ 4109 case OP_MUL: /* * */
4268 v = num_one; 4110 v = num_one;
4269 4111
4270 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4112 for (x = args; x != NIL; x = cdr (x))
4271 v = num_mul (v, nvalue (car (x))); 4113 v = num_op (NUM_MUL, v, nvalue (car (x)));
4272 4114
4273 s_return (mk_number (SCHEME_A_ v)); 4115 s_return (mk_number (SCHEME_A_ v));
4274 4116
4275 case OP_SUB: /* - */ 4117 case OP_SUB: /* - */
4276 if (cdr (SCHEME_V->args) == NIL) 4118 if (cdr (args) == NIL)
4277 { 4119 {
4278 x = SCHEME_V->args; 4120 x = args;
4279 v = num_zero; 4121 v = num_zero;
4280 } 4122 }
4281 else 4123 else
4282 { 4124 {
4283 x = cdr (SCHEME_V->args); 4125 x = cdr (args);
4284 v = nvalue (car (SCHEME_V->args)); 4126 v = nvalue (car (args));
4285 } 4127 }
4286 4128
4287 for (; x != NIL; x = cdr (x)) 4129 for (; x != NIL; x = cdr (x))
4288 v = num_sub (v, nvalue (car (x))); 4130 v = num_op (NUM_SUB, v, nvalue (car (x)));
4289 4131
4290 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4291 4133
4292 case OP_DIV: /* / */ 4134 case OP_DIV: /* / */
4293 if (cdr (SCHEME_V->args) == NIL) 4135 if (cdr (args) == NIL)
4294 { 4136 {
4295 x = SCHEME_V->args; 4137 x = args;
4296 v = num_one; 4138 v = num_one;
4297 } 4139 }
4298 else 4140 else
4299 { 4141 {
4300 x = cdr (SCHEME_V->args); 4142 x = cdr (args);
4301 v = nvalue (car (SCHEME_V->args)); 4143 v = nvalue (car (args));
4302 } 4144 }
4303 4145
4304 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4305 {
4306 if (!is_zero_rvalue (rvalue (car (x)))) 4147 if (!is_zero_rvalue (rvalue (car (x))))
4307 v = num_div (v, nvalue (car (x))); 4148 v = num_div (v, nvalue (car (x)));
4308 else 4149 else
4309 Error_0 ("/: division by zero"); 4150 Error_0 ("/: division by zero");
4310 }
4311 4151
4312 s_return (mk_number (SCHEME_A_ v)); 4152 s_return (mk_number (SCHEME_A_ v));
4313 4153
4314 case OP_INTDIV: /* quotient */ 4154 case OP_INTDIV: /* quotient */
4315 if (cdr (SCHEME_V->args) == NIL) 4155 if (cdr (args) == NIL)
4316 { 4156 {
4317 x = SCHEME_V->args; 4157 x = args;
4318 v = num_one; 4158 v = num_one;
4319 } 4159 }
4320 else 4160 else
4321 { 4161 {
4322 x = cdr (SCHEME_V->args); 4162 x = cdr (args);
4323 v = nvalue (car (SCHEME_V->args)); 4163 v = nvalue (car (args));
4324 } 4164 }
4325 4165
4326 for (; x != NIL; x = cdr (x)) 4166 for (; x != NIL; x = cdr (x))
4327 { 4167 {
4328 if (ivalue (car (x)) != 0) 4168 if (ivalue (car (x)) != 0)
4329 v = num_intdiv (v, nvalue (car (x))); 4169 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4330 else 4170 else
4331 Error_0 ("quotient: division by zero"); 4171 Error_0 ("quotient: division by zero");
4332 } 4172 }
4333 4173
4334 s_return (mk_number (SCHEME_A_ v)); 4174 s_return (mk_number (SCHEME_A_ v));
4335 4175
4336 case OP_REM: /* remainder */ 4176 case OP_REM: /* remainder */
4337 v = nvalue (car (SCHEME_V->args)); 4177 v = nvalue (x);
4338 4178
4339 if (ivalue (cadr (SCHEME_V->args)) != 0) 4179 if (ivalue (cadr (args)) != 0)
4340 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4180 v = num_rem (v, nvalue (cadr (args)));
4341 else 4181 else
4342 Error_0 ("remainder: division by zero"); 4182 Error_0 ("remainder: division by zero");
4343 4183
4344 s_return (mk_number (SCHEME_A_ v)); 4184 s_return (mk_number (SCHEME_A_ v));
4345 4185
4346 case OP_MOD: /* modulo */ 4186 case OP_MOD: /* modulo */
4347 v = nvalue (car (SCHEME_V->args)); 4187 v = nvalue (x);
4348 4188
4349 if (ivalue (cadr (SCHEME_V->args)) != 0) 4189 if (ivalue (cadr (args)) != 0)
4350 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4190 v = num_mod (v, nvalue (cadr (args)));
4351 else 4191 else
4352 Error_0 ("modulo: division by zero"); 4192 Error_0 ("modulo: division by zero");
4353 4193
4354 s_return (mk_number (SCHEME_A_ v)); 4194 s_return (mk_number (SCHEME_A_ v));
4355 4195
4356 case OP_CAR: /* car */ 4196 case OP_CAR: /* car */
4357 s_return (caar (SCHEME_V->args)); 4197 s_return (caar (args));
4358 4198
4359 case OP_CDR: /* cdr */ 4199 case OP_CDR: /* cdr */
4360 s_return (cdar (SCHEME_V->args)); 4200 s_return (cdar (args));
4361 4201
4362 case OP_CONS: /* cons */ 4202 case OP_CONS: /* cons */
4363 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4203 set_cdr (args, cadr (args));
4364 s_return (SCHEME_V->args); 4204 s_return (args);
4365 4205
4366 case OP_SETCAR: /* set-car! */ 4206 case OP_SETCAR: /* set-car! */
4367 if (!is_immutable (car (SCHEME_V->args))) 4207 if (!is_immutable (x))
4368 { 4208 {
4369 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4209 set_car (x, cadr (args));
4370 s_return (car (SCHEME_V->args)); 4210 s_return (car (args));
4371 } 4211 }
4372 else 4212 else
4373 Error_0 ("set-car!: unable to alter immutable pair"); 4213 Error_0 ("set-car!: unable to alter immutable pair");
4374 4214
4375 case OP_SETCDR: /* set-cdr! */ 4215 case OP_SETCDR: /* set-cdr! */
4376 if (!is_immutable (car (SCHEME_V->args))) 4216 if (!is_immutable (x))
4377 { 4217 {
4378 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4218 set_cdr (x, cadr (args));
4379 s_return (car (SCHEME_V->args)); 4219 s_return (car (args));
4380 } 4220 }
4381 else 4221 else
4382 Error_0 ("set-cdr!: unable to alter immutable pair"); 4222 Error_0 ("set-cdr!: unable to alter immutable pair");
4383 4223
4384 case OP_CHAR2INT: /* char->integer */ 4224 case OP_CHAR2INT: /* char->integer */
4385 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4225 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4386 4226
4387 case OP_INT2CHAR: /* integer->char */ 4227 case OP_INT2CHAR: /* integer->char */
4388 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4228 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4389 4229
4390 case OP_CHARUPCASE: 4230 case OP_CHARUPCASE:
4391 { 4231 {
4392 unsigned char c = ivalue (car (SCHEME_V->args)); 4232 unsigned char c = ivalue_unchecked (x);
4393 c = toupper (c); 4233 c = toupper (c);
4394 s_return (mk_character (SCHEME_A_ c)); 4234 s_return (mk_character (SCHEME_A_ c));
4395 } 4235 }
4396 4236
4397 case OP_CHARDNCASE: 4237 case OP_CHARDNCASE:
4398 { 4238 {
4399 unsigned char c = ivalue (car (SCHEME_V->args)); 4239 unsigned char c = ivalue_unchecked (x);
4400 c = tolower (c); 4240 c = tolower (c);
4401 s_return (mk_character (SCHEME_A_ c)); 4241 s_return (mk_character (SCHEME_A_ c));
4402 } 4242 }
4403 4243
4404 case OP_STR2SYM: /* string->symbol */ 4244 case OP_STR2SYM: /* string->symbol */
4405 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4245 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4406 4246
4407 case OP_STR2ATOM: /* string->atom */ 4247 case OP_STR2ATOM: /* string->atom */
4408 { 4248 {
4409 char *s = strvalue (car (SCHEME_V->args)); 4249 char *s = strvalue (x);
4410 long pf = 0; 4250 long pf = 0;
4411 4251
4412 if (cdr (SCHEME_V->args) != NIL) 4252 if (cdr (args) != NIL)
4413 { 4253 {
4414 /* we know cadr(SCHEME_V->args) is a natural number */ 4254 /* we know cadr(args) is a natural number */
4415 /* see if it is 2, 8, 10, or 16, or error */ 4255 /* see if it is 2, 8, 10, or 16, or error */
4416 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4256 pf = ivalue_unchecked (cadr (args));
4417 4257
4418 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4258 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4419 { 4259 {
4420 /* base is OK */ 4260 /* base is OK */
4421 } 4261 }
4422 else 4262 else
4423 pf = -1; 4263 pf = -1;
4424 } 4264 }
4425 4265
4426 if (pf < 0) 4266 if (pf < 0)
4427 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4267 Error_1 ("string->atom: bad base:", cadr (args));
4428 else if (*s == '#') /* no use of base! */ 4268 else if (*s == '#') /* no use of base! */
4429 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4269 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4430 else 4270 else
4431 { 4271 {
4432 if (pf == 0 || pf == 10) 4272 if (pf == 0 || pf == 10)
… …
4443 } 4283 }
4444 } 4284 }
4445 } 4285 }
4446 4286
4447 case OP_SYM2STR: /* symbol->string */ 4287 case OP_SYM2STR: /* symbol->string */
4448 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4288 x = mk_string (SCHEME_A_ symname (x));
4449 setimmutable (x); 4289 setimmutable (x);
4450 s_return (x); 4290 s_return (x);
4451 4291
4452 case OP_ATOM2STR: /* atom->string */ 4292 case OP_ATOM2STR: /* atom->string */
4453 { 4293 {
4454 long pf = 0; 4294 long pf = 0;
4455 4295
4456 x = car (SCHEME_V->args);
4457
4458 if (cdr (SCHEME_V->args) != NIL) 4296 if (cdr (args) != NIL)
4459 { 4297 {
4460 /* we know cadr(SCHEME_V->args) is a natural number */ 4298 /* we know cadr(args) is a natural number */
4461 /* see if it is 2, 8, 10, or 16, or error */ 4299 /* see if it is 2, 8, 10, or 16, or error */
4462 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4300 pf = ivalue_unchecked (cadr (args));
4463 4301
4464 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4302 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4465 { 4303 {
4466 /* base is OK */ 4304 /* base is OK */
4467 } 4305 }
4468 else 4306 else
4469 pf = -1; 4307 pf = -1;
4470 } 4308 }
4471 4309
4472 if (pf < 0) 4310 if (pf < 0)
4473 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4311 Error_1 ("atom->string: bad base:", cadr (args));
4474 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4312 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4475 { 4313 {
4476 char *p; 4314 char *p;
4477 int len; 4315 int len;
4478 4316
… …
4483 Error_1 ("atom->string: not an atom:", x); 4321 Error_1 ("atom->string: not an atom:", x);
4484 } 4322 }
4485 4323
4486 case OP_MKSTRING: /* make-string */ 4324 case OP_MKSTRING: /* make-string */
4487 { 4325 {
4488 int fill = ' '; 4326 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4489 int len; 4327 int len = ivalue_unchecked (x);
4490 4328
4491 len = ivalue (car (SCHEME_V->args));
4492
4493 if (cdr (SCHEME_V->args) != NIL)
4494 fill = charvalue (cadr (SCHEME_V->args));
4495
4496 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4329 s_return (mk_empty_string (SCHEME_A_ len, fill));
4497 } 4330 }
4498 4331
4499 case OP_STRLEN: /* string-length */ 4332 case OP_STRLEN: /* string-length */
4500 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4333 s_return (mk_integer (SCHEME_A_ strlength (x)));
4501 4334
4502 case OP_STRREF: /* string-ref */ 4335 case OP_STRREF: /* string-ref */
4503 { 4336 {
4504 char *str; 4337 char *str = strvalue (x);
4505 int index;
4506
4507 str = strvalue (car (SCHEME_V->args));
4508
4509 index = ivalue (cadr (SCHEME_V->args)); 4338 int index = ivalue_unchecked (cadr (args));
4510 4339
4511 if (index >= strlength (car (SCHEME_V->args))) 4340 if (index >= strlength (x))
4512 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4341 Error_1 ("string-ref: out of bounds:", cadr (args));
4513 4342
4514 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4343 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4515 } 4344 }
4516 4345
4517 case OP_STRSET: /* string-set! */ 4346 case OP_STRSET: /* string-set! */
4518 { 4347 {
4519 char *str; 4348 char *str = strvalue (x);
4520 int index; 4349 int index = ivalue_unchecked (cadr (args));
4521 int c; 4350 int c;
4522 4351
4523 if (is_immutable (car (SCHEME_V->args))) 4352 if (is_immutable (x))
4524 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4353 Error_1 ("string-set!: unable to alter immutable string:", x);
4525 4354
4526 str = strvalue (car (SCHEME_V->args));
4527
4528 index = ivalue (cadr (SCHEME_V->args));
4529
4530 if (index >= strlength (car (SCHEME_V->args))) 4355 if (index >= strlength (x))
4531 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4356 Error_1 ("string-set!: out of bounds:", cadr (args));
4532 4357
4533 c = charvalue (caddr (SCHEME_V->args)); 4358 c = charvalue (caddr (args));
4534 4359
4535 str[index] = (char) c; 4360 str[index] = c;
4536 s_return (car (SCHEME_V->args)); 4361 s_return (car (args));
4537 } 4362 }
4538 4363
4539 case OP_STRAPPEND: /* string-append */ 4364 case OP_STRAPPEND: /* string-append */
4540 { 4365 {
4541 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4366 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4542 int len = 0; 4367 int len = 0;
4543 pointer newstr; 4368 pointer newstr;
4544 char *pos; 4369 char *pos;
4545 4370
4546 /* compute needed length for new string */ 4371 /* compute needed length for new string */
4547 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4372 for (x = args; x != NIL; x = cdr (x))
4548 len += strlength (car (x)); 4373 len += strlength (car (x));
4549 4374
4550 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4375 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4551 4376
4552 /* store the contents of the argument strings into the new string */ 4377 /* store the contents of the argument strings into the new string */
4553 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4378 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4554 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4379 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4555 4380
4556 s_return (newstr); 4381 s_return (newstr);
4557 } 4382 }
4558 4383
4559 case OP_SUBSTR: /* substring */ 4384 case OP_SUBSTR: /* substring */
4560 { 4385 {
4561 char *str; 4386 char *str = strvalue (x);
4562 int index0; 4387 int index0 = ivalue_unchecked (cadr (args));
4563 int index1; 4388 int index1;
4564 int len; 4389 int len;
4565 4390
4566 str = strvalue (car (SCHEME_V->args));
4567
4568 index0 = ivalue (cadr (SCHEME_V->args));
4569
4570 if (index0 > strlength (car (SCHEME_V->args))) 4391 if (index0 > strlength (x))
4571 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4392 Error_1 ("substring: start out of bounds:", cadr (args));
4572 4393
4573 if (cddr (SCHEME_V->args) != NIL) 4394 if (cddr (args) != NIL)
4574 { 4395 {
4575 index1 = ivalue (caddr (SCHEME_V->args)); 4396 index1 = ivalue_unchecked (caddr (args));
4576 4397
4577 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4398 if (index1 > strlength (x) || index1 < index0)
4578 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4399 Error_1 ("substring: end out of bounds:", caddr (args));
4579 } 4400 }
4580 else 4401 else
4581 index1 = strlength (car (SCHEME_V->args)); 4402 index1 = strlength (x);
4582 4403
4583 len = index1 - index0; 4404 len = index1 - index0;
4584 x = mk_empty_string (SCHEME_A_ len, ' '); 4405 x = mk_empty_string (SCHEME_A_ len, ' ');
4585 memcpy (strvalue (x), str + index0, len); 4406 memcpy (strvalue (x), str + index0, len);
4586 strvalue (x)[len] = 0; 4407 strvalue (x)[len] = 0;
… …
4590 4411
4591 case OP_VECTOR: /* vector */ 4412 case OP_VECTOR: /* vector */
4592 { 4413 {
4593 int i; 4414 int i;
4594 pointer vec; 4415 pointer vec;
4595 int len = list_length (SCHEME_A_ SCHEME_V->args); 4416 int len = list_length (SCHEME_A_ args);
4596 4417
4597 if (len < 0) 4418 if (len < 0)
4598 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4419 Error_1 ("vector: not a proper list:", args);
4599 4420
4600 vec = mk_vector (SCHEME_A_ len); 4421 vec = mk_vector (SCHEME_A_ len);
4601 4422
4602#if USE_ERROR_CHECKING 4423#if USE_ERROR_CHECKING
4603 if (SCHEME_V->no_memory) 4424 if (SCHEME_V->no_memory)
4604 s_return (S_SINK); 4425 s_return (S_SINK);
4605#endif 4426#endif
4606 4427
4607 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4428 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4608 set_vector_elem (vec, i, car (x)); 4429 vector_set (vec, i, car (x));
4609 4430
4610 s_return (vec); 4431 s_return (vec);
4611 } 4432 }
4612 4433
4613 case OP_MKVECTOR: /* make-vector */ 4434 case OP_MKVECTOR: /* make-vector */
4614 { 4435 {
4615 pointer fill = NIL; 4436 pointer fill = NIL;
4616 int len;
4617 pointer vec; 4437 pointer vec;
4438 int len = ivalue_unchecked (x);
4618 4439
4619 len = ivalue (car (SCHEME_V->args));
4620
4621 if (cdr (SCHEME_V->args) != NIL) 4440 if (cdr (args) != NIL)
4622 fill = cadr (SCHEME_V->args); 4441 fill = cadr (args);
4623 4442
4624 vec = mk_vector (SCHEME_A_ len); 4443 vec = mk_vector (SCHEME_A_ len);
4625 4444
4626#if USE_ERROR_CHECKING 4445#if USE_ERROR_CHECKING
4627 if (SCHEME_V->no_memory) 4446 if (SCHEME_V->no_memory)
4628 s_return (S_SINK); 4447 s_return (S_SINK);
4629#endif 4448#endif
4630 4449
4631 if (fill != NIL) 4450 if (fill != NIL)
4632 fill_vector (vec, fill); 4451 fill_vector (vec, 0, fill);
4633 4452
4634 s_return (vec); 4453 s_return (vec);
4635 } 4454 }
4636 4455
4637 case OP_VECLEN: /* vector-length */ 4456 case OP_VECLEN: /* vector-length */
4638 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4457 s_return (mk_integer (SCHEME_A_ veclength (x)));
4458
4459 case OP_VECRESIZE:
4460 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4461 s_return (x);
4639 4462
4640 case OP_VECREF: /* vector-ref */ 4463 case OP_VECREF: /* vector-ref */
4641 { 4464 {
4642 int index;
4643
4644 index = ivalue (cadr (SCHEME_V->args)); 4465 int index = ivalue_unchecked (cadr (args));
4645 4466
4646 if (index >= ivalue (car (SCHEME_V->args))) 4467 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4647 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4468 Error_1 ("vector-ref: out of bounds:", cadr (args));
4648 4469
4649 s_return (vector_elem (car (SCHEME_V->args), index)); 4470 s_return (vector_get (x, index));
4650 } 4471 }
4651 4472
4652 case OP_VECSET: /* vector-set! */ 4473 case OP_VECSET: /* vector-set! */
4653 { 4474 {
4654 int index; 4475 int index = ivalue_unchecked (cadr (args));
4655 4476
4656 if (is_immutable (car (SCHEME_V->args))) 4477 if (is_immutable (x))
4657 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4478 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4658 4479
4659 index = ivalue (cadr (SCHEME_V->args)); 4480 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4660
4661 if (index >= ivalue (car (SCHEME_V->args)))
4662 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4481 Error_1 ("vector-set!: out of bounds:", cadr (args));
4663 4482
4664 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4483 vector_set (x, index, caddr (args));
4665 s_return (car (SCHEME_V->args)); 4484 s_return (x);
4666 } 4485 }
4667 } 4486 }
4668 4487
4669 return S_T; 4488 if (USE_ERROR_CHECKING) abort ();
4670} 4489}
4671 4490
4672INTERFACE int 4491static int
4673is_list (SCHEME_P_ pointer a) 4492opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4674{ 4493{
4675 return list_length (SCHEME_A_ a) >= 0; 4494 pointer x = SCHEME_V->args;
4676}
4677 4495
4678/* Result is: 4496 for (;;)
4679 proper list: length
4680 circular list: -1
4681 not even a pair: -2
4682 dotted list: -2 minus length before dot
4683*/
4684INTERFACE int
4685list_length (SCHEME_P_ pointer a)
4686{
4687 int i = 0;
4688 pointer slow, fast;
4689
4690 slow = fast = a;
4691
4692 while (1)
4693 { 4497 {
4498 num v = nvalue (car (x));
4499 x = cdr (x);
4500
4694 if (fast == NIL) 4501 if (x == NIL)
4695 return i; 4502 break;
4696 4503
4697 if (!is_pair (fast)) 4504 int r = num_cmp (v, nvalue (car (x)));
4698 return -2 - i;
4699 4505
4700 fast = cdr (fast); 4506 switch (op)
4701 ++i;
4702
4703 if (fast == NIL)
4704 return i;
4705
4706 if (!is_pair (fast))
4707 return -2 - i;
4708
4709 ++i;
4710 fast = cdr (fast);
4711
4712 /* Safe because we would have already returned if `fast'
4713 encountered a non-pair. */
4714 slow = cdr (slow);
4715
4716 if (fast == slow)
4717 { 4507 {
4718 /* the fast pointer has looped back around and caught up 4508 case OP_NUMEQ: r = r == 0; break;
4719 with the slow pointer, hence the structure is circular, 4509 case OP_LESS: r = r < 0; break;
4720 not of finite length, and therefore not a list */ 4510 case OP_GRE: r = r > 0; break;
4721 return -1; 4511 case OP_LEQ: r = r <= 0; break;
4512 case OP_GEQ: r = r >= 0; break;
4722 } 4513 }
4723 }
4724}
4725 4514
4515 if (!r)
4516 s_return (S_F);
4517 }
4518
4519 s_return (S_T);
4520}
4521
4726static pointer 4522static int
4727opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4523opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4728{ 4524{
4729 pointer x; 4525 pointer args = SCHEME_V->args;
4730 num v; 4526 pointer a = car (args);
4731 int (*comp_func) (num, num); 4527 pointer d = cdr (args);
4528 int r;
4732 4529
4733 switch (op) 4530 switch (op)
4734 { 4531 {
4735 case OP_NOT: /* not */ 4532 case OP_NOT: /* not */ r = is_false (a) ; break;
4736 s_retbool (is_false (car (SCHEME_V->args))); 4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4737 4542
4738 case OP_BOOLP: /* boolean? */
4739 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4740
4741 case OP_EOFOBJP: /* boolean? */
4742 s_retbool (car (SCHEME_V->args) == S_EOF);
4743
4744 case OP_NULLP: /* null? */
4745 s_retbool (car (SCHEME_V->args) == NIL);
4746
4747 case OP_NUMEQ: /* = */
4748 case OP_LESS: /* < */
4749 case OP_GRE: /* > */
4750 case OP_LEQ: /* <= */
4751 case OP_GEQ: /* >= */
4752 switch (op)
4753 {
4754 case OP_NUMEQ:
4755 comp_func = num_eq;
4756 break;
4757
4758 case OP_LESS:
4759 comp_func = num_lt;
4760 break;
4761
4762 case OP_GRE:
4763 comp_func = num_gt;
4764 break;
4765
4766 case OP_LEQ:
4767 comp_func = num_le;
4768 break;
4769
4770 case OP_GEQ:
4771 comp_func = num_ge;
4772 break;
4773 }
4774
4775 x = SCHEME_V->args;
4776 v = nvalue (car (x));
4777 x = cdr (x);
4778
4779 for (; x != NIL; x = cdr (x))
4780 {
4781 if (!comp_func (v, nvalue (car (x))))
4782 s_retbool (0);
4783
4784 v = nvalue (car (x));
4785 }
4786
4787 s_retbool (1);
4788
4789 case OP_SYMBOLP: /* symbol? */
4790 s_retbool (is_symbol (car (SCHEME_V->args)));
4791
4792 case OP_NUMBERP: /* number? */
4793 s_retbool (is_number (car (SCHEME_V->args)));
4794
4795 case OP_STRINGP: /* string? */
4796 s_retbool (is_string (car (SCHEME_V->args)));
4797
4798 case OP_INTEGERP: /* integer? */
4799 s_retbool (is_integer (car (SCHEME_V->args)));
4800
4801 case OP_REALP: /* real? */
4802 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4803
4804 case OP_CHARP: /* char? */
4805 s_retbool (is_character (car (SCHEME_V->args)));
4806#if USE_CHAR_CLASSIFIERS 4543#if USE_CHAR_CLASSIFIERS
4807 4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4808 case OP_CHARAP: /* char-alphabetic? */ 4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4809 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4810 4547 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4811 case OP_CHARNP: /* char-numeric? */ 4548 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4812 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4813
4814 case OP_CHARWP: /* char-whitespace? */
4815 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4816
4817 case OP_CHARUP: /* char-upper-case? */
4818 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4819
4820 case OP_CHARLP: /* char-lower-case? */
4821 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4822#endif 4549#endif
4550
4823#if USE_PORTS 4551#if USE_PORTS
4824 4552 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4825 case OP_PORTP: /* port? */
4826 s_retbool (is_port (car (SCHEME_V->args)));
4827
4828 case OP_INPORTP: /* input-port? */ 4553 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4829 s_retbool (is_inport (car (SCHEME_V->args)));
4830
4831 case OP_OUTPORTP: /* output-port? */ 4554 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4832 s_retbool (is_outport (car (SCHEME_V->args)));
4833#endif 4555#endif
4834 4556
4835 case OP_PROCP: /* procedure? */ 4557 case OP_PROCP: /* procedure? */
4836 4558
4837 /*-- 4559 /*--
4838 * continuation should be procedure by the example 4560 * continuation should be procedure by the example
4839 * (call-with-current-continuation procedure?) ==> #t 4561 * (call-with-current-continuation procedure?) ==> #t
4840 * in R^3 report sec. 6.9 4562 * in R^3 report sec. 6.9
4841 */ 4563 */
4842 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4564 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4843 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4565 break;
4844 4566
4845 case OP_PAIRP: /* pair? */ 4567 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4846 s_retbool (is_pair (car (SCHEME_V->args))); 4568 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4847 4569 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4848 case OP_LISTP: /* list? */ 4570 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4849 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4571 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4850 4572 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4851 case OP_ENVP: /* environment? */
4852 s_retbool (is_environment (car (SCHEME_V->args)));
4853
4854 case OP_VECTORP: /* vector? */
4855 s_retbool (is_vector (car (SCHEME_V->args)));
4856
4857 case OP_EQ: /* eq? */
4858 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4859
4860 case OP_EQV: /* eqv? */
4861 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4862 } 4573 }
4863 4574
4864 return S_T; 4575 s_retbool (r);
4865} 4576}
4866 4577
4867static pointer 4578static int
4868opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4579opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4869{ 4580{
4581 pointer args = SCHEME_V->args;
4582 pointer a = car (args);
4870 pointer x, y; 4583 pointer x, y;
4871 4584
4872 switch (op) 4585 switch (op)
4873 { 4586 {
4874 case OP_FORCE: /* force */ 4587 case OP_FORCE: /* force */
4875 SCHEME_V->code = car (SCHEME_V->args); 4588 SCHEME_V->code = a;
4876 4589
4877 if (is_promise (SCHEME_V->code)) 4590 if (is_promise (SCHEME_V->code))
4878 { 4591 {
4879 /* Should change type to closure here */ 4592 /* Should change type to closure here */
4880 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4593 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4901 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4614 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4902 SCHEME_V->outport = cadr (SCHEME_V->args); 4615 SCHEME_V->outport = cadr (SCHEME_V->args);
4903 } 4616 }
4904 } 4617 }
4905 4618
4906 SCHEME_V->args = car (SCHEME_V->args); 4619 SCHEME_V->args = a;
4907 4620
4908 if (op == OP_WRITE) 4621 if (op == OP_WRITE)
4909 SCHEME_V->print_flag = 1; 4622 SCHEME_V->print_flag = 1;
4910 else 4623 else
4911 SCHEME_V->print_flag = 0; 4624 SCHEME_V->print_flag = 0;
4912 4625
4913 s_goto (OP_P0LIST); 4626 s_goto (OP_P0LIST);
4914 4627
4915 case OP_NEWLINE: /* newline */ 4628 case OP_NEWLINE: /* newline */
4916 if (is_pair (SCHEME_V->args)) 4629 if (is_pair (args))
4917 { 4630 {
4918 if (car (SCHEME_V->args) != SCHEME_V->outport) 4631 if (a != SCHEME_V->outport)
4919 { 4632 {
4920 x = cons (SCHEME_V->outport, NIL); 4633 x = cons (SCHEME_V->outport, NIL);
4921 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4922 SCHEME_V->outport = car (SCHEME_V->args); 4635 SCHEME_V->outport = a;
4923 } 4636 }
4924 } 4637 }
4925 4638
4926 putstr (SCHEME_A_ "\n"); 4639 putstr (SCHEME_A_ "\n");
4927 s_return (S_T); 4640 s_return (S_T);
4928#endif 4641#endif
4929 4642
4930 case OP_ERR0: /* error */ 4643 case OP_ERR0: /* error */
4931 SCHEME_V->retcode = -1; 4644 SCHEME_V->retcode = -1;
4932 4645
4933 if (!is_string (car (SCHEME_V->args))) 4646 if (!is_string (a))
4934 { 4647 {
4935 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4648 args = cons (mk_string (SCHEME_A_ " -- "), args);
4936 setimmutable (car (SCHEME_V->args)); 4649 setimmutable (car (args));
4937 } 4650 }
4938 4651
4939 putstr (SCHEME_A_ "Error: "); 4652 putstr (SCHEME_A_ "Error: ");
4940 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4653 putstr (SCHEME_A_ strvalue (car (args)));
4941 SCHEME_V->args = cdr (SCHEME_V->args); 4654 SCHEME_V->args = cdr (args);
4942 s_goto (OP_ERR1); 4655 s_goto (OP_ERR1);
4943 4656
4944 case OP_ERR1: /* error */ 4657 case OP_ERR1: /* error */
4945 putstr (SCHEME_A_ " "); 4658 putstr (SCHEME_A_ " ");
4946 4659
4947 if (SCHEME_V->args != NIL) 4660 if (args != NIL)
4948 { 4661 {
4949 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4950 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4951 SCHEME_V->print_flag = 1; 4664 SCHEME_V->print_flag = 1;
4952 s_goto (OP_P0LIST); 4665 s_goto (OP_P0LIST);
4953 } 4666 }
4954 else 4667 else
4955 { 4668 {
4956 putstr (SCHEME_A_ "\n"); 4669 putstr (SCHEME_A_ "\n");
4957 4670
4958 if (SCHEME_V->interactive_repl) 4671 if (SCHEME_V->interactive_repl)
4959 s_goto (OP_T0LVL); 4672 s_goto (OP_T0LVL);
4960 else 4673 else
4961 return NIL; 4674 return -1;
4962 } 4675 }
4963 4676
4964 case OP_REVERSE: /* reverse */ 4677 case OP_REVERSE: /* reverse */
4965 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4678 s_return (reverse (SCHEME_A_ a));
4966 4679
4967 case OP_LIST_STAR: /* list* */ 4680 case OP_LIST_STAR: /* list* */
4968 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4681 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4969 4682
4970 case OP_APPEND: /* append */ 4683 case OP_APPEND: /* append */
4971 x = NIL; 4684 x = NIL;
4972 y = SCHEME_V->args; 4685 y = args;
4973 4686
4974 if (y == x) 4687 if (y == x)
4975 s_return (x); 4688 s_return (x);
4976 4689
4977 /* cdr() in the while condition is not a typo. If car() */ 4690 /* cdr() in the while condition is not a typo. If car() */
… …
4988 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4701 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4989 4702
4990#if USE_PLIST 4703#if USE_PLIST
4991 4704
4992 case OP_PUT: /* put */ 4705 case OP_PUT: /* put */
4993 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4706 if (!hasprop (a) || !hasprop (cadr (args)))
4994 Error_0 ("illegal use of put"); 4707 Error_0 ("illegal use of put");
4995 4708
4996 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4709 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4997 { 4710 {
4998 if (caar (x) == y) 4711 if (caar (x) == y)
4999 break; 4712 break;
5000 } 4713 }
5001 4714
5002 if (x != NIL) 4715 if (x != NIL)
5003 cdar (x) = caddr (SCHEME_V->args); 4716 cdar (x) = caddr (args);
5004 else 4717 else
5005 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4718 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
5006 4719
5007 s_return (S_T); 4720 s_return (S_T);
5008 4721
5009 case OP_GET: /* get */ 4722 case OP_GET: /* get */
5010 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4723 if (!hasprop (a) || !hasprop (cadr (args)))
5011 Error_0 ("illegal use of get"); 4724 Error_0 ("illegal use of get");
5012 4725
5013 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4726 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
5014 if (caar (x) == y) 4727 if (caar (x) == y)
5015 break; 4728 break;
5016 4729
5017 if (x != NIL) 4730 if (x != NIL)
5018 s_return (cdar (x)); 4731 s_return (cdar (x));
… …
5020 s_return (NIL); 4733 s_return (NIL);
5021 4734
5022#endif /* USE_PLIST */ 4735#endif /* USE_PLIST */
5023 4736
5024 case OP_QUIT: /* quit */ 4737 case OP_QUIT: /* quit */
5025 if (is_pair (SCHEME_V->args)) 4738 if (is_pair (args))
5026 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4739 SCHEME_V->retcode = ivalue (a);
5027 4740
5028 return NIL; 4741 return -1;
5029 4742
5030 case OP_GC: /* gc */ 4743 case OP_GC: /* gc */
5031 gc (SCHEME_A_ NIL, NIL); 4744 gc (SCHEME_A_ NIL, NIL);
5032 s_return (S_T); 4745 s_return (S_T);
5033 4746
5034 case OP_GCVERB: /* gc-verbose */ 4747 case OP_GCVERB: /* gc-verbose */
5035 { 4748 {
5036 int was = SCHEME_V->gc_verbose; 4749 int was = SCHEME_V->gc_verbose;
5037 4750
5038 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4751 SCHEME_V->gc_verbose = (a != S_F);
5039 s_retbool (was); 4752 s_retbool (was);
5040 } 4753 }
5041 4754
5042 case OP_NEWSEGMENT: /* new-segment */ 4755 case OP_NEWSEGMENT: /* new-segment */
5043 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4756 if (!is_pair (args) || !is_number (a))
5044 Error_0 ("new-segment: argument must be a number"); 4757 Error_0 ("new-segment: argument must be a number");
5045 4758
5046 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4759 alloc_cellseg (SCHEME_A_ ivalue (a));
5047 4760
5048 s_return (S_T); 4761 s_return (S_T);
5049 4762
5050 case OP_OBLIST: /* oblist */ 4763 case OP_OBLIST: /* oblist */
5051 s_return (oblist_all_symbols (SCHEME_A)); 4764 s_return (oblist_all_symbols (SCHEME_A));
… …
5078 case OP_OPEN_INOUTFILE: 4791 case OP_OPEN_INOUTFILE:
5079 prop = port_input | port_output; 4792 prop = port_input | port_output;
5080 break; 4793 break;
5081 } 4794 }
5082 4795
5083 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4796 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5084 4797
5085 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
5086 s_return (S_F);
5087
5088 s_return (p);
5089 } 4799 }
5090 4800
5091# if USE_STRING_PORTS 4801# if USE_STRING_PORTS
5092 4802
5093 case OP_OPEN_INSTRING: /* open-input-string */ 4803 case OP_OPEN_INSTRING: /* open-input-string */
… …
5105 case OP_OPEN_INOUTSTRING: 4815 case OP_OPEN_INOUTSTRING:
5106 prop = port_input | port_output; 4816 prop = port_input | port_output;
5107 break; 4817 break;
5108 } 4818 }
5109 4819
5110 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4820 p = port_from_string (SCHEME_A_ strvalue (a),
5111 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4821 strvalue (a) + strlength (a), prop);
5112 4822
5113 if (p == NIL) 4823 s_return (p == NIL ? S_F : p);
5114 s_return (S_F);
5115
5116 s_return (p);
5117 } 4824 }
5118 4825
5119 case OP_OPEN_OUTSTRING: /* open-output-string */ 4826 case OP_OPEN_OUTSTRING: /* open-output-string */
5120 { 4827 {
5121 pointer p; 4828 pointer p;
5122 4829
5123 if (car (SCHEME_V->args) == NIL) 4830 if (a == NIL)
5124 {
5125 p = port_from_scratch (SCHEME_A); 4831 p = port_from_scratch (SCHEME_A);
5126
5127 if (p == NIL)
5128 s_return (S_F);
5129 }
5130 else 4832 else
5131 {
5132 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4833 p = port_from_string (SCHEME_A_ strvalue (a),
5133 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4834 strvalue (a) + strlength (a), port_output);
5134 4835
5135 if (p == NIL) 4836 s_return (p == NIL ? S_F : p);
5136 s_return (S_F);
5137 }
5138
5139 s_return (p);
5140 } 4837 }
5141 4838
5142 case OP_GET_OUTSTRING: /* get-output-string */ 4839 case OP_GET_OUTSTRING: /* get-output-string */
5143 { 4840 {
5144 port *p; 4841 port *p;
5145 4842
5146 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4843 if ((p = a->object.port)->kind & port_string)
5147 { 4844 {
5148 off_t size; 4845 off_t size;
5149 char *str; 4846 char *str;
5150 4847
5151 size = p->rep.string.curr - p->rep.string.start + 1; 4848 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5167 } 4864 }
5168 4865
5169# endif 4866# endif
5170 4867
5171 case OP_CLOSE_INPORT: /* close-input-port */ 4868 case OP_CLOSE_INPORT: /* close-input-port */
5172 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4869 port_close (SCHEME_A_ a, port_input);
5173 s_return (S_T); 4870 s_return (S_T);
5174 4871
5175 case OP_CLOSE_OUTPORT: /* close-output-port */ 4872 case OP_CLOSE_OUTPORT: /* close-output-port */
5176 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4873 port_close (SCHEME_A_ a, port_output);
5177 s_return (S_T); 4874 s_return (S_T);
5178#endif 4875#endif
5179 4876
5180 case OP_INT_ENV: /* interaction-environment */ 4877 case OP_INT_ENV: /* interaction-environment */
5181 s_return (SCHEME_V->global_env); 4878 s_return (SCHEME_V->global_env);
… …
5183 case OP_CURR_ENV: /* current-environment */ 4880 case OP_CURR_ENV: /* current-environment */
5184 s_return (SCHEME_V->envir); 4881 s_return (SCHEME_V->envir);
5185 4882
5186 } 4883 }
5187 4884
5188 return S_T; 4885 if (USE_ERROR_CHECKING) abort ();
5189} 4886}
5190 4887
5191static pointer 4888static int
5192opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4889opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5193{ 4890{
4891 pointer args = SCHEME_V->args;
5194 pointer x; 4892 pointer x;
5195 4893
5196 if (SCHEME_V->nesting != 0) 4894 if (SCHEME_V->nesting != 0)
5197 { 4895 {
5198 int n = SCHEME_V->nesting; 4896 int n = SCHEME_V->nesting;
… …
5205 switch (op) 4903 switch (op)
5206 { 4904 {
5207 /* ========== reading part ========== */ 4905 /* ========== reading part ========== */
5208#if USE_PORTS 4906#if USE_PORTS
5209 case OP_READ: 4907 case OP_READ:
5210 if (!is_pair (SCHEME_V->args)) 4908 if (!is_pair (args))
5211 s_goto (OP_READ_INTERNAL); 4909 s_goto (OP_READ_INTERNAL);
5212 4910
5213 if (!is_inport (car (SCHEME_V->args))) 4911 if (!is_inport (car (args)))
5214 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4912 Error_1 ("read: not an input port:", car (args));
5215 4913
5216 if (car (SCHEME_V->args) == SCHEME_V->inport) 4914 if (car (args) == SCHEME_V->inport)
5217 s_goto (OP_READ_INTERNAL); 4915 s_goto (OP_READ_INTERNAL);
5218 4916
5219 x = SCHEME_V->inport; 4917 x = SCHEME_V->inport;
5220 SCHEME_V->inport = car (SCHEME_V->args); 4918 SCHEME_V->inport = car (args);
5221 x = cons (x, NIL); 4919 x = cons (x, NIL);
5222 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4920 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5223 s_goto (OP_READ_INTERNAL); 4921 s_goto (OP_READ_INTERNAL);
5224 4922
5225 case OP_READ_CHAR: /* read-char */ 4923 case OP_READ_CHAR: /* read-char */
5226 case OP_PEEK_CHAR: /* peek-char */ 4924 case OP_PEEK_CHAR: /* peek-char */
5227 { 4925 {
5228 int c; 4926 int c;
5229 4927
5230 if (is_pair (SCHEME_V->args)) 4928 if (is_pair (args))
5231 { 4929 {
5232 if (car (SCHEME_V->args) != SCHEME_V->inport) 4930 if (car (args) != SCHEME_V->inport)
5233 { 4931 {
5234 x = SCHEME_V->inport; 4932 x = SCHEME_V->inport;
5235 x = cons (x, NIL); 4933 x = cons (x, NIL);
5236 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4934 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5237 SCHEME_V->inport = car (SCHEME_V->args); 4935 SCHEME_V->inport = car (args);
5238 } 4936 }
5239 } 4937 }
5240 4938
5241 c = inchar (SCHEME_A); 4939 c = inchar (SCHEME_A);
5242 4940
… …
5252 case OP_CHAR_READY: /* char-ready? */ 4950 case OP_CHAR_READY: /* char-ready? */
5253 { 4951 {
5254 pointer p = SCHEME_V->inport; 4952 pointer p = SCHEME_V->inport;
5255 int res; 4953 int res;
5256 4954
5257 if (is_pair (SCHEME_V->args)) 4955 if (is_pair (args))
5258 p = car (SCHEME_V->args); 4956 p = car (args);
5259 4957
5260 res = p->object.port->kind & port_string; 4958 res = p->object.port->kind & port_string;
5261 4959
5262 s_retbool (res); 4960 s_retbool (res);
5263 } 4961 }
5264 4962
5265 case OP_SET_INPORT: /* set-input-port */ 4963 case OP_SET_INPORT: /* set-input-port */
5266 SCHEME_V->inport = car (SCHEME_V->args); 4964 SCHEME_V->inport = car (args);
5267 s_return (SCHEME_V->value); 4965 s_return (SCHEME_V->value);
5268 4966
5269 case OP_SET_OUTPORT: /* set-output-port */ 4967 case OP_SET_OUTPORT: /* set-output-port */
5270 SCHEME_V->outport = car (SCHEME_V->args); 4968 SCHEME_V->outport = car (args);
5271 s_return (SCHEME_V->value); 4969 s_return (SCHEME_V->value);
5272#endif 4970#endif
5273 4971
5274 case OP_RDSEXPR: 4972 case OP_RDSEXPR:
5275 switch (SCHEME_V->tok) 4973 switch (SCHEME_V->tok)
… …
5324 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5022 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5325 SCHEME_V->tok = token (SCHEME_A); 5023 SCHEME_V->tok = token (SCHEME_A);
5326 s_goto (OP_RDSEXPR); 5024 s_goto (OP_RDSEXPR);
5327 5025
5328 case TOK_ATOM: 5026 case TOK_ATOM:
5329 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5027 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5028
5029 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032
5033 case TOK_STRATOM:
5034 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5330 5037
5331 case TOK_DQUOTE: 5038 case TOK_DQUOTE:
5332 x = readstrexp (SCHEME_A); 5039 x = readstrexp (SCHEME_A_ '"');
5333 5040
5334 if (x == S_F) 5041 if (x == S_F)
5335 Error_0 ("Error reading string"); 5042 Error_0 ("Error reading string");
5336 5043
5337 setimmutable (x); 5044 setimmutable (x);
… …
5349 s_goto (OP_EVAL); 5056 s_goto (OP_EVAL);
5350 } 5057 }
5351 } 5058 }
5352 5059
5353 case TOK_SHARP_CONST: 5060 case TOK_SHARP_CONST:
5354 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5355 Error_0 ("undefined sharp expression"); 5062 Error_0 ("undefined sharp expression");
5356 else 5063 else
5357 s_return (x); 5064 s_return (x);
5358 5065
5359 default: 5066 default:
… …
5361 } 5068 }
5362 5069
5363 break; 5070 break;
5364 5071
5365 case OP_RDLIST: 5072 case OP_RDLIST:
5366 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5073 SCHEME_V->args = cons (SCHEME_V->value, args);
5367 SCHEME_V->tok = token (SCHEME_A); 5074 SCHEME_V->tok = token (SCHEME_A);
5368 5075
5369 switch (SCHEME_V->tok) 5076 switch (SCHEME_V->tok)
5370 { 5077 {
5371 case TOK_EOF: 5078 case TOK_EOF:
… …
5399 case OP_RDDOT: 5106 case OP_RDDOT:
5400 if (token (SCHEME_A) != TOK_RPAREN) 5107 if (token (SCHEME_A) != TOK_RPAREN)
5401 Error_0 ("syntax error: illegal dot expression"); 5108 Error_0 ("syntax error: illegal dot expression");
5402 5109
5403 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5110 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5404 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5111 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5405 5112
5406 case OP_RDQUOTE: 5113 case OP_RDQUOTE:
5407 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5114 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5408 5115
5409 case OP_RDQQUOTE: 5116 case OP_RDQQUOTE:
… …
5431 SCHEME_V->args = SCHEME_V->value; 5138 SCHEME_V->args = SCHEME_V->value;
5432 s_goto (OP_VECTOR); 5139 s_goto (OP_VECTOR);
5433 5140
5434 /* ========== printing part ========== */ 5141 /* ========== printing part ========== */
5435 case OP_P0LIST: 5142 case OP_P0LIST:
5436 if (is_vector (SCHEME_V->args)) 5143 if (is_vector (args))
5437 { 5144 {
5438 putstr (SCHEME_A_ "#("); 5145 putstr (SCHEME_A_ "#(");
5439 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5146 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5440 s_goto (OP_PVECFROM); 5147 s_goto (OP_PVECFROM);
5441 } 5148 }
5442 else if (is_environment (SCHEME_V->args)) 5149 else if (is_environment (args))
5443 { 5150 {
5444 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5151 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5445 s_return (S_T); 5152 s_return (S_T);
5446 } 5153 }
5447 else if (!is_pair (SCHEME_V->args)) 5154 else if (!is_pair (args))
5448 { 5155 {
5449 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5156 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5450 s_return (S_T); 5157 s_return (S_T);
5451 } 5158 }
5452 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5159 else
5453 { 5160 {
5161 pointer a = car (args);
5162 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b);
5165
5166 if (a == SCHEME_V->QUOTE && ok_abbr)
5454 putstr (SCHEME_A_ "'"); 5167 putstr (SCHEME_A_ "'");
5455 SCHEME_V->args = cadr (SCHEME_V->args); 5168 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`");
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ",");
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@");
5174 else
5175 {
5176 putstr (SCHEME_A_ "(");
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a;
5179 }
5180
5456 s_goto (OP_P0LIST); 5181 s_goto (OP_P0LIST);
5457 } 5182 }
5458 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5183
5184 case OP_P1LIST:
5185 if (is_pair (args))
5459 { 5186 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5460 putstr (SCHEME_A_ "`"); 5188 putstr (SCHEME_A_ " ");
5461 SCHEME_V->args = cadr (SCHEME_V->args); 5189 SCHEME_V->args = car (args);
5462 s_goto (OP_P0LIST); 5190 s_goto (OP_P0LIST);
5463 } 5191 }
5464 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5465 {
5466 putstr (SCHEME_A_ ",");
5467 SCHEME_V->args = cadr (SCHEME_V->args);
5468 s_goto (OP_P0LIST);
5469 }
5470 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5471 {
5472 putstr (SCHEME_A_ ",@");
5473 SCHEME_V->args = cadr (SCHEME_V->args);
5474 s_goto (OP_P0LIST);
5475 }
5476 else
5477 {
5478 putstr (SCHEME_A_ "(");
5479 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5480 SCHEME_V->args = car (SCHEME_V->args);
5481 s_goto (OP_P0LIST);
5482 }
5483
5484 case OP_P1LIST:
5485 if (is_pair (SCHEME_V->args))
5486 {
5487 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5488 putstr (SCHEME_A_ " ");
5489 SCHEME_V->args = car (SCHEME_V->args);
5490 s_goto (OP_P0LIST);
5491 }
5492 else if (is_vector (SCHEME_V->args)) 5192 else if (is_vector (args))
5493 { 5193 {
5494 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5194 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5495 putstr (SCHEME_A_ " . "); 5195 putstr (SCHEME_A_ " . ");
5496 s_goto (OP_P0LIST); 5196 s_goto (OP_P0LIST);
5497 } 5197 }
5498 else 5198 else
5499 { 5199 {
5500 if (SCHEME_V->args != NIL) 5200 if (args != NIL)
5501 { 5201 {
5502 putstr (SCHEME_A_ " . "); 5202 putstr (SCHEME_A_ " . ");
5503 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5504 } 5204 }
5505 5205
5506 putstr (SCHEME_A_ ")"); 5206 putstr (SCHEME_A_ ")");
5507 s_return (S_T); 5207 s_return (S_T);
5508 } 5208 }
5509 5209
5510 case OP_PVECFROM: 5210 case OP_PVECFROM:
5511 { 5211 {
5512 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5212 int i = ivalue_unchecked (cdr (args));
5513 pointer vec = car (SCHEME_V->args); 5213 pointer vec = car (args);
5514 int len = ivalue_unchecked (vec); 5214 int len = veclength (vec);
5515 5215
5516 if (i == len) 5216 if (i == len)
5517 { 5217 {
5518 putstr (SCHEME_A_ ")"); 5218 putstr (SCHEME_A_ ")");
5519 s_return (S_T); 5219 s_return (S_T);
5520 } 5220 }
5521 else 5221 else
5522 { 5222 {
5523 pointer elem = vector_elem (vec, i); 5223 pointer elem = vector_get (vec, i);
5524 5224
5525 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5225 ivalue_unchecked (cdr (args)) = i + 1;
5526 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5527 SCHEME_V->args = elem; 5227 SCHEME_V->args = elem;
5528 5228
5529 if (i > 0) 5229 if (i > 0)
5530 putstr (SCHEME_A_ " "); 5230 putstr (SCHEME_A_ " ");
5531 5231
5532 s_goto (OP_P0LIST); 5232 s_goto (OP_P0LIST);
5533 } 5233 }
5534 } 5234 }
5535 } 5235 }
5536 5236
5537 return S_T; 5237 if (USE_ERROR_CHECKING) abort ();
5538} 5238}
5539 5239
5540static pointer 5240static int
5541opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5241opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5542{ 5242{
5243 pointer args = SCHEME_V->args;
5244 pointer a = car (args);
5543 pointer x, y; 5245 pointer x, y;
5544 5246
5545 switch (op) 5247 switch (op)
5546 { 5248 {
5547 case OP_LIST_LENGTH: /* length *//* a.k */ 5249 case OP_LIST_LENGTH: /* length *//* a.k */
5548 { 5250 {
5549 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5251 long v = list_length (SCHEME_A_ a);
5550 5252
5551 if (v < 0) 5253 if (v < 0)
5552 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5254 Error_1 ("length: not a list:", a);
5553 5255
5554 s_return (mk_integer (SCHEME_A_ v)); 5256 s_return (mk_integer (SCHEME_A_ v));
5555 } 5257 }
5556 5258
5557 case OP_ASSQ: /* assq *//* a.k */ 5259 case OP_ASSQ: /* assq *//* a.k */
5558 x = car (SCHEME_V->args); 5260 x = a;
5559 5261
5560 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5262 for (y = cadr (args); is_pair (y); y = cdr (y))
5561 { 5263 {
5562 if (!is_pair (car (y))) 5264 if (!is_pair (car (y)))
5563 Error_0 ("unable to handle non pair element"); 5265 Error_0 ("unable to handle non pair element");
5564 5266
5565 if (x == caar (y)) 5267 if (x == caar (y))
… …
5571 else 5273 else
5572 s_return (S_F); 5274 s_return (S_F);
5573 5275
5574 5276
5575 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5576 SCHEME_V->args = car (SCHEME_V->args); 5278 SCHEME_V->args = a;
5577 5279
5578 if (SCHEME_V->args == NIL) 5280 if (SCHEME_V->args == NIL)
5579 s_return (S_F); 5281 s_return (S_F);
5580 else if (is_closure (SCHEME_V->args)) 5282 else if (is_closure (SCHEME_V->args))
5581 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5586 5288
5587 case OP_CLOSUREP: /* closure? */ 5289 case OP_CLOSUREP: /* closure? */
5588 /* 5290 /*
5589 * Note, macro object is also a closure. 5291 * Note, macro object is also a closure.
5590 * Therefore, (closure? <#MACRO>) ==> #t 5292 * Therefore, (closure? <#MACRO>) ==> #t
5293 * (schmorp) well, obviously not, fix? TODO
5591 */ 5294 */
5592 s_retbool (is_closure (car (SCHEME_V->args))); 5295 s_retbool (is_closure (a));
5593 5296
5594 case OP_MACROP: /* macro? */ 5297 case OP_MACROP: /* macro? */
5595 s_retbool (is_macro (car (SCHEME_V->args))); 5298 s_retbool (is_macro (a));
5596 } 5299 }
5597 5300
5598 return S_T; /* NOTREACHED */ 5301 if (USE_ERROR_CHECKING) abort ();
5599} 5302}
5600 5303
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5601typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5602 5306
5603typedef int (*test_predicate) (pointer); 5307typedef int (*test_predicate)(pointer);
5604static int 5308static int
5605is_any (pointer p) 5309tst_any (pointer p)
5606{ 5310{
5607 return 1; 5311 return 1;
5608} 5312}
5609 5313
5610static int 5314static int
5611is_nonneg (pointer p) 5315tst_inonneg (pointer p)
5612{ 5316{
5613 return ivalue (p) >= 0 && is_integer (p); 5317 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318}
5319
5320static int
5321tst_is_list (SCHEME_P_ pointer p)
5322{
5323 return p == NIL || is_pair (p);
5614} 5324}
5615 5325
5616/* Correspond carefully with following defines! */ 5326/* Correspond carefully with following defines! */
5617static struct 5327static struct
5618{ 5328{
5619 test_predicate fct; 5329 test_predicate fct;
5620 const char *kind; 5330 const char *kind;
5621} tests[] = 5331} tests[] = {
5622{ 5332 { tst_any , 0 },
5623 { 0, 0}, /* unused */ 5333 { is_string , "string" },
5624 { is_any, 0}, 5334 { is_symbol , "symbol" },
5625 { is_string, "string" }, 5335 { is_port , "port" },
5626 { is_symbol, "symbol" },
5627 { is_port, "port" },
5628 { is_inport, "input port" }, 5336 { is_inport , "input port" },
5629 { is_outport, "output port" }, 5337 { is_outport , "output port" },
5630 { is_environment, "environment" }, 5338 { is_environment, "environment" },
5631 { is_pair, "pair" }, 5339 { is_pair , "pair" },
5632 { 0, "pair or '()" }, 5340 { 0 , "pair or '()" },
5633 { is_character, "character" }, 5341 { is_character , "character" },
5634 { is_vector, "vector" }, 5342 { is_vector , "vector" },
5635 { is_number, "number" }, 5343 { is_number , "number" },
5636 { is_integer, "integer" }, 5344 { is_integer , "integer" },
5637 { is_nonneg, "non-negative integer" } 5345 { tst_inonneg , "non-negative integer" }
5638}; 5346};
5639 5347
5640#define TST_NONE 0 5348#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5641#define TST_ANY "\001" 5349#define TST_ANY "\001"
5642#define TST_STRING "\002" 5350#define TST_STRING "\002"
5643#define TST_SYMBOL "\003" 5351#define TST_SYMBOL "\003"
5644#define TST_PORT "\004" 5352#define TST_PORT "\004"
5645#define TST_INPORT "\005" 5353#define TST_INPORT "\005"
5646#define TST_OUTPORT "\006" 5354#define TST_OUTPORT "\006"
5647#define TST_ENVIRONMENT "\007" 5355#define TST_ENVIRONMENT "\007"
5648#define TST_PAIR "\010" 5356#define TST_PAIR "\010"
5649#define TST_LIST "\011" 5357#define TST_LIST "\011"
5650#define TST_CHAR "\012" 5358#define TST_CHAR "\012"
5651#define TST_VECTOR "\013" 5359#define TST_VECTOR "\013"
5652#define TST_NUMBER "\014" 5360#define TST_NUMBER "\014"
5653#define TST_INTEGER "\015" 5361#define TST_INTEGER "\015"
5654#define TST_NATURAL "\016" 5362#define TST_NATURAL "\016"
5363
5364#define INF_ARG 0xff
5365#define UNNAMED_OP ""
5366
5367static const char opnames[] =
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h"
5370#undef OP_DEF
5371;
5372
5373static const char *
5374opname (int idx)
5375{
5376 const char *name = opnames;
5377
5378 /* should do this at compile time, but would require external program, right? */
5379 while (idx--)
5380 name += strlen (name) + 1;
5381
5382 return *name ? name : "ILLEGAL";
5383}
5384
5385static const char *
5386procname (pointer x)
5387{
5388 return opname (procnum (x));
5389}
5655 5390
5656typedef struct 5391typedef struct
5657{ 5392{
5658 dispatch_func func; 5393 uint8_t func;
5659 char *name; 5394 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5395 uint8_t builtin;
5396#if USE_ERROR_CHECKING
5660 int min_arity; 5397 uint8_t min_arity;
5661 int max_arity; 5398 uint8_t max_arity;
5662 char *arg_tests_encoding; 5399 char arg_tests_encoding[3];
5400#endif
5663} op_code_info; 5401} op_code_info;
5664 5402
5665#define INF_ARG 0xffff
5666
5667static op_code_info dispatch_table[] = { 5403static const op_code_info dispatch_table[] = {
5668#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5404#if USE_ERROR_CHECKING
5405#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5406#else
5407#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5408#endif
5669#include "opdefines.h" 5409#include "opdefines.h"
5410#undef OP_DEF
5670 {0} 5411 {0}
5671}; 5412};
5672 5413
5673static const char *
5674procname (pointer x)
5675{
5676 int n = procnum (x);
5677 const char *name = dispatch_table[n].name;
5678
5679 if (name == 0)
5680 name = "ILLEGAL!";
5681
5682 return name;
5683}
5684
5685/* kernel of this interpreter */ 5414/* kernel of this interpreter */
5686static void 5415static void ecb_hot
5687Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5688{ 5417{
5689 SCHEME_V->op = op; 5418 SCHEME_V->op = op;
5690 5419
5691 for (;;) 5420 for (;;)
5692 { 5421 {
5693 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5422 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5694 5423
5424#if USE_ERROR_CHECKING
5695 if (pcd->name) /* if built-in function, check arguments */ 5425 if (pcd->builtin) /* if built-in function, check arguments */
5696 { 5426 {
5697#if USE_ERROR_CHECKING
5698 char msg[STRBUFFSIZE]; 5427 char msg[STRBUFFSIZE];
5699 int ok = 1;
5700 int n = list_length (SCHEME_A_ SCHEME_V->args); 5428 int n = list_length (SCHEME_A_ SCHEME_V->args);
5701 5429
5702 /* Check number of arguments */ 5430 /* Check number of arguments */
5703 if (n < pcd->min_arity) 5431 if (ecb_expect_false (n < pcd->min_arity))
5704 { 5432 {
5705 ok = 0;
5706 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5433 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5707 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5434 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5435 xError_1 (SCHEME_A_ msg, 0);
5436 continue;
5708 } 5437 }
5709 5438 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5710 if (ok && n > pcd->max_arity)
5711 { 5439 {
5712 ok = 0;
5713 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5440 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5714 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5441 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5442 xError_1 (SCHEME_A_ msg, 0);
5443 continue;
5715 } 5444 }
5716#endif 5445 else
5717
5718 if (ok)
5719 { 5446 {
5720 if (pcd->arg_tests_encoding && USE_ERROR_CHECKING) 5447 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5721 { 5448 {
5722 int i = 0; 5449 int i = 0;
5723 int j; 5450 int j;
5724 const char *t = pcd->arg_tests_encoding; 5451 const char *t = pcd->arg_tests_encoding;
5725 pointer arglist = SCHEME_V->args; 5452 pointer arglist = SCHEME_V->args;
5726 5453
5727 do 5454 do
5728 { 5455 {
5729 pointer arg = car (arglist); 5456 pointer arg = car (arglist);
5730 5457
5731 j = (int) t[0]; 5458 j = t[0];
5732 5459
5460 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5733 if (j == TST_LIST[0]) 5461 if (j == TST_LIST[0])
5734 { 5462 {
5735 if (arg != NIL && !is_pair (arg)) 5463 if (!tst_is_list (SCHEME_A_ arg))
5736 break; 5464 break;
5737 } 5465 }
5738 else 5466 else
5739 { 5467 {
5740 if (!tests[j].fct (arg)) 5468 if (!tests[j - 1].fct (arg))
5741 break; 5469 break;
5742 } 5470 }
5743 5471
5744 if (t[1] != 0) /* last test is replicated as necessary */ 5472 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5745 t++; 5473 t++;
5746 5474
5747 arglist = cdr (arglist); 5475 arglist = cdr (arglist);
5748 i++; 5476 i++;
5749 } 5477 }
5750 while (i < n); 5478 while (i < n);
5751 5479
5752 if (i < n) 5480 if (i < n)
5753 { 5481 {
5754 ok = 0;
5755 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5482 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5483 xError_1 (SCHEME_A_ msg, 0);
5484 continue;
5756 } 5485 }
5757 } 5486 }
5758 } 5487 }
5759
5760 if (!ok)
5761 {
5762 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5763 return;
5764
5765 pcd = dispatch_table + SCHEME_V->op;
5766 }
5767 } 5488 }
5489#endif
5768 5490
5769 ok_to_freely_gc (SCHEME_A); 5491 ok_to_freely_gc (SCHEME_A);
5770 5492
5771 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5493 static const dispatch_func dispatch_funcs[] = {
5494 opexe_0,
5495 opexe_1,
5496 opexe_2,
5497 opexe_3,
5498 opexe_4,
5499 opexe_5,
5500 opexe_6,
5501 };
5502
5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5772 return; 5504 return;
5773 5505
5774#if USE_ERROR_CHECKING 5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5775 if (SCHEME_V->no_memory)
5776 { 5507 {
5777 xwrstr ("No memory!\n"); 5508 xwrstr ("No memory!\n");
5778 return; 5509 return;
5779 } 5510 }
5780#endif
5781 } 5511 }
5782} 5512}
5783 5513
5784/* ========== Initialization of internal keywords ========== */ 5514/* ========== Initialization of internal keywords ========== */
5785 5515
… …
5802mk_proc (SCHEME_P_ enum scheme_opcodes op) 5532mk_proc (SCHEME_P_ enum scheme_opcodes op)
5803{ 5533{
5804 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5534 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5805 set_typeflag (y, (T_PROC | T_ATOM)); 5535 set_typeflag (y, (T_PROC | T_ATOM));
5806 ivalue_unchecked (y) = op; 5536 ivalue_unchecked (y) = op;
5807 set_num_integer (y);
5808 return y; 5537 return y;
5809} 5538}
5810 5539
5811/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5812static int 5541static int
5813syntaxnum (pointer p) 5542syntaxnum (pointer p)
5814{ 5543{
5815 const char *s = strvalue (car (p)); 5544 const char *s = strvalue (p);
5816 5545
5817 switch (strlength (car (p))) 5546 switch (strlength (p))
5818 { 5547 {
5819 case 2: 5548 case 2:
5820 if (s[0] == 'i') 5549 if (s[0] == 'i')
5821 return OP_IF0; /* if */ 5550 return OP_IF0; /* if */
5822 else 5551 else
… …
5836 5565
5837 case 'd': 5566 case 'd':
5838 return OP_COND0; /* cond */ 5567 return OP_COND0; /* cond */
5839 5568
5840 case '*': 5569 case '*':
5841 return OP_LET0AST; /* let* */ 5570 return OP_LET0AST;/* let* */
5842 5571
5843 default: 5572 default:
5844 return OP_SET0; /* set! */ 5573 return OP_SET0; /* set! */
5845 } 5574 }
5846 5575
… …
5868 5597
5869 case 'f': 5598 case 'f':
5870 return OP_DEF0; /* define */ 5599 return OP_DEF0; /* define */
5871 5600
5872 default: 5601 default:
5873 return OP_LET0REC; /* letrec */ 5602 return OP_LET0REC;/* letrec */
5874 } 5603 }
5875 5604
5876 default: 5605 default:
5877 return OP_C0STREAM; /* cons-stream */ 5606 return OP_C0STREAM; /* cons-stream */
5878 } 5607 }
5879} 5608}
5880 5609
5881#if USE_MULTIPLICITY 5610#if USE_MULTIPLICITY
5882scheme * 5611ecb_cold scheme *
5883scheme_init_new () 5612scheme_init_new ()
5884{ 5613{
5885 scheme *sc = malloc (sizeof (scheme)); 5614 scheme *sc = malloc (sizeof (scheme));
5886 5615
5887 if (!scheme_init (SCHEME_A)) 5616 if (!scheme_init (SCHEME_A))
… …
5892 else 5621 else
5893 return sc; 5622 return sc;
5894} 5623}
5895#endif 5624#endif
5896 5625
5897int 5626ecb_cold int
5898scheme_init (SCHEME_P) 5627scheme_init (SCHEME_P)
5899{ 5628{
5900 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5901 pointer x; 5630 pointer x;
5902 5631
… …
5945 set_cdr (S_T, S_T); 5674 set_cdr (S_T, S_T);
5946 /* init F */ 5675 /* init F */
5947 set_typeflag (S_F, T_ATOM | T_MARK); 5676 set_typeflag (S_F, T_ATOM | T_MARK);
5948 set_car (S_F, S_F); 5677 set_car (S_F, S_F);
5949 set_cdr (S_F, S_F); 5678 set_cdr (S_F, S_F);
5679 /* init EOF_OBJ */
5680 set_typeflag (S_EOF, T_ATOM | T_MARK);
5681 set_car (S_EOF, S_EOF);
5682 set_cdr (S_EOF, S_EOF);
5950 /* init sink */ 5683 /* init sink */
5951 set_typeflag (S_SINK, T_PAIR | T_MARK); 5684 set_typeflag (S_SINK, T_PAIR | T_MARK);
5952 set_car (S_SINK, NIL); 5685 set_car (S_SINK, NIL);
5686
5953 /* init c_nest */ 5687 /* init c_nest */
5954 SCHEME_V->c_nest = NIL; 5688 SCHEME_V->c_nest = NIL;
5955 5689
5956 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5690 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5957 /* init global_env */ 5691 /* init global_env */
… …
5970 5704
5971 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5705 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5972 assign_syntax (SCHEME_A_ syntax_names[i]); 5706 assign_syntax (SCHEME_A_ syntax_names[i]);
5973 } 5707 }
5974 5708
5709 // TODO: should iterate via strlen, to avoid n² complexity
5975 for (i = 0; i < n; i++) 5710 for (i = 0; i < n; i++)
5976 if (dispatch_table[i].name != 0) 5711 if (dispatch_table[i].builtin)
5977 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5712 assign_proc (SCHEME_A_ i, opname (i));
5978 5713
5979 /* initialization of global pointers to special symbols */ 5714 /* initialization of global pointers to special symbols */
5980 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5715 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5981 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5716 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5982 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5717 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
5983 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5718 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
5984 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5719 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
5985 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5720 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
5986 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5721 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
5987 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5722 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
5988 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5723 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
5989 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5724 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
5990 5725
5991 return !SCHEME_V->no_memory; 5726 return !SCHEME_V->no_memory;
5992} 5727}
5993 5728
… …
6021scheme_set_external_data (SCHEME_P_ void *p) 5756scheme_set_external_data (SCHEME_P_ void *p)
6022{ 5757{
6023 SCHEME_V->ext_data = p; 5758 SCHEME_V->ext_data = p;
6024} 5759}
6025 5760
6026void 5761ecb_cold void
6027scheme_deinit (SCHEME_P) 5762scheme_deinit (SCHEME_P)
6028{ 5763{
6029 int i; 5764 int i;
6030 5765
6031#if SHOW_ERROR_LINE 5766#if SHOW_ERROR_LINE
… …
6123{ 5858{
6124 dump_stack_reset (SCHEME_A); 5859 dump_stack_reset (SCHEME_A);
6125 SCHEME_V->envir = SCHEME_V->global_env; 5860 SCHEME_V->envir = SCHEME_V->global_env;
6126 SCHEME_V->file_i = 0; 5861 SCHEME_V->file_i = 0;
6127 SCHEME_V->load_stack[0].kind = port_input | port_string; 5862 SCHEME_V->load_stack[0].kind = port_input | port_string;
6128 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
6129 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6130 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6131#if USE_PORTS 5866#if USE_PORTS
6132 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6133#endif 5868#endif
6134 SCHEME_V->retcode = 0; 5869 SCHEME_V->retcode = 0;
6135 SCHEME_V->interactive_repl = 0; 5870 SCHEME_V->interactive_repl = 0;
… …
6240 5975
6241/* ========== Main ========== */ 5976/* ========== Main ========== */
6242 5977
6243#if STANDALONE 5978#if STANDALONE
6244 5979
6245# if defined(__APPLE__) && !defined (OSX)
6246int
6247main ()
6248{
6249 extern MacTS_main (int argc, char **argv);
6250 char **argv;
6251 int argc = ccommand (&argv);
6252
6253 MacTS_main (argc, argv);
6254 return 0;
6255}
6256
6257int
6258MacTS_main (int argc, char **argv)
6259{
6260# else
6261int 5980int
6262main (int argc, char **argv) 5981main (int argc, char **argv)
6263{ 5982{
6264# endif
6265# if USE_MULTIPLICITY 5983# if USE_MULTIPLICITY
6266 scheme ssc; 5984 scheme ssc;
6267 scheme *const SCHEME_V = &ssc; 5985 scheme *const SCHEME_V = &ssc;
6268# else 5986# else
6269# endif 5987# endif
6270 int fin; 5988 int fin;
6271 char *file_name = InitFile; 5989 char *file_name = InitFile;
6272 int retcode; 5990 int retcode;
6273 int isfile = 1; 5991 int isfile = 1;
5992 system ("ps v $PPID");//D
6274 5993
6275 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5994 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6276 { 5995 {
6277 xwrstr ("Usage: tinyscheme -?\n"); 5996 xwrstr ("Usage: tinyscheme -?\n");
6278 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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