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

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

Diff Legend

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