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.6 by root, Wed Nov 25 10:57:17 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 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
23#if 1
16#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
17#include "malloc.c" 25#include "malloc.c"
26#endif
18 27
19#define SCHEME_SOURCE 28#define SCHEME_SOURCE
20#include "scheme-private.h" 29#include "scheme-private.h"
21#ifndef WIN32 30#ifndef WIN32
22# include <unistd.h> 31# include <unistd.h>
23#endif 32#endif
24#if USE_MATH 33#if USE_MATH
25# include <math.h> 34# include <math.h>
26#endif 35#endif
27 36
37#include "ecb.h"
38
28#include <sys/types.h> 39#include <sys/types.h>
29#include <sys/stat.h> 40#include <sys/stat.h>
30#include <fcntl.h> 41#include <fcntl.h>
31 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
32#include <string.h> 49#include <string.h>
33#include <stdlib.h>
34 50
35#include <limits.h> 51#include <limits.h>
36#include <inttypes.h> 52#include <inttypes.h>
37#include <float.h> 53#include <float.h>
38//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
39 63
40enum { 64enum {
41 TOK_EOF, 65 TOK_EOF,
42 TOK_LPAREN, 66 TOK_LPAREN,
43 TOK_RPAREN, 67 TOK_RPAREN,
44 TOK_DOT, 68 TOK_DOT,
45 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
46 TOK_QUOTE, 72 TOK_QUOTE,
47 TOK_DQUOTE, 73 TOK_DQUOTE,
48 TOK_BQUOTE, 74 TOK_BQUOTE,
49 TOK_COMMA, 75 TOK_COMMA,
50 TOK_ATMARK, 76 TOK_ATMARK,
… …
52 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
53 TOK_VEC 79 TOK_VEC
54}; 80};
55 81
56#define BACKQUOTE '`' 82#define BACKQUOTE '`'
57#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
58 85
59#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
60#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
61#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
62#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
63#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
64 91
65#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
66static scheme sc; 93static scheme sc;
67#endif 94#endif
68 95
… …
76 } 103 }
77 104
78 char *p = s; 105 char *p = s;
79 106
80 do { 107 do {
81 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
82 n /= base; 109 n /= base;
83 } while (n); 110 } while (n);
84 111
85 *p-- = 0; 112 *p-- = 0;
86 113
… …
96{ 123{
97 xbase (s, n, 10); 124 xbase (s, n, 10);
98} 125}
99 126
100static void 127static void
101xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
102{
103 write (1, s, strlen (s));
104}
105
106static void
107xwrnum (long n)
108{ 129{
109 char buf[64]; 130 char buf[64];
110 131
111 xnum (buf, n); 132 xnum (buf, n);
112 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
113} 134}
114 135
115static char 136static char
116xtoupper (char c) 137xtoupper (char c)
117{ 138{
… …
128 c += 'a' - 'A'; 149 c += 'a' - 'A';
129 150
130 return c; 151 return c;
131} 152}
132 153
133#if USE_STRLWR 154static int
155xisdigit (char c)
156{
157 return c >= '0' && c <= '9';
158}
159
160#define toupper(c) xtoupper (c)
161#define tolower(c) xtolower (c)
162#define isdigit(c) xisdigit (c)
163
164#if USE_IGNORECASE
134static const char * 165static const char *
135strlwr (char *s) 166xstrlwr (char *s)
136{ 167{
137 const char *p = s; 168 const char *p = s;
138 169
139 while (*s) 170 while (*s)
140 { 171 {
… …
142 s++; 173 s++;
143 } 174 }
144 175
145 return p; 176 return p;
146} 177}
147#endif
148 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
149#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
150#define strlwr(s) (s) 184# define strlwr(s) (s)
151#define toupper(c) xtoupper(c) 185#endif
152#define tolower(c) xtolower(c)
153 186
154#ifndef prompt 187#ifndef prompt
155# define prompt "ts> " 188# define prompt "ts> "
156#endif 189#endif
157 190
158#ifndef InitFile 191#ifndef InitFile
159# define InitFile "init.scm" 192# define InitFile "init.scm"
160#endif 193#endif
161 194
162#ifndef FIRST_CELLSEGS
163# define FIRST_CELLSEGS 3
164#endif
165
166enum scheme_types 195enum scheme_types
167{ 196{
197 T_INTEGER,
168 T_FREE, 198 T_REAL,
169 T_STRING, 199 T_STRING,
170 T_NUMBER,
171 T_SYMBOL, 200 T_SYMBOL,
172 T_PROC, 201 T_PROC,
173 T_PAIR, 202 T_PAIR, /* also used for free cells */
174 T_CLOSURE, 203 T_CLOSURE,
175 T_CONTINUATION, 204 T_CONTINUATION,
176 T_FOREIGN, 205 T_FOREIGN,
177 T_CHARACTER, 206 T_CHARACTER,
178 T_PORT, 207 T_PORT,
… …
188#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
189#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
190#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
191#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
192 221
193static num num_add (num a, num b); 222/* num, for generic arithmetic */
194static num num_mul (num a, num b); 223struct num
195static num num_div (num a, num b); 224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
249
250static num num_op (enum num_op op, num a, num b);
196static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
197static num num_sub (num a, num b);
198static num num_rem (num a, num b); 252static num num_rem (num a, num b);
199static num num_mod (num a, num b); 253static num num_mod (num a, num b);
200static int num_eq (num a, num b);
201static int num_gt (num a, num b);
202static int num_ge (num a, num b);
203static int num_lt (num a, num b);
204static int num_le (num a, num b);
205 254
206#if USE_MATH
207static double round_per_R5RS (double x);
208#endif
209static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
210
211static INLINE int
212num_is_integer (pointer p)
213{
214 return num_is_fixnum (p->object.number);
215}
216 256
217static num num_zero; 257static num num_zero;
218static num num_one; 258static num num_one;
219 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
220/* macros for cell operations */ 264/* macros for cell operations */
221#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
222#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
223#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
224 268
225INTERFACE INLINE int 269INTERFACE int
226is_string (pointer p) 270is_string (pointer p)
227{ 271{
228 return type (p) == T_STRING; 272 return type (p) == T_STRING;
229} 273}
230 274
231#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
232#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
233 277
234INTERFACE int is_list (SCHEME_P_ pointer p);
235INTERFACE INLINE int 278INTERFACE int
236is_vector (pointer p) 279is_vector (pointer p)
237{ 280{
238 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
239} 282}
240 283
284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
285#define veclength(p) (CELL(p)->object.vector.length)
241INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
242INTERFACE uint32_t vector_length (pointer vec);
243INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
244INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
245 289
246INTERFACE uint32_t 290INTERFACE int
247vector_length (pointer vec) 291is_integer (pointer p)
248{ 292{
249 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
250} 294}
251 295
296/* not the same as in scheme, where integers are (correctly :) reals */
252INTERFACE INLINE int 297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
301}
302
303INTERFACE int
253is_number (pointer p) 304is_number (pointer p)
254{ 305{
255 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
256} 307}
257 308
258INTERFACE INLINE int 309INTERFACE int
259is_integer (pointer p)
260{
261 if (!is_number (p))
262 return 0;
263
264 if (num_is_integer (p) || ivalue (p) == rvalue (p))
265 return 1;
266
267 return 0;
268}
269
270INTERFACE INLINE int
271is_real (pointer p)
272{
273 return is_number (p) && !num_is_fixnum (p->object.number);
274}
275
276INTERFACE INLINE int
277is_character (pointer p) 310is_character (pointer p)
278{ 311{
279 return type (p) == T_CHARACTER; 312 return type (p) == T_CHARACTER;
280} 313}
281 314
282INTERFACE INLINE char * 315INTERFACE char *
283string_value (pointer p) 316string_value (pointer p)
284{ 317{
285 return strvalue (p); 318 return strvalue (p);
286} 319}
287 320
288INLINE num
289nvalue (pointer p)
290{
291 return (p)->object.number;
292}
293
294static IVALUE
295num_get_ivalue (const num n)
296{
297 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
298}
299
300static RVALUE
301num_get_rvalue (const num n)
302{
303 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
304}
305
306INTERFACE IVALUE
307ivalue (pointer p)
308{
309 return num_get_ivalue (p->object.number);
310}
311
312INTERFACE RVALUE
313rvalue (pointer p)
314{
315 return num_get_rvalue (p->object.number);
316}
317
318#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
319#if USE_FLOAT 322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
324#if USE_REAL
320# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
321# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
322# define set_num_real(p) (p)->object.number.is_fixnum=0;
323#else 327#else
324# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
325# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
326# define set_num_real(p) 0
327#endif 330#endif
331
328INTERFACE long 332INTERFACE long
329charvalue (pointer p) 333charvalue (pointer p)
330{ 334{
331 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
332} 336}
333 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
334INTERFACE INLINE int 340INTERFACE int
335is_port (pointer p) 341is_port (pointer p)
336{ 342{
337 return type (p) == T_PORT; 343 return type (p) == T_PORT;
338} 344}
339 345
340INTERFACE INLINE int 346INTERFACE int
341is_inport (pointer p) 347is_inport (pointer p)
342{ 348{
343 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
344} 350}
345 351
346INTERFACE INLINE int 352INTERFACE int
347is_outport (pointer p) 353is_outport (pointer p)
348{ 354{
349 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
350} 356}
351 357
352INTERFACE INLINE int 358INTERFACE int
353is_pair (pointer p) 359is_pair (pointer p)
354{ 360{
355 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
356} 362}
357 363
358#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
359#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
360 366
361#define caar(p) car (car (p)) 367static pointer caar (pointer p) { return car (car (p)); }
362#define cadr(p) car (cdr (p)) 368static pointer cadr (pointer p) { return car (cdr (p)); }
363#define cdar(p) cdr (car (p)) 369static pointer cdar (pointer p) { return cdr (car (p)); }
364#define cddr(p) cdr (cdr (p)) 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
365 371
366#define cadar(p) car (cdr (car (p))) 372static pointer cadar (pointer p) { return car (cdr (car (p))); }
367#define caddr(p) car (cdr (cdr (p))) 373static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
368#define cdaar(p) cdr (car (car (p))) 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
369 375
370INTERFACE void 376INTERFACE void
371set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
372{ 378{
373 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
374} 380}
375 381
376INTERFACE void 382INTERFACE void
377set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
378{ 384{
379 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
380} 386}
381 387
382INTERFACE pointer 388INTERFACE pointer
383pair_car (pointer p) 389pair_car (pointer p)
384{ 390{
… …
389pair_cdr (pointer p) 395pair_cdr (pointer p)
390{ 396{
391 return cdr (p); 397 return cdr (p);
392} 398}
393 399
394INTERFACE INLINE int 400INTERFACE int
395is_symbol (pointer p) 401is_symbol (pointer p)
396{ 402{
397 return type (p) == T_SYMBOL; 403 return type (p) == T_SYMBOL;
398} 404}
399 405
400INTERFACE INLINE char * 406INTERFACE char *
401symname (pointer p) 407symname (pointer p)
402{ 408{
403 return strvalue (car (p)); 409 return strvalue (p);
404} 410}
405 411
406#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
407SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
408hasprop (pointer p) 416hasprop (pointer p)
409{ 417{
410 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
411} 419}
412
413# define symprop(p) cdr(p)
414#endif 420#endif
415 421
416INTERFACE INLINE int 422INTERFACE int
417is_syntax (pointer p) 423is_syntax (pointer p)
418{ 424{
419 return typeflag (p) & T_SYNTAX; 425 return typeflag (p) & T_SYNTAX;
420} 426}
421 427
422INTERFACE INLINE int 428INTERFACE int
423is_proc (pointer p) 429is_proc (pointer p)
424{ 430{
425 return type (p) == T_PROC; 431 return type (p) == T_PROC;
426} 432}
427 433
428INTERFACE INLINE int 434INTERFACE int
429is_foreign (pointer p) 435is_foreign (pointer p)
430{ 436{
431 return type (p) == T_FOREIGN; 437 return type (p) == T_FOREIGN;
432} 438}
433 439
434INTERFACE INLINE char * 440INTERFACE char *
435syntaxname (pointer p) 441syntaxname (pointer p)
436{ 442{
437 return strvalue (car (p)); 443 return strvalue (p);
438} 444}
439 445
440#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
441static const char *procname (pointer x); 447static const char *procname (pointer x);
442 448
443INTERFACE INLINE int 449INTERFACE int
444is_closure (pointer p) 450is_closure (pointer p)
445{ 451{
446 return type (p) == T_CLOSURE; 452 return type (p) == T_CLOSURE;
447} 453}
448 454
449INTERFACE INLINE int 455INTERFACE int
450is_macro (pointer p) 456is_macro (pointer p)
451{ 457{
452 return type (p) == T_MACRO; 458 return type (p) == T_MACRO;
453} 459}
454 460
455INTERFACE INLINE pointer 461INTERFACE pointer
456closure_code (pointer p) 462closure_code (pointer p)
457{ 463{
458 return car (p); 464 return car (p);
459} 465}
460 466
461INTERFACE INLINE pointer 467INTERFACE pointer
462closure_env (pointer p) 468closure_env (pointer p)
463{ 469{
464 return cdr (p); 470 return cdr (p);
465} 471}
466 472
467INTERFACE INLINE int 473INTERFACE int
468is_continuation (pointer p) 474is_continuation (pointer p)
469{ 475{
470 return type (p) == T_CONTINUATION; 476 return type (p) == T_CONTINUATION;
471} 477}
472 478
473#define cont_dump(p) cdr (p) 479#define cont_dump(p) cdr (p)
474#define set_cont_dump(p,v) set_cdr ((p), (v)) 480#define set_cont_dump(p,v) set_cdr ((p), (v))
475 481
476/* To do: promise should be forced ONCE only */ 482/* To do: promise should be forced ONCE only */
477INTERFACE INLINE int 483INTERFACE int
478is_promise (pointer p) 484is_promise (pointer p)
479{ 485{
480 return type (p) == T_PROMISE; 486 return type (p) == T_PROMISE;
481} 487}
482 488
483INTERFACE INLINE int 489INTERFACE int
484is_environment (pointer p) 490is_environment (pointer p)
485{ 491{
486 return type (p) == T_ENVIRONMENT; 492 return type (p) == T_ENVIRONMENT;
487} 493}
488 494
489#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 495#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
490 496
491#define is_atom1(p) (TYPESET_ATOM & (1U << type (p)))
492#define is_atom(p) (typeflag (p) & T_ATOM) 497#define is_atom(p) (typeflag (p) & T_ATOM)
493#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 498#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
494#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 499#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
495 500
496#define is_mark(p) (typeflag (p) & T_MARK) 501#define is_mark(p) (typeflag (p) & T_MARK)
497#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
498#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
499 504
500#if 0
501static int
502is_atom(pointer p)
503{
504 if (!is_atom1(p) != !is_atom2(p))
505 printf ("atoms disagree %x\n", typeflag(p));
506
507 return is_atom2(p);
508}
509#endif
510
511INTERFACE INLINE int 505INTERFACE int
512is_immutable (pointer p) 506is_immutable (pointer p)
513{ 507{
514 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
515} 509}
516 510
517INTERFACE INLINE void 511INTERFACE void
518setimmutable (pointer p) 512setimmutable (pointer p)
519{ 513{
520#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
521 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
522#endif 516#endif
523} 517}
524 518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
571}
572
525#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
526static INLINE int 574ecb_inline int
527Cisalpha (int c) 575Cisalpha (int c)
528{ 576{
529 return isascii (c) && isalpha (c); 577 return isascii (c) && isalpha (c);
530} 578}
531 579
532static INLINE int 580ecb_inline int
533Cisdigit (int c) 581Cisdigit (int c)
534{ 582{
535 return isascii (c) && isdigit (c); 583 return isascii (c) && isdigit (c);
536} 584}
537 585
538static INLINE int 586ecb_inline int
539Cisspace (int c) 587Cisspace (int c)
540{ 588{
541 return isascii (c) && isspace (c); 589 return isascii (c) && isspace (c);
542} 590}
543 591
544static INLINE int 592ecb_inline int
545Cisupper (int c) 593Cisupper (int c)
546{ 594{
547 return isascii (c) && isupper (c); 595 return isascii (c) && isupper (c);
548} 596}
549 597
550static INLINE int 598ecb_inline int
551Cislower (int c) 599Cislower (int c)
552{ 600{
553 return isascii (c) && islower (c); 601 return isascii (c) && islower (c);
554} 602}
555#endif 603#endif
… …
616#endif 664#endif
617 665
618static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
619static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
620static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
621static INLINE int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
622static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
623static long binary_decode (const char *s);
624static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
625static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
626static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
627static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
628static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
629static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
644static void mark (pointer a); 691static void mark (pointer a);
645static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
646static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
647static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
648static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
649static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
650static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
651static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
652static int token (SCHEME_P); 699static int token (SCHEME_P);
653static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
654static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
655static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
656static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
660static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
661static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
662static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
663static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
664static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
665static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
713static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
666static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
667static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
668static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
669static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
670static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
671static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
672static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
673static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
674static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
675 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
676static num 751static num
677num_add (num a, num b) 752num_op (enum num_op op, num a, num b)
678{ 753{
679 num ret; 754 num ret;
680 755
681 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
682 757
683 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
684 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 759 {
760 switch (op)
761 {
762 case NUM_ADD: a.ivalue += b.ivalue; break;
763 case NUM_SUB: a.ivalue -= b.ivalue; break;
764 case NUM_MUL: a.ivalue *= b.ivalue; break;
765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
766 }
767
768 num_set_ivalue (ret, a.ivalue);
769 }
770#if USE_REAL
685 else 771 else
686 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 772 {
773 switch (op)
774 {
775 case NUM_ADD: a.rvalue += b.rvalue; break;
776 case NUM_SUB: a.rvalue -= b.rvalue; break;
777 case NUM_MUL: a.rvalue *= b.rvalue; break;
778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
779 }
687 780
688 return ret; 781 num_set_rvalue (ret, a.rvalue);
689} 782 }
690 783#endif
691static num
692num_mul (num a, num b)
693{
694 num ret;
695
696 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
697
698 if (num_is_fixnum (ret))
699 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
700 else
701 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
702 784
703 return ret; 785 return ret;
704} 786}
705 787
706static num 788static num
707num_div (num a, num b) 789num_div (num a, num b)
708{ 790{
709 num ret; 791 num ret;
710 792
711 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
712 794
713 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
714 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
715 else 797 else
716 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
717
718 return ret;
719}
720
721static num
722num_intdiv (num a, num b)
723{
724 num ret;
725
726 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
727
728 if (num_is_fixnum (ret))
729 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
730 else
731 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
732
733 return ret;
734}
735
736static num
737num_sub (num a, num b)
738{
739 num ret;
740
741 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
742
743 if (num_is_fixnum (ret))
744 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
745 else
746 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
747 799
748 return ret; 800 return ret;
749} 801}
750 802
751static num 803static num
… …
753{ 805{
754 num ret; 806 num ret;
755 long e1, e2, res; 807 long e1, e2, res;
756 808
757 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
758 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
759 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
760 res = e1 % e2; 812 res = e1 % e2;
761 813
762 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
763 if (res > 0) 815 if (res > 0)
764 { 816 {
… …
780{ 832{
781 num ret; 833 num ret;
782 long e1, e2, res; 834 long e1, e2, res;
783 835
784 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
785 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
786 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
787 res = e1 % e2; 839 res = e1 % e2;
788 840
789 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
790 if (res * e2 < 0) 842 if (res * e2 < 0)
791 res += e2; 843 res += e2;
792 844
793 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
794 return ret; 846 return ret;
795} 847}
796 848
849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
797static int 850static int
798num_eq (num a, num b) 851num_cmp (num a, num b)
799{ 852{
853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
800 int ret; 854 int ret;
801 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
802 855
803 if (is_fixnum) 856 if (is_fixnum)
804 ret = num_get_ivalue (a) == num_get_ivalue (b); 857 {
858 IVALUE av = num_ivalue (a);
859 IVALUE bv = num_ivalue (b);
860
861 ret = av == bv ? 0 : av < bv ? -1 : +1;
862 }
805 else 863 else
806 ret = num_get_rvalue (a) == num_get_rvalue (b); 864 {
865 RVALUE av = num_rvalue (a);
866 RVALUE bv = num_rvalue (b);
867
868 ret = av == bv ? 0 : av < bv ? -1 : +1;
869 }
807 870
808 return ret; 871 return ret;
809} 872}
810
811
812static int
813num_gt (num a, num b)
814{
815 int ret;
816 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
817
818 if (is_fixnum)
819 ret = num_get_ivalue (a) > num_get_ivalue (b);
820 else
821 ret = num_get_rvalue (a) > num_get_rvalue (b);
822
823 return ret;
824}
825
826static int
827num_ge (num a, num b)
828{
829 return !num_lt (a, b);
830}
831
832static int
833num_lt (num a, num b)
834{
835 int ret;
836 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
837
838 if (is_fixnum)
839 ret = num_get_ivalue (a) < num_get_ivalue (b);
840 else
841 ret = num_get_rvalue (a) < num_get_rvalue (b);
842
843 return ret;
844}
845
846static int
847num_le (num a, num b)
848{
849 return !num_gt (a, b);
850}
851
852#if USE_MATH
853
854/* Round to nearest. Round to even if midway */
855static double
856round_per_R5RS (double x)
857{
858 double fl = floor (x);
859 double ce = ceil (x);
860 double dfl = x - fl;
861 double dce = ce - x;
862
863 if (dfl > dce)
864 return ce;
865 else if (dfl < dce)
866 return fl;
867 else
868 {
869 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */
870 return fl;
871 else
872 return ce;
873 }
874}
875#endif
876 873
877static int 874static int
878is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
879{ 876{
880#if USE_FLOAT 877 return x == 0;
878#if 0
879#if USE_REAL
881 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 880 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
882#else 881#else
883 return x == 0; 882 return x == 0;
884#endif 883#endif
885} 884#endif
886
887static long
888binary_decode (const char *s)
889{
890 long x = 0;
891
892 while (*s != 0 && (*s == '1' || *s == '0'))
893 {
894 x <<= 1;
895 x += *s - '0';
896 s++;
897 }
898
899 return x;
900} 885}
901 886
902/* allocate new cell segment */ 887/* allocate new cell segment */
903static int 888static int
904alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
905{ 890{
906 pointer newp; 891 struct cell *newp;
907 pointer last; 892 struct cell *last;
908 pointer p; 893 struct cell *p;
909 char *cp; 894 char *cp;
910 long i; 895 long i;
911 int k; 896 int k;
912 897
913 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
914 segsize <<= 1; 899 segsize <<= 1;
915 900
916 for (k = 0; k < n; k++)
917 {
918 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
919 return k;
920
921 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
922 902
923 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
924 return k; 904 return k;
925 905
926 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
927 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
928 908
929 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
930 newp = (pointer)cp;
931 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
932 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
933
934 //TODO: insert, not swap
935 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
936 {
937 p = SCHEME_V->cell_seg[i];
938 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
939 SCHEME_V->cell_seg[i - 1] = p;
940
941 k = SCHEME_V->cell_segsize[i];
942 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
943 SCHEME_V->cell_segsize[i - 1] = k;
944
945 --i;
946 }
947
948 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
949 last = newp + segsize - 1; 913 last = newp + segsize - 1;
950 914
951 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
952 { 916 {
917 pointer cp = POINTER (p);
953 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
954 set_car (p, NIL); 919 set_car (cp, NIL);
955 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
956 } 921 }
957 922
958 /* insert new cells in address order on free list */
959 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
960 {
961 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
962 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
963 }
964 else
965 {
966 p = SCHEME_V->free_cell;
967 925
968 while (cdr (p) != NIL && newp > cdr (p))
969 p = cdr (p);
970
971 set_cdr (last, cdr (p));
972 set_cdr (p, newp);
973 }
974 }
975
976 return n; 926 return 1;
977} 927}
978 928
979/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
980static INLINE pointer 930ecb_inline pointer
981get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
982{ 932{
983 if (SCHEME_V->free_cell == NIL) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
984 { 934 {
985 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
986 return S_SINK; 936 return S_SINK;
987 937
988 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
989 { 939 {
990 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
991 941
992 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
993 943
994 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
995 { 945 {
996 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
997 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
998 { 948 {
999#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
1000 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
1001 return S_SINK; 951 return S_SINK;
1002#endif 952#endif
… …
1014 } 964 }
1015} 965}
1016 966
1017/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1018 Tehom */ 968 Tehom */
1019
1020static void 969static void
1021push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1022{ 971{
1023 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1024 973
… …
1046} 995}
1047 996
1048static pointer 997static pointer
1049get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1050{ 999{
1051 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1052 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1053 1002
1054 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1055 return S_SINK; 1004 return S_SINK;
1056 1005
1057 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1058 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1059 1008
1060 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1061 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1062 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1063 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1064 1013
1065 return v; 1014 return v;
1066} 1015}
1067 1016
1068static INLINE void 1017ecb_inline void
1069ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1070{ 1019{
1071 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1072} 1021}
1073 1022
… …
1075static void 1024static void
1076check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1077{ 1026{
1078 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1079 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1080 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1081 1030
1082 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1083 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1084} 1033}
1085 1034
1086static void 1035static void
1087check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1088{ 1037{
… …
1110 set_cdr (x, b); 1059 set_cdr (x, b);
1111 1060
1112 return x; 1061 return x;
1113} 1062}
1114 1063
1064static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1115/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1116 1074
1117#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1118 1076
1077static int
1119static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1120 1088
1121static pointer 1089static pointer
1122oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1123{ 1091{
1124 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1126 1094
1127/* returns the new symbol */ 1095/* returns the new symbol */
1128static pointer 1096static pointer
1129oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1130{ 1098{
1131 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1132
1133 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1134 set_typeflag (x, T_SYMBOL);
1135 setimmutable (car (x));
1136
1137 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1138 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1139 return x; 1102 return x;
1140} 1103}
1141 1104
1142static INLINE pointer 1105ecb_inline pointer
1143oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1144{ 1107{
1145 int location; 1108 int location;
1146 pointer x; 1109 pointer x;
1147 char *s; 1110 char *s;
1148 1111
1149 location = hash_fn (name, vector_length (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1150 1113
1151 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1152 { 1115 {
1153 s = symname (car (x)); 1116 s = symname (car (x));
1154 1117
1155 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1156 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1165{ 1128{
1166 int i; 1129 int i;
1167 pointer x; 1130 pointer x;
1168 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1169 1132
1170 for (i = 0; i < vector_length (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1171 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1172 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1173 1136
1174 return ob_list; 1137 return ob_list;
1175} 1138}
1176 1139
… …
1180oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1181{ 1144{
1182 return NIL; 1145 return NIL;
1183} 1146}
1184 1147
1185static INLINE pointer 1148ecb_inline pointer
1186oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1187{ 1150{
1188 pointer x; 1151 pointer x;
1189 char *s; 1152 char *s;
1190 1153
… …
1202 1165
1203/* returns the new symbol */ 1166/* returns the new symbol */
1204static pointer 1167static pointer
1205oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1206{ 1169{
1207 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1208
1209 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1210 set_typeflag (x, T_SYMBOL);
1211 setimmutable (car (x));
1212 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1213 return x; 1172 return x;
1214} 1173}
1215 1174
1216static pointer 1175static pointer
… …
1226mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1227{ 1186{
1228 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1229 1188
1230 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1231 x->object.port = p; 1190 set_port (x, p);
1232 1191
1233 return x; 1192 return x;
1234} 1193}
1235#endif 1194#endif
1236 1195
1237pointer 1196pointer
1238mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1239{ 1198{
1240 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1241 1200
1242 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1243 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1244 1203
1245 return x; 1204 return x;
1246} 1205}
1247 1206
1248INTERFACE pointer 1207INTERFACE pointer
1249mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1250{ 1209{
1251 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1252 1211
1253 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1254 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1255 set_num_integer (x); 1214
1256 return x; 1215 return x;
1257} 1216}
1258 1217
1259/* get number atom (integer) */ 1218/* get number atom (integer) */
1260INTERFACE pointer 1219INTERFACE pointer
1261mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1262{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1263 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1264 1233
1265 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1266 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1267 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1268 return x; 1241 return *pp;
1269} 1242}
1270 1243
1271INTERFACE pointer 1244INTERFACE pointer
1272mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1273{ 1246{
1247#if USE_REAL
1274 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1275 1249
1276 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1277 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1278 set_num_real (x); 1252
1279 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1280} 1257}
1281 1258
1282static pointer 1259static pointer
1283mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1284{ 1261{
1262#if USE_REAL
1285 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1286 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1287 else 1268#endif
1288 return mk_real (SCHEME_A_ num_get_rvalue (n));
1289} 1269}
1290 1270
1291/* allocate name to string area */ 1271/* allocate name to string area */
1292static char * 1272static char *
1293store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1299 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1300 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1301 } 1281 }
1302 1282
1303 if (str) 1283 if (str)
1304 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1305 int l = strlen (str);
1306
1307 if (l > len_str)
1308 l = len_str;
1309
1310 memcpy (q, str, l);
1311 q[l] = 0;
1312 }
1313 else 1285 else
1314 {
1315 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1316 q[len_str] = 0; 1288 q[len_str] = 0;
1317 }
1318 1289
1319 return q; 1290 return q;
1320}
1321
1322/* get new string */
1323INTERFACE pointer
1324mk_string (SCHEME_P_ const char *str)
1325{
1326 return mk_counted_string (SCHEME_A_ str, strlen (str));
1327}
1328
1329INTERFACE pointer
1330mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1331{
1332 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1333
1334 set_typeflag (x, T_STRING | T_ATOM);
1335 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1336 strlength (x) = len;
1337 return x;
1338} 1291}
1339 1292
1340INTERFACE pointer 1293INTERFACE pointer
1341mk_empty_string (SCHEME_P_ uint32_t len, char fill) 1294mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1342{ 1295{
… …
1347 strlength (x) = len; 1300 strlength (x) = len;
1348 return x; 1301 return x;
1349} 1302}
1350 1303
1351INTERFACE pointer 1304INTERFACE pointer
1305mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1306{
1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1308
1309 set_typeflag (x, T_STRING | T_ATOM);
1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1311 strlength (x) = len;
1312
1313 return x;
1314}
1315
1316INTERFACE pointer
1317mk_string (SCHEME_P_ const char *str)
1318{
1319 return mk_counted_string (SCHEME_A_ str, strlen (str));
1320}
1321
1322INTERFACE pointer
1352mk_vector (SCHEME_P_ uint32_t len) 1323mk_vector (SCHEME_P_ uint32_t len)
1353{ 1324{
1354 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1355} 1326}
1356 1327
1357INTERFACE void 1328INTERFACE void
1358fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1359{ 1330{
1360 int i; 1331 int i;
1361 1332
1362 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1363 vec->object.vector.vvalue[i] = obj; 1334 vecvalue (vec)[i] = obj;
1335}
1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1364} 1344}
1365 1345
1366INTERFACE pointer 1346INTERFACE pointer
1367vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1368{ 1348{
1369 return vec->object.vector.vvalue[ielem]; 1349 return vecvalue(vec)[ielem];
1370} 1350}
1371 1351
1372INTERFACE void 1352INTERFACE void
1373set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1374{ 1354{
1375 vec->object.vector.vvalue[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1376} 1356}
1377 1357
1378/* get new symbol */ 1358/* get new symbol */
1379INTERFACE pointer 1359INTERFACE pointer
1380mk_symbol (SCHEME_P_ const char *name) 1360mk_symbol (SCHEME_P_ const char *name)
… …
1390 1370
1391INTERFACE pointer 1371INTERFACE pointer
1392gensym (SCHEME_P) 1372gensym (SCHEME_P)
1393{ 1373{
1394 pointer x; 1374 pointer x;
1395 char name[40]; 1375 char name[40] = "gensym-";
1396
1397 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1398 {
1399 strcpy (name, "gensym-");
1400 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1401 1377
1402 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1403 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1404 1380
1405 if (x != NIL) 1381static int
1406 continue; 1382is_gensym (SCHEME_P_ pointer x)
1407 else 1383{
1408 { 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1409 x = oblist_add_by_name (SCHEME_A_ name);
1410 return x;
1411 }
1412 }
1413
1414 return NIL;
1415} 1385}
1416 1386
1417/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1418static pointer 1388static pointer
1419mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
… …
1421 char c, *p; 1391 char c, *p;
1422 int has_dec_point = 0; 1392 int has_dec_point = 0;
1423 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
1424 1394
1425#if USE_COLON_HOOK 1395#if USE_COLON_HOOK
1426
1427 if ((p = strstr (q, "::")) != 0) 1396 if ((p = strstr (q, "::")) != 0)
1428 { 1397 {
1429 *p = 0; 1398 *p = 0;
1430 return cons (SCHEME_V->COLON_HOOK, 1399 return cons (SCHEME_V->COLON_HOOK,
1431 cons (cons (SCHEME_V->QUOTE, 1400 cons (cons (SCHEME_V->QUOTE,
1432 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL))); 1401 cons (mk_atom (SCHEME_A_ p + 2), NIL)), cons (mk_symbol (SCHEME_A_ strlwr (q)), NIL)));
1433 } 1402 }
1434
1435#endif 1403#endif
1436 1404
1437 p = q; 1405 p = q;
1438 c = *p++; 1406 c = *p++;
1439 1407
… …
1475 } 1443 }
1476 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1477 { 1445 {
1478 if (!has_fp_exp) 1446 if (!has_fp_exp)
1479 { 1447 {
1480 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1481 from now on */
1482 p++; 1449 p++;
1483 1450
1484 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1485 continue; 1452 continue;
1486 } 1453 }
… …
1488 1455
1489 return mk_symbol (SCHEME_A_ strlwr (q)); 1456 return mk_symbol (SCHEME_A_ strlwr (q));
1490 } 1457 }
1491 } 1458 }
1492 1459
1493#if USE_FLOAT 1460#if USE_REAL
1494 if (has_dec_point) 1461 if (has_dec_point)
1495 return mk_real (SCHEME_A_ atof (q)); 1462 return mk_real (SCHEME_A_ atof (q));
1496#endif 1463#endif
1497 1464
1498 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1500 1467
1501/* make constant */ 1468/* make constant */
1502static pointer 1469static pointer
1503mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1504{ 1471{
1505 long x;
1506 char tmp[STRBUFFSIZE];
1507
1508 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1509 return S_T; 1473 return S_T;
1510 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1511 return S_F; 1475 return S_F;
1512 else if (*name == 'o') /* #o (octal) */
1513 {
1514 x = strtol (name + 1, 0, 8);
1515 return mk_integer (SCHEME_A_ x);
1516 }
1517 else if (*name == 'd') /* #d (decimal) */
1518 {
1519 x = strtol (name + 1, 0, 10);
1520 return mk_integer (SCHEME_A_ x);
1521 }
1522 else if (*name == 'x') /* #x (hex) */
1523 {
1524 x = strtol (name + 1, 0, 16);
1525 return mk_integer (SCHEME_A_ x);
1526 }
1527 else if (*name == 'b') /* #b (binary) */
1528 {
1529 x = binary_decode (name + 1);
1530 return mk_integer (SCHEME_A_ x);
1531 }
1532 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1533 { 1477 {
1534 int c = 0; 1478 int c;
1535 1479
1536 if (stricmp (name + 1, "space") == 0) 1480 if (stricmp (name + 1, "space") == 0)
1537 c = ' '; 1481 c = ' ';
1538 else if (stricmp (name + 1, "newline") == 0) 1482 else if (stricmp (name + 1, "newline") == 0)
1539 c = '\n'; 1483 c = '\n';
… …
1541 c = '\r'; 1485 c = '\r';
1542 else if (stricmp (name + 1, "tab") == 0) 1486 else if (stricmp (name + 1, "tab") == 0)
1543 c = '\t'; 1487 c = '\t';
1544 else if (name[1] == 'x' && name[2] != 0) 1488 else if (name[1] == 'x' && name[2] != 0)
1545 { 1489 {
1546 int c1 = strtol (name + 2, 0, 16); 1490 long c1 = strtol (name + 2, 0, 16);
1547 1491
1548 if (c1 <= UCHAR_MAX) 1492 if (0 <= c1 && c1 <= UCHAR_MAX)
1549 c = c1; 1493 c = c1;
1550 else 1494 else
1551 return NIL; 1495 return NIL;
1552 1496 }
1553#if USE_ASCII_NAMES 1497#if USE_ASCII_NAMES
1554 }
1555 else if (is_ascii_name (name + 1, &c)) 1498 else if (is_ascii_name (name + 1, &c))
1556 {
1557 /* nothing */ 1499 /* nothing */;
1558#endif 1500#endif
1559 }
1560 else if (name[2] == 0) 1501 else if (name[2] == 0)
1561 c = name[1]; 1502 c = name[1];
1562 else 1503 else
1563 return NIL; 1504 return NIL;
1564 1505
1565 return mk_character (SCHEME_A_ c); 1506 return mk_character (SCHEME_A_ c);
1566 } 1507 }
1567 else 1508 else
1509 {
1510 /* identify base by string index */
1511 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x";
1512 char *base = strchr (baseidx, *name);
1513
1514 if (base)
1515 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1516
1568 return NIL; 1517 return NIL;
1518 }
1569} 1519}
1570 1520
1571/* ========== garbage collector ========== */ 1521/* ========== garbage collector ========== */
1572 1522
1573/*-- 1523/*--
1574 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1575 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1576 * for marking. 1526 * for marking.
1527 *
1528 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector
1577 */ 1531 */
1578static void 1532static void
1579mark (pointer a) 1533mark (pointer a)
1580{ 1534{
1581 pointer t, q, p; 1535 pointer t, q, p;
… …
1583 t = 0; 1537 t = 0;
1584 p = a; 1538 p = a;
1585E2: 1539E2:
1586 setmark (p); 1540 setmark (p);
1587 1541
1588 if (is_vector (p)) 1542 if (ecb_expect_false (is_vector (p)))
1589 { 1543 {
1590 int i; 1544 int i;
1591 1545
1592 for (i = 0; i < p->object.vector.length; i++) 1546 for (i = 0; i < veclength (p); i++)
1593 mark (p->object.vector.vvalue[i]); 1547 mark (vecvalue (p)[i]);
1594 } 1548 }
1595 1549
1596 if (is_atom (p)) 1550 if (is_atom (p))
1597 goto E6; 1551 goto E6;
1598 1552
… …
1644 1598
1645/* garbage collection. parameter a, b is marked. */ 1599/* garbage collection. parameter a, b is marked. */
1646static void 1600static void
1647gc (SCHEME_P_ pointer a, pointer b) 1601gc (SCHEME_P_ pointer a, pointer b)
1648{ 1602{
1649 pointer p;
1650 int i; 1603 int i;
1651 1604
1652 if (SCHEME_V->gc_verbose) 1605 if (SCHEME_V->gc_verbose)
1653 putstr (SCHEME_A_ "gc..."); 1606 putstr (SCHEME_A_ "gc...");
1654 1607
… …
1670 /* Mark recent objects the interpreter doesn't know about yet. */ 1623 /* Mark recent objects the interpreter doesn't know about yet. */
1671 mark (car (S_SINK)); 1624 mark (car (S_SINK));
1672 /* Mark any older stuff above nested C calls */ 1625 /* Mark any older stuff above nested C calls */
1673 mark (SCHEME_V->c_nest); 1626 mark (SCHEME_V->c_nest);
1674 1627
1628#if USE_INTCACHE
1629 /* mark intcache */
1630 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1631 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1632 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1633#endif
1634
1675 /* mark variables a, b */ 1635 /* mark variables a, b */
1676 mark (a); 1636 mark (a);
1677 mark (b); 1637 mark (b);
1678 1638
1679 /* garbage collect */ 1639 /* garbage collect */
1680 clrmark (NIL); 1640 clrmark (NIL);
1681 SCHEME_V->fcells = 0; 1641 SCHEME_V->fcells = 0;
1682 SCHEME_V->free_cell = NIL; 1642 SCHEME_V->free_cell = NIL;
1683 1643
1684 /* free-list is kept sorted by address so as to maintain consecutive 1644 if (SCHEME_V->gc_verbose)
1685 ranges, if possible, for use with vectors. Here we scan the cells 1645 putstr (SCHEME_A_ "freeing...");
1686 (which are also kept sorted by address) downwards to build the 1646
1687 free-list in sorted order. 1647 uint32_t total = 0;
1688 */ 1648
1649 /* Here we scan the cells to build the free-list. */
1689 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1690 { 1651 {
1691 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1652 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1653 struct cell *p;
1654 total += SCHEME_V->cell_segsize [i];
1692 1655
1693 while (--p >= SCHEME_V->cell_seg[i]) 1656 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1694 { 1657 {
1658 pointer c = POINTER (p);
1659
1695 if (is_mark (p)) 1660 if (is_mark (c))
1696 clrmark (p); 1661 clrmark (c);
1697 else 1662 else
1698 { 1663 {
1699 /* reclaim cell */ 1664 /* reclaim cell */
1700 if (typeflag (p) != T_FREE) 1665 if (typeflag (c) != T_PAIR)
1701 { 1666 {
1702 finalize_cell (SCHEME_A_ p); 1667 finalize_cell (SCHEME_A_ c);
1703 set_typeflag (p, T_FREE); 1668 set_typeflag (c, T_PAIR);
1704 set_car (p, NIL); 1669 set_car (c, NIL);
1705 } 1670 }
1706 1671
1707 ++SCHEME_V->fcells; 1672 ++SCHEME_V->fcells;
1708 set_cdr (p, SCHEME_V->free_cell); 1673 set_cdr (c, SCHEME_V->free_cell);
1709 SCHEME_V->free_cell = p; 1674 SCHEME_V->free_cell = c;
1710 } 1675 }
1711 } 1676 }
1712 } 1677 }
1713 1678
1714 if (SCHEME_V->gc_verbose) 1679 if (SCHEME_V->gc_verbose)
1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1680 {
1681 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1682 }
1716} 1683}
1717 1684
1718static void 1685static void
1719finalize_cell (SCHEME_P_ pointer a) 1686finalize_cell (SCHEME_P_ pointer a)
1720{ 1687{
1721 if (is_string (a)) 1688 /* TODO, fast bitmap check? */
1689 if (is_string (a) || is_symbol (a))
1722 free (strvalue (a)); 1690 free (strvalue (a));
1723 else if (is_vector (a)) 1691 else if (is_vector (a))
1724 free (a->object.vector.vvalue); 1692 free (vecvalue (a));
1725#if USE_PORTS 1693#if USE_PORTS
1726 else if (is_port (a)) 1694 else if (is_port (a))
1727 { 1695 {
1728 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1696 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1729 port_close (SCHEME_A_ a, port_input | port_output); 1697 port_close (SCHEME_A_ a, port_input | port_output);
1730 1698
1731 free (a->object.port); 1699 free (port (a));
1732 } 1700 }
1733#endif 1701#endif
1734} 1702}
1735 1703
1736/* ========== Routines for Reading ========== */ 1704/* ========== Routines for Reading ========== */
… …
1752 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1720 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1753 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1721 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1754 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1722 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1755 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1723 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1756 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1724 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1725 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 1726
1759#if SHOW_ERROR_LINE 1727#if SHOW_ERROR_LINE
1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1761 1729
1762 if (fname) 1730 if (fname)
… …
1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1747 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1780#if USE_PORTS 1748#if USE_PORTS
1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1749 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1782#endif 1750#endif
1783 SCHEME_V->file_i--; 1751 SCHEME_V->file_i--;
1784 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1752 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1785 } 1753 }
1786} 1754}
1787 1755
1788static int 1756static int
1789file_interactive (SCHEME_P) 1757file_interactive (SCHEME_P)
1790{ 1758{
1791#if USE_PORTS 1759#if USE_PORTS
1792 return SCHEME_V->file_i == 0 1760 return SCHEME_V->file_i == 0
1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1761 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1794 && (SCHEME_V->inport->object.port->kind & port_file); 1762 && (port (SCHEME_V->inport)->kind & port_file);
1795#else 1763#else
1796 return 0; 1764 return 0;
1797#endif 1765#endif
1798} 1766}
1799 1767
… …
1933} 1901}
1934 1902
1935static void 1903static void
1936port_close (SCHEME_P_ pointer p, int flag) 1904port_close (SCHEME_P_ pointer p, int flag)
1937{ 1905{
1938 port *pt = p->object.port; 1906 port *pt = port (p);
1939 1907
1940 pt->kind &= ~flag; 1908 pt->kind &= ~flag;
1941 1909
1942 if ((pt->kind & (port_input | port_output)) == 0) 1910 if ((pt->kind & (port_input | port_output)) == 0)
1943 { 1911 {
… …
1964/* get new character from input file */ 1932/* get new character from input file */
1965static int 1933static int
1966inchar (SCHEME_P) 1934inchar (SCHEME_P)
1967{ 1935{
1968 int c; 1936 int c;
1969 port *pt; 1937 port *pt = port (SCHEME_V->inport);
1970
1971 pt = SCHEME_V->inport->object.port;
1972 1938
1973 if (pt->kind & port_saw_EOF) 1939 if (pt->kind & port_saw_EOF)
1974 return EOF; 1940 return EOF;
1975 1941
1976 c = basic_inchar (pt); 1942 c = basic_inchar (pt);
… …
2043 port *pt; 2009 port *pt;
2044 2010
2045 if (c == EOF) 2011 if (c == EOF)
2046 return; 2012 return;
2047 2013
2048 pt = SCHEME_V->inport->object.port; 2014 pt = port (SCHEME_V->inport);
2049 pt->unget = c; 2015 pt->unget = c;
2050#else 2016#else
2051 if (c == EOF) 2017 if (c == EOF)
2052 return; 2018 return;
2053 2019
… …
2081 2047
2082INTERFACE void 2048INTERFACE void
2083putstr (SCHEME_P_ const char *s) 2049putstr (SCHEME_P_ const char *s)
2084{ 2050{
2085#if USE_PORTS 2051#if USE_PORTS
2086 port *pt = SCHEME_V->outport->object.port; 2052 port *pt = port (SCHEME_V->outport);
2087 2053
2088 if (pt->kind & port_file) 2054 if (pt->kind & port_file)
2089 write (pt->rep.stdio.file, s, strlen (s)); 2055 write (pt->rep.stdio.file, s, strlen (s));
2090 else 2056 else
2091 for (; *s; s++) 2057 for (; *s; s++)
… …
2093 *pt->rep.string.curr++ = *s; 2059 *pt->rep.string.curr++ = *s;
2094 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2060 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2095 *pt->rep.string.curr++ = *s; 2061 *pt->rep.string.curr++ = *s;
2096 2062
2097#else 2063#else
2098 xwrstr (s); 2064 write (pt->rep.stdio.file, s, strlen (s));
2099#endif 2065#endif
2100} 2066}
2101 2067
2102static void 2068static void
2103putchars (SCHEME_P_ const char *s, int len) 2069putchars (SCHEME_P_ const char *s, int len)
2104{ 2070{
2105#if USE_PORTS 2071#if USE_PORTS
2106 port *pt = SCHEME_V->outport->object.port; 2072 port *pt = port (SCHEME_V->outport);
2107 2073
2108 if (pt->kind & port_file) 2074 if (pt->kind & port_file)
2109 write (pt->rep.stdio.file, s, len); 2075 write (pt->rep.stdio.file, s, len);
2110 else 2076 else
2111 { 2077 {
… …
2125 2091
2126INTERFACE void 2092INTERFACE void
2127putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2128{ 2094{
2129#if USE_PORTS 2095#if USE_PORTS
2130 port *pt = SCHEME_V->outport->object.port; 2096 port *pt = port (SCHEME_V->outport);
2131 2097
2132 if (pt->kind & port_file) 2098 if (pt->kind & port_file)
2133 { 2099 {
2134 char cc = c; 2100 char cc = c;
2135 write (pt->rep.stdio.file, &cc, 1); 2101 write (pt->rep.stdio.file, &cc, 1);
… …
2148#endif 2114#endif
2149} 2115}
2150 2116
2151/* read characters up to delimiter, but cater to character constants */ 2117/* read characters up to delimiter, but cater to character constants */
2152static char * 2118static char *
2153readstr_upto (SCHEME_P_ char *delim) 2119readstr_upto (SCHEME_P_ int skip, const char *delim)
2154{ 2120{
2155 char *p = SCHEME_V->strbuff; 2121 char *p = SCHEME_V->strbuff + skip;
2156 2122
2157 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2123 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2158 2124
2159 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2125 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2160 *p = 0; 2126 *p = 0;
… …
2167 return SCHEME_V->strbuff; 2133 return SCHEME_V->strbuff;
2168} 2134}
2169 2135
2170/* read string expression "xxx...xxx" */ 2136/* read string expression "xxx...xxx" */
2171static pointer 2137static pointer
2172readstrexp (SCHEME_P) 2138readstrexp (SCHEME_P_ char delim)
2173{ 2139{
2174 char *p = SCHEME_V->strbuff; 2140 char *p = SCHEME_V->strbuff;
2175 int c; 2141 int c;
2176 int c1 = 0; 2142 int c1 = 0;
2177 enum
2178 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2143 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2179 2144
2180 for (;;) 2145 for (;;)
2181 { 2146 {
2182 c = inchar (SCHEME_A); 2147 c = inchar (SCHEME_A);
2183 2148
… …
2185 return S_F; 2150 return S_F;
2186 2151
2187 switch (state) 2152 switch (state)
2188 { 2153 {
2189 case st_ok: 2154 case st_ok:
2190 switch (c) 2155 if (ecb_expect_false (c == delim))
2191 {
2192 case '\\':
2193 state = st_bsl;
2194 break;
2195
2196 case '"':
2197 *p = 0;
2198 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2156 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2199 2157
2200 default: 2158 if (ecb_expect_false (c == '\\'))
2159 state = st_bsl;
2160 else
2201 *p++ = c; 2161 *p++ = c;
2202 break;
2203 }
2204 2162
2205 break; 2163 break;
2206 2164
2207 case st_bsl: 2165 case st_bsl:
2208 switch (c) 2166 switch (c)
… …
2238 case 'r': 2196 case 'r':
2239 *p++ = '\r'; 2197 *p++ = '\r';
2240 state = st_ok; 2198 state = st_ok;
2241 break; 2199 break;
2242 2200
2243 case '"':
2244 *p++ = '"';
2245 state = st_ok;
2246 break;
2247
2248 default: 2201 default:
2249 *p++ = c; 2202 *p++ = c;
2250 state = st_ok; 2203 state = st_ok;
2251 break; 2204 break;
2252 } 2205 }
2253 2206
2254 break; 2207 break;
2255 2208
2256 case st_x1: 2209 case st_x1:
2257 case st_x2: 2210 case st_x2:
2258 c = toupper (c); 2211 c = tolower (c);
2259 2212
2260 if (c >= '0' && c <= 'F') 2213 if (c >= '0' && c <= '9')
2261 {
2262 if (c <= '9')
2263 c1 = (c1 << 4) + c - '0'; 2214 c1 = (c1 << 4) + c - '0';
2264 else 2215 else if (c >= 'a' && c <= 'f')
2265 c1 = (c1 << 4) + c - 'A' + 10; 2216 c1 = (c1 << 4) + c - 'a' + 10;
2266
2267 if (state == st_x1)
2268 state = st_x2;
2269 else
2270 {
2271 *p++ = c1;
2272 state = st_ok;
2273 }
2274 }
2275 else 2217 else
2276 return S_F; 2218 return S_F;
2219
2220 if (state == st_x1)
2221 state = st_x2;
2222 else
2223 {
2224 *p++ = c1;
2225 state = st_ok;
2226 }
2277 2227
2278 break; 2228 break;
2279 2229
2280 case st_oct1: 2230 case st_oct1:
2281 case st_oct2: 2231 case st_oct2:
… …
2285 backchar (SCHEME_A_ c); 2235 backchar (SCHEME_A_ c);
2286 state = st_ok; 2236 state = st_ok;
2287 } 2237 }
2288 else 2238 else
2289 { 2239 {
2290 if (state == st_oct2 && c1 >= 32) 2240 if (state == st_oct2 && c1 >= ' ')
2291 return S_F; 2241 return S_F;
2292 2242
2293 c1 = (c1 << 3) + (c - '0'); 2243 c1 = (c1 << 3) + (c - '0');
2294 2244
2295 if (state == st_oct1) 2245 if (state == st_oct1)
… …
2300 state = st_ok; 2250 state = st_ok;
2301 } 2251 }
2302 } 2252 }
2303 2253
2304 break; 2254 break;
2305
2306 } 2255 }
2307 } 2256 }
2308} 2257}
2309 2258
2310/* check c is in chars */ 2259/* check c is in chars */
2311static INLINE int 2260ecb_inline int
2312is_one_of (char *s, int c) 2261is_one_of (const char *s, int c)
2313{ 2262{
2314 if (c == EOF)
2315 return 1;
2316
2317 return !!strchr (s, c); 2263 return c == EOF || !!strchr (s, c);
2318} 2264}
2319 2265
2320/* skip white characters */ 2266/* skip white characters */
2321static INLINE int 2267ecb_inline int
2322skipspace (SCHEME_P) 2268skipspace (SCHEME_P)
2323{ 2269{
2324 int c, curr_line = 0; 2270 int c, curr_line = 0;
2325 2271
2326 do 2272 do
2327 { 2273 {
2328 c = inchar (SCHEME_A); 2274 c = inchar (SCHEME_A);
2275
2329#if SHOW_ERROR_LINE 2276#if SHOW_ERROR_LINE
2330 if (c == '\n') 2277 if (ecb_expect_false (c == '\n'))
2331 curr_line++; 2278 curr_line++;
2332#endif 2279#endif
2280
2281 if (ecb_expect_false (c == EOF))
2282 return c;
2333 } 2283 }
2334 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2284 while (is_one_of (WHITESPACE, c));
2335 2285
2336 /* record it */ 2286 /* record it */
2337#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2338 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2288 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2339 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2289 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2340#endif 2290#endif
2341 2291
2342 if (c != EOF)
2343 {
2344 backchar (SCHEME_A_ c); 2292 backchar (SCHEME_A_ c);
2345 return 1; 2293 return 1;
2346 }
2347 else
2348 return EOF;
2349} 2294}
2350 2295
2351/* get token */ 2296/* get token */
2352static int 2297static int
2353token (SCHEME_P) 2298token (SCHEME_P)
… …
2369 return TOK_RPAREN; 2314 return TOK_RPAREN;
2370 2315
2371 case '.': 2316 case '.':
2372 c = inchar (SCHEME_A); 2317 c = inchar (SCHEME_A);
2373 2318
2374 if (is_one_of (" \n\t", c)) 2319 if (is_one_of (WHITESPACE, c))
2375 return TOK_DOT; 2320 return TOK_DOT;
2376 else 2321 else
2377 { 2322 {
2378 //TODO: ungetc twice in a row is not supported in C
2379 backchar (SCHEME_A_ c); 2323 backchar (SCHEME_A_ c);
2380 backchar (SCHEME_A_ '.');
2381 return TOK_ATOM; 2324 return TOK_DOTATOM;
2382 } 2325 }
2326
2327 case '|':
2328 return TOK_STRATOM;
2383 2329
2384 case '\'': 2330 case '\'':
2385 return TOK_QUOTE; 2331 return TOK_QUOTE;
2386 2332
2387 case ';': 2333 case ';':
… …
2519 } 2465 }
2520 2466
2521 putcharacter (SCHEME_A_ '"'); 2467 putcharacter (SCHEME_A_ '"');
2522} 2468}
2523 2469
2524
2525/* print atoms */ 2470/* print atoms */
2526static void 2471static void
2527printatom (SCHEME_P_ pointer l, int f) 2472printatom (SCHEME_P_ pointer l, int f)
2528{ 2473{
2529 char *p; 2474 char *p;
2530 int len; 2475 int len;
2531 2476
2532 atom2str (SCHEME_A_ l, f, &p, &len); 2477 atom2str (SCHEME_A_ l, f, &p, &len);
2533 putchars (SCHEME_A_ p, len); 2478 putchars (SCHEME_A_ p, len);
2534} 2479}
2535
2536 2480
2537/* Uses internal buffer unless string pointer is already available */ 2481/* Uses internal buffer unless string pointer is already available */
2538static void 2482static void
2539atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2483atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2540{ 2484{
… …
2554 { 2498 {
2555 p = SCHEME_V->strbuff; 2499 p = SCHEME_V->strbuff;
2556 2500
2557 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2501 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2558 { 2502 {
2559 if (num_is_integer (l)) 2503 if (is_integer (l))
2560 xnum (p, ivalue_unchecked (l)); 2504 xnum (p, ivalue_unchecked (l));
2561#if USE_FLOAT 2505#if USE_REAL
2562 else 2506 else
2563 { 2507 {
2564 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2508 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2565 /* r5rs says there must be a '.' (unless 'e'?) */ 2509 /* r5rs says there must be a '.' (unless 'e'?) */
2566 f = strcspn (p, ".e"); 2510 f = strcspn (p, ".e");
… …
2701#endif 2645#endif
2702 } 2646 }
2703 else if (is_continuation (l)) 2647 else if (is_continuation (l))
2704 p = "#<CONTINUATION>"; 2648 p = "#<CONTINUATION>";
2705 else 2649 else
2650 {
2651#if USE_PRINTF
2652 p = SCHEME_V->strbuff;
2653 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2654#else
2706 p = "#<ERROR>"; 2655 p = "#<ERROR>";
2656#endif
2657 }
2707 2658
2708 *pp = p; 2659 *pp = p;
2709 *plen = strlen (p); 2660 *plen = strlen (p);
2710} 2661}
2711 2662
… …
2819 return 0; 2770 return 0;
2820 } 2771 }
2821 else if (is_number (a)) 2772 else if (is_number (a))
2822 { 2773 {
2823 if (is_number (b)) 2774 if (is_number (b))
2824 if (num_is_integer (a) == num_is_integer (b))
2825 return num_eq (nvalue (a), nvalue (b)); 2775 return num_cmp (nvalue (a), nvalue (b)) == 0;
2826 2776
2827 return 0; 2777 return 0;
2828 } 2778 }
2829 else if (is_character (a)) 2779 else if (is_character (a))
2830 { 2780 {
… …
2856/* () is #t in R5RS */ 2806/* () is #t in R5RS */
2857#define is_true(p) ((p) != S_F) 2807#define is_true(p) ((p) != S_F)
2858#define is_false(p) ((p) == S_F) 2808#define is_false(p) ((p) == S_F)
2859 2809
2860/* ========== Environment implementation ========== */ 2810/* ========== Environment implementation ========== */
2861
2862#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2863
2864static int
2865hash_fn (const char *key, int table_size)
2866{
2867 const unsigned char *p = key;
2868 uint32_t hash = 2166136261;
2869
2870 while (*p)
2871 hash = (hash ^ *p++) * 16777619;
2872
2873 return hash % table_size;
2874}
2875#endif
2876 2811
2877#ifndef USE_ALIST_ENV 2812#ifndef USE_ALIST_ENV
2878 2813
2879/* 2814/*
2880 * In this implementation, each frame of the environment may be 2815 * In this implementation, each frame of the environment may be
… …
2897 2832
2898 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2833 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2899 setenvironment (SCHEME_V->envir); 2834 setenvironment (SCHEME_V->envir);
2900} 2835}
2901 2836
2902static INLINE void 2837static uint32_t
2838sym_hash (pointer sym, uint32_t size)
2839{
2840 uintptr_t ptr = (uintptr_t)sym;
2841
2842#if 0
2843 /* table size is prime, so why mix */
2844 ptr += ptr >> 32;
2845 ptr += ptr >> 16;
2846 ptr += ptr >> 8;
2847#endif
2848
2849 return ptr % size;
2850}
2851
2852ecb_inline void
2903new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2853new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2904{ 2854{
2905 pointer slot = immutable_cons (variable, value); 2855 pointer slot = immutable_cons (variable, value);
2906 2856
2907 if (is_vector (car (env))) 2857 if (is_vector (car (env)))
2908 { 2858 {
2909 int location = hash_fn (symname (variable), vector_length (car (env))); 2859 int location = sym_hash (variable, veclength (car (env)));
2910
2911 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2860 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2912 } 2861 }
2913 else 2862 else
2914 set_car (env, immutable_cons (slot, car (env))); 2863 set_car (env, immutable_cons (slot, car (env)));
2915} 2864}
2916 2865
2917static pointer 2866static pointer
2918find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2867find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2919{ 2868{
2920 pointer x, y; 2869 pointer x, y;
2921 int location;
2922 2870
2923 for (x = env; x != NIL; x = cdr (x)) 2871 for (x = env; x != NIL; x = cdr (x))
2924 { 2872 {
2925 if (is_vector (car (x))) 2873 if (is_vector (car (x)))
2926 { 2874 {
2927 location = hash_fn (symname (hdl), vector_length (car (x))); 2875 int location = sym_hash (hdl, veclength (car (x)));
2928 y = vector_elem (car (x), location); 2876 y = vector_get (car (x), location);
2929 } 2877 }
2930 else 2878 else
2931 y = car (x); 2879 y = car (x);
2932 2880
2933 for (; y != NIL; y = cdr (y)) 2881 for (; y != NIL; y = cdr (y))
2934 if (caar (y) == hdl) 2882 if (caar (y) == hdl)
2935 break; 2883 break;
2936 2884
2937 if (y != NIL) 2885 if (y != NIL)
2886 return car (y);
2887
2888 if (!all)
2938 break; 2889 break;
2939
2940 if (!all)
2941 return NIL;
2942 } 2890 }
2943
2944 if (x != NIL)
2945 return car (y);
2946 2891
2947 return NIL; 2892 return NIL;
2948} 2893}
2949 2894
2950#else /* USE_ALIST_ENV */ 2895#else /* USE_ALIST_ENV */
2951 2896
2952static INLINE void 2897ecb_inline void
2953new_frame_in_env (SCHEME_P_ pointer old_env) 2898new_frame_in_env (SCHEME_P_ pointer old_env)
2954{ 2899{
2955 SCHEME_V->envir = immutable_cons (NIL, old_env); 2900 SCHEME_V->envir = immutable_cons (NIL, old_env);
2956 setenvironment (SCHEME_V->envir); 2901 setenvironment (SCHEME_V->envir);
2957} 2902}
2958 2903
2959static INLINE void 2904ecb_inline void
2960new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2905new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2961{ 2906{
2962 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2907 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2963} 2908}
2964 2909
… …
2972 for (y = car (x); y != NIL; y = cdr (y)) 2917 for (y = car (x); y != NIL; y = cdr (y))
2973 if (caar (y) == hdl) 2918 if (caar (y) == hdl)
2974 break; 2919 break;
2975 2920
2976 if (y != NIL) 2921 if (y != NIL)
2922 return car (y);
2977 break; 2923 break;
2978 2924
2979 if (!all) 2925 if (!all)
2980 return NIL; 2926 break;
2981 } 2927 }
2982
2983 if (x != NIL)
2984 return car (y);
2985 2928
2986 return NIL; 2929 return NIL;
2987} 2930}
2988 2931
2989#endif /* USE_ALIST_ENV else */ 2932#endif /* USE_ALIST_ENV else */
2990 2933
2991static INLINE void 2934ecb_inline void
2992new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2935new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2993{ 2936{
2937 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2994 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2938 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2995} 2939}
2996 2940
2997static INLINE void 2941ecb_inline void
2998set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2942set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2999{ 2943{
3000 set_cdr (slot, value); 2944 set_cdr (slot, value);
3001} 2945}
3002 2946
3003static INLINE pointer 2947ecb_inline pointer
3004slot_value_in_env (pointer slot) 2948slot_value_in_env (pointer slot)
3005{ 2949{
3006 return cdr (slot); 2950 return cdr (slot);
3007} 2951}
3008 2952
3009/* ========== Evaluation Cycle ========== */ 2953/* ========== Evaluation Cycle ========== */
3010 2954
3011static pointer 2955static int
3012xError_1 (SCHEME_P_ const char *s, pointer a) 2956xError_1 (SCHEME_P_ const char *s, pointer a)
3013{ 2957{
3014#if USE_ERROR_HOOK 2958#if USE_ERROR_HOOK
3015 pointer x; 2959 pointer x;
3016 pointer hdl = SCHEME_V->ERROR_HOOK; 2960 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3042#if USE_ERROR_HOOK 2986#if USE_ERROR_HOOK
3043 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2987 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1);
3044 2988
3045 if (x != NIL) 2989 if (x != NIL)
3046 { 2990 {
3047 if (a) 2991 pointer code = a
3048 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2992 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3049 else 2993 : NIL;
3050 SCHEME_V->code = NIL;
3051 2994
3052 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2995 code = cons (mk_string (SCHEME_A_ s), code);
3053 setimmutable (car (SCHEME_V->code)); 2996 setimmutable (car (code));
3054 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2997 SCHEME_V->code = cons (slot_value_in_env (x), code);
3055 SCHEME_V->op = OP_EVAL; 2998 SCHEME_V->op = OP_EVAL;
3056 2999
3057 return S_T; 3000 return 0;
3058 } 3001 }
3059#endif 3002#endif
3060 3003
3061 if (a) 3004 if (a)
3062 SCHEME_V->args = cons (a, NIL); 3005 SCHEME_V->args = cons (a, NIL);
… …
3064 SCHEME_V->args = NIL; 3007 SCHEME_V->args = NIL;
3065 3008
3066 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3009 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3067 setimmutable (car (SCHEME_V->args)); 3010 setimmutable (car (SCHEME_V->args));
3068 SCHEME_V->op = OP_ERR0; 3011 SCHEME_V->op = OP_ERR0;
3012
3069 return S_T; 3013 return 0;
3070} 3014}
3071 3015
3072#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3016#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3073#define Error_0(s) Error_1 (s, 0) 3017#define Error_0(s) Error_1 (s, 0)
3074 3018
3075/* Too small to turn into function */ 3019/* Too small to turn into function */
3076#define BEGIN do { 3020#define BEGIN do {
3077#define END } while (0) 3021#define END } while (0)
3078#define s_goto(a) BEGIN \ 3022#define s_goto(a) BEGIN \
3079 SCHEME_V->op = a; \ 3023 SCHEME_V->op = a; \
3080 return S_T; END 3024 return 0; END
3081 3025
3082#define s_return(a) return xs_return (SCHEME_A_ a) 3026#define s_return(a) return xs_return (SCHEME_A_ a)
3083 3027
3084#ifndef USE_SCHEME_STACK 3028#ifndef USE_SCHEME_STACK
3085 3029
… …
3099{ 3043{
3100 int nframes = (uintptr_t)SCHEME_V->dump; 3044 int nframes = (uintptr_t)SCHEME_V->dump;
3101 struct dump_stack_frame *next_frame; 3045 struct dump_stack_frame *next_frame;
3102 3046
3103 /* enough room for the next frame? */ 3047 /* enough room for the next frame? */
3104 if (nframes >= SCHEME_V->dump_size) 3048 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3105 { 3049 {
3106 SCHEME_V->dump_size += STACK_GROWTH; 3050 SCHEME_V->dump_size += STACK_GROWTH;
3107 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3051 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3108 } 3052 }
3109 3053
3110 next_frame = SCHEME_V->dump_base + nframes; 3054 next_frame = SCHEME_V->dump_base + nframes;
3111 3055
3112 next_frame->op = op; 3056 next_frame->op = op;
3113 next_frame->args = args; 3057 next_frame->args = args;
3114 next_frame->envir = SCHEME_V->envir; 3058 next_frame->envir = SCHEME_V->envir;
3115 next_frame->code = code; 3059 next_frame->code = code;
3116 3060
3117 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3061 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3118} 3062}
3119 3063
3120static pointer 3064static int
3121xs_return (SCHEME_P_ pointer a) 3065xs_return (SCHEME_P_ pointer a)
3122{ 3066{
3123 int nframes = (uintptr_t)SCHEME_V->dump; 3067 int nframes = (uintptr_t)SCHEME_V->dump;
3124 struct dump_stack_frame *frame; 3068 struct dump_stack_frame *frame;
3125 3069
3126 SCHEME_V->value = a; 3070 SCHEME_V->value = a;
3127 3071
3128 if (nframes <= 0) 3072 if (nframes <= 0)
3129 return NIL; 3073 return -1;
3130 3074
3131 frame = &SCHEME_V->dump_base[--nframes]; 3075 frame = &SCHEME_V->dump_base[--nframes];
3132 SCHEME_V->op = frame->op; 3076 SCHEME_V->op = frame->op;
3133 SCHEME_V->args = frame->args; 3077 SCHEME_V->args = frame->args;
3134 SCHEME_V->envir = frame->envir; 3078 SCHEME_V->envir = frame->envir;
3135 SCHEME_V->code = frame->code; 3079 SCHEME_V->code = frame->code;
3136 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3080 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3137 3081
3138 return S_T; 3082 return 0;
3139} 3083}
3140 3084
3141static INLINE void 3085ecb_inline void
3142dump_stack_reset (SCHEME_P) 3086dump_stack_reset (SCHEME_P)
3143{ 3087{
3144 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3088 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3145 SCHEME_V->dump = (pointer)+0; 3089 SCHEME_V->dump = (pointer)+0;
3146} 3090}
3147 3091
3148static INLINE void 3092ecb_inline void
3149dump_stack_initialize (SCHEME_P) 3093dump_stack_initialize (SCHEME_P)
3150{ 3094{
3151 SCHEME_V->dump_size = 0; 3095 SCHEME_V->dump_size = 0;
3152 SCHEME_V->dump_base = 0; 3096 SCHEME_V->dump_base = 0;
3153 dump_stack_reset (SCHEME_A); 3097 dump_stack_reset (SCHEME_A);
… …
3206 int i = 0; 3150 int i = 0;
3207 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3151 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3208 3152
3209 while (cont != NIL) 3153 while (cont != NIL)
3210 { 3154 {
3211 frame->op = ivalue (car (cont)); cont = cdr (cont); 3155 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3212 frame->args = car (cont) ; cont = cdr (cont); 3156 frame->args = car (cont) ; cont = cdr (cont);
3213 frame->envir = car (cont) ; cont = cdr (cont); 3157 frame->envir = car (cont) ; cont = cdr (cont);
3214 frame->code = car (cont) ; cont = cdr (cont); 3158 frame->code = car (cont) ; cont = cdr (cont);
3215 3159
3216 ++frame; 3160 ++frame;
3217 ++i; 3161 ++i;
3218 } 3162 }
3219 3163
3220 SCHEME_V->dump = (pointer)(uintptr_t)i; 3164 SCHEME_V->dump = (pointer)(uintptr_t)i;
3221} 3165}
3222 3166
3223#else 3167#else
3224 3168
3225static INLINE void 3169ecb_inline void
3226dump_stack_reset (SCHEME_P) 3170dump_stack_reset (SCHEME_P)
3227{ 3171{
3228 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3229} 3173}
3230 3174
3231static INLINE void 3175ecb_inline void
3232dump_stack_initialize (SCHEME_P) 3176dump_stack_initialize (SCHEME_P)
3233{ 3177{
3234 dump_stack_reset (SCHEME_A); 3178 dump_stack_reset (SCHEME_A);
3235} 3179}
3236 3180
… …
3238dump_stack_free (SCHEME_P) 3182dump_stack_free (SCHEME_P)
3239{ 3183{
3240 SCHEME_V->dump = NIL; 3184 SCHEME_V->dump = NIL;
3241} 3185}
3242 3186
3243static pointer 3187static int
3244xs_return (SCHEME_P_ pointer a) 3188xs_return (SCHEME_P_ pointer a)
3245{ 3189{
3246 pointer dump = SCHEME_V->dump; 3190 pointer dump = SCHEME_V->dump;
3247 3191
3248 SCHEME_V->value = a; 3192 SCHEME_V->value = a;
3249 3193
3250 if (dump == NIL) 3194 if (dump == NIL)
3251 return NIL; 3195 return -1;
3252 3196
3253 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3197 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3254 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3198 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3255 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3199 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3256 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3200 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3257 3201
3258 SCHEME_V->dump = dump; 3202 SCHEME_V->dump = dump;
3259 3203
3260 return S_T; 3204 return 0;
3261} 3205}
3262 3206
3263static void 3207static void
3264s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3208s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3265{ 3209{
… …
3290 3234
3291#endif 3235#endif
3292 3236
3293#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3237#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3294 3238
3239#if EXPERIMENT
3295static pointer 3240static int
3241debug (SCHEME_P_ int indent, pointer x)
3242{
3243 int c;
3244
3245 if (is_syntax (x))
3246 {
3247 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3248 return 8 + 8;
3249 }
3250
3251 if (x == NIL)
3252 {
3253 printf ("%*sNIL\n", indent, "");
3254 return 3;
3255 }
3256
3257 switch (type (x))
3258 {
3259 case T_INTEGER:
3260 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3261 return 32+8;
3262
3263 case T_SYMBOL:
3264 printf ("%*sS<%s>\n", indent, "", symname (x));
3265 return 24+8;
3266
3267 case T_CLOSURE:
3268 printf ("%*sS<%s>\n", indent, "", "closure");
3269 debug (SCHEME_A_ indent + 3, cdr(x));
3270 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3271
3272 case T_PAIR:
3273 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3274 c = debug (SCHEME_A_ indent + 3, car (x));
3275 c += debug (SCHEME_A_ indent + 3, cdr (x));
3276 return c + 1;
3277
3278 case T_PORT:
3279 printf ("%*sS<%s>\n", indent, "", "port");
3280 return 24+8;
3281
3282 case T_VECTOR:
3283 printf ("%*sS<%s>\n", indent, "", "vector");
3284 return 24+8;
3285
3286 case T_ENVIRONMENT:
3287 printf ("%*sS<%s>\n", indent, "", "environment");
3288 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3289
3290 default:
3291 printf ("unhandled type %d\n", type (x));
3292 break;
3293 }
3294}
3295#endif
3296
3297static int
3296opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3298opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3297{ 3299{
3300 pointer args = SCHEME_V->args;
3298 pointer x, y; 3301 pointer x, y;
3299 3302
3300 switch (op) 3303 switch (op)
3301 { 3304 {
3305#if EXPERIMENT //D
3306 case OP_DEBUG:
3307 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3308 printf ("\n");
3309 s_return (S_T);
3310#endif
3302 case OP_LOAD: /* load */ 3311 case OP_LOAD: /* load */
3303 if (file_interactive (SCHEME_A)) 3312 if (file_interactive (SCHEME_A))
3304 { 3313 {
3305 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3314 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3306 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3315 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3307 } 3316 }
3308 3317
3309 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3318 if (!file_push (SCHEME_A_ strvalue (car (args))))
3310 Error_1 ("unable to open", car (SCHEME_V->args)); 3319 Error_1 ("unable to open", car (args));
3311 else 3320 else
3312 { 3321 {
3313 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3322 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3314 s_goto (OP_T0LVL); 3323 s_goto (OP_T0LVL);
3315 } 3324 }
3316 3325
3317 case OP_T0LVL: /* top level */ 3326 case OP_T0LVL: /* top level */
3318 3327
3319 /* If we reached the end of file, this loop is done. */ 3328 /* If we reached the end of file, this loop is done. */
3320 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3329 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3321 { 3330 {
3322 if (SCHEME_V->file_i == 0) 3331 if (SCHEME_V->file_i == 0)
3323 { 3332 {
3324 SCHEME_V->args = NIL; 3333 SCHEME_V->args = NIL;
3325 s_goto (OP_QUIT); 3334 s_goto (OP_QUIT);
… …
3350 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3359 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3351 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3360 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3352 s_goto (OP_READ_INTERNAL); 3361 s_goto (OP_READ_INTERNAL);
3353 3362
3354 case OP_T1LVL: /* top level */ 3363 case OP_T1LVL: /* top level */
3355 SCHEME_V->code = SCHEME_V->value; 3364 SCHEME_V->code = SCHEME_V->value;
3356 SCHEME_V->inport = SCHEME_V->save_inport; 3365 SCHEME_V->inport = SCHEME_V->save_inport;
3357 s_goto (OP_EVAL); 3366 s_goto (OP_EVAL);
3358 3367
3359 case OP_READ_INTERNAL: /* internal read */ 3368 case OP_READ_INTERNAL: /* internal read */
3360 SCHEME_V->tok = token (SCHEME_A); 3369 SCHEME_V->tok = token (SCHEME_A);
… …
3389 case OP_EVAL: /* main part of evaluation */ 3398 case OP_EVAL: /* main part of evaluation */
3390#if USE_TRACING 3399#if USE_TRACING
3391 if (SCHEME_V->tracing) 3400 if (SCHEME_V->tracing)
3392 { 3401 {
3393 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3402 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3394 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3403 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3395 SCHEME_V->args = SCHEME_V->code; 3404 SCHEME_V->args = SCHEME_V->code;
3396 putstr (SCHEME_A_ "\nEval: "); 3405 putstr (SCHEME_A_ "\nEval: ");
3397 s_goto (OP_P0LIST); 3406 s_goto (OP_P0LIST);
3398 } 3407 }
3399 3408
… …
3403#endif 3412#endif
3404 if (is_symbol (SCHEME_V->code)) /* symbol */ 3413 if (is_symbol (SCHEME_V->code)) /* symbol */
3405 { 3414 {
3406 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3415 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3407 3416
3408 if (x != NIL) 3417 if (x == NIL)
3409 s_return (slot_value_in_env (x));
3410 else
3411 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3418 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3419
3420 s_return (slot_value_in_env (x));
3412 } 3421 }
3413 else if (is_pair (SCHEME_V->code)) 3422 else if (is_pair (SCHEME_V->code))
3414 { 3423 {
3424 x = car (SCHEME_V->code);
3425
3415 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3426 if (is_syntax (x)) /* SYNTAX */
3416 { 3427 {
3417 SCHEME_V->code = cdr (SCHEME_V->code); 3428 SCHEME_V->code = cdr (SCHEME_V->code);
3418 s_goto (syntaxnum (x)); 3429 s_goto (syntaxnum (x));
3419 } 3430 }
3420 else /* first, eval top element and eval arguments */ 3431 else /* first, eval top element and eval arguments */
3421 { 3432 {
3422 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3433 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3423 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3434 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3424 SCHEME_V->code = car (SCHEME_V->code); 3435 SCHEME_V->code = x;
3425 s_goto (OP_EVAL); 3436 s_goto (OP_EVAL);
3426 } 3437 }
3427 } 3438 }
3428 else 3439 else
3429 s_return (SCHEME_V->code); 3440 s_return (SCHEME_V->code);
3430 3441
3431 case OP_E0ARGS: /* eval arguments */ 3442 case OP_E0ARGS: /* eval arguments */
3432 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3443 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3433 { 3444 {
3434 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3445 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3435 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3446 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3436 SCHEME_V->code = SCHEME_V->value; 3447 SCHEME_V->code = SCHEME_V->value;
3437 s_goto (OP_APPLY); 3448 s_goto (OP_APPLY);
… …
3441 SCHEME_V->code = cdr (SCHEME_V->code); 3452 SCHEME_V->code = cdr (SCHEME_V->code);
3442 s_goto (OP_E1ARGS); 3453 s_goto (OP_E1ARGS);
3443 } 3454 }
3444 3455
3445 case OP_E1ARGS: /* eval arguments */ 3456 case OP_E1ARGS: /* eval arguments */
3446 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3457 args = cons (SCHEME_V->value, args);
3447 3458
3448 if (is_pair (SCHEME_V->code)) /* continue */ 3459 if (is_pair (SCHEME_V->code)) /* continue */
3449 { 3460 {
3450 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3461 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3451 SCHEME_V->code = car (SCHEME_V->code); 3462 SCHEME_V->code = car (SCHEME_V->code);
3452 SCHEME_V->args = NIL; 3463 SCHEME_V->args = NIL;
3453 s_goto (OP_EVAL); 3464 s_goto (OP_EVAL);
3454 } 3465 }
3455 else /* end */ 3466 else /* end */
3456 { 3467 {
3457 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3468 args = reverse_in_place (SCHEME_A_ NIL, args);
3458 SCHEME_V->code = car (SCHEME_V->args); 3469 SCHEME_V->code = car (args);
3459 SCHEME_V->args = cdr (SCHEME_V->args); 3470 SCHEME_V->args = cdr (args);
3460 s_goto (OP_APPLY); 3471 s_goto (OP_APPLY);
3461 } 3472 }
3462 3473
3463#if USE_TRACING 3474#if USE_TRACING
3464 3475
3465 case OP_TRACING: 3476 case OP_TRACING:
3466 { 3477 {
3467 int tr = SCHEME_V->tracing; 3478 int tr = SCHEME_V->tracing;
3468 3479
3469 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3480 SCHEME_V->tracing = ivalue_unchecked (car (args));
3470 s_return (mk_integer (SCHEME_A_ tr)); 3481 s_return (mk_integer (SCHEME_A_ tr));
3471 } 3482 }
3472 3483
3473#endif 3484#endif
3474 3485
3475 case OP_APPLY: /* apply 'code' to 'args' */ 3486 case OP_APPLY: /* apply 'code' to 'args' */
3476#if USE_TRACING 3487#if USE_TRACING
3477 if (SCHEME_V->tracing) 3488 if (SCHEME_V->tracing)
3478 { 3489 {
3479 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3490 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3480 SCHEME_V->print_flag = 1; 3491 SCHEME_V->print_flag = 1;
3481 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3492 /* args=cons(SCHEME_V->code,args); */
3482 putstr (SCHEME_A_ "\nApply to: "); 3493 putstr (SCHEME_A_ "\nApply to: ");
3483 s_goto (OP_P0LIST); 3494 s_goto (OP_P0LIST);
3484 } 3495 }
3485 3496
3486 /* fall through */ 3497 /* fall through */
3487 3498
3488 case OP_REAL_APPLY: 3499 case OP_REAL_APPLY:
3489#endif 3500#endif
3490 if (is_proc (SCHEME_V->code)) 3501 if (is_proc (SCHEME_V->code))
3491 {
3492 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3502 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3493 }
3494 else if (is_foreign (SCHEME_V->code)) 3503 else if (is_foreign (SCHEME_V->code))
3495 { 3504 {
3496 /* Keep nested calls from GC'ing the arglist */ 3505 /* Keep nested calls from GC'ing the arglist */
3497 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3506 push_recent_alloc (SCHEME_A_ args, NIL);
3498 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3507 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3499 3508
3500 s_return (x); 3509 s_return (x);
3501 } 3510 }
3502 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3511 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3503 { 3512 {
3504 /* Should not accept promise */ 3513 /* Should not accept promise */
3505 /* make environment */ 3514 /* make environment */
3506 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3515 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3507 3516
3508 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3517 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3509 { 3518 {
3510 if (y == NIL) 3519 if (y == NIL)
3511 Error_0 ("not enough arguments"); 3520 Error_0 ("not enough arguments");
3512 else 3521 else
3513 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3522 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3531 s_goto (OP_BEGIN); 3540 s_goto (OP_BEGIN);
3532 } 3541 }
3533 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3542 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3534 { 3543 {
3535 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3544 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3536 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3545 s_return (args != NIL ? car (args) : NIL);
3537 } 3546 }
3538 else 3547 else
3539 Error_0 ("illegal function"); 3548 Error_0 ("illegal function");
3540 3549
3541 case OP_DOMACRO: /* do macro */ 3550 case OP_DOMACRO: /* do macro */
3542 SCHEME_V->code = SCHEME_V->value; 3551 SCHEME_V->code = SCHEME_V->value;
3543 s_goto (OP_EVAL); 3552 s_goto (OP_EVAL);
3544
3545#if 1
3546 3553
3547 case OP_LAMBDA: /* lambda */ 3554 case OP_LAMBDA: /* lambda */
3548 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3555 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3549 set SCHEME_V->value fall thru */ 3556 set SCHEME_V->value fall thru */
3550 { 3557 {
3551 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3558 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3552 3559
3553 if (f != NIL) 3560 if (f != NIL)
3554 { 3561 {
3555 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3562 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3556 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3563 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3557 SCHEME_V->code = slot_value_in_env (f); 3564 SCHEME_V->code = slot_value_in_env (f);
3558 s_goto (OP_APPLY); 3565 s_goto (OP_APPLY);
3559 } 3566 }
3560 3567
3561 SCHEME_V->value = SCHEME_V->code; 3568 SCHEME_V->value = SCHEME_V->code;
3562 /* Fallthru */
3563 } 3569 }
3570 /* Fallthru */
3564 3571
3565 case OP_LAMBDA1: 3572 case OP_LAMBDA1:
3566 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3573 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3567 3574
3568#else
3569
3570 case OP_LAMBDA: /* lambda */
3571 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3572
3573#endif
3574
3575 case OP_MKCLOSURE: /* make-closure */ 3575 case OP_MKCLOSURE: /* make-closure */
3576 x = car (SCHEME_V->args); 3576 x = car (args);
3577 3577
3578 if (car (x) == SCHEME_V->LAMBDA) 3578 if (car (x) == SCHEME_V->LAMBDA)
3579 x = cdr (x); 3579 x = cdr (x);
3580 3580
3581 if (cdr (SCHEME_V->args) == NIL) 3581 if (cdr (args) == NIL)
3582 y = SCHEME_V->envir; 3582 y = SCHEME_V->envir;
3583 else 3583 else
3584 y = cadr (SCHEME_V->args); 3584 y = cadr (args);
3585 3585
3586 s_return (mk_closure (SCHEME_A_ x, y)); 3586 s_return (mk_closure (SCHEME_A_ x, y));
3587 3587
3588 case OP_QUOTE: /* quote */ 3588 case OP_QUOTE: /* quote */
3589 s_return (car (SCHEME_V->code)); 3589 s_return (car (SCHEME_V->code));
… …
3621 3621
3622 3622
3623 case OP_DEFP: /* defined? */ 3623 case OP_DEFP: /* defined? */
3624 x = SCHEME_V->envir; 3624 x = SCHEME_V->envir;
3625 3625
3626 if (cdr (SCHEME_V->args) != NIL) 3626 if (cdr (args) != NIL)
3627 x = cadr (SCHEME_V->args); 3627 x = cadr (args);
3628 3628
3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3629 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3630 3630
3631 case OP_SET0: /* set! */ 3631 case OP_SET0: /* set! */
3632 if (is_immutable (car (SCHEME_V->code))) 3632 if (is_immutable (car (SCHEME_V->code)))
3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3633 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3634 3634
… …
3665 3665
3666 case OP_IF1: /* if */ 3666 case OP_IF1: /* if */
3667 if (is_true (SCHEME_V->value)) 3667 if (is_true (SCHEME_V->value))
3668 SCHEME_V->code = car (SCHEME_V->code); 3668 SCHEME_V->code = car (SCHEME_V->code);
3669 else 3669 else
3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3670 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3671
3672 * car(NIL) = NIL */
3673 s_goto (OP_EVAL); 3671 s_goto (OP_EVAL);
3674 3672
3675 case OP_LET0: /* let */ 3673 case OP_LET0: /* let */
3676 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3677 SCHEME_V->value = SCHEME_V->code; 3675 SCHEME_V->value = SCHEME_V->code;
3678 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3676 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3679 s_goto (OP_LET1); 3677 s_goto (OP_LET1);
3680 3678
3681 case OP_LET1: /* let (calculate parameters) */ 3679 case OP_LET1: /* let (calculate parameters) */
3682 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3680 args = cons (SCHEME_V->value, args);
3683 3681
3684 if (is_pair (SCHEME_V->code)) /* continue */ 3682 if (is_pair (SCHEME_V->code)) /* continue */
3685 { 3683 {
3686 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3684 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3687 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3685 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3688 3686
3689 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3687 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3690 SCHEME_V->code = cadar (SCHEME_V->code); 3688 SCHEME_V->code = cadar (SCHEME_V->code);
3691 SCHEME_V->args = NIL; 3689 SCHEME_V->args = NIL;
3692 s_goto (OP_EVAL); 3690 s_goto (OP_EVAL);
3693 } 3691 }
3694 else /* end */ 3692 else /* end */
3695 { 3693 {
3696 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3694 args = reverse_in_place (SCHEME_A_ NIL, args);
3697 SCHEME_V->code = car (SCHEME_V->args); 3695 SCHEME_V->code = car (args);
3698 SCHEME_V->args = cdr (SCHEME_V->args); 3696 SCHEME_V->args = cdr (args);
3699 s_goto (OP_LET2); 3697 s_goto (OP_LET2);
3700 } 3698 }
3701 3699
3702 case OP_LET2: /* let */ 3700 case OP_LET2: /* let */
3703 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3701 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3704 3702
3705 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3703 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3706 y != NIL; x = cdr (x), y = cdr (y)) 3704 y != NIL; x = cdr (x), y = cdr (y))
3707 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3705 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3708 3706
3709 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3707 if (is_symbol (car (SCHEME_V->code))) /* named let */
3710 { 3708 {
3711 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3709 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3712 { 3710 {
3713 if (!is_pair (x)) 3711 if (!is_pair (x))
3714 Error_1 ("Bad syntax of binding in let :", x); 3712 Error_1 ("Bad syntax of binding in let :", x);
3715 3713
3716 if (!is_list (SCHEME_A_ car (x))) 3714 if (!is_list (SCHEME_A_ car (x)))
3717 Error_1 ("Bad syntax of binding in let :", car (x)); 3715 Error_1 ("Bad syntax of binding in let :", car (x));
3718 3716
3719 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3717 args = cons (caar (x), args);
3720 } 3718 }
3721 3719
3722 x =
3723 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3720 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3724 SCHEME_V->envir); 3721 SCHEME_V->envir);
3725 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3722 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3726 SCHEME_V->code = cddr (SCHEME_V->code); 3723 SCHEME_V->code = cddr (SCHEME_V->code);
3727 SCHEME_V->args = NIL;
3728 } 3724 }
3729 else 3725 else
3730 { 3726 {
3731 SCHEME_V->code = cdr (SCHEME_V->code); 3727 SCHEME_V->code = cdr (SCHEME_V->code);
3728 }
3729
3732 SCHEME_V->args = NIL; 3730 SCHEME_V->args = NIL;
3733 }
3734
3735 s_goto (OP_BEGIN); 3731 s_goto (OP_BEGIN);
3736 3732
3737 case OP_LET0AST: /* let* */ 3733 case OP_LET0AST: /* let* */
3738 if (car (SCHEME_V->code) == NIL) 3734 if (car (SCHEME_V->code) == NIL)
3739 { 3735 {
… …
3757 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3753 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3758 SCHEME_V->code = cdr (SCHEME_V->code); 3754 SCHEME_V->code = cdr (SCHEME_V->code);
3759 3755
3760 if (is_pair (SCHEME_V->code)) /* continue */ 3756 if (is_pair (SCHEME_V->code)) /* continue */
3761 { 3757 {
3762 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3758 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3763 SCHEME_V->code = cadar (SCHEME_V->code); 3759 SCHEME_V->code = cadar (SCHEME_V->code);
3764 SCHEME_V->args = NIL; 3760 SCHEME_V->args = NIL;
3765 s_goto (OP_EVAL); 3761 s_goto (OP_EVAL);
3766 } 3762 }
3767 else /* end */ 3763 else /* end */
3768 { 3764 {
3769 SCHEME_V->code = SCHEME_V->args; 3765 SCHEME_V->code = args;
3770 SCHEME_V->args = NIL; 3766 SCHEME_V->args = NIL;
3771 s_goto (OP_BEGIN); 3767 s_goto (OP_BEGIN);
3772 } 3768 }
3773 3769
3774 case OP_LET0REC: /* letrec */ 3770 case OP_LET0REC: /* letrec */
… …
3777 SCHEME_V->value = SCHEME_V->code; 3773 SCHEME_V->value = SCHEME_V->code;
3778 SCHEME_V->code = car (SCHEME_V->code); 3774 SCHEME_V->code = car (SCHEME_V->code);
3779 s_goto (OP_LET1REC); 3775 s_goto (OP_LET1REC);
3780 3776
3781 case OP_LET1REC: /* letrec (calculate parameters) */ 3777 case OP_LET1REC: /* letrec (calculate parameters) */
3782 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3778 args = cons (SCHEME_V->value, args);
3783 3779
3784 if (is_pair (SCHEME_V->code)) /* continue */ 3780 if (is_pair (SCHEME_V->code)) /* continue */
3785 { 3781 {
3786 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3782 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3787 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3783 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3788 3784
3789 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3785 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3790 SCHEME_V->code = cadar (SCHEME_V->code); 3786 SCHEME_V->code = cadar (SCHEME_V->code);
3791 SCHEME_V->args = NIL; 3787 SCHEME_V->args = NIL;
3792 s_goto (OP_EVAL); 3788 s_goto (OP_EVAL);
3793 } 3789 }
3794 else /* end */ 3790 else /* end */
3795 { 3791 {
3796 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3792 args = reverse_in_place (SCHEME_A_ NIL, args);
3797 SCHEME_V->code = car (SCHEME_V->args); 3793 SCHEME_V->code = car (args);
3798 SCHEME_V->args = cdr (SCHEME_V->args); 3794 SCHEME_V->args = cdr (args);
3799 s_goto (OP_LET2REC); 3795 s_goto (OP_LET2REC);
3800 } 3796 }
3801 3797
3802 case OP_LET2REC: /* letrec */ 3798 case OP_LET2REC: /* letrec */
3803 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3799 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3804 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3800 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3805 3801
3806 SCHEME_V->code = cdr (SCHEME_V->code); 3802 SCHEME_V->code = cdr (SCHEME_V->code);
3807 SCHEME_V->args = NIL; 3803 SCHEME_V->args = NIL;
3808 s_goto (OP_BEGIN); 3804 s_goto (OP_BEGIN);
… …
3894 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3890 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3895 SCHEME_V->code = car (SCHEME_V->code); 3891 SCHEME_V->code = car (SCHEME_V->code);
3896 s_goto (OP_EVAL); 3892 s_goto (OP_EVAL);
3897 3893
3898 case OP_C1STREAM: /* cons-stream */ 3894 case OP_C1STREAM: /* cons-stream */
3899 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3895 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3900 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3896 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3901 set_typeflag (x, T_PROMISE); 3897 set_typeflag (x, T_PROMISE);
3902 s_return (cons (SCHEME_V->args, x)); 3898 s_return (cons (args, x));
3903 3899
3904 case OP_MACRO0: /* macro */ 3900 case OP_MACRO0: /* macro */
3905 if (is_pair (car (SCHEME_V->code))) 3901 if (is_pair (car (SCHEME_V->code)))
3906 { 3902 {
3907 x = caar (SCHEME_V->code); 3903 x = caar (SCHEME_V->code);
… …
3940 { 3936 {
3941 if (!is_pair (y = caar (x))) 3937 if (!is_pair (y = caar (x)))
3942 break; 3938 break;
3943 3939
3944 for (; y != NIL; y = cdr (y)) 3940 for (; y != NIL; y = cdr (y))
3945 {
3946 if (eqv (car (y), SCHEME_V->value)) 3941 if (eqv (car (y), SCHEME_V->value))
3947 break; 3942 break;
3948 }
3949 3943
3950 if (y != NIL) 3944 if (y != NIL)
3951 break; 3945 break;
3952 } 3946 }
3953 3947
… …
3973 s_goto (OP_BEGIN); 3967 s_goto (OP_BEGIN);
3974 else 3968 else
3975 s_return (NIL); 3969 s_return (NIL);
3976 3970
3977 case OP_PAPPLY: /* apply */ 3971 case OP_PAPPLY: /* apply */
3978 SCHEME_V->code = car (SCHEME_V->args); 3972 SCHEME_V->code = car (args);
3979 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3973 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3980 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3974 /*SCHEME_V->args = cadr(args); */
3981 s_goto (OP_APPLY); 3975 s_goto (OP_APPLY);
3982 3976
3983 case OP_PEVAL: /* eval */ 3977 case OP_PEVAL: /* eval */
3984 if (cdr (SCHEME_V->args) != NIL) 3978 if (cdr (args) != NIL)
3985 SCHEME_V->envir = cadr (SCHEME_V->args); 3979 SCHEME_V->envir = cadr (args);
3986 3980
3987 SCHEME_V->code = car (SCHEME_V->args); 3981 SCHEME_V->code = car (args);
3988 s_goto (OP_EVAL); 3982 s_goto (OP_EVAL);
3989 3983
3990 case OP_CONTINUATION: /* call-with-current-continuation */ 3984 case OP_CONTINUATION: /* call-with-current-continuation */
3991 SCHEME_V->code = car (SCHEME_V->args); 3985 SCHEME_V->code = car (args);
3992 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_V)), NIL); 3986 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3993 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3994 } 3988 }
3995 3989
3996 return S_T; 3990 if (USE_ERROR_CHECKING) abort ();
3997} 3991}
3998 3992
3999static pointer 3993static int
4000opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3994opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4001{ 3995{
4002 pointer x; 3996 pointer args = SCHEME_V->args;
3997 pointer x = car (args);
4003 num v; 3998 num v;
4004 3999
4000 switch (op)
4001 {
4005#if USE_MATH 4002#if USE_MATH
4006 RVALUE dd;
4007#endif
4008
4009 switch (op)
4010 {
4011#if USE_MATH
4012
4013 case OP_INEX2EX: /* inexact->exact */ 4003 case OP_INEX2EX: /* inexact->exact */
4014 x = car (SCHEME_V->args);
4015
4016 if (num_is_integer (x)) 4004 if (!is_integer (x))
4017 s_return (x); 4005 {
4018 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4006 RVALUE r = rvalue_unchecked (x);
4019 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4007
4008 if (r == (RVALUE)(IVALUE)r)
4009 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4020 else 4010 else
4021 Error_1 ("inexact->exact: not integral:", x); 4011 Error_1 ("inexact->exact: not integral:", x);
4012 }
4022 4013
4023 case OP_EXP: 4014 s_return (x);
4024 x = car (SCHEME_V->args); 4015
4025 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4016 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4026
4027 case OP_LOG:
4028 x = car (SCHEME_V->args);
4029 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4017 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4030 4018 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4031 case OP_SIN:
4032 x = car (SCHEME_V->args);
4033 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4019 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4034
4035 case OP_COS:
4036 x = car (SCHEME_V->args);
4037 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4020 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4038
4039 case OP_TAN:
4040 x = car (SCHEME_V->args);
4041 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4021 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4042
4043 case OP_ASIN:
4044 x = car (SCHEME_V->args);
4045 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4022 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4046
4047 case OP_ACOS:
4048 x = car (SCHEME_V->args);
4049 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4023 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4050 4024
4051 case OP_ATAN: 4025 case OP_ATAN:
4052 x = car (SCHEME_V->args);
4053
4054 if (cdr (SCHEME_V->args) == NIL)
4055 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4026 s_return (mk_real (SCHEME_A_
4056 else 4027 cdr (args) == NIL
4057 { 4028 ? atan (rvalue (x))
4058 pointer y = cadr (SCHEME_V->args); 4029 : atan2 (rvalue (x), rvalue (cadr (args)))));
4059
4060 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4061 }
4062 4030
4063 case OP_SQRT: 4031 case OP_SQRT:
4064 x = car (SCHEME_V->args);
4065 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4032 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4066 4033
4067 case OP_EXPT: 4034 case OP_EXPT:
4068 { 4035 {
4069 RVALUE result; 4036 RVALUE result;
4070 int real_result = 1; 4037 int real_result = 1;
4071 pointer y = cadr (SCHEME_V->args); 4038 pointer y = cadr (args);
4072 4039
4073 x = car (SCHEME_V->args);
4074
4075 if (num_is_integer (x) && num_is_integer (y)) 4040 if (is_integer (x) && is_integer (y))
4076 real_result = 0; 4041 real_result = 0;
4077 4042
4078 /* This 'if' is an R5RS compatibility fix. */ 4043 /* This 'if' is an R5RS compatibility fix. */
4079 /* NOTE: Remove this 'if' fix for R6RS. */ 4044 /* NOTE: Remove this 'if' fix for R6RS. */
4080 if (rvalue (x) == 0 && rvalue (y) < 0) 4045 if (rvalue (x) == 0 && rvalue (y) < 0)
4081 result = 0.0; 4046 result = 0;
4082 else 4047 else
4083 result = pow (rvalue (x), rvalue (y)); 4048 result = pow (rvalue (x), rvalue (y));
4084 4049
4085 /* Before returning integer result make sure we can. */ 4050 /* Before returning integer result make sure we can. */
4086 /* If the test fails, result is too big for integer. */ 4051 /* If the test fails, result is too big for integer. */
4087 if (!real_result) 4052 if (!real_result)
4088 { 4053 {
4089 long result_as_long = (long) result; 4054 long result_as_long = result;
4090 4055
4091 if (result != (RVALUE) result_as_long) 4056 if (result != result_as_long)
4092 real_result = 1; 4057 real_result = 1;
4093 } 4058 }
4094 4059
4095 if (real_result) 4060 if (real_result)
4096 s_return (mk_real (SCHEME_A_ result)); 4061 s_return (mk_real (SCHEME_A_ result));
4097 else 4062 else
4098 s_return (mk_integer (SCHEME_A_ result)); 4063 s_return (mk_integer (SCHEME_A_ result));
4099 } 4064 }
4100 4065
4101 case OP_FLOOR:
4102 x = car (SCHEME_V->args);
4103 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4066 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4104
4105 case OP_CEILING:
4106 x = car (SCHEME_V->args);
4107 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4067 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4108 4068 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4109 case OP_TRUNCATE:
4110 {
4111 RVALUE rvalue_of_x;
4112
4113 x = car (SCHEME_V->args);
4114 rvalue_of_x = rvalue (x);
4115
4116 if (rvalue_of_x > 0)
4117 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4118 else
4119 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 4069 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4120 }
4121
4122 case OP_ROUND:
4123 x = car (SCHEME_V->args);
4124
4125 if (num_is_integer (x))
4126 s_return (x);
4127
4128 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4129#endif 4070#endif
4130 4071
4131 case OP_ADD: /* + */ 4072 case OP_ADD: /* + */
4132 v = num_zero; 4073 v = num_zero;
4133 4074
4134 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4075 for (x = args; x != NIL; x = cdr (x))
4135 v = num_add (v, nvalue (car (x))); 4076 v = num_op (NUM_ADD, v, nvalue (car (x)));
4136 4077
4137 s_return (mk_number (SCHEME_A_ v)); 4078 s_return (mk_number (SCHEME_A_ v));
4138 4079
4139 case OP_MUL: /* * */ 4080 case OP_MUL: /* * */
4140 v = num_one; 4081 v = num_one;
4141 4082
4142 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4083 for (x = args; x != NIL; x = cdr (x))
4143 v = num_mul (v, nvalue (car (x))); 4084 v = num_op (NUM_MUL, v, nvalue (car (x)));
4144 4085
4145 s_return (mk_number (SCHEME_A_ v)); 4086 s_return (mk_number (SCHEME_A_ v));
4146 4087
4147 case OP_SUB: /* - */ 4088 case OP_SUB: /* - */
4148 if (cdr (SCHEME_V->args) == NIL) 4089 if (cdr (args) == NIL)
4149 { 4090 {
4150 x = SCHEME_V->args; 4091 x = args;
4151 v = num_zero; 4092 v = num_zero;
4152 } 4093 }
4153 else 4094 else
4154 { 4095 {
4155 x = cdr (SCHEME_V->args); 4096 x = cdr (args);
4156 v = nvalue (car (SCHEME_V->args)); 4097 v = nvalue (car (args));
4157 } 4098 }
4158 4099
4159 for (; x != NIL; x = cdr (x)) 4100 for (; x != NIL; x = cdr (x))
4160 v = num_sub (v, nvalue (car (x))); 4101 v = num_op (NUM_SUB, v, nvalue (car (x)));
4161 4102
4162 s_return (mk_number (SCHEME_A_ v)); 4103 s_return (mk_number (SCHEME_A_ v));
4163 4104
4164 case OP_DIV: /* / */ 4105 case OP_DIV: /* / */
4165 if (cdr (SCHEME_V->args) == NIL) 4106 if (cdr (args) == NIL)
4166 { 4107 {
4167 x = SCHEME_V->args; 4108 x = args;
4168 v = num_one; 4109 v = num_one;
4169 } 4110 }
4170 else 4111 else
4171 { 4112 {
4172 x = cdr (SCHEME_V->args); 4113 x = cdr (args);
4173 v = nvalue (car (SCHEME_V->args)); 4114 v = nvalue (car (args));
4174 } 4115 }
4175 4116
4176 for (; x != NIL; x = cdr (x)) 4117 for (; x != NIL; x = cdr (x))
4177 {
4178 if (!is_zero_rvalue (rvalue (car (x)))) 4118 if (!is_zero_rvalue (rvalue (car (x))))
4179 v = num_div (v, nvalue (car (x))); 4119 v = num_div (v, nvalue (car (x)));
4180 else 4120 else
4181 Error_0 ("/: division by zero"); 4121 Error_0 ("/: division by zero");
4182 }
4183 4122
4184 s_return (mk_number (SCHEME_A_ v)); 4123 s_return (mk_number (SCHEME_A_ v));
4185 4124
4186 case OP_INTDIV: /* quotient */ 4125 case OP_INTDIV: /* quotient */
4187 if (cdr (SCHEME_V->args) == NIL) 4126 if (cdr (args) == NIL)
4188 { 4127 {
4189 x = SCHEME_V->args; 4128 x = args;
4190 v = num_one; 4129 v = num_one;
4191 } 4130 }
4192 else 4131 else
4193 { 4132 {
4194 x = cdr (SCHEME_V->args); 4133 x = cdr (args);
4195 v = nvalue (car (SCHEME_V->args)); 4134 v = nvalue (car (args));
4196 } 4135 }
4197 4136
4198 for (; x != NIL; x = cdr (x)) 4137 for (; x != NIL; x = cdr (x))
4199 { 4138 {
4200 if (ivalue (car (x)) != 0) 4139 if (ivalue (car (x)) != 0)
4201 v = num_intdiv (v, nvalue (car (x))); 4140 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4202 else 4141 else
4203 Error_0 ("quotient: division by zero"); 4142 Error_0 ("quotient: division by zero");
4204 } 4143 }
4205 4144
4206 s_return (mk_number (SCHEME_A_ v)); 4145 s_return (mk_number (SCHEME_A_ v));
4207 4146
4208 case OP_REM: /* remainder */ 4147 case OP_REM: /* remainder */
4209 v = nvalue (car (SCHEME_V->args)); 4148 v = nvalue (x);
4210 4149
4211 if (ivalue (cadr (SCHEME_V->args)) != 0) 4150 if (ivalue (cadr (args)) != 0)
4212 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4151 v = num_rem (v, nvalue (cadr (args)));
4213 else 4152 else
4214 Error_0 ("remainder: division by zero"); 4153 Error_0 ("remainder: division by zero");
4215 4154
4216 s_return (mk_number (SCHEME_A_ v)); 4155 s_return (mk_number (SCHEME_A_ v));
4217 4156
4218 case OP_MOD: /* modulo */ 4157 case OP_MOD: /* modulo */
4219 v = nvalue (car (SCHEME_V->args)); 4158 v = nvalue (x);
4220 4159
4221 if (ivalue (cadr (SCHEME_V->args)) != 0) 4160 if (ivalue (cadr (args)) != 0)
4222 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4161 v = num_mod (v, nvalue (cadr (args)));
4223 else 4162 else
4224 Error_0 ("modulo: division by zero"); 4163 Error_0 ("modulo: division by zero");
4225 4164
4226 s_return (mk_number (SCHEME_A_ v)); 4165 s_return (mk_number (SCHEME_A_ v));
4227 4166
4228 case OP_CAR: /* car */ 4167 /* the compiler will optimize this mess... */
4229 s_return (caar (SCHEME_V->args)); 4168 case OP_CAR: op_car: s_return (car (x));
4230 4169 case OP_CDR: op_cdr: s_return (cdr (x));
4231 case OP_CDR: /* cdr */ 4170 case OP_CAAR: op_caar: x = car (x); goto op_car;
4232 s_return (cdar (SCHEME_V->args)); 4171 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4172 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4173 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4174 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4175 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4176 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4177 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4178 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4179 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4180 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4181 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4182 case OP_CAAAAR: x = car (x); goto op_caaar;
4183 case OP_CAAADR: x = cdr (x); goto op_caaar;
4184 case OP_CAADAR: x = car (x); goto op_caadr;
4185 case OP_CAADDR: x = cdr (x); goto op_caadr;
4186 case OP_CADAAR: x = car (x); goto op_cadar;
4187 case OP_CADADR: x = cdr (x); goto op_cadar;
4188 case OP_CADDAR: x = car (x); goto op_caddr;
4189 case OP_CADDDR: x = cdr (x); goto op_caddr;
4190 case OP_CDAAAR: x = car (x); goto op_cdaar;
4191 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4192 case OP_CDADAR: x = car (x); goto op_cdadr;
4193 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4194 case OP_CDDAAR: x = car (x); goto op_cddar;
4195 case OP_CDDADR: x = cdr (x); goto op_cddar;
4196 case OP_CDDDAR: x = car (x); goto op_cdddr;
4197 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4233 4198
4234 case OP_CONS: /* cons */ 4199 case OP_CONS: /* cons */
4235 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4200 set_cdr (args, cadr (args));
4236 s_return (SCHEME_V->args); 4201 s_return (args);
4237 4202
4238 case OP_SETCAR: /* set-car! */ 4203 case OP_SETCAR: /* set-car! */
4239 if (!is_immutable (car (SCHEME_V->args))) 4204 if (!is_immutable (x))
4240 { 4205 {
4241 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4206 set_car (x, cadr (args));
4242 s_return (car (SCHEME_V->args)); 4207 s_return (car (args));
4243 } 4208 }
4244 else 4209 else
4245 Error_0 ("set-car!: unable to alter immutable pair"); 4210 Error_0 ("set-car!: unable to alter immutable pair");
4246 4211
4247 case OP_SETCDR: /* set-cdr! */ 4212 case OP_SETCDR: /* set-cdr! */
4248 if (!is_immutable (car (SCHEME_V->args))) 4213 if (!is_immutable (x))
4249 { 4214 {
4250 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4215 set_cdr (x, cadr (args));
4251 s_return (car (SCHEME_V->args)); 4216 s_return (car (args));
4252 } 4217 }
4253 else 4218 else
4254 Error_0 ("set-cdr!: unable to alter immutable pair"); 4219 Error_0 ("set-cdr!: unable to alter immutable pair");
4255 4220
4256 case OP_CHAR2INT: /* char->integer */ 4221 case OP_CHAR2INT: /* char->integer */
4257 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4222 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4258 4223
4259 case OP_INT2CHAR: /* integer->char */ 4224 case OP_INT2CHAR: /* integer->char */
4260 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4225 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4261 4226
4262 case OP_CHARUPCASE: 4227 case OP_CHARUPCASE:
4263 { 4228 {
4264 unsigned char c = ivalue (car (SCHEME_V->args)); 4229 unsigned char c = ivalue_unchecked (x);
4265 c = toupper (c); 4230 c = toupper (c);
4266 s_return (mk_character (SCHEME_A_ c)); 4231 s_return (mk_character (SCHEME_A_ c));
4267 } 4232 }
4268 4233
4269 case OP_CHARDNCASE: 4234 case OP_CHARDNCASE:
4270 { 4235 {
4271 unsigned char c = ivalue (car (SCHEME_V->args)); 4236 unsigned char c = ivalue_unchecked (x);
4272 c = tolower (c); 4237 c = tolower (c);
4273 s_return (mk_character (SCHEME_A_ c)); 4238 s_return (mk_character (SCHEME_A_ c));
4274 } 4239 }
4275 4240
4276 case OP_STR2SYM: /* string->symbol */ 4241 case OP_STR2SYM: /* string->symbol */
4277 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4242 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4278 4243
4279 case OP_STR2ATOM: /* string->atom */ 4244 case OP_STR2ATOM: /* string->atom */
4280 { 4245 {
4281 char *s = strvalue (car (SCHEME_V->args)); 4246 char *s = strvalue (x);
4282 long pf = 0; 4247 long pf = 0;
4283 4248
4284 if (cdr (SCHEME_V->args) != NIL) 4249 if (cdr (args) != NIL)
4285 { 4250 {
4286 /* we know cadr(SCHEME_V->args) is a natural number */ 4251 /* we know cadr(args) is a natural number */
4287 /* see if it is 2, 8, 10, or 16, or error */ 4252 /* see if it is 2, 8, 10, or 16, or error */
4288 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4253 pf = ivalue_unchecked (cadr (args));
4289 4254
4290 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4255 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4291 { 4256 {
4292 /* base is OK */ 4257 /* base is OK */
4293 } 4258 }
4294 else 4259 else
4295 pf = -1; 4260 pf = -1;
4296 } 4261 }
4297 4262
4298 if (pf < 0) 4263 if (pf < 0)
4299 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4264 Error_1 ("string->atom: bad base:", cadr (args));
4300 else if (*s == '#') /* no use of base! */ 4265 else if (*s == '#') /* no use of base! */
4301 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4266 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4302 else 4267 else
4303 { 4268 {
4304 if (pf == 0 || pf == 10) 4269 if (pf == 0 || pf == 10)
… …
4315 } 4280 }
4316 } 4281 }
4317 } 4282 }
4318 4283
4319 case OP_SYM2STR: /* symbol->string */ 4284 case OP_SYM2STR: /* symbol->string */
4320 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4285 x = mk_string (SCHEME_A_ symname (x));
4321 setimmutable (x); 4286 setimmutable (x);
4322 s_return (x); 4287 s_return (x);
4323 4288
4324 case OP_ATOM2STR: /* atom->string */ 4289 case OP_ATOM2STR: /* atom->string */
4325 { 4290 {
4326 long pf = 0; 4291 long pf = 0;
4327 4292
4328 x = car (SCHEME_V->args);
4329
4330 if (cdr (SCHEME_V->args) != NIL) 4293 if (cdr (args) != NIL)
4331 { 4294 {
4332 /* we know cadr(SCHEME_V->args) is a natural number */ 4295 /* we know cadr(args) is a natural number */
4333 /* see if it is 2, 8, 10, or 16, or error */ 4296 /* see if it is 2, 8, 10, or 16, or error */
4334 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4297 pf = ivalue_unchecked (cadr (args));
4335 4298
4336 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4299 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4337 { 4300 {
4338 /* base is OK */ 4301 /* base is OK */
4339 } 4302 }
4340 else 4303 else
4341 pf = -1; 4304 pf = -1;
4342 } 4305 }
4343 4306
4344 if (pf < 0) 4307 if (pf < 0)
4345 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4308 Error_1 ("atom->string: bad base:", cadr (args));
4346 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4309 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4347 { 4310 {
4348 char *p; 4311 char *p;
4349 int len; 4312 int len;
4350 4313
… …
4355 Error_1 ("atom->string: not an atom:", x); 4318 Error_1 ("atom->string: not an atom:", x);
4356 } 4319 }
4357 4320
4358 case OP_MKSTRING: /* make-string */ 4321 case OP_MKSTRING: /* make-string */
4359 { 4322 {
4360 int fill = ' '; 4323 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4361 int len; 4324 int len = ivalue_unchecked (x);
4362 4325
4363 len = ivalue (car (SCHEME_V->args));
4364
4365 if (cdr (SCHEME_V->args) != NIL)
4366 fill = charvalue (cadr (SCHEME_V->args));
4367
4368 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4326 s_return (mk_empty_string (SCHEME_A_ len, fill));
4369 } 4327 }
4370 4328
4371 case OP_STRLEN: /* string-length */ 4329 case OP_STRLEN: /* string-length */
4372 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4330 s_return (mk_integer (SCHEME_A_ strlength (x)));
4373 4331
4374 case OP_STRREF: /* string-ref */ 4332 case OP_STRREF: /* string-ref */
4375 { 4333 {
4376 char *str; 4334 char *str = strvalue (x);
4377 int index;
4378
4379 str = strvalue (car (SCHEME_V->args));
4380
4381 index = ivalue (cadr (SCHEME_V->args)); 4335 int index = ivalue_unchecked (cadr (args));
4382 4336
4383 if (index >= strlength (car (SCHEME_V->args))) 4337 if (index >= strlength (x))
4384 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4338 Error_1 ("string-ref: out of bounds:", cadr (args));
4385 4339
4386 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4340 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4387 } 4341 }
4388 4342
4389 case OP_STRSET: /* string-set! */ 4343 case OP_STRSET: /* string-set! */
4390 { 4344 {
4391 char *str; 4345 char *str = strvalue (x);
4392 int index; 4346 int index = ivalue_unchecked (cadr (args));
4393 int c; 4347 int c;
4394 4348
4395 if (is_immutable (car (SCHEME_V->args))) 4349 if (is_immutable (x))
4396 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4350 Error_1 ("string-set!: unable to alter immutable string:", x);
4397 4351
4398 str = strvalue (car (SCHEME_V->args));
4399
4400 index = ivalue (cadr (SCHEME_V->args));
4401
4402 if (index >= strlength (car (SCHEME_V->args))) 4352 if (index >= strlength (x))
4403 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4353 Error_1 ("string-set!: out of bounds:", cadr (args));
4404 4354
4405 c = charvalue (caddr (SCHEME_V->args)); 4355 c = charvalue (caddr (args));
4406 4356
4407 str[index] = (char) c; 4357 str[index] = c;
4408 s_return (car (SCHEME_V->args)); 4358 s_return (car (args));
4409 } 4359 }
4410 4360
4411 case OP_STRAPPEND: /* string-append */ 4361 case OP_STRAPPEND: /* string-append */
4412 { 4362 {
4413 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4363 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4414 int len = 0; 4364 int len = 0;
4415 pointer newstr; 4365 pointer newstr;
4416 char *pos; 4366 char *pos;
4417 4367
4418 /* compute needed length for new string */ 4368 /* compute needed length for new string */
4419 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4369 for (x = args; x != NIL; x = cdr (x))
4420 len += strlength (car (x)); 4370 len += strlength (car (x));
4421 4371
4422 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4372 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4423 4373
4424 /* store the contents of the argument strings into the new string */ 4374 /* store the contents of the argument strings into the new string */
4425 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4375 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4426 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4376 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4427 4377
4428 s_return (newstr); 4378 s_return (newstr);
4429 } 4379 }
4430 4380
4431 case OP_SUBSTR: /* substring */ 4381 case OP_SUBSTR: /* substring */
4432 { 4382 {
4433 char *str; 4383 char *str = strvalue (x);
4434 int index0; 4384 int index0 = ivalue_unchecked (cadr (args));
4435 int index1; 4385 int index1;
4436 int len; 4386 int len;
4437 4387
4438 str = strvalue (car (SCHEME_V->args));
4439
4440 index0 = ivalue (cadr (SCHEME_V->args));
4441
4442 if (index0 > strlength (car (SCHEME_V->args))) 4388 if (index0 > strlength (x))
4443 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4389 Error_1 ("substring: start out of bounds:", cadr (args));
4444 4390
4445 if (cddr (SCHEME_V->args) != NIL) 4391 if (cddr (args) != NIL)
4446 { 4392 {
4447 index1 = ivalue (caddr (SCHEME_V->args)); 4393 index1 = ivalue_unchecked (caddr (args));
4448 4394
4449 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4395 if (index1 > strlength (x) || index1 < index0)
4450 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4396 Error_1 ("substring: end out of bounds:", caddr (args));
4451 } 4397 }
4452 else 4398 else
4453 index1 = strlength (car (SCHEME_V->args)); 4399 index1 = strlength (x);
4454 4400
4455 len = index1 - index0; 4401 len = index1 - index0;
4456 x = mk_empty_string (SCHEME_A_ len, ' '); 4402 x = mk_empty_string (SCHEME_A_ len, ' ');
4457 memcpy (strvalue (x), str + index0, len); 4403 memcpy (strvalue (x), str + index0, len);
4458 strvalue (x)[len] = 0; 4404 strvalue (x)[len] = 0;
… …
4462 4408
4463 case OP_VECTOR: /* vector */ 4409 case OP_VECTOR: /* vector */
4464 { 4410 {
4465 int i; 4411 int i;
4466 pointer vec; 4412 pointer vec;
4467 int len = list_length (SCHEME_A_ SCHEME_V->args); 4413 int len = list_length (SCHEME_A_ args);
4468 4414
4469 if (len < 0) 4415 if (len < 0)
4470 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4416 Error_1 ("vector: not a proper list:", args);
4471 4417
4472 vec = mk_vector (SCHEME_A_ len); 4418 vec = mk_vector (SCHEME_A_ len);
4473 4419
4474#if USE_ERROR_CHECKING 4420#if USE_ERROR_CHECKING
4475 if (SCHEME_V->no_memory) 4421 if (SCHEME_V->no_memory)
4476 s_return (S_SINK); 4422 s_return (S_SINK);
4477#endif 4423#endif
4478 4424
4479 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4425 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4480 set_vector_elem (vec, i, car (x)); 4426 vector_set (vec, i, car (x));
4481 4427
4482 s_return (vec); 4428 s_return (vec);
4483 } 4429 }
4484 4430
4485 case OP_MKVECTOR: /* make-vector */ 4431 case OP_MKVECTOR: /* make-vector */
4486 { 4432 {
4487 pointer fill = NIL; 4433 pointer fill = NIL;
4488 int len;
4489 pointer vec; 4434 pointer vec;
4435 int len = ivalue_unchecked (x);
4490 4436
4491 len = ivalue (car (SCHEME_V->args));
4492
4493 if (cdr (SCHEME_V->args) != NIL) 4437 if (cdr (args) != NIL)
4494 fill = cadr (SCHEME_V->args); 4438 fill = cadr (args);
4495 4439
4496 vec = mk_vector (SCHEME_A_ len); 4440 vec = mk_vector (SCHEME_A_ len);
4497 4441
4498#if USE_ERROR_CHECKING 4442#if USE_ERROR_CHECKING
4499 if (SCHEME_V->no_memory) 4443 if (SCHEME_V->no_memory)
4500 s_return (S_SINK); 4444 s_return (S_SINK);
4501#endif 4445#endif
4502 4446
4503 if (fill != NIL) 4447 if (fill != NIL)
4504 fill_vector (vec, fill); 4448 fill_vector (vec, 0, fill);
4505 4449
4506 s_return (vec); 4450 s_return (vec);
4507 } 4451 }
4508 4452
4509 case OP_VECLEN: /* vector-length */ 4453 case OP_VECLEN: /* vector-length */
4510 s_return (mk_integer (SCHEME_A_ vector_length (car (SCHEME_V->args)))); 4454 s_return (mk_integer (SCHEME_A_ veclength (x)));
4455
4456 case OP_VECRESIZE:
4457 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4458 s_return (x);
4511 4459
4512 case OP_VECREF: /* vector-ref */ 4460 case OP_VECREF: /* vector-ref */
4513 { 4461 {
4514 int index;
4515
4516 index = ivalue (cadr (SCHEME_V->args)); 4462 int index = ivalue_unchecked (cadr (args));
4517 4463
4518 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4464 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4519 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4465 Error_1 ("vector-ref: out of bounds:", cadr (args));
4520 4466
4521 s_return (vector_elem (car (SCHEME_V->args), index)); 4467 s_return (vector_get (x, index));
4522 } 4468 }
4523 4469
4524 case OP_VECSET: /* vector-set! */ 4470 case OP_VECSET: /* vector-set! */
4525 { 4471 {
4526 int index; 4472 int index = ivalue_unchecked (cadr (args));
4527 4473
4528 if (is_immutable (car (SCHEME_V->args))) 4474 if (is_immutable (x))
4529 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4475 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4530 4476
4531 index = ivalue (cadr (SCHEME_V->args));
4532
4533 if (index >= vector_length (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4477 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4534 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4478 Error_1 ("vector-set!: out of bounds:", cadr (args));
4535 4479
4536 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4480 vector_set (x, index, caddr (args));
4537 s_return (car (SCHEME_V->args)); 4481 s_return (x);
4538 } 4482 }
4539 } 4483 }
4540 4484
4541 return S_T; 4485 if (USE_ERROR_CHECKING) abort ();
4542} 4486}
4543 4487
4544INTERFACE int 4488static int
4545is_list (SCHEME_P_ pointer a) 4489opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4546{ 4490{
4547 return list_length (SCHEME_A_ a) >= 0; 4491 pointer x = SCHEME_V->args;
4548}
4549 4492
4550/* Result is: 4493 for (;;)
4551 proper list: length
4552 circular list: -1
4553 not even a pair: -2
4554 dotted list: -2 minus length before dot
4555*/
4556INTERFACE int
4557list_length (SCHEME_P_ pointer a)
4558{
4559 int i = 0;
4560 pointer slow, fast;
4561
4562 slow = fast = a;
4563
4564 while (1)
4565 { 4494 {
4495 num v = nvalue (car (x));
4496 x = cdr (x);
4497
4566 if (fast == NIL) 4498 if (x == NIL)
4567 return i; 4499 break;
4568 4500
4569 if (!is_pair (fast)) 4501 int r = num_cmp (v, nvalue (car (x)));
4570 return -2 - i;
4571 4502
4572 fast = cdr (fast); 4503 switch (op)
4573 ++i;
4574
4575 if (fast == NIL)
4576 return i;
4577
4578 if (!is_pair (fast))
4579 return -2 - i;
4580
4581 ++i;
4582 fast = cdr (fast);
4583
4584 /* Safe because we would have already returned if `fast'
4585 encountered a non-pair. */
4586 slow = cdr (slow);
4587
4588 if (fast == slow)
4589 { 4504 {
4590 /* the fast pointer has looped back around and caught up 4505 case OP_NUMEQ: r = r == 0; break;
4591 with the slow pointer, hence the structure is circular, 4506 case OP_LESS: r = r < 0; break;
4592 not of finite length, and therefore not a list */ 4507 case OP_GRE: r = r > 0; break;
4593 return -1; 4508 case OP_LEQ: r = r <= 0; break;
4509 case OP_GEQ: r = r >= 0; break;
4594 } 4510 }
4595 }
4596}
4597 4511
4512 if (!r)
4513 s_return (S_F);
4514 }
4515
4516 s_return (S_T);
4517}
4518
4598static pointer 4519static int
4599opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4520opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4600{ 4521{
4601 pointer x; 4522 pointer args = SCHEME_V->args;
4602 num v; 4523 pointer a = car (args);
4603 int (*comp_func) (num, num); 4524 pointer d = cdr (args);
4525 int r;
4604 4526
4605 switch (op) 4527 switch (op)
4606 { 4528 {
4607 case OP_NOT: /* not */ 4529 case OP_NOT: /* not */ r = is_false (a) ; break;
4608 s_retbool (is_false (car (SCHEME_V->args))); 4530 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4531 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4532 case OP_NULLP: /* null? */ r = a == NIL ; break;
4533 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4534 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4535 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4536 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4537 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4538 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4539 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4609 4540
4610 case OP_BOOLP: /* boolean? */
4611 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4612
4613 case OP_EOFOBJP: /* boolean? */
4614 s_retbool (car (SCHEME_V->args) == S_EOF);
4615
4616 case OP_NULLP: /* null? */
4617 s_retbool (car (SCHEME_V->args) == NIL);
4618
4619 case OP_NUMEQ: /* = */
4620 case OP_LESS: /* < */
4621 case OP_GRE: /* > */
4622 case OP_LEQ: /* <= */
4623 case OP_GEQ: /* >= */
4624 switch (op)
4625 {
4626 case OP_NUMEQ:
4627 comp_func = num_eq;
4628 break;
4629
4630 case OP_LESS:
4631 comp_func = num_lt;
4632 break;
4633
4634 case OP_GRE:
4635 comp_func = num_gt;
4636 break;
4637
4638 case OP_LEQ:
4639 comp_func = num_le;
4640 break;
4641
4642 case OP_GEQ:
4643 comp_func = num_ge;
4644 break;
4645 }
4646
4647 x = SCHEME_V->args;
4648 v = nvalue (car (x));
4649 x = cdr (x);
4650
4651 for (; x != NIL; x = cdr (x))
4652 {
4653 if (!comp_func (v, nvalue (car (x))))
4654 s_retbool (0);
4655
4656 v = nvalue (car (x));
4657 }
4658
4659 s_retbool (1);
4660
4661 case OP_SYMBOLP: /* symbol? */
4662 s_retbool (is_symbol (car (SCHEME_V->args)));
4663
4664 case OP_NUMBERP: /* number? */
4665 s_retbool (is_number (car (SCHEME_V->args)));
4666
4667 case OP_STRINGP: /* string? */
4668 s_retbool (is_string (car (SCHEME_V->args)));
4669
4670 case OP_INTEGERP: /* integer? */
4671 s_retbool (is_integer (car (SCHEME_V->args)));
4672
4673 case OP_REALP: /* real? */
4674 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4675
4676 case OP_CHARP: /* char? */
4677 s_retbool (is_character (car (SCHEME_V->args)));
4678#if USE_CHAR_CLASSIFIERS 4541#if USE_CHAR_CLASSIFIERS
4679 4542 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4680 case OP_CHARAP: /* char-alphabetic? */ 4543 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4681 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4544 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4682 4545 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4683 case OP_CHARNP: /* char-numeric? */ 4546 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4684 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4685
4686 case OP_CHARWP: /* char-whitespace? */
4687 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4688
4689 case OP_CHARUP: /* char-upper-case? */
4690 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4691
4692 case OP_CHARLP: /* char-lower-case? */
4693 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4694#endif 4547#endif
4548
4695#if USE_PORTS 4549#if USE_PORTS
4696 4550 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4697 case OP_PORTP: /* port? */
4698 s_retbool (is_port (car (SCHEME_V->args)));
4699
4700 case OP_INPORTP: /* input-port? */ 4551 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4701 s_retbool (is_inport (car (SCHEME_V->args)));
4702
4703 case OP_OUTPORTP: /* output-port? */ 4552 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4704 s_retbool (is_outport (car (SCHEME_V->args)));
4705#endif 4553#endif
4706 4554
4707 case OP_PROCP: /* procedure? */ 4555 case OP_PROCP: /* procedure? */
4708 4556
4709 /*-- 4557 /*--
4710 * continuation should be procedure by the example 4558 * continuation should be procedure by the example
4711 * (call-with-current-continuation procedure?) ==> #t 4559 * (call-with-current-continuation procedure?) ==> #t
4712 * in R^3 report sec. 6.9 4560 * in R^3 report sec. 6.9
4713 */ 4561 */
4714 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4562 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4715 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4563 break;
4716 4564
4717 case OP_PAIRP: /* pair? */ 4565 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4718 s_retbool (is_pair (car (SCHEME_V->args))); 4566 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4719 4567 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4720 case OP_LISTP: /* list? */ 4568 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4721 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4569 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4722 4570 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4723 case OP_ENVP: /* environment? */
4724 s_retbool (is_environment (car (SCHEME_V->args)));
4725
4726 case OP_VECTORP: /* vector? */
4727 s_retbool (is_vector (car (SCHEME_V->args)));
4728
4729 case OP_EQ: /* eq? */
4730 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4731
4732 case OP_EQV: /* eqv? */
4733 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4734 } 4571 }
4735 4572
4736 return S_T; 4573 s_retbool (r);
4737} 4574}
4738 4575
4739static pointer 4576static int
4740opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4577opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4741{ 4578{
4579 pointer args = SCHEME_V->args;
4580 pointer a = car (args);
4742 pointer x, y; 4581 pointer x, y;
4743 4582
4744 switch (op) 4583 switch (op)
4745 { 4584 {
4746 case OP_FORCE: /* force */ 4585 case OP_FORCE: /* force */
4747 SCHEME_V->code = car (SCHEME_V->args); 4586 SCHEME_V->code = a;
4748 4587
4749 if (is_promise (SCHEME_V->code)) 4588 if (is_promise (SCHEME_V->code))
4750 { 4589 {
4751 /* Should change type to closure here */ 4590 /* Should change type to closure here */
4752 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4591 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4755 } 4594 }
4756 else 4595 else
4757 s_return (SCHEME_V->code); 4596 s_return (SCHEME_V->code);
4758 4597
4759 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4598 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4760 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4599 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4761 s_return (SCHEME_V->value); 4600 s_return (SCHEME_V->value);
4762 4601
4763#if USE_PORTS 4602#if USE_PORTS
4764 4603
4765 case OP_WRITE: /* write */ 4604 case OP_WRITE: /* write */
… …
4773 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4612 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4774 SCHEME_V->outport = cadr (SCHEME_V->args); 4613 SCHEME_V->outport = cadr (SCHEME_V->args);
4775 } 4614 }
4776 } 4615 }
4777 4616
4778 SCHEME_V->args = car (SCHEME_V->args); 4617 SCHEME_V->args = a;
4779 4618
4780 if (op == OP_WRITE) 4619 if (op == OP_WRITE)
4781 SCHEME_V->print_flag = 1; 4620 SCHEME_V->print_flag = 1;
4782 else 4621 else
4783 SCHEME_V->print_flag = 0; 4622 SCHEME_V->print_flag = 0;
4784 4623
4785 s_goto (OP_P0LIST); 4624 s_goto (OP_P0LIST);
4786 4625
4787 case OP_NEWLINE: /* newline */ 4626 case OP_NEWLINE: /* newline */
4788 if (is_pair (SCHEME_V->args)) 4627 if (is_pair (args))
4789 { 4628 {
4790 if (car (SCHEME_V->args) != SCHEME_V->outport) 4629 if (a != SCHEME_V->outport)
4791 { 4630 {
4792 x = cons (SCHEME_V->outport, NIL); 4631 x = cons (SCHEME_V->outport, NIL);
4793 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4632 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4794 SCHEME_V->outport = car (SCHEME_V->args); 4633 SCHEME_V->outport = a;
4795 } 4634 }
4796 } 4635 }
4797 4636
4798 putstr (SCHEME_A_ "\n"); 4637 putstr (SCHEME_A_ "\n");
4799 s_return (S_T); 4638 s_return (S_T);
4800#endif 4639#endif
4801 4640
4802 case OP_ERR0: /* error */ 4641 case OP_ERR0: /* error */
4803 SCHEME_V->retcode = -1; 4642 SCHEME_V->retcode = -1;
4804 4643
4805 if (!is_string (car (SCHEME_V->args))) 4644 if (!is_string (a))
4806 { 4645 {
4807 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4646 args = cons (mk_string (SCHEME_A_ " -- "), args);
4808 setimmutable (car (SCHEME_V->args)); 4647 setimmutable (car (args));
4809 } 4648 }
4810 4649
4811 putstr (SCHEME_A_ "Error: "); 4650 putstr (SCHEME_A_ "Error: ");
4812 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4651 putstr (SCHEME_A_ strvalue (car (args)));
4813 SCHEME_V->args = cdr (SCHEME_V->args); 4652 SCHEME_V->args = cdr (args);
4814 s_goto (OP_ERR1); 4653 s_goto (OP_ERR1);
4815 4654
4816 case OP_ERR1: /* error */ 4655 case OP_ERR1: /* error */
4817 putstr (SCHEME_A_ " "); 4656 putstr (SCHEME_A_ " ");
4818 4657
4819 if (SCHEME_V->args != NIL) 4658 if (args != NIL)
4820 { 4659 {
4821 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4660 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4822 SCHEME_V->args = car (SCHEME_V->args); 4661 SCHEME_V->args = a;
4823 SCHEME_V->print_flag = 1; 4662 SCHEME_V->print_flag = 1;
4824 s_goto (OP_P0LIST); 4663 s_goto (OP_P0LIST);
4825 } 4664 }
4826 else 4665 else
4827 { 4666 {
4828 putstr (SCHEME_A_ "\n"); 4667 putstr (SCHEME_A_ "\n");
4829 4668
4830 if (SCHEME_V->interactive_repl) 4669 if (SCHEME_V->interactive_repl)
4831 s_goto (OP_T0LVL); 4670 s_goto (OP_T0LVL);
4832 else 4671 else
4833 return NIL; 4672 return -1;
4834 } 4673 }
4835 4674
4836 case OP_REVERSE: /* reverse */ 4675 case OP_REVERSE: /* reverse */
4837 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4676 s_return (reverse (SCHEME_A_ a));
4838 4677
4839 case OP_LIST_STAR: /* list* */ 4678 case OP_LIST_STAR: /* list* */
4840 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4679 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4841 4680
4842 case OP_APPEND: /* append */ 4681 case OP_APPEND: /* append */
4843 x = NIL; 4682 x = NIL;
4844 y = SCHEME_V->args; 4683 y = args;
4845 4684
4846 if (y == x) 4685 if (y == x)
4847 s_return (x); 4686 s_return (x);
4848 4687
4849 /* cdr() in the while condition is not a typo. If car() */ 4688 /* cdr() in the while condition is not a typo. If car() */
… …
4860 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4699 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4861 4700
4862#if USE_PLIST 4701#if USE_PLIST
4863 4702
4864 case OP_PUT: /* put */ 4703 case OP_PUT: /* put */
4865 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4704 if (!hasprop (a) || !hasprop (cadr (args)))
4866 Error_0 ("illegal use of put"); 4705 Error_0 ("illegal use of put");
4867 4706
4868 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4707 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4869 { 4708 {
4870 if (caar (x) == y) 4709 if (caar (x) == y)
4871 break; 4710 break;
4872 } 4711 }
4873 4712
4874 if (x != NIL) 4713 if (x != NIL)
4875 cdar (x) = caddr (SCHEME_V->args); 4714 cdar (x) = caddr (args);
4876 else 4715 else
4877 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4716 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4878 4717
4879 s_return (S_T); 4718 s_return (S_T);
4880 4719
4881 case OP_GET: /* get */ 4720 case OP_GET: /* get */
4882 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4721 if (!hasprop (a) || !hasprop (cadr (args)))
4883 Error_0 ("illegal use of get"); 4722 Error_0 ("illegal use of get");
4884 4723
4885 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4724 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4886 if (caar (x) == y) 4725 if (caar (x) == y)
4887 break; 4726 break;
4888 4727
4889 if (x != NIL) 4728 if (x != NIL)
4890 s_return (cdar (x)); 4729 s_return (cdar (x));
… …
4892 s_return (NIL); 4731 s_return (NIL);
4893 4732
4894#endif /* USE_PLIST */ 4733#endif /* USE_PLIST */
4895 4734
4896 case OP_QUIT: /* quit */ 4735 case OP_QUIT: /* quit */
4897 if (is_pair (SCHEME_V->args)) 4736 if (is_pair (args))
4898 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4737 SCHEME_V->retcode = ivalue (a);
4899 4738
4900 return NIL; 4739 return -1;
4901 4740
4902 case OP_GC: /* gc */ 4741 case OP_GC: /* gc */
4903 gc (SCHEME_A_ NIL, NIL); 4742 gc (SCHEME_A_ NIL, NIL);
4904 s_return (S_T); 4743 s_return (S_T);
4905 4744
4906 case OP_GCVERB: /* gc-verbose */ 4745 case OP_GCVERB: /* gc-verbose */
4907 { 4746 {
4908 int was = SCHEME_V->gc_verbose; 4747 int was = SCHEME_V->gc_verbose;
4909 4748
4910 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4749 SCHEME_V->gc_verbose = (a != S_F);
4911 s_retbool (was); 4750 s_retbool (was);
4912 } 4751 }
4913 4752
4914 case OP_NEWSEGMENT: /* new-segment */ 4753 case OP_NEWSEGMENT: /* new-segment */
4754#if 0
4915 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4755 if (!is_pair (args) || !is_number (a))
4916 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
4917 4757#endif
4918 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4758 s_retbool (alloc_cellseg (SCHEME_A));
4919
4920 s_return (S_T);
4921 4759
4922 case OP_OBLIST: /* oblist */ 4760 case OP_OBLIST: /* oblist */
4923 s_return (oblist_all_symbols (SCHEME_A)); 4761 s_return (oblist_all_symbols (SCHEME_A));
4924 4762
4925#if USE_PORTS 4763#if USE_PORTS
… …
4950 case OP_OPEN_INOUTFILE: 4788 case OP_OPEN_INOUTFILE:
4951 prop = port_input | port_output; 4789 prop = port_input | port_output;
4952 break; 4790 break;
4953 } 4791 }
4954 4792
4955 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4793 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4956 4794
4957 if (p == NIL) 4795 s_return (p == NIL ? S_F : p);
4958 s_return (S_F);
4959
4960 s_return (p);
4961 } 4796 }
4962 4797
4963# if USE_STRING_PORTS 4798# if USE_STRING_PORTS
4964 4799
4965 case OP_OPEN_INSTRING: /* open-input-string */ 4800 case OP_OPEN_INSTRING: /* open-input-string */
… …
4977 case OP_OPEN_INOUTSTRING: 4812 case OP_OPEN_INOUTSTRING:
4978 prop = port_input | port_output; 4813 prop = port_input | port_output;
4979 break; 4814 break;
4980 } 4815 }
4981 4816
4982 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4817 p = port_from_string (SCHEME_A_ strvalue (a),
4983 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4818 strvalue (a) + strlength (a), prop);
4984 4819
4985 if (p == NIL) 4820 s_return (p == NIL ? S_F : p);
4986 s_return (S_F);
4987
4988 s_return (p);
4989 } 4821 }
4990 4822
4991 case OP_OPEN_OUTSTRING: /* open-output-string */ 4823 case OP_OPEN_OUTSTRING: /* open-output-string */
4992 { 4824 {
4993 pointer p; 4825 pointer p;
4994 4826
4995 if (car (SCHEME_V->args) == NIL) 4827 if (a == NIL)
4996 {
4997 p = port_from_scratch (SCHEME_A); 4828 p = port_from_scratch (SCHEME_A);
4998
4999 if (p == NIL)
5000 s_return (S_F);
5001 }
5002 else 4829 else
5003 {
5004 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4830 p = port_from_string (SCHEME_A_ strvalue (a),
5005 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4831 strvalue (a) + strlength (a), port_output);
5006 4832
5007 if (p == NIL) 4833 s_return (p == NIL ? S_F : p);
5008 s_return (S_F);
5009 }
5010
5011 s_return (p);
5012 } 4834 }
5013 4835
5014 case OP_GET_OUTSTRING: /* get-output-string */ 4836 case OP_GET_OUTSTRING: /* get-output-string */
5015 { 4837 {
5016 port *p; 4838 port *p = port (a);
5017 4839
5018 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4840 if (p->kind & port_string)
5019 { 4841 {
5020 off_t size; 4842 off_t size;
5021 char *str; 4843 char *str;
5022 4844
5023 size = p->rep.string.curr - p->rep.string.start + 1; 4845 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5039 } 4861 }
5040 4862
5041# endif 4863# endif
5042 4864
5043 case OP_CLOSE_INPORT: /* close-input-port */ 4865 case OP_CLOSE_INPORT: /* close-input-port */
5044 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4866 port_close (SCHEME_A_ a, port_input);
5045 s_return (S_T); 4867 s_return (S_T);
5046 4868
5047 case OP_CLOSE_OUTPORT: /* close-output-port */ 4869 case OP_CLOSE_OUTPORT: /* close-output-port */
5048 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4870 port_close (SCHEME_A_ a, port_output);
5049 s_return (S_T); 4871 s_return (S_T);
5050#endif 4872#endif
5051 4873
5052 case OP_INT_ENV: /* interaction-environment */ 4874 case OP_INT_ENV: /* interaction-environment */
5053 s_return (SCHEME_V->global_env); 4875 s_return (SCHEME_V->global_env);
… …
5055 case OP_CURR_ENV: /* current-environment */ 4877 case OP_CURR_ENV: /* current-environment */
5056 s_return (SCHEME_V->envir); 4878 s_return (SCHEME_V->envir);
5057 4879
5058 } 4880 }
5059 4881
5060 return S_T; 4882 if (USE_ERROR_CHECKING) abort ();
5061} 4883}
5062 4884
5063static pointer 4885static int
5064opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4886opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5065{ 4887{
4888 pointer args = SCHEME_V->args;
5066 pointer x; 4889 pointer x;
5067 4890
5068 if (SCHEME_V->nesting != 0) 4891 if (SCHEME_V->nesting != 0)
5069 { 4892 {
5070 int n = SCHEME_V->nesting; 4893 int n = SCHEME_V->nesting;
… …
5077 switch (op) 4900 switch (op)
5078 { 4901 {
5079 /* ========== reading part ========== */ 4902 /* ========== reading part ========== */
5080#if USE_PORTS 4903#if USE_PORTS
5081 case OP_READ: 4904 case OP_READ:
5082 if (!is_pair (SCHEME_V->args)) 4905 if (!is_pair (args))
5083 s_goto (OP_READ_INTERNAL); 4906 s_goto (OP_READ_INTERNAL);
5084 4907
5085 if (!is_inport (car (SCHEME_V->args))) 4908 if (!is_inport (car (args)))
5086 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4909 Error_1 ("read: not an input port:", car (args));
5087 4910
5088 if (car (SCHEME_V->args) == SCHEME_V->inport) 4911 if (car (args) == SCHEME_V->inport)
5089 s_goto (OP_READ_INTERNAL); 4912 s_goto (OP_READ_INTERNAL);
5090 4913
5091 x = SCHEME_V->inport; 4914 x = SCHEME_V->inport;
5092 SCHEME_V->inport = car (SCHEME_V->args); 4915 SCHEME_V->inport = car (args);
5093 x = cons (x, NIL); 4916 x = cons (x, NIL);
5094 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4917 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5095 s_goto (OP_READ_INTERNAL); 4918 s_goto (OP_READ_INTERNAL);
5096 4919
5097 case OP_READ_CHAR: /* read-char */ 4920 case OP_READ_CHAR: /* read-char */
5098 case OP_PEEK_CHAR: /* peek-char */ 4921 case OP_PEEK_CHAR: /* peek-char */
5099 { 4922 {
5100 int c; 4923 int c;
5101 4924
5102 if (is_pair (SCHEME_V->args)) 4925 if (is_pair (args))
5103 { 4926 {
5104 if (car (SCHEME_V->args) != SCHEME_V->inport) 4927 if (car (args) != SCHEME_V->inport)
5105 { 4928 {
5106 x = SCHEME_V->inport; 4929 x = SCHEME_V->inport;
5107 x = cons (x, NIL); 4930 x = cons (x, NIL);
5108 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4931 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5109 SCHEME_V->inport = car (SCHEME_V->args); 4932 SCHEME_V->inport = car (args);
5110 } 4933 }
5111 } 4934 }
5112 4935
5113 c = inchar (SCHEME_A); 4936 c = inchar (SCHEME_A);
5114 4937
… …
5124 case OP_CHAR_READY: /* char-ready? */ 4947 case OP_CHAR_READY: /* char-ready? */
5125 { 4948 {
5126 pointer p = SCHEME_V->inport; 4949 pointer p = SCHEME_V->inport;
5127 int res; 4950 int res;
5128 4951
5129 if (is_pair (SCHEME_V->args)) 4952 if (is_pair (args))
5130 p = car (SCHEME_V->args); 4953 p = car (args);
5131 4954
5132 res = p->object.port->kind & port_string; 4955 res = port (p)->kind & port_string;
5133 4956
5134 s_retbool (res); 4957 s_retbool (res);
5135 } 4958 }
5136 4959
5137 case OP_SET_INPORT: /* set-input-port */ 4960 case OP_SET_INPORT: /* set-input-port */
5138 SCHEME_V->inport = car (SCHEME_V->args); 4961 SCHEME_V->inport = car (args);
5139 s_return (SCHEME_V->value); 4962 s_return (SCHEME_V->value);
5140 4963
5141 case OP_SET_OUTPORT: /* set-output-port */ 4964 case OP_SET_OUTPORT: /* set-output-port */
5142 SCHEME_V->outport = car (SCHEME_V->args); 4965 SCHEME_V->outport = car (args);
5143 s_return (SCHEME_V->value); 4966 s_return (SCHEME_V->value);
5144#endif 4967#endif
5145 4968
5146 case OP_RDSEXPR: 4969 case OP_RDSEXPR:
5147 switch (SCHEME_V->tok) 4970 switch (SCHEME_V->tok)
… …
5196 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5019 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5197 SCHEME_V->tok = token (SCHEME_A); 5020 SCHEME_V->tok = token (SCHEME_A);
5198 s_goto (OP_RDSEXPR); 5021 s_goto (OP_RDSEXPR);
5199 5022
5200 case TOK_ATOM: 5023 case TOK_ATOM:
5201 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5024 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5025
5026 case TOK_DOTATOM:
5027 SCHEME_V->strbuff[0] = '.';
5028 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5029
5030 case TOK_STRATOM:
5031 x = readstrexp (SCHEME_A_ '|');
5032 //TODO: haven't checked whether the garbage collector could interfere
5033 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5202 5034
5203 case TOK_DQUOTE: 5035 case TOK_DQUOTE:
5204 x = readstrexp (SCHEME_A); 5036 x = readstrexp (SCHEME_A_ '"');
5205 5037
5206 if (x == S_F) 5038 if (x == S_F)
5207 Error_0 ("Error reading string"); 5039 Error_0 ("Error reading string");
5208 5040
5209 setimmutable (x); 5041 setimmutable (x);
… …
5221 s_goto (OP_EVAL); 5053 s_goto (OP_EVAL);
5222 } 5054 }
5223 } 5055 }
5224 5056
5225 case TOK_SHARP_CONST: 5057 case TOK_SHARP_CONST:
5226 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5058 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5227 Error_0 ("undefined sharp expression"); 5059 Error_0 ("undefined sharp expression");
5228 else 5060 else
5229 s_return (x); 5061 s_return (x);
5230 5062
5231 default: 5063 default:
… …
5233 } 5065 }
5234 5066
5235 break; 5067 break;
5236 5068
5237 case OP_RDLIST: 5069 case OP_RDLIST:
5238 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5070 SCHEME_V->args = cons (SCHEME_V->value, args);
5239 SCHEME_V->tok = token (SCHEME_A); 5071 SCHEME_V->tok = token (SCHEME_A);
5240 5072
5241 switch (SCHEME_V->tok) 5073 switch (SCHEME_V->tok)
5242 { 5074 {
5243 case TOK_EOF: 5075 case TOK_EOF:
… …
5271 case OP_RDDOT: 5103 case OP_RDDOT:
5272 if (token (SCHEME_A) != TOK_RPAREN) 5104 if (token (SCHEME_A) != TOK_RPAREN)
5273 Error_0 ("syntax error: illegal dot expression"); 5105 Error_0 ("syntax error: illegal dot expression");
5274 5106
5275 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5107 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5276 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5108 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5277 5109
5278 case OP_RDQUOTE: 5110 case OP_RDQUOTE:
5279 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5111 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5280 5112
5281 case OP_RDQQUOTE: 5113 case OP_RDQQUOTE:
… …
5303 SCHEME_V->args = SCHEME_V->value; 5135 SCHEME_V->args = SCHEME_V->value;
5304 s_goto (OP_VECTOR); 5136 s_goto (OP_VECTOR);
5305 5137
5306 /* ========== printing part ========== */ 5138 /* ========== printing part ========== */
5307 case OP_P0LIST: 5139 case OP_P0LIST:
5308 if (is_vector (SCHEME_V->args)) 5140 if (is_vector (args))
5309 { 5141 {
5310 putstr (SCHEME_A_ "#("); 5142 putstr (SCHEME_A_ "#(");
5311 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5143 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5312 s_goto (OP_PVECFROM); 5144 s_goto (OP_PVECFROM);
5313 } 5145 }
5314 else if (is_environment (SCHEME_V->args)) 5146 else if (is_environment (args))
5315 { 5147 {
5316 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5148 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5317 s_return (S_T); 5149 s_return (S_T);
5318 } 5150 }
5319 else if (!is_pair (SCHEME_V->args)) 5151 else if (!is_pair (args))
5320 { 5152 {
5321 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5153 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5322 s_return (S_T); 5154 s_return (S_T);
5323 } 5155 }
5324 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5156 else
5325 { 5157 {
5158 pointer a = car (args);
5159 pointer b = cdr (args);
5160 int ok_abbr = ok_abbrev (b);
5161 SCHEME_V->args = car (b);
5162
5163 if (a == SCHEME_V->QUOTE && ok_abbr)
5326 putstr (SCHEME_A_ "'"); 5164 putstr (SCHEME_A_ "'");
5327 SCHEME_V->args = cadr (SCHEME_V->args); 5165 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5166 putstr (SCHEME_A_ "`");
5167 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ ",");
5169 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5170 putstr (SCHEME_A_ ",@");
5171 else
5172 {
5173 putstr (SCHEME_A_ "(");
5174 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5175 SCHEME_V->args = a;
5176 }
5177
5328 s_goto (OP_P0LIST); 5178 s_goto (OP_P0LIST);
5329 } 5179 }
5330 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5180
5181 case OP_P1LIST:
5182 if (is_pair (args))
5331 { 5183 {
5184 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5332 putstr (SCHEME_A_ "`"); 5185 putstr (SCHEME_A_ " ");
5333 SCHEME_V->args = cadr (SCHEME_V->args); 5186 SCHEME_V->args = car (args);
5334 s_goto (OP_P0LIST); 5187 s_goto (OP_P0LIST);
5335 } 5188 }
5336 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5337 {
5338 putstr (SCHEME_A_ ",");
5339 SCHEME_V->args = cadr (SCHEME_V->args);
5340 s_goto (OP_P0LIST);
5341 }
5342 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5343 {
5344 putstr (SCHEME_A_ ",@");
5345 SCHEME_V->args = cadr (SCHEME_V->args);
5346 s_goto (OP_P0LIST);
5347 }
5348 else
5349 {
5350 putstr (SCHEME_A_ "(");
5351 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5352 SCHEME_V->args = car (SCHEME_V->args);
5353 s_goto (OP_P0LIST);
5354 }
5355
5356 case OP_P1LIST:
5357 if (is_pair (SCHEME_V->args))
5358 {
5359 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5360 putstr (SCHEME_A_ " ");
5361 SCHEME_V->args = car (SCHEME_V->args);
5362 s_goto (OP_P0LIST);
5363 }
5364 else if (is_vector (SCHEME_V->args)) 5189 else if (is_vector (args))
5365 { 5190 {
5366 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5191 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5367 putstr (SCHEME_A_ " . "); 5192 putstr (SCHEME_A_ " . ");
5368 s_goto (OP_P0LIST); 5193 s_goto (OP_P0LIST);
5369 } 5194 }
5370 else 5195 else
5371 { 5196 {
5372 if (SCHEME_V->args != NIL) 5197 if (args != NIL)
5373 { 5198 {
5374 putstr (SCHEME_A_ " . "); 5199 putstr (SCHEME_A_ " . ");
5375 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5200 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5376 } 5201 }
5377 5202
5378 putstr (SCHEME_A_ ")"); 5203 putstr (SCHEME_A_ ")");
5379 s_return (S_T); 5204 s_return (S_T);
5380 } 5205 }
5381 5206
5382 case OP_PVECFROM: 5207 case OP_PVECFROM:
5383 { 5208 {
5384 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5209 int i = ivalue_unchecked (cdr (args));
5385 pointer vec = car (SCHEME_V->args); 5210 pointer vec = car (args);
5386 int len = vector_length (vec); 5211 int len = veclength (vec);
5387 5212
5388 if (i == len) 5213 if (i == len)
5389 { 5214 {
5390 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
5391 s_return (S_T); 5216 s_return (S_T);
5392 } 5217 }
5393 else 5218 else
5394 { 5219 {
5395 pointer elem = vector_elem (vec, i); 5220 pointer elem = vector_get (vec, i);
5396 5221
5397 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5222 ivalue_unchecked (cdr (args)) = i + 1;
5398 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5399 SCHEME_V->args = elem; 5224 SCHEME_V->args = elem;
5400 5225
5401 if (i > 0) 5226 if (i > 0)
5402 putstr (SCHEME_A_ " "); 5227 putstr (SCHEME_A_ " ");
5403 5228
5404 s_goto (OP_P0LIST); 5229 s_goto (OP_P0LIST);
5405 } 5230 }
5406 } 5231 }
5407 } 5232 }
5408 5233
5409 return S_T; 5234 if (USE_ERROR_CHECKING) abort ();
5410} 5235}
5411 5236
5412static pointer 5237static int
5413opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5238opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5414{ 5239{
5240 pointer args = SCHEME_V->args;
5241 pointer a = car (args);
5415 pointer x, y; 5242 pointer x, y;
5416 5243
5417 switch (op) 5244 switch (op)
5418 { 5245 {
5419 case OP_LIST_LENGTH: /* length *//* a.k */ 5246 case OP_LIST_LENGTH: /* length *//* a.k */
5420 { 5247 {
5421 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5248 long v = list_length (SCHEME_A_ a);
5422 5249
5423 if (v < 0) 5250 if (v < 0)
5424 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5251 Error_1 ("length: not a list:", a);
5425 5252
5426 s_return (mk_integer (SCHEME_A_ v)); 5253 s_return (mk_integer (SCHEME_A_ v));
5427 } 5254 }
5428 5255
5429 case OP_ASSQ: /* assq *//* a.k */ 5256 case OP_ASSQ: /* assq *//* a.k */
5430 x = car (SCHEME_V->args); 5257 x = a;
5431 5258
5432 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5259 for (y = cadr (args); is_pair (y); y = cdr (y))
5433 { 5260 {
5434 if (!is_pair (car (y))) 5261 if (!is_pair (car (y)))
5435 Error_0 ("unable to handle non pair element"); 5262 Error_0 ("unable to handle non pair element");
5436 5263
5437 if (x == caar (y)) 5264 if (x == caar (y))
… …
5443 else 5270 else
5444 s_return (S_F); 5271 s_return (S_F);
5445 5272
5446 5273
5447 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5274 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5448 SCHEME_V->args = car (SCHEME_V->args); 5275 SCHEME_V->args = a;
5449 5276
5450 if (SCHEME_V->args == NIL) 5277 if (SCHEME_V->args == NIL)
5451 s_return (S_F); 5278 s_return (S_F);
5452 else if (is_closure (SCHEME_V->args)) 5279 else if (is_closure (SCHEME_V->args))
5453 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5280 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5458 5285
5459 case OP_CLOSUREP: /* closure? */ 5286 case OP_CLOSUREP: /* closure? */
5460 /* 5287 /*
5461 * Note, macro object is also a closure. 5288 * Note, macro object is also a closure.
5462 * Therefore, (closure? <#MACRO>) ==> #t 5289 * Therefore, (closure? <#MACRO>) ==> #t
5290 * (schmorp) well, obviously not, fix? TODO
5463 */ 5291 */
5464 s_retbool (is_closure (car (SCHEME_V->args))); 5292 s_retbool (is_closure (a));
5465 5293
5466 case OP_MACROP: /* macro? */ 5294 case OP_MACROP: /* macro? */
5467 s_retbool (is_macro (car (SCHEME_V->args))); 5295 s_retbool (is_macro (a));
5468 } 5296 }
5469 5297
5470 return S_T; /* NOTREACHED */ 5298 if (USE_ERROR_CHECKING) abort ();
5471} 5299}
5472 5300
5301/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5473typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5302typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5474 5303
5475typedef int (*test_predicate) (pointer); 5304typedef int (*test_predicate)(pointer);
5476static int 5305static int
5477is_any (pointer p) 5306tst_any (pointer p)
5478{ 5307{
5479 return 1; 5308 return 1;
5480} 5309}
5481 5310
5482static int 5311static int
5483is_nonneg (pointer p) 5312tst_inonneg (pointer p)
5484{ 5313{
5485 return ivalue (p) >= 0 && is_integer (p); 5314 return is_integer (p) && ivalue_unchecked (p) >= 0;
5315}
5316
5317static int
5318tst_is_list (SCHEME_P_ pointer p)
5319{
5320 return p == NIL || is_pair (p);
5486} 5321}
5487 5322
5488/* Correspond carefully with following defines! */ 5323/* Correspond carefully with following defines! */
5489static struct 5324static struct
5490{ 5325{
5491 test_predicate fct; 5326 test_predicate fct;
5492 const char *kind; 5327 const char *kind;
5493} tests[] = 5328} tests[] = {
5494{ 5329 { tst_any , 0 },
5495 { 0, 0}, /* unused */ 5330 { is_string , "string" },
5496 { is_any, 0}, 5331 { is_symbol , "symbol" },
5497 { is_string, "string" }, 5332 { is_port , "port" },
5498 { is_symbol, "symbol" },
5499 { is_port, "port" },
5500 { is_inport, "input port" }, 5333 { is_inport , "input port" },
5501 { is_outport, "output port" }, 5334 { is_outport , "output port" },
5502 { is_environment, "environment" }, 5335 { is_environment, "environment" },
5503 { is_pair, "pair" }, 5336 { is_pair , "pair" },
5504 { 0, "pair or '()" }, 5337 { 0 , "pair or '()" },
5505 { is_character, "character" }, 5338 { is_character , "character" },
5506 { is_vector, "vector" }, 5339 { is_vector , "vector" },
5507 { is_number, "number" }, 5340 { is_number , "number" },
5508 { is_integer, "integer" }, 5341 { is_integer , "integer" },
5509 { is_nonneg, "non-negative integer" } 5342 { tst_inonneg , "non-negative integer" }
5510}; 5343};
5511 5344
5512#define TST_NONE 0 5345#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5513#define TST_ANY "\001" 5346#define TST_ANY "\001"
5514#define TST_STRING "\002" 5347#define TST_STRING "\002"
5515#define TST_SYMBOL "\003" 5348#define TST_SYMBOL "\003"
5516#define TST_PORT "\004" 5349#define TST_PORT "\004"
5517#define TST_INPORT "\005" 5350#define TST_INPORT "\005"
5518#define TST_OUTPORT "\006" 5351#define TST_OUTPORT "\006"
5519#define TST_ENVIRONMENT "\007" 5352#define TST_ENVIRONMENT "\007"
5520#define TST_PAIR "\010" 5353#define TST_PAIR "\010"
5521#define TST_LIST "\011" 5354#define TST_LIST "\011"
5522#define TST_CHAR "\012" 5355#define TST_CHAR "\012"
5523#define TST_VECTOR "\013" 5356#define TST_VECTOR "\013"
5524#define TST_NUMBER "\014" 5357#define TST_NUMBER "\014"
5525#define TST_INTEGER "\015" 5358#define TST_INTEGER "\015"
5526#define TST_NATURAL "\016" 5359#define TST_NATURAL "\016"
5360
5361#define INF_ARG 0xff
5362#define UNNAMED_OP ""
5363
5364static const char opnames[] =
5365#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5366#include "opdefines.h"
5367#undef OP_DEF
5368;
5369
5370static const char *
5371opname (int idx)
5372{
5373 const char *name = opnames;
5374
5375 /* should do this at compile time, but would require external program, right? */
5376 while (idx--)
5377 name += strlen (name) + 1;
5378
5379 return *name ? name : "ILLEGAL";
5380}
5381
5382static const char *
5383procname (pointer x)
5384{
5385 return opname (procnum (x));
5386}
5527 5387
5528typedef struct 5388typedef struct
5529{ 5389{
5530 dispatch_func func; 5390 uint8_t func;
5531 char *name; 5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5392 uint8_t builtin;
5393#if USE_ERROR_CHECKING
5532 int min_arity; 5394 uint8_t min_arity;
5533 int max_arity; 5395 uint8_t max_arity;
5534 char *arg_tests_encoding; 5396 char arg_tests_encoding[3];
5397#endif
5535} op_code_info; 5398} op_code_info;
5536 5399
5537#define INF_ARG 0xffff
5538
5539static op_code_info dispatch_table[] = { 5400static const op_code_info dispatch_table[] = {
5540#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5401#if USE_ERROR_CHECKING
5402#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5403#else
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5405#endif
5541#include "opdefines.h" 5406#include "opdefines.h"
5407#undef OP_DEF
5542 {0} 5408 {0}
5543}; 5409};
5544 5410
5545static const char *
5546procname (pointer x)
5547{
5548 int n = procnum (x);
5549 const char *name = dispatch_table[n].name;
5550
5551 if (name == 0)
5552 name = "ILLEGAL!";
5553
5554 return name;
5555}
5556
5557/* kernel of this interpreter */ 5411/* kernel of this interpreter */
5558static void 5412static void ecb_hot
5559Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5413Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5560{ 5414{
5561 SCHEME_V->op = op; 5415 SCHEME_V->op = op;
5562 5416
5563 for (;;) 5417 for (;;)
5564 { 5418 {
5565 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5419 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5566 5420
5567#if USE_ERROR_CHECKING 5421#if USE_ERROR_CHECKING
5568 if (pcd->name) /* if built-in function, check arguments */ 5422 if (pcd->builtin) /* if built-in function, check arguments */
5569 { 5423 {
5570 int ok = 1;
5571 char msg[STRBUFFSIZE]; 5424 char msg[STRBUFFSIZE];
5572 int n = list_length (SCHEME_A_ SCHEME_V->args); 5425 int n = list_length (SCHEME_A_ SCHEME_V->args);
5573 5426
5574 /* Check number of arguments */ 5427 /* Check number of arguments */
5575 if (n < pcd->min_arity) 5428 if (ecb_expect_false (n < pcd->min_arity))
5576 { 5429 {
5577 ok = 0;
5578 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5430 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5579 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5431 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5432 xError_1 (SCHEME_A_ msg, 0);
5433 continue;
5580 } 5434 }
5581 5435 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5582 if (ok && n > pcd->max_arity)
5583 { 5436 {
5584 ok = 0;
5585 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5437 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5586 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5438 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5439 xError_1 (SCHEME_A_ msg, 0);
5440 continue;
5587 } 5441 }
5588 5442 else
5589 if (ok)
5590 { 5443 {
5591 if (pcd->arg_tests_encoding) 5444 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5592 { 5445 {
5593 int i = 0; 5446 int i = 0;
5594 int j; 5447 int j;
5595 const char *t = pcd->arg_tests_encoding; 5448 const char *t = pcd->arg_tests_encoding;
5596 pointer arglist = SCHEME_V->args; 5449 pointer arglist = SCHEME_V->args;
5597 5450
5598 do 5451 do
5599 { 5452 {
5600 pointer arg = car (arglist); 5453 pointer arg = car (arglist);
5601 5454
5602 j = (int) t[0]; 5455 j = t[0];
5603 5456
5457 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5604 if (j == TST_LIST[0]) 5458 if (j == TST_LIST[0])
5605 { 5459 {
5606 if (arg != NIL && !is_pair (arg)) 5460 if (!tst_is_list (SCHEME_A_ arg))
5607 break; 5461 break;
5608 } 5462 }
5609 else 5463 else
5610 { 5464 {
5611 if (!tests[j].fct (arg)) 5465 if (!tests[j - 1].fct (arg))
5612 break; 5466 break;
5613 } 5467 }
5614 5468
5615 if (t[1] != 0) /* last test is replicated as necessary */ 5469 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5616 t++; 5470 t++;
5617 5471
5618 arglist = cdr (arglist); 5472 arglist = cdr (arglist);
5619 i++; 5473 i++;
5620 } 5474 }
5621 while (i < n); 5475 while (i < n);
5622 5476
5623 if (i < n) 5477 if (i < n)
5624 { 5478 {
5625 ok = 0;
5626 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5479 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5480 xError_1 (SCHEME_A_ msg, 0);
5481 continue;
5627 } 5482 }
5628 } 5483 }
5629 } 5484 }
5630
5631 if (!ok)
5632 {
5633 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5634 return;
5635
5636 pcd = dispatch_table + SCHEME_V->op;
5637 }
5638 } 5485 }
5639#endif 5486#endif
5640 5487
5641 ok_to_freely_gc (SCHEME_A); 5488 ok_to_freely_gc (SCHEME_A);
5642 5489
5643 if (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL) 5490 static const dispatch_func dispatch_funcs[] = {
5491 opexe_0,
5492 opexe_1,
5493 opexe_2,
5494 opexe_3,
5495 opexe_4,
5496 opexe_5,
5497 opexe_6,
5498 };
5499
5500 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5644 return; 5501 return;
5645 5502
5646 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5503 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5647 { 5504 {
5648 xwrstr ("No memory!\n"); 5505 putstr (SCHEME_A_ "No memory!\n");
5649 return; 5506 return;
5650 } 5507 }
5651 } 5508 }
5652} 5509}
5653 5510
… …
5672mk_proc (SCHEME_P_ enum scheme_opcodes op) 5529mk_proc (SCHEME_P_ enum scheme_opcodes op)
5673{ 5530{
5674 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5531 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5675 set_typeflag (y, (T_PROC | T_ATOM)); 5532 set_typeflag (y, (T_PROC | T_ATOM));
5676 ivalue_unchecked (y) = op; 5533 ivalue_unchecked (y) = op;
5677 set_num_integer (y);
5678 return y; 5534 return y;
5679} 5535}
5680 5536
5681/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5537/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5682static int 5538static int
5683syntaxnum (pointer p) 5539syntaxnum (pointer p)
5684{ 5540{
5685 const char *s = strvalue (car (p)); 5541 const char *s = strvalue (p);
5686 5542
5687 switch (strlength (car (p))) 5543 switch (strlength (p))
5688 { 5544 {
5689 case 2: 5545 case 2:
5690 if (s[0] == 'i') 5546 if (s[0] == 'i')
5691 return OP_IF0; /* if */ 5547 return OP_IF0; /* if */
5692 else 5548 else
… …
5706 5562
5707 case 'd': 5563 case 'd':
5708 return OP_COND0; /* cond */ 5564 return OP_COND0; /* cond */
5709 5565
5710 case '*': 5566 case '*':
5711 return OP_LET0AST; /* let* */ 5567 return OP_LET0AST;/* let* */
5712 5568
5713 default: 5569 default:
5714 return OP_SET0; /* set! */ 5570 return OP_SET0; /* set! */
5715 } 5571 }
5716 5572
… …
5738 5594
5739 case 'f': 5595 case 'f':
5740 return OP_DEF0; /* define */ 5596 return OP_DEF0; /* define */
5741 5597
5742 default: 5598 default:
5743 return OP_LET0REC; /* letrec */ 5599 return OP_LET0REC;/* letrec */
5744 } 5600 }
5745 5601
5746 default: 5602 default:
5747 return OP_C0STREAM; /* cons-stream */ 5603 return OP_C0STREAM; /* cons-stream */
5748 } 5604 }
5749} 5605}
5750 5606
5751#if USE_MULTIPLICITY 5607#if USE_MULTIPLICITY
5752scheme * 5608ecb_cold scheme *
5753scheme_init_new () 5609scheme_init_new ()
5754{ 5610{
5755 scheme *sc = malloc (sizeof (scheme)); 5611 scheme *sc = malloc (sizeof (scheme));
5756 5612
5757 if (!scheme_init (SCHEME_A)) 5613 if (!scheme_init (SCHEME_A))
… …
5762 else 5618 else
5763 return sc; 5619 return sc;
5764} 5620}
5765#endif 5621#endif
5766 5622
5767int 5623ecb_cold int
5768scheme_init (SCHEME_P) 5624scheme_init (SCHEME_P)
5769{ 5625{
5770 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5626 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5771 pointer x; 5627 pointer x;
5628
5629 /* this memset is not strictly correct, as we assume (intcache)
5630 * that memset 0 will also set pointers to 0, but memset does
5631 * of course not guarantee that. screw such systems.
5632 */
5633 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5772 5634
5773 num_set_fixnum (num_zero, 1); 5635 num_set_fixnum (num_zero, 1);
5774 num_set_ivalue (num_zero, 0); 5636 num_set_ivalue (num_zero, 0);
5775 num_set_fixnum (num_one, 1); 5637 num_set_fixnum (num_one, 1);
5776 num_set_ivalue (num_one, 1); 5638 num_set_ivalue (num_one, 1);
… …
5788 SCHEME_V->save_inport = NIL; 5650 SCHEME_V->save_inport = NIL;
5789 SCHEME_V->loadport = NIL; 5651 SCHEME_V->loadport = NIL;
5790 SCHEME_V->nesting = 0; 5652 SCHEME_V->nesting = 0;
5791 SCHEME_V->interactive_repl = 0; 5653 SCHEME_V->interactive_repl = 0;
5792 5654
5793 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5655 if (!alloc_cellseg (SCHEME_A))
5794 { 5656 {
5795#if USE_ERROR_CHECKING 5657#if USE_ERROR_CHECKING
5796 SCHEME_V->no_memory = 1; 5658 SCHEME_V->no_memory = 1;
5797 return 0; 5659 return 0;
5798#endif 5660#endif
… …
5815 set_cdr (S_T, S_T); 5677 set_cdr (S_T, S_T);
5816 /* init F */ 5678 /* init F */
5817 set_typeflag (S_F, T_ATOM | T_MARK); 5679 set_typeflag (S_F, T_ATOM | T_MARK);
5818 set_car (S_F, S_F); 5680 set_car (S_F, S_F);
5819 set_cdr (S_F, S_F); 5681 set_cdr (S_F, S_F);
5682 /* init EOF_OBJ */
5683 set_typeflag (S_EOF, T_ATOM | T_MARK);
5684 set_car (S_EOF, S_EOF);
5685 set_cdr (S_EOF, S_EOF);
5820 /* init sink */ 5686 /* init sink */
5821 set_typeflag (S_SINK, T_PAIR | T_MARK); 5687 set_typeflag (S_SINK, T_PAIR | T_MARK);
5822 set_car (S_SINK, NIL); 5688 set_car (S_SINK, NIL);
5689
5823 /* init c_nest */ 5690 /* init c_nest */
5824 SCHEME_V->c_nest = NIL; 5691 SCHEME_V->c_nest = NIL;
5825 5692
5826 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5693 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5827 /* init global_env */ 5694 /* init global_env */
… …
5840 5707
5841 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5708 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5842 assign_syntax (SCHEME_A_ syntax_names[i]); 5709 assign_syntax (SCHEME_A_ syntax_names[i]);
5843 } 5710 }
5844 5711
5712 // TODO: should iterate via strlen, to avoid n² complexity
5845 for (i = 0; i < n; i++) 5713 for (i = 0; i < n; i++)
5846 if (dispatch_table[i].name != 0) 5714 if (dispatch_table[i].builtin)
5847 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5715 assign_proc (SCHEME_A_ i, opname (i));
5848 5716
5849 /* initialization of global pointers to special symbols */ 5717 /* initialization of global pointers to special symbols */
5850 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5718 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5851 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5719 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5852 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5720 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5891scheme_set_external_data (SCHEME_P_ void *p) 5759scheme_set_external_data (SCHEME_P_ void *p)
5892{ 5760{
5893 SCHEME_V->ext_data = p; 5761 SCHEME_V->ext_data = p;
5894} 5762}
5895 5763
5896void 5764ecb_cold void
5897scheme_deinit (SCHEME_P) 5765scheme_deinit (SCHEME_P)
5898{ 5766{
5899 int i; 5767 int i;
5900 5768
5901#if SHOW_ERROR_LINE 5769#if SHOW_ERROR_LINE
… …
5993{ 5861{
5994 dump_stack_reset (SCHEME_A); 5862 dump_stack_reset (SCHEME_A);
5995 SCHEME_V->envir = SCHEME_V->global_env; 5863 SCHEME_V->envir = SCHEME_V->global_env;
5996 SCHEME_V->file_i = 0; 5864 SCHEME_V->file_i = 0;
5997 SCHEME_V->load_stack[0].kind = port_input | port_string; 5865 SCHEME_V->load_stack[0].kind = port_input | port_string;
5998 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5866 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5999 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5867 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
6000 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5868 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6001#if USE_PORTS 5869#if USE_PORTS
6002 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5870 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6003#endif 5871#endif
6004 SCHEME_V->retcode = 0; 5872 SCHEME_V->retcode = 0;
6005 SCHEME_V->interactive_repl = 0; 5873 SCHEME_V->interactive_repl = 0;
… …
6110 5978
6111/* ========== Main ========== */ 5979/* ========== Main ========== */
6112 5980
6113#if STANDALONE 5981#if STANDALONE
6114 5982
6115# if defined(__APPLE__) && !defined (OSX)
6116int
6117main ()
6118{
6119 extern MacTS_main (int argc, char **argv);
6120 char **argv;
6121 int argc = ccommand (&argv);
6122
6123 MacTS_main (argc, argv);
6124 return 0;
6125}
6126
6127int
6128MacTS_main (int argc, char **argv)
6129{
6130# else
6131int 5983int
6132main (int argc, char **argv) 5984main (int argc, char **argv)
6133{ 5985{
6134# endif
6135# if USE_MULTIPLICITY 5986# if USE_MULTIPLICITY
6136 scheme ssc; 5987 scheme ssc;
6137 scheme *const SCHEME_V = &ssc; 5988 scheme *const SCHEME_V = &ssc;
6138# else 5989# else
6139# endif 5990# endif
6140 int fin; 5991 int fin;
6141 char *file_name = InitFile; 5992 char *file_name = InitFile;
6142 int retcode; 5993 int retcode;
6143 int isfile = 1; 5994 int isfile = 1;
5995 system ("ps v $PPID");//D
6144 5996
6145 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5997 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6146 { 5998 {
6147 xwrstr ("Usage: tinyscheme -?\n"); 5999 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6148 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6000 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6149 xwrstr ("followed by\n"); 6001 putstr (SCHEME_A_ "followed by\n");
6150 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6002 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6151 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6003 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6152 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6004 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6153 xwrstr ("Use - as filename for stdin.\n"); 6005 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6154 return 1; 6006 return 1;
6155 } 6007 }
6156 6008
6157 if (!scheme_init (SCHEME_A)) 6009 if (!scheme_init (SCHEME_A))
6158 { 6010 {
6159 xwrstr ("Could not initialize!\n"); 6011 putstr (SCHEME_A_ "Could not initialize!\n");
6160 return 2; 6012 return 2;
6161 } 6013 }
6162 6014
6163# if USE_PORTS 6015# if USE_PORTS
6164 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6016 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6209 fin = open (file_name, O_RDONLY); 6061 fin = open (file_name, O_RDONLY);
6210#endif 6062#endif
6211 6063
6212 if (isfile && fin < 0) 6064 if (isfile && fin < 0)
6213 { 6065 {
6214 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6066 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6215 } 6067 }
6216 else 6068 else
6217 { 6069 {
6218 if (isfile) 6070 if (isfile)
6219 scheme_load_named_file (SCHEME_A_ fin, file_name); 6071 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6223#if USE_PORTS 6075#if USE_PORTS
6224 if (!isfile || fin != STDIN_FILENO) 6076 if (!isfile || fin != STDIN_FILENO)
6225 { 6077 {
6226 if (SCHEME_V->retcode != 0) 6078 if (SCHEME_V->retcode != 0)
6227 { 6079 {
6228 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6080 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6229 } 6081 }
6230 6082
6231 if (isfile) 6083 if (isfile)
6232 close (fin); 6084 close (fin);
6233 } 6085 }

Diff Legend

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