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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.4 by root, Wed Nov 25 10:49:29 2015 UTC vs.
Revision 1.43 by root, Mon Nov 30 06:40:57 2015 UTC

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

Diff Legend

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