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

Diff Legend

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