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

Diff Legend

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