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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.51 by root, Tue Dec 1 01:54:27 2015 UTC

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

Diff Legend

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