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

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

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

Diff Legend

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