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

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

Diff Legend

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