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

Diff Legend

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