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

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

Diff Legend

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