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.10 by root, Thu Nov 26 00:03:19 2015 UTC vs.
Revision 1.52 by root, Tue Dec 1 01:56:22 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#endif
76 91
77#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
78static scheme sc; 93static scheme sc;
79#endif 94#endif
80 95
… …
150 165
151#define toupper(c) xtoupper (c) 166#define toupper(c) xtoupper (c)
152#define tolower(c) xtolower (c) 167#define tolower(c) xtolower (c)
153#define isdigit(c) xisdigit (c) 168#define isdigit(c) xisdigit (c)
154 169
155#if USE_STRLWR 170#if USE_IGNORECASE
156static const char * 171static const char *
157strlwr (char *s) 172xstrlwr (char *s)
158{ 173{
159 const char *p = s; 174 const char *p = s;
160 175
161 while (*s) 176 while (*s)
162 { 177 {
… …
164 s++; 179 s++;
165 } 180 }
166 181
167 return p; 182 return p;
168} 183}
169#endif
170 184
185#define stricmp(a,b) strcasecmp (a, b)
186#define strlwr(s) xstrlwr (s)
187
188#else
171#define stricmp(a,b) strcmp (a, b) 189# define stricmp(a,b) strcmp (a, b)
172#define strlwr(s) (s) 190# define strlwr(s) (s)
191#endif
173 192
174#ifndef prompt 193#ifndef prompt
175# define prompt "ts> " 194# define prompt "ts> "
176#endif 195#endif
177 196
178#ifndef InitFile 197#ifndef InitFile
179# define InitFile "init.scm" 198# define InitFile "init.scm"
180#endif 199#endif
181 200
182#ifndef FIRST_CELLSEGS
183# define FIRST_CELLSEGS 3
184#endif
185
186enum scheme_types 201enum scheme_types
187{ 202{
203 T_INTEGER,
188 T_FREE, 204 T_REAL,
189 T_STRING, 205 T_STRING,
190 T_NUMBER,
191 T_SYMBOL, 206 T_SYMBOL,
192 T_PROC, 207 T_PROC,
193 T_PAIR, 208 T_PAIR, /* also used for free cells */
194 T_CLOSURE, 209 T_CLOSURE,
195 T_CONTINUATION, 210 T_CONTINUATION,
196 T_FOREIGN, 211 T_FOREIGN,
197 T_CHARACTER, 212 T_CHARACTER,
198 T_PORT, 213 T_PORT,
… …
208#define T_SYNTAX 0x0010 223#define T_SYNTAX 0x0010
209#define T_IMMUTABLE 0x0020 224#define T_IMMUTABLE 0x0020
210#define T_ATOM 0x0040 /* only for gc */ 225#define T_ATOM 0x0040 /* only for gc */
211#define T_MARK 0x0080 /* only for gc */ 226#define T_MARK 0x0080 /* only for gc */
212 227
213static num num_add (num a, num b); 228/* num, for generic arithmetic */
214static num num_mul (num a, num b); 229struct num
215static 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);
216static num num_intdiv (num a, num b); 257static num num_intdiv (num a, num b);
217static num num_sub (num a, num b);
218static num num_rem (num a, num b); 258static num num_rem (num a, num b);
219static num num_mod (num a, num b); 259static num num_mod (num a, num b);
220static int num_eq (num a, num b);
221static int num_gt (num a, num b);
222static int num_ge (num a, num b);
223static int num_lt (num a, num b);
224static int num_le (num a, num b);
225 260
226#if USE_MATH 261#if USE_MATH
227static double round_per_R5RS (double x); 262static double round_per_R5RS (double x);
228#endif 263#endif
229static int is_zero_rvalue (RVALUE x); 264static int is_zero_rvalue (RVALUE x);
230 265
231static INLINE int
232num_is_integer (pointer p)
233{
234 return num_is_fixnum (p->object.number);
235}
236
237static num num_zero; 266static num num_zero;
238static num num_one; 267static num num_one;
239 268
269/* convert "pointer" to cell* / cell* to pointer */
270#define CELL(p) ((struct cell *)(p) + 0)
271#define POINTER(c) ((void *)((c) - 0))
272
240/* macros for cell operations */ 273/* macros for cell operations */
241#define typeflag(p) ((p)->flag + 0) 274#define typeflag(p) (CELL(p)->flag + 0)
242#define set_typeflag(p,v) ((p)->flag = (v)) 275#define set_typeflag(p,v) (CELL(p)->flag = (v))
243#define type(p) (typeflag (p) & T_MASKTYPE) 276#define type(p) (typeflag (p) & T_MASKTYPE)
244 277
245INTERFACE INLINE int 278INTERFACE int
246is_string (pointer p) 279is_string (pointer p)
247{ 280{
248 return type (p) == T_STRING; 281 return type (p) == T_STRING;
249} 282}
250 283
251#define strvalue(p) ((p)->object.string.svalue) 284#define strvalue(p) (CELL(p)->object.string.svalue)
252#define strlength(p) ((p)->object.string.length) 285#define strlength(p) (CELL(p)->object.string.length)
253 286
254INTERFACE int is_list (SCHEME_P_ pointer p);
255INTERFACE INLINE int 287INTERFACE int
256is_vector (pointer p) 288is_vector (pointer p)
257{ 289{
258 return type (p) == T_VECTOR; 290 return type (p) == T_VECTOR;
259} 291}
260 292
261#define vecvalue(p) ((p)->object.vector.vvalue) 293#define vecvalue(p) (CELL(p)->object.vector.vvalue)
262#define veclength(p) ((p)->object.vector.length) 294#define veclength(p) (CELL(p)->object.vector.length)
263INTERFACE void fill_vector (pointer vec, pointer obj); 295INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
264INTERFACE uint32_t vector_length (pointer vec);
265INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 296INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
266INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 297INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
267 298
268INTERFACE uint32_t 299INTERFACE int
269vector_length (pointer vec) 300is_integer (pointer p)
270{ 301{
271 return vec->object.vector.length; 302 return type (p) == T_INTEGER;
272} 303}
273 304
305/* not the same as in scheme, where integers are (correctly :) reals */
274INTERFACE INLINE int 306INTERFACE int
307is_real (pointer p)
308{
309 return type (p) == T_REAL;
310}
311
312INTERFACE int
275is_number (pointer p) 313is_number (pointer p)
276{ 314{
277 return type (p) == T_NUMBER; 315 return is_integer (p) || is_real (p);
278} 316}
279 317
280INTERFACE INLINE int 318INTERFACE int
281is_integer (pointer p)
282{
283 if (!is_number (p))
284 return 0;
285
286 if (num_is_integer (p) || ivalue (p) == rvalue (p))
287 return 1;
288
289 return 0;
290}
291
292INTERFACE INLINE int
293is_real (pointer p)
294{
295 return is_number (p) && !num_is_fixnum (p->object.number);
296}
297
298INTERFACE INLINE int
299is_character (pointer p) 319is_character (pointer p)
300{ 320{
301 return type (p) == T_CHARACTER; 321 return type (p) == T_CHARACTER;
302} 322}
303 323
304INTERFACE INLINE char * 324INTERFACE char *
305string_value (pointer p) 325string_value (pointer p)
306{ 326{
307 return strvalue (p); 327 return strvalue (p);
308} 328}
309 329
310INLINE num
311nvalue (pointer p)
312{
313 return (p)->object.number;
314}
315
316static IVALUE
317num_get_ivalue (const num n)
318{
319 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
320}
321
322static RVALUE
323num_get_rvalue (const num n)
324{
325 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
326}
327
328INTERFACE IVALUE
329ivalue (pointer p)
330{
331 return num_get_ivalue (p->object.number);
332}
333
334INTERFACE RVALUE
335rvalue (pointer p)
336{
337 return num_get_rvalue (p->object.number);
338}
339
340#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 330#define ivalue_unchecked(p) CELL(p)->object.ivalue
331#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
332
341#if USE_REAL 333#if USE_REAL
342# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 334#define rvalue_unchecked(p) CELL(p)->object.rvalue
343# define set_num_integer(p) (p)->object.number.is_fixnum=1; 335#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
344# define set_num_real(p) (p)->object.number.is_fixnum=0;
345#else 336#else
346# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 337#define rvalue_unchecked(p) CELL(p)->object.ivalue
347# define set_num_integer(p) 0 338#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
348# define set_num_real(p) 0
349#endif 339#endif
340
350INTERFACE long 341INTERFACE long
351charvalue (pointer p) 342charvalue (pointer p)
352{ 343{
353 return ivalue_unchecked (p); 344 return ivalue_unchecked (p);
354} 345}
355 346
347#define port(p) CELL(p)->object.port
348#define set_port(p,v) port(p) = (v)
356INTERFACE INLINE int 349INTERFACE int
357is_port (pointer p) 350is_port (pointer p)
358{ 351{
359 return type (p) == T_PORT; 352 return type (p) == T_PORT;
360} 353}
361 354
362INTERFACE INLINE int 355INTERFACE int
363is_inport (pointer p) 356is_inport (pointer p)
364{ 357{
365 return is_port (p) && p->object.port->kind & port_input; 358 return is_port (p) && port (p)->kind & port_input;
366} 359}
367 360
368INTERFACE INLINE int 361INTERFACE int
369is_outport (pointer p) 362is_outport (pointer p)
370{ 363{
371 return is_port (p) && p->object.port->kind & port_output; 364 return is_port (p) && port (p)->kind & port_output;
372} 365}
373 366
374INTERFACE INLINE int 367INTERFACE int
375is_pair (pointer p) 368is_pair (pointer p)
376{ 369{
377 return type (p) == T_PAIR; 370 return type (p) == T_PAIR;
378} 371}
379 372
380#define car(p) ((p)->object.cons.car + 0) 373#define car(p) (POINTER (CELL(p)->object.cons.car))
381#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 374#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
382 375
383#define caar(p) car (car (p)) 376static pointer caar (pointer p) { return car (car (p)); }
384#define cadr(p) car (cdr (p)) 377static pointer cadr (pointer p) { return car (cdr (p)); }
385#define cdar(p) cdr (car (p)) 378static pointer cdar (pointer p) { return cdr (car (p)); }
386#define cddr(p) cdr (cdr (p)) 379static pointer cddr (pointer p) { return cdr (cdr (p)); }
387 380
388#define cadar(p) car (cdr (car (p))) 381static pointer cadar (pointer p) { return car (cdr (car (p))); }
389#define caddr(p) car (cdr (cdr (p))) 382static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
390#define cdaar(p) cdr (car (car (p))) 383static pointer cdaar (pointer p) { return cdr (car (car (p))); }
391 384
392INTERFACE void 385INTERFACE void
393set_car (pointer p, pointer q) 386set_car (pointer p, pointer q)
394{ 387{
395 p->object.cons.car = q; 388 CELL(p)->object.cons.car = CELL (q);
396} 389}
397 390
398INTERFACE void 391INTERFACE void
399set_cdr (pointer p, pointer q) 392set_cdr (pointer p, pointer q)
400{ 393{
401 p->object.cons.cdr = q; 394 CELL(p)->object.cons.cdr = CELL (q);
402} 395}
403 396
404INTERFACE pointer 397INTERFACE pointer
405pair_car (pointer p) 398pair_car (pointer p)
406{ 399{
… …
411pair_cdr (pointer p) 404pair_cdr (pointer p)
412{ 405{
413 return cdr (p); 406 return cdr (p);
414} 407}
415 408
416INTERFACE INLINE int 409INTERFACE int
417is_symbol (pointer p) 410is_symbol (pointer p)
418{ 411{
419 return type (p) == T_SYMBOL; 412 return type (p) == T_SYMBOL;
420} 413}
421 414
422INTERFACE INLINE char * 415INTERFACE char *
423symname (pointer p) 416symname (pointer p)
424{ 417{
425 return strvalue (car (p)); 418 return strvalue (p);
426} 419}
427 420
428#if USE_PLIST 421#if USE_PLIST
422#error plists are broken because symbols are no longer pairs
423#define symprop(p) cdr(p)
429SCHEME_EXPORT INLINE int 424SCHEME_EXPORT int
430hasprop (pointer p) 425hasprop (pointer p)
431{ 426{
432 return typeflag (p) & T_SYMBOL; 427 return typeflag (p) & T_SYMBOL;
433} 428}
434
435# define symprop(p) cdr(p)
436#endif 429#endif
437 430
438INTERFACE INLINE int 431INTERFACE int
439is_syntax (pointer p) 432is_syntax (pointer p)
440{ 433{
441 return typeflag (p) & T_SYNTAX; 434 return typeflag (p) & T_SYNTAX;
442} 435}
443 436
444INTERFACE INLINE int 437INTERFACE int
445is_proc (pointer p) 438is_proc (pointer p)
446{ 439{
447 return type (p) == T_PROC; 440 return type (p) == T_PROC;
448} 441}
449 442
450INTERFACE INLINE int 443INTERFACE int
451is_foreign (pointer p) 444is_foreign (pointer p)
452{ 445{
453 return type (p) == T_FOREIGN; 446 return type (p) == T_FOREIGN;
454} 447}
455 448
456INTERFACE INLINE char * 449INTERFACE char *
457syntaxname (pointer p) 450syntaxname (pointer p)
458{ 451{
459 return strvalue (car (p)); 452 return strvalue (p);
460} 453}
461 454
462#define procnum(p) ivalue (p) 455#define procnum(p) ivalue_unchecked (p)
463static const char *procname (pointer x); 456static const char *procname (pointer x);
464 457
465INTERFACE INLINE int 458INTERFACE int
466is_closure (pointer p) 459is_closure (pointer p)
467{ 460{
468 return type (p) == T_CLOSURE; 461 return type (p) == T_CLOSURE;
469} 462}
470 463
471INTERFACE INLINE int 464INTERFACE int
472is_macro (pointer p) 465is_macro (pointer p)
473{ 466{
474 return type (p) == T_MACRO; 467 return type (p) == T_MACRO;
475} 468}
476 469
477INTERFACE INLINE pointer 470INTERFACE pointer
478closure_code (pointer p) 471closure_code (pointer p)
479{ 472{
480 return car (p); 473 return car (p);
481} 474}
482 475
483INTERFACE INLINE pointer 476INTERFACE pointer
484closure_env (pointer p) 477closure_env (pointer p)
485{ 478{
486 return cdr (p); 479 return cdr (p);
487} 480}
488 481
489INTERFACE INLINE int 482INTERFACE int
490is_continuation (pointer p) 483is_continuation (pointer p)
491{ 484{
492 return type (p) == T_CONTINUATION; 485 return type (p) == T_CONTINUATION;
493} 486}
494 487
495#define cont_dump(p) cdr (p) 488#define cont_dump(p) cdr (p)
496#define set_cont_dump(p,v) set_cdr ((p), (v)) 489#define set_cont_dump(p,v) set_cdr ((p), (v))
497 490
498/* To do: promise should be forced ONCE only */ 491/* To do: promise should be forced ONCE only */
499INTERFACE INLINE int 492INTERFACE int
500is_promise (pointer p) 493is_promise (pointer p)
501{ 494{
502 return type (p) == T_PROMISE; 495 return type (p) == T_PROMISE;
503} 496}
504 497
505INTERFACE INLINE int 498INTERFACE int
506is_environment (pointer p) 499is_environment (pointer p)
507{ 500{
508 return type (p) == T_ENVIRONMENT; 501 return type (p) == T_ENVIRONMENT;
509} 502}
510 503
… …
516 509
517#define is_mark(p) (typeflag (p) & T_MARK) 510#define is_mark(p) (typeflag (p) & T_MARK)
518#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 511#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
519#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 512#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
520 513
521INTERFACE INLINE int 514INTERFACE int
522is_immutable (pointer p) 515is_immutable (pointer p)
523{ 516{
524 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 517 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
525} 518}
526 519
527INTERFACE INLINE void 520INTERFACE void
528setimmutable (pointer p) 521setimmutable (pointer p)
529{ 522{
530#if USE_ERROR_CHECKING 523#if USE_ERROR_CHECKING
531 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 524 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
532#endif 525#endif
533} 526}
534 527
528/* Result is:
529 proper list: length
530 circular list: -1
531 not even a pair: -2
532 dotted list: -2 minus length before dot
533*/
534INTERFACE int
535list_length (SCHEME_P_ pointer a)
536{
537 int i = 0;
538 pointer slow, fast;
539
540 slow = fast = a;
541
542 while (1)
543 {
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 fast = cdr (fast);
551 ++i;
552
553 if (fast == NIL)
554 return i;
555
556 if (!is_pair (fast))
557 return -2 - i;
558
559 ++i;
560 fast = cdr (fast);
561
562 /* Safe because we would have already returned if `fast'
563 encountered a non-pair. */
564 slow = cdr (slow);
565
566 if (fast == slow)
567 {
568 /* the fast pointer has looped back around and caught up
569 with the slow pointer, hence the structure is circular,
570 not of finite length, and therefore not a list */
571 return -1;
572 }
573 }
574}
575
576INTERFACE int
577is_list (SCHEME_P_ pointer a)
578{
579 return list_length (SCHEME_A_ a) >= 0;
580}
581
535#if USE_CHAR_CLASSIFIERS 582#if USE_CHAR_CLASSIFIERS
536static INLINE int 583ecb_inline int
537Cisalpha (int c) 584Cisalpha (int c)
538{ 585{
539 return isascii (c) && isalpha (c); 586 return isascii (c) && isalpha (c);
540} 587}
541 588
542static INLINE int 589ecb_inline int
543Cisdigit (int c) 590Cisdigit (int c)
544{ 591{
545 return isascii (c) && isdigit (c); 592 return isascii (c) && isdigit (c);
546} 593}
547 594
548static INLINE int 595ecb_inline int
549Cisspace (int c) 596Cisspace (int c)
550{ 597{
551 return isascii (c) && isspace (c); 598 return isascii (c) && isspace (c);
552} 599}
553 600
554static INLINE int 601ecb_inline int
555Cisupper (int c) 602Cisupper (int c)
556{ 603{
557 return isascii (c) && isupper (c); 604 return isascii (c) && isupper (c);
558} 605}
559 606
560static INLINE int 607ecb_inline int
561Cislower (int c) 608Cislower (int c)
562{ 609{
563 return isascii (c) && islower (c); 610 return isascii (c) && islower (c);
564} 611}
565#endif 612#endif
… …
626#endif 673#endif
627 674
628static int file_push (SCHEME_P_ const char *fname); 675static int file_push (SCHEME_P_ const char *fname);
629static void file_pop (SCHEME_P); 676static void file_pop (SCHEME_P);
630static int file_interactive (SCHEME_P); 677static int file_interactive (SCHEME_P);
631static INLINE int is_one_of (char *s, int c); 678ecb_inline int is_one_of (const char *s, int c);
632static int alloc_cellseg (SCHEME_P_ int n); 679static int alloc_cellseg (SCHEME_P);
633static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 680ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
634static void finalize_cell (SCHEME_P_ pointer a); 681static void finalize_cell (SCHEME_P_ pointer a);
635static int count_consecutive_cells (pointer x, int needed); 682static int count_consecutive_cells (pointer x, int needed);
636static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 683static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
637static pointer mk_number (SCHEME_P_ const num n); 684static pointer mk_number (SCHEME_P_ const num n);
638static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 685static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
653static void mark (pointer a); 700static void mark (pointer a);
654static void gc (SCHEME_P_ pointer a, pointer b); 701static void gc (SCHEME_P_ pointer a, pointer b);
655static int basic_inchar (port *pt); 702static int basic_inchar (port *pt);
656static int inchar (SCHEME_P); 703static int inchar (SCHEME_P);
657static void backchar (SCHEME_P_ int c); 704static void backchar (SCHEME_P_ int c);
658static char *readstr_upto (SCHEME_P_ char *delim); 705static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
659static pointer readstrexp (SCHEME_P); 706static pointer readstrexp (SCHEME_P_ char delim);
660static INLINE int skipspace (SCHEME_P); 707ecb_inline int skipspace (SCHEME_P);
661static int token (SCHEME_P); 708static int token (SCHEME_P);
662static void printslashstring (SCHEME_P_ char *s, int len); 709static void printslashstring (SCHEME_P_ char *s, int len);
663static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 710static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
664static void printatom (SCHEME_P_ pointer l, int f); 711static void printatom (SCHEME_P_ pointer l, int f);
665static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 712static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
669static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 716static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
670static pointer revappend (SCHEME_P_ pointer a, pointer b); 717static pointer revappend (SCHEME_P_ pointer a, pointer b);
671static pointer ss_get_cont (SCHEME_P); 718static pointer ss_get_cont (SCHEME_P);
672static void ss_set_cont (SCHEME_P_ pointer cont); 719static void ss_set_cont (SCHEME_P_ pointer cont);
673static void dump_stack_mark (SCHEME_P); 720static void dump_stack_mark (SCHEME_P);
674static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 721static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
722static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 723static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 724static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 725static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 726static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
679static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 727static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
680static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 728static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
681static void assign_syntax (SCHEME_P_ const char *name); 729static void assign_syntax (SCHEME_P_ const char *name);
682static int syntaxnum (pointer p); 730static int syntaxnum (pointer p);
683static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 731static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
684 732
733static IVALUE
734ivalue (pointer x)
735{
736 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
737}
738
739static RVALUE
740rvalue (pointer x)
741{
742 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
743}
744
745INTERFACE num
746nvalue (pointer x)
747{
748 num n;
749
750 num_set_fixnum (n, is_integer (x));
751
752 if (num_is_fixnum (n))
753 num_set_ivalue (n, ivalue_unchecked (x));
754 else
755 num_set_rvalue (n, rvalue_unchecked (x));
756
757 return n;
758}
759
685static num 760static num
686num_add (num a, num b) 761num_op (enum num_op op, num a, num b)
687{ 762{
688 num ret; 763 num ret;
689 764
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 765 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
691 766
692 if (num_is_fixnum (ret)) 767 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, num_get_ivalue (a) + num_get_ivalue (b)); 768 {
769 switch (op)
770 {
771 case NUM_ADD: a.ivalue += b.ivalue; break;
772 case NUM_SUB: a.ivalue -= b.ivalue; break;
773 case NUM_MUL: a.ivalue *= b.ivalue; break;
774 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
775 }
776
777 num_set_ivalue (ret, a.ivalue);
778 }
779#if USE_REAL
694 else 780 else
695 num_set_rvalue (ret, num_get_rvalue (a) + num_get_rvalue (b)); 781 {
782 switch (op)
783 {
784 case NUM_ADD: a.rvalue += b.rvalue; break;
785 case NUM_SUB: a.rvalue -= b.rvalue; break;
786 case NUM_MUL: a.rvalue *= b.rvalue; break;
787 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
788 }
696 789
697 return ret; 790 num_set_rvalue (ret, a.rvalue);
698} 791 }
699 792#endif
700static num
701num_mul (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, num_get_ivalue (a) * num_get_ivalue (b));
709 else
710 num_set_rvalue (ret, num_get_rvalue (a) * num_get_rvalue (b));
711 793
712 return ret; 794 return ret;
713} 795}
714 796
715static num 797static num
716num_div (num a, num b) 798num_div (num a, num b)
717{ 799{
718 num ret; 800 num ret;
719 801
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 802 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
721 803
722 if (num_is_fixnum (ret)) 804 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 805 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
724 else 806 else
725 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 807 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
726
727 return ret;
728}
729
730static num
731num_intdiv (num a, num b)
732{
733 num ret;
734
735 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
736
737 if (num_is_fixnum (ret))
738 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
739 else
740 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
741
742 return ret;
743}
744
745static num
746num_sub (num a, num b)
747{
748 num ret;
749
750 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
751
752 if (num_is_fixnum (ret))
753 num_set_ivalue (ret, num_get_ivalue (a) - num_get_ivalue (b));
754 else
755 num_set_rvalue (ret, num_get_rvalue (a) - num_get_rvalue (b));
756 808
757 return ret; 809 return ret;
758} 810}
759 811
760static num 812static num
… …
762{ 814{
763 num ret; 815 num ret;
764 long e1, e2, res; 816 long e1, e2, res;
765 817
766 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 818 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
767 e1 = num_get_ivalue (a); 819 e1 = num_ivalue (a);
768 e2 = num_get_ivalue (b); 820 e2 = num_ivalue (b);
769 res = e1 % e2; 821 res = e1 % e2;
770 822
771 /* remainder should have same sign as second operand */ 823 /* remainder should have same sign as second operand */
772 if (res > 0) 824 if (res > 0)
773 { 825 {
… …
789{ 841{
790 num ret; 842 num ret;
791 long e1, e2, res; 843 long e1, e2, res;
792 844
793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 845 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
794 e1 = num_get_ivalue (a); 846 e1 = num_ivalue (a);
795 e2 = num_get_ivalue (b); 847 e2 = num_ivalue (b);
796 res = e1 % e2; 848 res = e1 % e2;
797 849
798 /* modulo should have same sign as second operand */ 850 /* modulo should have same sign as second operand */
799 if (res * e2 < 0) 851 if (res * e2 < 0)
800 res += e2; 852 res += e2;
801 853
802 num_set_ivalue (ret, res); 854 num_set_ivalue (ret, res);
803 return ret; 855 return ret;
804} 856}
805 857
858/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
806static int 859static int
807num_eq (num a, num b) 860num_cmp (num a, num b)
808{ 861{
862 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
809 int ret; 863 int ret;
810 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
811 864
812 if (is_fixnum) 865 if (is_fixnum)
813 ret = num_get_ivalue (a) == num_get_ivalue (b); 866 {
867 IVALUE av = num_ivalue (a);
868 IVALUE bv = num_ivalue (b);
869
870 ret = av == bv ? 0 : av < bv ? -1 : +1;
871 }
814 else 872 else
815 ret = num_get_rvalue (a) == num_get_rvalue (b); 873 {
874 RVALUE av = num_rvalue (a);
875 RVALUE bv = num_rvalue (b);
876
877 ret = av == bv ? 0 : av < bv ? -1 : +1;
878 }
816 879
817 return ret; 880 return ret;
818}
819
820
821static int
822num_gt (num a, num b)
823{
824 int ret;
825 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
826
827 if (is_fixnum)
828 ret = num_get_ivalue (a) > num_get_ivalue (b);
829 else
830 ret = num_get_rvalue (a) > num_get_rvalue (b);
831
832 return ret;
833}
834
835static int
836num_ge (num a, num b)
837{
838 return !num_lt (a, b);
839}
840
841static int
842num_lt (num a, num b)
843{
844 int ret;
845 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
846
847 if (is_fixnum)
848 ret = num_get_ivalue (a) < num_get_ivalue (b);
849 else
850 ret = num_get_rvalue (a) < num_get_rvalue (b);
851
852 return ret;
853}
854
855static int
856num_le (num a, num b)
857{
858 return !num_gt (a, b);
859} 881}
860 882
861#if USE_MATH 883#if USE_MATH
862 884
863/* Round to nearest. Round to even if midway */ 885/* Round to nearest. Round to even if midway */
… …
873 return ce; 895 return ce;
874 else if (dfl < dce) 896 else if (dfl < dce)
875 return fl; 897 return fl;
876 else 898 else
877 { 899 {
878 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 900 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl; 901 return fl;
880 else 902 else
881 return ce; 903 return ce;
882 } 904 }
883} 905}
884#endif 906#endif
885 907
886static int 908static int
887is_zero_rvalue (RVALUE x) 909is_zero_rvalue (RVALUE x)
888{ 910{
911 return x == 0;
912#if 0
889#if USE_REAL 913#if USE_REAL
890 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 914 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
891#else 915#else
892 return x == 0; 916 return x == 0;
893#endif 917#endif
918#endif
894} 919}
895 920
896/* allocate new cell segment */ 921/* allocate new cell segment */
897static int 922static int
898alloc_cellseg (SCHEME_P_ int n) 923alloc_cellseg (SCHEME_P)
899{ 924{
900 pointer newp; 925 struct cell *newp;
901 pointer last; 926 struct cell *last;
902 pointer p; 927 struct cell *p;
903 char *cp; 928 char *cp;
904 long i; 929 long i;
905 int k; 930 int k;
906 931
907 static int segsize = CELL_SEGSIZE >> 1; 932 static int segsize = CELL_SEGSIZE >> 1;
908 segsize <<= 1; 933 segsize <<= 1;
909 934
910 for (k = 0; k < n; k++)
911 {
912 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
913 return k;
914
915 cp = malloc (segsize * sizeof (struct cell)); 935 cp = malloc (segsize * sizeof (struct cell));
916 936
917 if (!cp && USE_ERROR_CHECKING) 937 if (!cp && USE_ERROR_CHECKING)
918 return k; 938 return k;
919 939
920 i = ++SCHEME_V->last_cell_seg; 940 i = ++SCHEME_V->last_cell_seg;
921 SCHEME_V->alloc_seg[i] = cp; 941 SCHEME_V->alloc_seg[i] = cp;
922 942
923 /* insert new segment in address order */ 943 newp = (struct cell *)cp;
924 newp = (pointer)cp;
925 SCHEME_V->cell_seg[i] = newp; 944 SCHEME_V->cell_seg[i] = newp;
926 SCHEME_V->cell_segsize[i] = segsize; 945 SCHEME_V->cell_segsize[i] = segsize;
927
928 //TODO: insert, not swap
929 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
930 {
931 p = SCHEME_V->cell_seg[i];
932 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
933 SCHEME_V->cell_seg[i - 1] = p;
934
935 k = SCHEME_V->cell_segsize[i];
936 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
937 SCHEME_V->cell_segsize[i - 1] = k;
938
939 --i;
940 }
941
942 SCHEME_V->fcells += segsize; 946 SCHEME_V->fcells += segsize;
943 last = newp + segsize - 1; 947 last = newp + segsize - 1;
944 948
945 for (p = newp; p <= last; p++) 949 for (p = newp; p <= last; p++)
946 { 950 {
951 pointer cp = POINTER (p);
947 set_typeflag (p, T_FREE); 952 set_typeflag (cp, T_PAIR);
948 set_car (p, NIL); 953 set_car (cp, NIL);
949 set_cdr (p, p + 1); 954 set_cdr (cp, POINTER (p + 1));
950 } 955 }
951 956
952 /* insert new cells in address order on free list */
953 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
954 {
955 set_cdr (last, SCHEME_V->free_cell); 957 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 958 SCHEME_V->free_cell = POINTER (newp);
957 }
958 else
959 {
960 p = SCHEME_V->free_cell;
961 959
962 while (cdr (p) != NIL && newp > cdr (p))
963 p = cdr (p);
964
965 set_cdr (last, cdr (p));
966 set_cdr (p, newp);
967 }
968 }
969
970 return n; 960 return 1;
971} 961}
972 962
973/* get new cell. parameter a, b is marked by gc. */ 963/* get new cell. parameter a, b is marked by gc. */
974static INLINE pointer 964ecb_inline pointer
975get_cell_x (SCHEME_P_ pointer a, pointer b) 965get_cell_x (SCHEME_P_ pointer a, pointer b)
976{ 966{
977 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 967 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
978 { 968 {
979 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 969 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
980 return S_SINK; 970 return S_SINK;
981 971
982 if (SCHEME_V->free_cell == NIL) 972 if (SCHEME_V->free_cell == NIL)
983 { 973 {
984 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 974 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
985 975
986 gc (SCHEME_A_ a, b); 976 gc (SCHEME_A_ a, b);
987 977
988 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 978 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
989 { 979 {
990 /* if only a few recovered, get more to avoid fruitless gc's */ 980 /* if only a few recovered, get more to avoid fruitless gc's */
991 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 981 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
992 { 982 {
993#if USE_ERROR_CHECKING 983#if USE_ERROR_CHECKING
994 SCHEME_V->no_memory = 1; 984 SCHEME_V->no_memory = 1;
995 return S_SINK; 985 return S_SINK;
996#endif 986#endif
… …
1008 } 998 }
1009} 999}
1010 1000
1011/* To retain recent allocs before interpreter knows about them - 1001/* To retain recent allocs before interpreter knows about them -
1012 Tehom */ 1002 Tehom */
1013
1014static void 1003static void
1015push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1016{ 1005{
1017 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1018 1007
… …
1040} 1029}
1041 1030
1042static pointer 1031static pointer
1043get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1032get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1044{ 1033{
1045 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1034 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1046 pointer *e = malloc (len * sizeof (pointer)); 1035 pointer *e = malloc (len * sizeof (pointer));
1047 1036
1048 if (!e && USE_ERROR_CHECKING) 1037 if (!e && USE_ERROR_CHECKING)
1049 return S_SINK; 1038 return S_SINK;
1050 1039
1051 /* Record it as a vector so that gc understands it. */ 1040 /* Record it as a vector so that gc understands it. */
1052 set_typeflag (v, T_VECTOR | T_ATOM); 1041 set_typeflag (v, T_VECTOR | T_ATOM);
1053 1042
1054 v->object.vector.vvalue = e; 1043 CELL(v)->object.vector.vvalue = e;
1055 v->object.vector.length = len; 1044 CELL(v)->object.vector.length = len;
1056 fill_vector (v, init); 1045 fill_vector (v, 0, init);
1057 push_recent_alloc (SCHEME_A_ v, NIL); 1046 push_recent_alloc (SCHEME_A_ v, NIL);
1058 1047
1059 return v; 1048 return v;
1060} 1049}
1061 1050
1062static INLINE void 1051ecb_inline void
1063ok_to_freely_gc (SCHEME_P) 1052ok_to_freely_gc (SCHEME_P)
1064{ 1053{
1065 set_car (S_SINK, NIL); 1054 set_car (S_SINK, NIL);
1066} 1055}
1067 1056
… …
1104 set_cdr (x, b); 1093 set_cdr (x, b);
1105 1094
1106 return x; 1095 return x;
1107} 1096}
1108 1097
1098static pointer
1099generate_symbol (SCHEME_P_ const char *name)
1100{
1101 pointer x = mk_string (SCHEME_A_ name);
1102 setimmutable (x);
1103 set_typeflag (x, T_SYMBOL | T_ATOM);
1104 return x;
1105}
1106
1109/* ========== oblist implementation ========== */ 1107/* ========== oblist implementation ========== */
1110 1108
1111#ifndef USE_OBJECT_LIST 1109#ifndef USE_OBJECT_LIST
1112 1110
1111static int
1113static 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}
1114 1122
1115static pointer 1123static pointer
1116oblist_initial_value (SCHEME_P) 1124oblist_initial_value (SCHEME_P)
1117{ 1125{
1118 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1120 1128
1121/* returns the new symbol */ 1129/* returns the new symbol */
1122static pointer 1130static pointer
1123oblist_add_by_name (SCHEME_P_ const char *name) 1131oblist_add_by_name (SCHEME_P_ const char *name)
1124{ 1132{
1125 int location; 1133 pointer x = generate_symbol (SCHEME_A_ name);
1126
1127 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1128 set_typeflag (x, T_SYMBOL);
1129 setimmutable (car (x));
1130
1131 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1134 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1132 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)));
1133 return x; 1136 return x;
1134} 1137}
1135 1138
1136static INLINE pointer 1139ecb_inline pointer
1137oblist_find_by_name (SCHEME_P_ const char *name) 1140oblist_find_by_name (SCHEME_P_ const char *name)
1138{ 1141{
1139 int location; 1142 int location;
1140 pointer x; 1143 pointer x;
1141 char *s; 1144 char *s;
1142 1145
1143 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1146 location = hash_fn (name, veclength (SCHEME_V->oblist));
1144 1147
1145 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))
1146 { 1149 {
1147 s = symname (car (x)); 1150 s = symname (car (x));
1148 1151
1149 /* case-insensitive, per R5RS section 2 */ 1152 /* case-insensitive, per R5RS section 2 */
1150 if (stricmp (name, s) == 0) 1153 if (stricmp (name, s) == 0)
… …
1160 int i; 1163 int i;
1161 pointer x; 1164 pointer x;
1162 pointer ob_list = NIL; 1165 pointer ob_list = NIL;
1163 1166
1164 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1167 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1165 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))
1166 ob_list = cons (x, ob_list); 1169 ob_list = cons (x, ob_list);
1167 1170
1168 return ob_list; 1171 return ob_list;
1169} 1172}
1170 1173
… …
1174oblist_initial_value (SCHEME_P) 1177oblist_initial_value (SCHEME_P)
1175{ 1178{
1176 return NIL; 1179 return NIL;
1177} 1180}
1178 1181
1179static INLINE pointer 1182ecb_inline pointer
1180oblist_find_by_name (SCHEME_P_ const char *name) 1183oblist_find_by_name (SCHEME_P_ const char *name)
1181{ 1184{
1182 pointer x; 1185 pointer x;
1183 char *s; 1186 char *s;
1184 1187
… …
1196 1199
1197/* returns the new symbol */ 1200/* returns the new symbol */
1198static pointer 1201static pointer
1199oblist_add_by_name (SCHEME_P_ const char *name) 1202oblist_add_by_name (SCHEME_P_ const char *name)
1200{ 1203{
1201 pointer x; 1204 pointer x = generate_symbol (SCHEME_A_ name);
1202
1203 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1204 set_typeflag (x, T_SYMBOL);
1205 setimmutable (car (x));
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1205 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1206 return x;
1208} 1207}
1209 1208
1210static pointer 1209static pointer
… …
1220mk_port (SCHEME_P_ port *p) 1219mk_port (SCHEME_P_ port *p)
1221{ 1220{
1222 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1221 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223 1222
1224 set_typeflag (x, T_PORT | T_ATOM); 1223 set_typeflag (x, T_PORT | T_ATOM);
1225 x->object.port = p; 1224 set_port (x, p);
1226 1225
1227 return x; 1226 return x;
1228} 1227}
1229#endif 1228#endif
1230 1229
1231pointer 1230pointer
1232mk_foreign_func (SCHEME_P_ foreign_func f) 1231mk_foreign_func (SCHEME_P_ foreign_func f)
1233{ 1232{
1234 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1233 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235 1234
1236 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1235 set_typeflag (x, T_FOREIGN | T_ATOM);
1237 x->object.ff = f; 1236 CELL(x)->object.ff = f;
1238 1237
1239 return x; 1238 return x;
1240} 1239}
1241 1240
1242INTERFACE pointer 1241INTERFACE pointer
1243mk_character (SCHEME_P_ int c) 1242mk_character (SCHEME_P_ int c)
1244{ 1243{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1244 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1245
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1246 set_typeflag (x, T_CHARACTER | T_ATOM);
1248 ivalue_unchecked (x) = c & 0xff; 1247 set_ivalue (x, c & 0xff);
1249 set_num_integer (x); 1248
1250 return x; 1249 return x;
1251} 1250}
1252 1251
1253/* get number atom (integer) */ 1252/* get number atom (integer) */
1254INTERFACE pointer 1253INTERFACE pointer
1255mk_integer (SCHEME_P_ long num) 1254mk_integer (SCHEME_P_ long n)
1256{ 1255{
1256 pointer p = 0;
1257 pointer *pp = &p;
1258
1259#if USE_INTCACHE
1260 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1261 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1262#endif
1263
1264 if (!*pp)
1265 {
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1266 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1267
1259 set_typeflag (x, (T_NUMBER | T_ATOM)); 1268 set_typeflag (x, T_INTEGER | T_ATOM);
1260 ivalue_unchecked (x) = num; 1269 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_num_integer (x); 1270 set_ivalue (x, n);
1271
1272 *pp = x;
1273 }
1274
1262 return x; 1275 return *pp;
1263} 1276}
1264 1277
1265INTERFACE pointer 1278INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1279mk_real (SCHEME_P_ RVALUE n)
1267{ 1280{
1281#if USE_REAL
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1282 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1283
1270 set_typeflag (x, (T_NUMBER | T_ATOM)); 1284 set_typeflag (x, T_REAL | T_ATOM);
1271 rvalue_unchecked (x) = n; 1285 set_rvalue (x, n);
1272 set_num_real (x); 1286
1273 return x; 1287 return x;
1288#else
1289 return mk_integer (SCHEME_A_ n);
1290#endif
1274} 1291}
1275 1292
1276static pointer 1293static pointer
1277mk_number (SCHEME_P_ const num n) 1294mk_number (SCHEME_P_ const num n)
1278{ 1295{
1296#if USE_REAL
1279 if (num_is_fixnum (n)) 1297 return num_is_fixnum (n)
1298 ? mk_integer (SCHEME_A_ num_ivalue (n))
1299 : mk_real (SCHEME_A_ num_rvalue (n));
1300#else
1280 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1301 return mk_integer (SCHEME_A_ num_ivalue (n));
1281 else 1302#endif
1282 return mk_real (SCHEME_A_ num_get_rvalue (n));
1283} 1303}
1284 1304
1285/* allocate name to string area */ 1305/* allocate name to string area */
1286static char * 1306static char *
1287store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1307store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1293 SCHEME_V->no_memory = 1; 1313 SCHEME_V->no_memory = 1;
1294 return SCHEME_V->strbuff; 1314 return SCHEME_V->strbuff;
1295 } 1315 }
1296 1316
1297 if (str) 1317 if (str)
1298 { 1318 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1299 int l = strlen (str);
1300
1301 if (l > len_str)
1302 l = len_str;
1303
1304 memcpy (q, str, l);
1305 q[l] = 0;
1306 }
1307 else 1319 else
1308 {
1309 memset (q, fill, len_str); 1320 memset (q, fill, len_str);
1321
1310 q[len_str] = 0; 1322 q[len_str] = 0;
1311 }
1312 1323
1313 return q; 1324 return q;
1314} 1325}
1315 1326
1316INTERFACE pointer 1327INTERFACE pointer
… …
1330 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1341 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1331 1342
1332 set_typeflag (x, T_STRING | T_ATOM); 1343 set_typeflag (x, T_STRING | T_ATOM);
1333 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1344 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1334 strlength (x) = len; 1345 strlength (x) = len;
1346
1335 return x; 1347 return x;
1336} 1348}
1337 1349
1338INTERFACE pointer 1350INTERFACE pointer
1339mk_string (SCHEME_P_ const char *str) 1351mk_string (SCHEME_P_ const char *str)
… …
1346{ 1358{
1347 return get_vector_object (SCHEME_A_ len, NIL); 1359 return get_vector_object (SCHEME_A_ len, NIL);
1348} 1360}
1349 1361
1350INTERFACE void 1362INTERFACE void
1351fill_vector (pointer vec, pointer obj) 1363fill_vector (pointer vec, uint32_t start, pointer obj)
1352{ 1364{
1353 int i; 1365 int i;
1354 1366
1355 for (i = 0; i < vec->object.vector.length; i++) 1367 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1368 vecvalue (vec)[i] = obj;
1357} 1369}
1358 1370
1371INTERFACE void
1372vector_resize (pointer vec, uint32_t newsize, pointer fill)
1373{
1374 uint32_t oldsize = veclength (vec);
1375 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1376 veclength (vec) = newsize;
1377 fill_vector (vec, oldsize, fill);
1378}
1379
1359INTERFACE pointer 1380INTERFACE pointer
1360vector_elem (pointer vec, uint32_t ielem) 1381vector_get (pointer vec, uint32_t ielem)
1361{ 1382{
1362 return vecvalue(vec)[ielem]; 1383 return vecvalue(vec)[ielem];
1363} 1384}
1364 1385
1365INTERFACE void 1386INTERFACE void
1366set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1387vector_set (pointer vec, uint32_t ielem, pointer a)
1367{ 1388{
1368 vecvalue(vec)[ielem] = a; 1389 vecvalue(vec)[ielem] = a;
1369} 1390}
1370 1391
1371/* get new symbol */ 1392/* get new symbol */
… …
1383 1404
1384INTERFACE pointer 1405INTERFACE pointer
1385gensym (SCHEME_P) 1406gensym (SCHEME_P)
1386{ 1407{
1387 pointer x; 1408 pointer x;
1388
1389 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1390 {
1391 char name[40] = "gensym-"; 1409 char name[40] = "gensym-";
1392 xnum (name + 7, SCHEME_V->gensym_cnt); 1410 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1393 1411
1394 /* first check oblist */ 1412 return generate_symbol (SCHEME_A_ name);
1395 x = oblist_find_by_name (SCHEME_A_ name); 1413}
1396 1414
1397 if (x == NIL) 1415static int
1398 { 1416is_gensym (SCHEME_P_ pointer x)
1399 x = oblist_add_by_name (SCHEME_A_ name); 1417{
1400 return x; 1418 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1401 }
1402 }
1403
1404 return NIL;
1405} 1419}
1406 1420
1407/* make symbol or number atom from string */ 1421/* make symbol or number atom from string */
1408static pointer 1422static pointer
1409mk_atom (SCHEME_P_ char *q) 1423mk_atom (SCHEME_P_ char *q)
… …
1463 } 1477 }
1464 else if ((c == 'e') || (c == 'E')) 1478 else if ((c == 'e') || (c == 'E'))
1465 { 1479 {
1466 if (!has_fp_exp) 1480 if (!has_fp_exp)
1467 { 1481 {
1468 has_dec_point = 1; /* decimal point illegal 1482 has_dec_point = 1; /* decimal point illegal from now on */
1469 from now on */
1470 p++; 1483 p++;
1471 1484
1472 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1485 if ((*p == '-') || (*p == '+') || isdigit (*p))
1473 continue; 1486 continue;
1474 } 1487 }
… …
1562 1575
1563 if (ecb_expect_false (is_vector (p))) 1576 if (ecb_expect_false (is_vector (p)))
1564 { 1577 {
1565 int i; 1578 int i;
1566 1579
1567 for (i = 0; i < p->object.vector.length; i++) 1580 for (i = 0; i < veclength (p); i++)
1568 mark (vecvalue (p)[i]); 1581 mark (vecvalue (p)[i]);
1569 } 1582 }
1570 1583
1571 if (is_atom (p)) 1584 if (is_atom (p))
1572 goto E6; 1585 goto E6;
… …
1619 1632
1620/* garbage collection. parameter a, b is marked. */ 1633/* garbage collection. parameter a, b is marked. */
1621static void 1634static void
1622gc (SCHEME_P_ pointer a, pointer b) 1635gc (SCHEME_P_ pointer a, pointer b)
1623{ 1636{
1624 pointer p;
1625 int i; 1637 int i;
1626 1638
1627 if (SCHEME_V->gc_verbose) 1639 if (SCHEME_V->gc_verbose)
1628 putstr (SCHEME_A_ "gc..."); 1640 putstr (SCHEME_A_ "gc...");
1629 1641
… …
1645 /* Mark recent objects the interpreter doesn't know about yet. */ 1657 /* Mark recent objects the interpreter doesn't know about yet. */
1646 mark (car (S_SINK)); 1658 mark (car (S_SINK));
1647 /* Mark any older stuff above nested C calls */ 1659 /* Mark any older stuff above nested C calls */
1648 mark (SCHEME_V->c_nest); 1660 mark (SCHEME_V->c_nest);
1649 1661
1662#if USE_INTCACHE
1663 /* mark intcache */
1664 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1665 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1666 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1667#endif
1668
1650 /* mark variables a, b */ 1669 /* mark variables a, b */
1651 mark (a); 1670 mark (a);
1652 mark (b); 1671 mark (b);
1653 1672
1654 /* garbage collect */ 1673 /* garbage collect */
1655 clrmark (NIL); 1674 clrmark (NIL);
1656 SCHEME_V->fcells = 0; 1675 SCHEME_V->fcells = 0;
1657 SCHEME_V->free_cell = NIL; 1676 SCHEME_V->free_cell = NIL;
1658 1677
1659 /* free-list is kept sorted by address so as to maintain consecutive 1678 if (SCHEME_V->gc_verbose)
1660 ranges, if possible, for use with vectors. Here we scan the cells 1679 xwrstr ("freeing...");
1661 (which are also kept sorted by address) downwards to build the 1680
1662 free-list in sorted order. 1681 uint32_t total = 0;
1663 */ 1682
1683 /* Here we scan the cells to build the free-list. */
1664 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1684 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1665 { 1685 {
1666 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1686 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1687 struct cell *p;
1688 total += SCHEME_V->cell_segsize [i];
1667 1689
1668 while (--p >= SCHEME_V->cell_seg[i]) 1690 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1669 { 1691 {
1692 pointer c = POINTER (p);
1693
1670 if (is_mark (p)) 1694 if (is_mark (c))
1671 clrmark (p); 1695 clrmark (c);
1672 else 1696 else
1673 { 1697 {
1674 /* reclaim cell */ 1698 /* reclaim cell */
1675 if (typeflag (p) != T_FREE) 1699 if (typeflag (c) != T_PAIR)
1676 { 1700 {
1677 finalize_cell (SCHEME_A_ p); 1701 finalize_cell (SCHEME_A_ c);
1678 set_typeflag (p, T_FREE); 1702 set_typeflag (c, T_PAIR);
1679 set_car (p, NIL); 1703 set_car (c, NIL);
1680 } 1704 }
1681 1705
1682 ++SCHEME_V->fcells; 1706 ++SCHEME_V->fcells;
1683 set_cdr (p, SCHEME_V->free_cell); 1707 set_cdr (c, SCHEME_V->free_cell);
1684 SCHEME_V->free_cell = p; 1708 SCHEME_V->free_cell = c;
1685 } 1709 }
1686 } 1710 }
1687 } 1711 }
1688 1712
1689 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1714 {
1690 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1716 }
1691} 1717}
1692 1718
1693static void 1719static void
1694finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1695{ 1721{
1696 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1697 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1698 free (strvalue (a)); 1724 free (strvalue (a));
1699 else if (is_vector (a)) 1725 else if (is_vector (a))
1700 free (vecvalue (a)); 1726 free (vecvalue (a));
1701#if USE_PORTS 1727#if USE_PORTS
1702 else if (is_port (a)) 1728 else if (is_port (a))
1703 { 1729 {
1704 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1730 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1705 port_close (SCHEME_A_ a, port_input | port_output); 1731 port_close (SCHEME_A_ a, port_input | port_output);
1706 1732
1707 free (a->object.port); 1733 free (port (a));
1708 } 1734 }
1709#endif 1735#endif
1710} 1736}
1711 1737
1712/* ========== Routines for Reading ========== */ 1738/* ========== Routines for Reading ========== */
… …
1728 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1754 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1729 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1755 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1730 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1731 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1732 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1758 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1733 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1759 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1734 1760
1735#if SHOW_ERROR_LINE 1761#if SHOW_ERROR_LINE
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1762 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1737 1763
1738 if (fname) 1764 if (fname)
… …
1755 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1756#if USE_PORTS 1782#if USE_PORTS
1757 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1758#endif 1784#endif
1759 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1760 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1761 } 1787 }
1762} 1788}
1763 1789
1764static int 1790static int
1765file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1766{ 1792{
1767#if USE_PORTS 1793#if USE_PORTS
1768 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1769 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1770 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1771#else 1797#else
1772 return 0; 1798 return 0;
1773#endif 1799#endif
1774} 1800}
1775 1801
… …
1909} 1935}
1910 1936
1911static void 1937static void
1912port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1913{ 1939{
1914 port *pt = p->object.port; 1940 port *pt = port (p);
1915 1941
1916 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1917 1943
1918 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1919 { 1945 {
… …
1940/* get new character from input file */ 1966/* get new character from input file */
1941static int 1967static int
1942inchar (SCHEME_P) 1968inchar (SCHEME_P)
1943{ 1969{
1944 int c; 1970 int c;
1945 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1946
1947 pt = SCHEME_V->inport->object.port;
1948 1972
1949 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1950 return EOF; 1974 return EOF;
1951 1975
1952 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
2019 port *pt; 2043 port *pt;
2020 2044
2021 if (c == EOF) 2045 if (c == EOF)
2022 return; 2046 return;
2023 2047
2024 pt = SCHEME_V->inport->object.port; 2048 pt = port (SCHEME_V->inport);
2025 pt->unget = c; 2049 pt->unget = c;
2026#else 2050#else
2027 if (c == EOF) 2051 if (c == EOF)
2028 return; 2052 return;
2029 2053
… …
2057 2081
2058INTERFACE void 2082INTERFACE void
2059putstr (SCHEME_P_ const char *s) 2083putstr (SCHEME_P_ const char *s)
2060{ 2084{
2061#if USE_PORTS 2085#if USE_PORTS
2062 port *pt = SCHEME_V->outport->object.port; 2086 port *pt = port (SCHEME_V->outport);
2063 2087
2064 if (pt->kind & port_file) 2088 if (pt->kind & port_file)
2065 write (pt->rep.stdio.file, s, strlen (s)); 2089 write (pt->rep.stdio.file, s, strlen (s));
2066 else 2090 else
2067 for (; *s; s++) 2091 for (; *s; s++)
… …
2077 2101
2078static void 2102static void
2079putchars (SCHEME_P_ const char *s, int len) 2103putchars (SCHEME_P_ const char *s, int len)
2080{ 2104{
2081#if USE_PORTS 2105#if USE_PORTS
2082 port *pt = SCHEME_V->outport->object.port; 2106 port *pt = port (SCHEME_V->outport);
2083 2107
2084 if (pt->kind & port_file) 2108 if (pt->kind & port_file)
2085 write (pt->rep.stdio.file, s, len); 2109 write (pt->rep.stdio.file, s, len);
2086 else 2110 else
2087 { 2111 {
… …
2101 2125
2102INTERFACE void 2126INTERFACE void
2103putcharacter (SCHEME_P_ int c) 2127putcharacter (SCHEME_P_ int c)
2104{ 2128{
2105#if USE_PORTS 2129#if USE_PORTS
2106 port *pt = SCHEME_V->outport->object.port; 2130 port *pt = port (SCHEME_V->outport);
2107 2131
2108 if (pt->kind & port_file) 2132 if (pt->kind & port_file)
2109 { 2133 {
2110 char cc = c; 2134 char cc = c;
2111 write (pt->rep.stdio.file, &cc, 1); 2135 write (pt->rep.stdio.file, &cc, 1);
… …
2124#endif 2148#endif
2125} 2149}
2126 2150
2127/* read characters up to delimiter, but cater to character constants */ 2151/* read characters up to delimiter, but cater to character constants */
2128static char * 2152static char *
2129readstr_upto (SCHEME_P_ char *delim) 2153readstr_upto (SCHEME_P_ int skip, const char *delim)
2130{ 2154{
2131 char *p = SCHEME_V->strbuff; 2155 char *p = SCHEME_V->strbuff + skip;
2132 2156
2133 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2157 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2134 2158
2135 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2159 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2136 *p = 0; 2160 *p = 0;
… …
2143 return SCHEME_V->strbuff; 2167 return SCHEME_V->strbuff;
2144} 2168}
2145 2169
2146/* read string expression "xxx...xxx" */ 2170/* read string expression "xxx...xxx" */
2147static pointer 2171static pointer
2148readstrexp (SCHEME_P) 2172readstrexp (SCHEME_P_ char delim)
2149{ 2173{
2150 char *p = SCHEME_V->strbuff; 2174 char *p = SCHEME_V->strbuff;
2151 int c; 2175 int c;
2152 int c1 = 0; 2176 int c1 = 0;
2153 enum
2154 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2177 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2155 2178
2156 for (;;) 2179 for (;;)
2157 { 2180 {
2158 c = inchar (SCHEME_A); 2181 c = inchar (SCHEME_A);
2159 2182
… …
2161 return S_F; 2184 return S_F;
2162 2185
2163 switch (state) 2186 switch (state)
2164 { 2187 {
2165 case st_ok: 2188 case st_ok:
2166 switch (c) 2189 if (ecb_expect_false (c == delim))
2167 {
2168 case '\\':
2169 state = st_bsl;
2170 break;
2171
2172 case '"':
2173 *p = 0;
2174 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2190 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2175 2191
2176 default: 2192 if (ecb_expect_false (c == '\\'))
2193 state = st_bsl;
2194 else
2177 *p++ = c; 2195 *p++ = c;
2178 break;
2179 }
2180 2196
2181 break; 2197 break;
2182 2198
2183 case st_bsl: 2199 case st_bsl:
2184 switch (c) 2200 switch (c)
… …
2214 case 'r': 2230 case 'r':
2215 *p++ = '\r'; 2231 *p++ = '\r';
2216 state = st_ok; 2232 state = st_ok;
2217 break; 2233 break;
2218 2234
2219 case '"':
2220 *p++ = '"';
2221 state = st_ok;
2222 break;
2223
2224 default: 2235 default:
2225 *p++ = c; 2236 *p++ = c;
2226 state = st_ok; 2237 state = st_ok;
2227 break; 2238 break;
2228 } 2239 }
2229 2240
2230 break; 2241 break;
2231 2242
2232 case st_x1: 2243 case st_x1:
2233 case st_x2: 2244 case st_x2:
2234 c = toupper (c); 2245 c = tolower (c);
2235 2246
2236 if (c >= '0' && c <= 'F') 2247 if (c >= '0' && c <= '9')
2237 {
2238 if (c <= '9')
2239 c1 = (c1 << 4) + c - '0'; 2248 c1 = (c1 << 4) + c - '0';
2240 else 2249 else if (c >= 'a' && c <= 'f')
2241 c1 = (c1 << 4) + c - 'A' + 10; 2250 c1 = (c1 << 4) + c - 'a' + 10;
2242
2243 if (state == st_x1)
2244 state = st_x2;
2245 else
2246 {
2247 *p++ = c1;
2248 state = st_ok;
2249 }
2250 }
2251 else 2251 else
2252 return S_F; 2252 return S_F;
2253
2254 if (state == st_x1)
2255 state = st_x2;
2256 else
2257 {
2258 *p++ = c1;
2259 state = st_ok;
2260 }
2253 2261
2254 break; 2262 break;
2255 2263
2256 case st_oct1: 2264 case st_oct1:
2257 case st_oct2: 2265 case st_oct2:
… …
2261 backchar (SCHEME_A_ c); 2269 backchar (SCHEME_A_ c);
2262 state = st_ok; 2270 state = st_ok;
2263 } 2271 }
2264 else 2272 else
2265 { 2273 {
2266 if (state == st_oct2 && c1 >= 32) 2274 if (state == st_oct2 && c1 >= ' ')
2267 return S_F; 2275 return S_F;
2268 2276
2269 c1 = (c1 << 3) + (c - '0'); 2277 c1 = (c1 << 3) + (c - '0');
2270 2278
2271 if (state == st_oct1) 2279 if (state == st_oct1)
… …
2276 state = st_ok; 2284 state = st_ok;
2277 } 2285 }
2278 } 2286 }
2279 2287
2280 break; 2288 break;
2281
2282 } 2289 }
2283 } 2290 }
2284} 2291}
2285 2292
2286/* check c is in chars */ 2293/* check c is in chars */
2287static INLINE int 2294ecb_inline int
2288is_one_of (char *s, int c) 2295is_one_of (const char *s, int c)
2289{ 2296{
2290 if (c == EOF)
2291 return 1;
2292
2293 return !!strchr (s, c); 2297 return c == EOF || !!strchr (s, c);
2294} 2298}
2295 2299
2296/* skip white characters */ 2300/* skip white characters */
2297static INLINE int 2301ecb_inline int
2298skipspace (SCHEME_P) 2302skipspace (SCHEME_P)
2299{ 2303{
2300 int c, curr_line = 0; 2304 int c, curr_line = 0;
2301 2305
2302 do 2306 do
2303 { 2307 {
2304 c = inchar (SCHEME_A); 2308 c = inchar (SCHEME_A);
2309
2305#if SHOW_ERROR_LINE 2310#if SHOW_ERROR_LINE
2306 if (c == '\n') 2311 if (ecb_expect_false (c == '\n'))
2307 curr_line++; 2312 curr_line++;
2308#endif 2313#endif
2314
2315 if (ecb_expect_false (c == EOF))
2316 return c;
2309 } 2317 }
2310 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2318 while (is_one_of (WHITESPACE, c));
2311 2319
2312 /* record it */ 2320 /* record it */
2313#if SHOW_ERROR_LINE 2321#if SHOW_ERROR_LINE
2314 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2322 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2315 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2323 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2316#endif 2324#endif
2317 2325
2318 if (c != EOF)
2319 {
2320 backchar (SCHEME_A_ c); 2326 backchar (SCHEME_A_ c);
2321 return 1; 2327 return 1;
2322 }
2323 else
2324 return EOF;
2325} 2328}
2326 2329
2327/* get token */ 2330/* get token */
2328static int 2331static int
2329token (SCHEME_P) 2332token (SCHEME_P)
… …
2345 return TOK_RPAREN; 2348 return TOK_RPAREN;
2346 2349
2347 case '.': 2350 case '.':
2348 c = inchar (SCHEME_A); 2351 c = inchar (SCHEME_A);
2349 2352
2350 if (is_one_of (" \n\t", c)) 2353 if (is_one_of (WHITESPACE, c))
2351 return TOK_DOT; 2354 return TOK_DOT;
2352 else 2355 else
2353 { 2356 {
2354 //TODO: ungetc twice in a row is not supported in C
2355 backchar (SCHEME_A_ c); 2357 backchar (SCHEME_A_ c);
2356 backchar (SCHEME_A_ '.');
2357 return TOK_ATOM; 2358 return TOK_DOTATOM;
2358 } 2359 }
2360
2361 case '|':
2362 return TOK_STRATOM;
2359 2363
2360 case '\'': 2364 case '\'':
2361 return TOK_QUOTE; 2365 return TOK_QUOTE;
2362 2366
2363 case ';': 2367 case ';':
… …
2495 } 2499 }
2496 2500
2497 putcharacter (SCHEME_A_ '"'); 2501 putcharacter (SCHEME_A_ '"');
2498} 2502}
2499 2503
2500
2501/* print atoms */ 2504/* print atoms */
2502static void 2505static void
2503printatom (SCHEME_P_ pointer l, int f) 2506printatom (SCHEME_P_ pointer l, int f)
2504{ 2507{
2505 char *p; 2508 char *p;
2506 int len; 2509 int len;
2507 2510
2508 atom2str (SCHEME_A_ l, f, &p, &len); 2511 atom2str (SCHEME_A_ l, f, &p, &len);
2509 putchars (SCHEME_A_ p, len); 2512 putchars (SCHEME_A_ p, len);
2510} 2513}
2511
2512 2514
2513/* Uses internal buffer unless string pointer is already available */ 2515/* Uses internal buffer unless string pointer is already available */
2514static void 2516static void
2515atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2517atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2516{ 2518{
… …
2530 { 2532 {
2531 p = SCHEME_V->strbuff; 2533 p = SCHEME_V->strbuff;
2532 2534
2533 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2535 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2534 { 2536 {
2535 if (num_is_integer (l)) 2537 if (is_integer (l))
2536 xnum (p, ivalue_unchecked (l)); 2538 xnum (p, ivalue_unchecked (l));
2537#if USE_REAL 2539#if USE_REAL
2538 else 2540 else
2539 { 2541 {
2540 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2542 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2677#endif 2679#endif
2678 } 2680 }
2679 else if (is_continuation (l)) 2681 else if (is_continuation (l))
2680 p = "#<CONTINUATION>"; 2682 p = "#<CONTINUATION>";
2681 else 2683 else
2684 {
2685#if USE_PRINTF
2686 p = SCHEME_V->strbuff;
2687 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2688#else
2682 p = "#<ERROR>"; 2689 p = "#<ERROR>";
2690#endif
2691 }
2683 2692
2684 *pp = p; 2693 *pp = p;
2685 *plen = strlen (p); 2694 *plen = strlen (p);
2686} 2695}
2687 2696
… …
2795 return 0; 2804 return 0;
2796 } 2805 }
2797 else if (is_number (a)) 2806 else if (is_number (a))
2798 { 2807 {
2799 if (is_number (b)) 2808 if (is_number (b))
2800 if (num_is_integer (a) == num_is_integer (b))
2801 return num_eq (nvalue (a), nvalue (b)); 2809 return num_cmp (nvalue (a), nvalue (b)) == 0;
2802 2810
2803 return 0; 2811 return 0;
2804 } 2812 }
2805 else if (is_character (a)) 2813 else if (is_character (a))
2806 { 2814 {
… …
2832/* () is #t in R5RS */ 2840/* () is #t in R5RS */
2833#define is_true(p) ((p) != S_F) 2841#define is_true(p) ((p) != S_F)
2834#define is_false(p) ((p) == S_F) 2842#define is_false(p) ((p) == S_F)
2835 2843
2836/* ========== Environment implementation ========== */ 2844/* ========== Environment implementation ========== */
2837
2838#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2839
2840static int
2841hash_fn (const char *key, int table_size)
2842{
2843 const unsigned char *p = key;
2844 uint32_t hash = 2166136261;
2845
2846 while (*p)
2847 hash = (hash ^ *p++) * 16777619;
2848
2849 return hash % table_size;
2850}
2851#endif
2852 2845
2853#ifndef USE_ALIST_ENV 2846#ifndef USE_ALIST_ENV
2854 2847
2855/* 2848/*
2856 * In this implementation, each frame of the environment may be 2849 * In this implementation, each frame of the environment may be
… …
2873 2866
2874 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2867 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2875 setenvironment (SCHEME_V->envir); 2868 setenvironment (SCHEME_V->envir);
2876} 2869}
2877 2870
2878static INLINE void 2871static uint32_t
2872sym_hash (pointer sym, uint32_t size)
2873{
2874 uintptr_t ptr = (uintptr_t)sym;
2875
2876#if 0
2877 /* table size is prime, so why mix */
2878 ptr += ptr >> 32;
2879 ptr += ptr >> 16;
2880 ptr += ptr >> 8;
2881#endif
2882
2883 return ptr % size;
2884}
2885
2886ecb_inline void
2879new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2887new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2880{ 2888{
2881 pointer slot = immutable_cons (variable, value); 2889 pointer slot = immutable_cons (variable, value);
2882 2890
2883 if (is_vector (car (env))) 2891 if (is_vector (car (env)))
2884 { 2892 {
2885 int location = hash_fn (symname (variable), veclength (car (env))); 2893 int location = sym_hash (variable, veclength (car (env)));
2886
2887 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2894 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2888 } 2895 }
2889 else 2896 else
2890 set_car (env, immutable_cons (slot, car (env))); 2897 set_car (env, immutable_cons (slot, car (env)));
2891} 2898}
2892 2899
2893static pointer 2900static pointer
2894find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2901find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2895{ 2902{
2896 pointer x, y; 2903 pointer x, y;
2897 int location;
2898 2904
2899 for (x = env; x != NIL; x = cdr (x)) 2905 for (x = env; x != NIL; x = cdr (x))
2900 { 2906 {
2901 if (is_vector (car (x))) 2907 if (is_vector (car (x)))
2902 { 2908 {
2903 location = hash_fn (symname (hdl), veclength (car (x))); 2909 int location = sym_hash (hdl, veclength (car (x)));
2904 y = vector_elem (car (x), location); 2910 y = vector_get (car (x), location);
2905 } 2911 }
2906 else 2912 else
2907 y = car (x); 2913 y = car (x);
2908 2914
2909 for (; y != NIL; y = cdr (y)) 2915 for (; y != NIL; y = cdr (y))
2910 if (caar (y) == hdl) 2916 if (caar (y) == hdl)
2911 break; 2917 break;
2912 2918
2913 if (y != NIL) 2919 if (y != NIL)
2920 return car (y);
2921
2922 if (!all)
2914 break; 2923 break;
2915
2916 if (!all)
2917 return NIL;
2918 } 2924 }
2919
2920 if (x != NIL)
2921 return car (y);
2922 2925
2923 return NIL; 2926 return NIL;
2924} 2927}
2925 2928
2926#else /* USE_ALIST_ENV */ 2929#else /* USE_ALIST_ENV */
2927 2930
2928static INLINE void 2931ecb_inline void
2929new_frame_in_env (SCHEME_P_ pointer old_env) 2932new_frame_in_env (SCHEME_P_ pointer old_env)
2930{ 2933{
2931 SCHEME_V->envir = immutable_cons (NIL, old_env); 2934 SCHEME_V->envir = immutable_cons (NIL, old_env);
2932 setenvironment (SCHEME_V->envir); 2935 setenvironment (SCHEME_V->envir);
2933} 2936}
2934 2937
2935static INLINE void 2938ecb_inline void
2936new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2939new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2937{ 2940{
2938 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2941 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2939} 2942}
2940 2943
… …
2948 for (y = car (x); y != NIL; y = cdr (y)) 2951 for (y = car (x); y != NIL; y = cdr (y))
2949 if (caar (y) == hdl) 2952 if (caar (y) == hdl)
2950 break; 2953 break;
2951 2954
2952 if (y != NIL) 2955 if (y != NIL)
2956 return car (y);
2953 break; 2957 break;
2954 2958
2955 if (!all) 2959 if (!all)
2956 return NIL; 2960 break;
2957 } 2961 }
2958
2959 if (x != NIL)
2960 return car (y);
2961 2962
2962 return NIL; 2963 return NIL;
2963} 2964}
2964 2965
2965#endif /* USE_ALIST_ENV else */ 2966#endif /* USE_ALIST_ENV else */
2966 2967
2967static INLINE void 2968ecb_inline void
2968new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2969new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2969{ 2970{
2971 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2970 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2972 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2971} 2973}
2972 2974
2973static INLINE void 2975ecb_inline void
2974set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2976set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2975{ 2977{
2976 set_cdr (slot, value); 2978 set_cdr (slot, value);
2977} 2979}
2978 2980
2979static INLINE pointer 2981ecb_inline pointer
2980slot_value_in_env (pointer slot) 2982slot_value_in_env (pointer slot)
2981{ 2983{
2982 return cdr (slot); 2984 return cdr (slot);
2983} 2985}
2984 2986
2985/* ========== Evaluation Cycle ========== */ 2987/* ========== Evaluation Cycle ========== */
2986 2988
2987static pointer 2989static int
2988xError_1 (SCHEME_P_ const char *s, pointer a) 2990xError_1 (SCHEME_P_ const char *s, pointer a)
2989{ 2991{
2990#if USE_ERROR_HOOK 2992#if USE_ERROR_HOOK
2991 pointer x; 2993 pointer x;
2992 pointer hdl = SCHEME_V->ERROR_HOOK; 2994 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3027 code = cons (mk_string (SCHEME_A_ s), code); 3029 code = cons (mk_string (SCHEME_A_ s), code);
3028 setimmutable (car (code)); 3030 setimmutable (car (code));
3029 SCHEME_V->code = cons (slot_value_in_env (x), code); 3031 SCHEME_V->code = cons (slot_value_in_env (x), code);
3030 SCHEME_V->op = OP_EVAL; 3032 SCHEME_V->op = OP_EVAL;
3031 3033
3032 return S_T; 3034 return 0;
3033 } 3035 }
3034#endif 3036#endif
3035 3037
3036 if (a) 3038 if (a)
3037 SCHEME_V->args = cons (a, NIL); 3039 SCHEME_V->args = cons (a, NIL);
… …
3039 SCHEME_V->args = NIL; 3041 SCHEME_V->args = NIL;
3040 3042
3041 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3043 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
3042 setimmutable (car (SCHEME_V->args)); 3044 setimmutable (car (SCHEME_V->args));
3043 SCHEME_V->op = OP_ERR0; 3045 SCHEME_V->op = OP_ERR0;
3046
3044 return S_T; 3047 return 0;
3045} 3048}
3046 3049
3047#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3050#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
3048#define Error_0(s) Error_1 (s, 0) 3051#define Error_0(s) Error_1 (s, 0)
3049 3052
3050/* Too small to turn into function */ 3053/* Too small to turn into function */
3051#define BEGIN do { 3054#define BEGIN do {
3052#define END } while (0) 3055#define END } while (0)
3053#define s_goto(a) BEGIN \ 3056#define s_goto(a) BEGIN \
3054 SCHEME_V->op = a; \ 3057 SCHEME_V->op = a; \
3055 return S_T; END 3058 return 0; END
3056 3059
3057#define s_return(a) return xs_return (SCHEME_A_ a) 3060#define s_return(a) return xs_return (SCHEME_A_ a)
3058 3061
3059#ifndef USE_SCHEME_STACK 3062#ifndef USE_SCHEME_STACK
3060 3063
… …
3074{ 3077{
3075 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3076 struct dump_stack_frame *next_frame; 3079 struct dump_stack_frame *next_frame;
3077 3080
3078 /* enough room for the next frame? */ 3081 /* enough room for the next frame? */
3079 if (nframes >= SCHEME_V->dump_size) 3082 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3080 { 3083 {
3081 SCHEME_V->dump_size += STACK_GROWTH; 3084 SCHEME_V->dump_size += STACK_GROWTH;
3082 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3085 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3083 } 3086 }
3084 3087
3085 next_frame = SCHEME_V->dump_base + nframes; 3088 next_frame = SCHEME_V->dump_base + nframes;
3086 3089
3087 next_frame->op = op; 3090 next_frame->op = op;
3088 next_frame->args = args; 3091 next_frame->args = args;
3089 next_frame->envir = SCHEME_V->envir; 3092 next_frame->envir = SCHEME_V->envir;
3090 next_frame->code = code; 3093 next_frame->code = code;
3091 3094
3092 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3095 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3093} 3096}
3094 3097
3095static pointer 3098static int
3096xs_return (SCHEME_P_ pointer a) 3099xs_return (SCHEME_P_ pointer a)
3097{ 3100{
3098 int nframes = (uintptr_t)SCHEME_V->dump; 3101 int nframes = (uintptr_t)SCHEME_V->dump;
3099 struct dump_stack_frame *frame; 3102 struct dump_stack_frame *frame;
3100 3103
3101 SCHEME_V->value = a; 3104 SCHEME_V->value = a;
3102 3105
3103 if (nframes <= 0) 3106 if (nframes <= 0)
3104 return NIL; 3107 return -1;
3105 3108
3106 frame = &SCHEME_V->dump_base[--nframes]; 3109 frame = &SCHEME_V->dump_base[--nframes];
3107 SCHEME_V->op = frame->op; 3110 SCHEME_V->op = frame->op;
3108 SCHEME_V->args = frame->args; 3111 SCHEME_V->args = frame->args;
3109 SCHEME_V->envir = frame->envir; 3112 SCHEME_V->envir = frame->envir;
3110 SCHEME_V->code = frame->code; 3113 SCHEME_V->code = frame->code;
3111 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3114 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3112 3115
3113 return S_T; 3116 return 0;
3114} 3117}
3115 3118
3116static INLINE void 3119ecb_inline void
3117dump_stack_reset (SCHEME_P) 3120dump_stack_reset (SCHEME_P)
3118{ 3121{
3119 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3122 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3120 SCHEME_V->dump = (pointer)+0; 3123 SCHEME_V->dump = (pointer)+0;
3121} 3124}
3122 3125
3123static INLINE void 3126ecb_inline void
3124dump_stack_initialize (SCHEME_P) 3127dump_stack_initialize (SCHEME_P)
3125{ 3128{
3126 SCHEME_V->dump_size = 0; 3129 SCHEME_V->dump_size = 0;
3127 SCHEME_V->dump_base = 0; 3130 SCHEME_V->dump_base = 0;
3128 dump_stack_reset (SCHEME_A); 3131 dump_stack_reset (SCHEME_A);
… …
3181 int i = 0; 3184 int i = 0;
3182 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3185 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3183 3186
3184 while (cont != NIL) 3187 while (cont != NIL)
3185 { 3188 {
3186 frame->op = ivalue (car (cont)); cont = cdr (cont); 3189 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3187 frame->args = car (cont) ; cont = cdr (cont); 3190 frame->args = car (cont) ; cont = cdr (cont);
3188 frame->envir = car (cont) ; cont = cdr (cont); 3191 frame->envir = car (cont) ; cont = cdr (cont);
3189 frame->code = car (cont) ; cont = cdr (cont); 3192 frame->code = car (cont) ; cont = cdr (cont);
3190 3193
3191 ++frame; 3194 ++frame;
3192 ++i; 3195 ++i;
3193 } 3196 }
3194 3197
3195 SCHEME_V->dump = (pointer)(uintptr_t)i; 3198 SCHEME_V->dump = (pointer)(uintptr_t)i;
3196} 3199}
3197 3200
3198#else 3201#else
3199 3202
3200static INLINE void 3203ecb_inline void
3201dump_stack_reset (SCHEME_P) 3204dump_stack_reset (SCHEME_P)
3202{ 3205{
3203 SCHEME_V->dump = NIL; 3206 SCHEME_V->dump = NIL;
3204} 3207}
3205 3208
3206static INLINE void 3209ecb_inline void
3207dump_stack_initialize (SCHEME_P) 3210dump_stack_initialize (SCHEME_P)
3208{ 3211{
3209 dump_stack_reset (SCHEME_A); 3212 dump_stack_reset (SCHEME_A);
3210} 3213}
3211 3214
… …
3213dump_stack_free (SCHEME_P) 3216dump_stack_free (SCHEME_P)
3214{ 3217{
3215 SCHEME_V->dump = NIL; 3218 SCHEME_V->dump = NIL;
3216} 3219}
3217 3220
3218static pointer 3221static int
3219xs_return (SCHEME_P_ pointer a) 3222xs_return (SCHEME_P_ pointer a)
3220{ 3223{
3221 pointer dump = SCHEME_V->dump; 3224 pointer dump = SCHEME_V->dump;
3222 3225
3223 SCHEME_V->value = a; 3226 SCHEME_V->value = a;
3224 3227
3225 if (dump == NIL) 3228 if (dump == NIL)
3226 return NIL; 3229 return -1;
3227 3230
3228 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3231 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3229 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3232 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3230 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3233 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3231 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3234 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3232 3235
3233 SCHEME_V->dump = dump; 3236 SCHEME_V->dump = dump;
3234 3237
3235 return S_T; 3238 return 0;
3236} 3239}
3237 3240
3238static void 3241static void
3239s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3242s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3240{ 3243{
… …
3265 3268
3266#endif 3269#endif
3267 3270
3268#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3271#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3269 3272
3273#if EXPERIMENT
3270static pointer 3274static int
3275debug (SCHEME_P_ int indent, pointer x)
3276{
3277 int c;
3278
3279 if (is_syntax (x))
3280 {
3281 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3282 return 8 + 8;
3283 }
3284
3285 if (x == NIL)
3286 {
3287 printf ("%*sNIL\n", indent, "");
3288 return 3;
3289 }
3290
3291 switch (type (x))
3292 {
3293 case T_INTEGER:
3294 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3295 return 32+8;
3296
3297 case T_SYMBOL:
3298 printf ("%*sS<%s>\n", indent, "", symname (x));
3299 return 24+8;
3300
3301 case T_CLOSURE:
3302 printf ("%*sS<%s>\n", indent, "", "closure");
3303 debug (SCHEME_A_ indent + 3, cdr(x));
3304 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3305
3306 case T_PAIR:
3307 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3308 c = debug (SCHEME_A_ indent + 3, car (x));
3309 c += debug (SCHEME_A_ indent + 3, cdr (x));
3310 return c + 1;
3311
3312 case T_PORT:
3313 printf ("%*sS<%s>\n", indent, "", "port");
3314 return 24+8;
3315
3316 case T_VECTOR:
3317 printf ("%*sS<%s>\n", indent, "", "vector");
3318 return 24+8;
3319
3320 case T_ENVIRONMENT:
3321 printf ("%*sS<%s>\n", indent, "", "environment");
3322 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3323
3324 default:
3325 printf ("unhandled type %d\n", type (x));
3326 break;
3327 }
3328}
3329#endif
3330
3331static int
3271opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3332opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3272{ 3333{
3334 pointer args = SCHEME_V->args;
3273 pointer x, y; 3335 pointer x, y;
3274 3336
3275 switch (op) 3337 switch (op)
3276 { 3338 {
3339#if EXPERIMENT //D
3340 case OP_DEBUG:
3341 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3342 printf ("\n");
3343 s_return (S_T);
3344#endif
3277 case OP_LOAD: /* load */ 3345 case OP_LOAD: /* load */
3278 if (file_interactive (SCHEME_A)) 3346 if (file_interactive (SCHEME_A))
3279 { 3347 {
3280 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3348 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3281 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (SCHEME_V->args))); 3349 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3282 } 3350 }
3283 3351
3284 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3352 if (!file_push (SCHEME_A_ strvalue (car (args))))
3285 Error_1 ("unable to open", car (SCHEME_V->args)); 3353 Error_1 ("unable to open", car (args));
3286 else 3354 else
3287 { 3355 {
3288 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3356 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3289 s_goto (OP_T0LVL); 3357 s_goto (OP_T0LVL);
3290 } 3358 }
3291 3359
3292 case OP_T0LVL: /* top level */ 3360 case OP_T0LVL: /* top level */
3293 3361
3294 /* If we reached the end of file, this loop is done. */ 3362 /* If we reached the end of file, this loop is done. */
3295 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3363 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3296 { 3364 {
3297 if (SCHEME_V->file_i == 0) 3365 if (SCHEME_V->file_i == 0)
3298 { 3366 {
3299 SCHEME_V->args = NIL; 3367 SCHEME_V->args = NIL;
3300 s_goto (OP_QUIT); 3368 s_goto (OP_QUIT);
… …
3364 case OP_EVAL: /* main part of evaluation */ 3432 case OP_EVAL: /* main part of evaluation */
3365#if USE_TRACING 3433#if USE_TRACING
3366 if (SCHEME_V->tracing) 3434 if (SCHEME_V->tracing)
3367 { 3435 {
3368 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3436 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3369 s_save (SCHEME_A_ OP_REAL_EVAL, SCHEME_V->args, SCHEME_V->code); 3437 s_save (SCHEME_A_ OP_REAL_EVAL, args, SCHEME_V->code);
3370 SCHEME_V->args = SCHEME_V->code; 3438 SCHEME_V->args = SCHEME_V->code;
3371 putstr (SCHEME_A_ "\nEval: "); 3439 putstr (SCHEME_A_ "\nEval: ");
3372 s_goto (OP_P0LIST); 3440 s_goto (OP_P0LIST);
3373 } 3441 }
3374 3442
… …
3378#endif 3446#endif
3379 if (is_symbol (SCHEME_V->code)) /* symbol */ 3447 if (is_symbol (SCHEME_V->code)) /* symbol */
3380 { 3448 {
3381 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3449 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3382 3450
3383 if (x != NIL) 3451 if (x == NIL)
3384 s_return (slot_value_in_env (x));
3385 else
3386 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3452 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3453
3454 s_return (slot_value_in_env (x));
3387 } 3455 }
3388 else if (is_pair (SCHEME_V->code)) 3456 else if (is_pair (SCHEME_V->code))
3389 { 3457 {
3390 x = car (SCHEME_V->code); 3458 x = car (SCHEME_V->code);
3391 3459
… …
3404 } 3472 }
3405 else 3473 else
3406 s_return (SCHEME_V->code); 3474 s_return (SCHEME_V->code);
3407 3475
3408 case OP_E0ARGS: /* eval arguments */ 3476 case OP_E0ARGS: /* eval arguments */
3409 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3477 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3410 { 3478 {
3411 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3479 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3412 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3480 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3413 SCHEME_V->code = SCHEME_V->value; 3481 SCHEME_V->code = SCHEME_V->value;
3414 s_goto (OP_APPLY); 3482 s_goto (OP_APPLY);
… …
3418 SCHEME_V->code = cdr (SCHEME_V->code); 3486 SCHEME_V->code = cdr (SCHEME_V->code);
3419 s_goto (OP_E1ARGS); 3487 s_goto (OP_E1ARGS);
3420 } 3488 }
3421 3489
3422 case OP_E1ARGS: /* eval arguments */ 3490 case OP_E1ARGS: /* eval arguments */
3423 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3491 args = cons (SCHEME_V->value, args);
3424 3492
3425 if (is_pair (SCHEME_V->code)) /* continue */ 3493 if (is_pair (SCHEME_V->code)) /* continue */
3426 { 3494 {
3427 s_save (SCHEME_A_ OP_E1ARGS, SCHEME_V->args, cdr (SCHEME_V->code)); 3495 s_save (SCHEME_A_ OP_E1ARGS, args, cdr (SCHEME_V->code));
3428 SCHEME_V->code = car (SCHEME_V->code); 3496 SCHEME_V->code = car (SCHEME_V->code);
3429 SCHEME_V->args = NIL; 3497 SCHEME_V->args = NIL;
3430 s_goto (OP_EVAL); 3498 s_goto (OP_EVAL);
3431 } 3499 }
3432 else /* end */ 3500 else /* end */
3433 { 3501 {
3434 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3502 args = reverse_in_place (SCHEME_A_ NIL, args);
3435 SCHEME_V->code = car (SCHEME_V->args); 3503 SCHEME_V->code = car (args);
3436 SCHEME_V->args = cdr (SCHEME_V->args); 3504 SCHEME_V->args = cdr (args);
3437 s_goto (OP_APPLY); 3505 s_goto (OP_APPLY);
3438 } 3506 }
3439 3507
3440#if USE_TRACING 3508#if USE_TRACING
3441 3509
3442 case OP_TRACING: 3510 case OP_TRACING:
3443 { 3511 {
3444 int tr = SCHEME_V->tracing; 3512 int tr = SCHEME_V->tracing;
3445 3513
3446 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3514 SCHEME_V->tracing = ivalue_unchecked (car (args));
3447 s_return (mk_integer (SCHEME_A_ tr)); 3515 s_return (mk_integer (SCHEME_A_ tr));
3448 } 3516 }
3449 3517
3450#endif 3518#endif
3451 3519
3452 case OP_APPLY: /* apply 'code' to 'args' */ 3520 case OP_APPLY: /* apply 'code' to 'args' */
3453#if USE_TRACING 3521#if USE_TRACING
3454 if (SCHEME_V->tracing) 3522 if (SCHEME_V->tracing)
3455 { 3523 {
3456 s_save (SCHEME_A_ OP_REAL_APPLY, SCHEME_V->args, SCHEME_V->code); 3524 s_save (SCHEME_A_ OP_REAL_APPLY, args, SCHEME_V->code);
3457 SCHEME_V->print_flag = 1; 3525 SCHEME_V->print_flag = 1;
3458 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3526 /* args=cons(SCHEME_V->code,args); */
3459 putstr (SCHEME_A_ "\nApply to: "); 3527 putstr (SCHEME_A_ "\nApply to: ");
3460 s_goto (OP_P0LIST); 3528 s_goto (OP_P0LIST);
3461 } 3529 }
3462 3530
3463 /* fall through */ 3531 /* fall through */
3464 3532
3465 case OP_REAL_APPLY: 3533 case OP_REAL_APPLY:
3466#endif 3534#endif
3467 if (is_proc (SCHEME_V->code)) 3535 if (is_proc (SCHEME_V->code))
3468 {
3469 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3536 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3470 }
3471 else if (is_foreign (SCHEME_V->code)) 3537 else if (is_foreign (SCHEME_V->code))
3472 { 3538 {
3473 /* Keep nested calls from GC'ing the arglist */ 3539 /* Keep nested calls from GC'ing the arglist */
3474 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3540 push_recent_alloc (SCHEME_A_ args, NIL);
3475 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3541 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3476 3542
3477 s_return (x); 3543 s_return (x);
3478 } 3544 }
3479 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3545 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3480 { 3546 {
3481 /* Should not accept promise */ 3547 /* Should not accept promise */
3482 /* make environment */ 3548 /* make environment */
3483 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3549 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3484 3550
3485 for (x = car (closure_code (SCHEME_V->code)), y = SCHEME_V->args; is_pair (x); x = cdr (x), y = cdr (y)) 3551 for (x = car (closure_code (SCHEME_V->code)), y = args; is_pair (x); x = cdr (x), y = cdr (y))
3486 { 3552 {
3487 if (y == NIL) 3553 if (y == NIL)
3488 Error_0 ("not enough arguments"); 3554 Error_0 ("not enough arguments");
3489 else 3555 else
3490 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3556 new_slot_in_env (SCHEME_A_ car (x), car (y));
… …
3508 s_goto (OP_BEGIN); 3574 s_goto (OP_BEGIN);
3509 } 3575 }
3510 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3576 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3511 { 3577 {
3512 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3578 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3513 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3579 s_return (args != NIL ? car (args) : NIL);
3514 } 3580 }
3515 else 3581 else
3516 Error_0 ("illegal function"); 3582 Error_0 ("illegal function");
3517 3583
3518 case OP_DOMACRO: /* do macro */ 3584 case OP_DOMACRO: /* do macro */
3519 SCHEME_V->code = SCHEME_V->value; 3585 SCHEME_V->code = SCHEME_V->value;
3520 s_goto (OP_EVAL); 3586 s_goto (OP_EVAL);
3521
3522#if 1
3523 3587
3524 case OP_LAMBDA: /* lambda */ 3588 case OP_LAMBDA: /* lambda */
3525 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3589 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3526 set SCHEME_V->value fall thru */ 3590 set SCHEME_V->value fall thru */
3527 { 3591 {
3528 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3592 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3529 3593
3530 if (f != NIL) 3594 if (f != NIL)
3531 { 3595 {
3532 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3596 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3533 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3597 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3534 SCHEME_V->code = slot_value_in_env (f); 3598 SCHEME_V->code = slot_value_in_env (f);
3535 s_goto (OP_APPLY); 3599 s_goto (OP_APPLY);
3536 } 3600 }
3537 3601
3538 SCHEME_V->value = SCHEME_V->code; 3602 SCHEME_V->value = SCHEME_V->code;
3539 /* Fallthru */
3540 } 3603 }
3604 /* Fallthru */
3541 3605
3542 case OP_LAMBDA1: 3606 case OP_LAMBDA1:
3543 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3607 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3544 3608
3545#else
3546
3547 case OP_LAMBDA: /* lambda */
3548 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3549
3550#endif
3551
3552 case OP_MKCLOSURE: /* make-closure */ 3609 case OP_MKCLOSURE: /* make-closure */
3553 x = car (SCHEME_V->args); 3610 x = car (args);
3554 3611
3555 if (car (x) == SCHEME_V->LAMBDA) 3612 if (car (x) == SCHEME_V->LAMBDA)
3556 x = cdr (x); 3613 x = cdr (x);
3557 3614
3558 if (cdr (SCHEME_V->args) == NIL) 3615 if (cdr (args) == NIL)
3559 y = SCHEME_V->envir; 3616 y = SCHEME_V->envir;
3560 else 3617 else
3561 y = cadr (SCHEME_V->args); 3618 y = cadr (args);
3562 3619
3563 s_return (mk_closure (SCHEME_A_ x, y)); 3620 s_return (mk_closure (SCHEME_A_ x, y));
3564 3621
3565 case OP_QUOTE: /* quote */ 3622 case OP_QUOTE: /* quote */
3566 s_return (car (SCHEME_V->code)); 3623 s_return (car (SCHEME_V->code));
… …
3598 3655
3599 3656
3600 case OP_DEFP: /* defined? */ 3657 case OP_DEFP: /* defined? */
3601 x = SCHEME_V->envir; 3658 x = SCHEME_V->envir;
3602 3659
3603 if (cdr (SCHEME_V->args) != NIL) 3660 if (cdr (args) != NIL)
3604 x = cadr (SCHEME_V->args); 3661 x = cadr (args);
3605 3662
3606 s_retbool (find_slot_in_env (SCHEME_A_ x, car (SCHEME_V->args), 1) != NIL); 3663 s_retbool (find_slot_in_env (SCHEME_A_ x, car (args), 1) != NIL);
3607 3664
3608 case OP_SET0: /* set! */ 3665 case OP_SET0: /* set! */
3609 if (is_immutable (car (SCHEME_V->code))) 3666 if (is_immutable (car (SCHEME_V->code)))
3610 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code)); 3667 Error_1 ("set!: unable to alter immutable variable", car (SCHEME_V->code));
3611 3668
… …
3642 3699
3643 case OP_IF1: /* if */ 3700 case OP_IF1: /* if */
3644 if (is_true (SCHEME_V->value)) 3701 if (is_true (SCHEME_V->value))
3645 SCHEME_V->code = car (SCHEME_V->code); 3702 SCHEME_V->code = car (SCHEME_V->code);
3646 else 3703 else
3647 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because 3704 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3648
3649 * car(NIL) = NIL */
3650 s_goto (OP_EVAL); 3705 s_goto (OP_EVAL);
3651 3706
3652 case OP_LET0: /* let */ 3707 case OP_LET0: /* let */
3653 SCHEME_V->args = NIL; 3708 SCHEME_V->args = NIL;
3654 SCHEME_V->value = SCHEME_V->code; 3709 SCHEME_V->value = SCHEME_V->code;
3655 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 3710 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3656 s_goto (OP_LET1); 3711 s_goto (OP_LET1);
3657 3712
3658 case OP_LET1: /* let (calculate parameters) */ 3713 case OP_LET1: /* let (calculate parameters) */
3659 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3714 args = cons (SCHEME_V->value, args);
3660 3715
3661 if (is_pair (SCHEME_V->code)) /* continue */ 3716 if (is_pair (SCHEME_V->code)) /* continue */
3662 { 3717 {
3663 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3718 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3664 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 3719 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code));
3665 3720
3666 s_save (SCHEME_A_ OP_LET1, SCHEME_V->args, cdr (SCHEME_V->code)); 3721 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code));
3667 SCHEME_V->code = cadar (SCHEME_V->code); 3722 SCHEME_V->code = cadar (SCHEME_V->code);
3668 SCHEME_V->args = NIL; 3723 SCHEME_V->args = NIL;
3669 s_goto (OP_EVAL); 3724 s_goto (OP_EVAL);
3670 } 3725 }
3671 else /* end */ 3726 else /* end */
3672 { 3727 {
3673 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3728 args = reverse_in_place (SCHEME_A_ NIL, args);
3674 SCHEME_V->code = car (SCHEME_V->args); 3729 SCHEME_V->code = car (args);
3675 SCHEME_V->args = cdr (SCHEME_V->args); 3730 SCHEME_V->args = cdr (args);
3676 s_goto (OP_LET2); 3731 s_goto (OP_LET2);
3677 } 3732 }
3678 3733
3679 case OP_LET2: /* let */ 3734 case OP_LET2: /* let */
3680 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3735 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3681 3736
3682 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = SCHEME_V->args; 3737 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3683 y != NIL; x = cdr (x), y = cdr (y)) 3738 y != NIL; x = cdr (x), y = cdr (y))
3684 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3739 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3685 3740
3686 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3741 if (is_symbol (car (SCHEME_V->code))) /* named let */
3687 { 3742 {
3688 for (x = cadr (SCHEME_V->code), SCHEME_V->args = NIL; x != NIL; x = cdr (x)) 3743 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3689 { 3744 {
3690 if (!is_pair (x)) 3745 if (!is_pair (x))
3691 Error_1 ("Bad syntax of binding in let :", x); 3746 Error_1 ("Bad syntax of binding in let :", x);
3692 3747
3693 if (!is_list (SCHEME_A_ car (x))) 3748 if (!is_list (SCHEME_A_ car (x)))
3694 Error_1 ("Bad syntax of binding in let :", car (x)); 3749 Error_1 ("Bad syntax of binding in let :", car (x));
3695 3750
3696 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3751 args = cons (caar (x), args);
3697 } 3752 }
3698 3753
3699 x =
3700 mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args), cddr (SCHEME_V->code)), 3754 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
3701 SCHEME_V->envir); 3755 SCHEME_V->envir);
3702 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3756 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3703 SCHEME_V->code = cddr (SCHEME_V->code); 3757 SCHEME_V->code = cddr (SCHEME_V->code);
3704 SCHEME_V->args = NIL;
3705 } 3758 }
3706 else 3759 else
3707 { 3760 {
3708 SCHEME_V->code = cdr (SCHEME_V->code); 3761 SCHEME_V->code = cdr (SCHEME_V->code);
3762 }
3763
3709 SCHEME_V->args = NIL; 3764 SCHEME_V->args = NIL;
3710 }
3711
3712 s_goto (OP_BEGIN); 3765 s_goto (OP_BEGIN);
3713 3766
3714 case OP_LET0AST: /* let* */ 3767 case OP_LET0AST: /* let* */
3715 if (car (SCHEME_V->code) == NIL) 3768 if (car (SCHEME_V->code) == NIL)
3716 { 3769 {
… …
3734 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value); 3787 new_slot_in_env (SCHEME_A_ caar (SCHEME_V->code), SCHEME_V->value);
3735 SCHEME_V->code = cdr (SCHEME_V->code); 3788 SCHEME_V->code = cdr (SCHEME_V->code);
3736 3789
3737 if (is_pair (SCHEME_V->code)) /* continue */ 3790 if (is_pair (SCHEME_V->code)) /* continue */
3738 { 3791 {
3739 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3792 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3740 SCHEME_V->code = cadar (SCHEME_V->code); 3793 SCHEME_V->code = cadar (SCHEME_V->code);
3741 SCHEME_V->args = NIL; 3794 SCHEME_V->args = NIL;
3742 s_goto (OP_EVAL); 3795 s_goto (OP_EVAL);
3743 } 3796 }
3744 else /* end */ 3797 else /* end */
3745 { 3798 {
3746 SCHEME_V->code = SCHEME_V->args; 3799 SCHEME_V->code = args;
3747 SCHEME_V->args = NIL; 3800 SCHEME_V->args = NIL;
3748 s_goto (OP_BEGIN); 3801 s_goto (OP_BEGIN);
3749 } 3802 }
3750 3803
3751 case OP_LET0REC: /* letrec */ 3804 case OP_LET0REC: /* letrec */
… …
3754 SCHEME_V->value = SCHEME_V->code; 3807 SCHEME_V->value = SCHEME_V->code;
3755 SCHEME_V->code = car (SCHEME_V->code); 3808 SCHEME_V->code = car (SCHEME_V->code);
3756 s_goto (OP_LET1REC); 3809 s_goto (OP_LET1REC);
3757 3810
3758 case OP_LET1REC: /* letrec (calculate parameters) */ 3811 case OP_LET1REC: /* letrec (calculate parameters) */
3759 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3812 args = cons (SCHEME_V->value, args);
3760 3813
3761 if (is_pair (SCHEME_V->code)) /* continue */ 3814 if (is_pair (SCHEME_V->code)) /* continue */
3762 { 3815 {
3763 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 3816 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3764 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code)); 3817 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3765 3818
3766 s_save (SCHEME_A_ OP_LET1REC, SCHEME_V->args, cdr (SCHEME_V->code)); 3819 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3767 SCHEME_V->code = cadar (SCHEME_V->code); 3820 SCHEME_V->code = cadar (SCHEME_V->code);
3768 SCHEME_V->args = NIL; 3821 SCHEME_V->args = NIL;
3769 s_goto (OP_EVAL); 3822 s_goto (OP_EVAL);
3770 } 3823 }
3771 else /* end */ 3824 else /* end */
3772 { 3825 {
3773 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3826 args = reverse_in_place (SCHEME_A_ NIL, args);
3774 SCHEME_V->code = car (SCHEME_V->args); 3827 SCHEME_V->code = car (args);
3775 SCHEME_V->args = cdr (SCHEME_V->args); 3828 SCHEME_V->args = cdr (args);
3776 s_goto (OP_LET2REC); 3829 s_goto (OP_LET2REC);
3777 } 3830 }
3778 3831
3779 case OP_LET2REC: /* letrec */ 3832 case OP_LET2REC: /* letrec */
3780 for (x = car (SCHEME_V->code), y = SCHEME_V->args; y != NIL; x = cdr (x), y = cdr (y)) 3833 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3781 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3834 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3782 3835
3783 SCHEME_V->code = cdr (SCHEME_V->code); 3836 SCHEME_V->code = cdr (SCHEME_V->code);
3784 SCHEME_V->args = NIL; 3837 SCHEME_V->args = NIL;
3785 s_goto (OP_BEGIN); 3838 s_goto (OP_BEGIN);
… …
3871 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3924 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3872 SCHEME_V->code = car (SCHEME_V->code); 3925 SCHEME_V->code = car (SCHEME_V->code);
3873 s_goto (OP_EVAL); 3926 s_goto (OP_EVAL);
3874 3927
3875 case OP_C1STREAM: /* cons-stream */ 3928 case OP_C1STREAM: /* cons-stream */
3876 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register SCHEME_V->args for gc */ 3929 SCHEME_V->args = SCHEME_V->value; /* save SCHEME_V->value to register args for gc */
3877 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3930 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3878 set_typeflag (x, T_PROMISE); 3931 set_typeflag (x, T_PROMISE);
3879 s_return (cons (SCHEME_V->args, x)); 3932 s_return (cons (args, x));
3880 3933
3881 case OP_MACRO0: /* macro */ 3934 case OP_MACRO0: /* macro */
3882 if (is_pair (car (SCHEME_V->code))) 3935 if (is_pair (car (SCHEME_V->code)))
3883 { 3936 {
3884 x = caar (SCHEME_V->code); 3937 x = caar (SCHEME_V->code);
… …
3917 { 3970 {
3918 if (!is_pair (y = caar (x))) 3971 if (!is_pair (y = caar (x)))
3919 break; 3972 break;
3920 3973
3921 for (; y != NIL; y = cdr (y)) 3974 for (; y != NIL; y = cdr (y))
3922 {
3923 if (eqv (car (y), SCHEME_V->value)) 3975 if (eqv (car (y), SCHEME_V->value))
3924 break; 3976 break;
3925 }
3926 3977
3927 if (y != NIL) 3978 if (y != NIL)
3928 break; 3979 break;
3929 } 3980 }
3930 3981
… …
3950 s_goto (OP_BEGIN); 4001 s_goto (OP_BEGIN);
3951 else 4002 else
3952 s_return (NIL); 4003 s_return (NIL);
3953 4004
3954 case OP_PAPPLY: /* apply */ 4005 case OP_PAPPLY: /* apply */
3955 SCHEME_V->code = car (SCHEME_V->args); 4006 SCHEME_V->code = car (args);
3956 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 4007 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3957 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 4008 /*SCHEME_V->args = cadr(args); */
3958 s_goto (OP_APPLY); 4009 s_goto (OP_APPLY);
3959 4010
3960 case OP_PEVAL: /* eval */ 4011 case OP_PEVAL: /* eval */
3961 if (cdr (SCHEME_V->args) != NIL) 4012 if (cdr (args) != NIL)
3962 SCHEME_V->envir = cadr (SCHEME_V->args); 4013 SCHEME_V->envir = cadr (args);
3963 4014
3964 SCHEME_V->code = car (SCHEME_V->args); 4015 SCHEME_V->code = car (args);
3965 s_goto (OP_EVAL); 4016 s_goto (OP_EVAL);
3966 4017
3967 case OP_CONTINUATION: /* call-with-current-continuation */ 4018 case OP_CONTINUATION: /* call-with-current-continuation */
3968 SCHEME_V->code = car (SCHEME_V->args); 4019 SCHEME_V->code = car (args);
3969 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 4020 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3970 s_goto (OP_APPLY); 4021 s_goto (OP_APPLY);
3971 } 4022 }
3972 4023
3973 return S_T; 4024 if (USE_ERROR_CHECKING) abort ();
3974} 4025}
3975 4026
3976static pointer 4027static int
3977opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4028opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3978{ 4029{
3979 pointer x; 4030 pointer args = SCHEME_V->args;
4031 pointer x = car (args);
3980 num v; 4032 num v;
3981 4033
4034 switch (op)
4035 {
3982#if USE_MATH 4036#if USE_MATH
3983 RVALUE dd;
3984#endif
3985
3986 switch (op)
3987 {
3988#if USE_MATH
3989
3990 case OP_INEX2EX: /* inexact->exact */ 4037 case OP_INEX2EX: /* inexact->exact */
3991 x = car (SCHEME_V->args); 4038 {
3992
3993 if (num_is_integer (x)) 4039 if (is_integer (x))
3994 s_return (x); 4040 s_return (x);
3995 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 4041
4042 RVALUE r = rvalue_unchecked (x);
4043
4044 if (r == (RVALUE)(IVALUE)r)
3996 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4045 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));
3997 else 4046 else
3998 Error_1 ("inexact->exact: not integral:", x); 4047 Error_1 ("inexact->exact: not integral:", x);
4048 }
3999 4049
4000 case OP_EXP:
4001 x = car (SCHEME_V->args);
4002 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4050 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4003
4004 case OP_LOG:
4005 x = car (SCHEME_V->args);
4006 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4051 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4007
4008 case OP_SIN:
4009 x = car (SCHEME_V->args);
4010 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4052 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4011
4012 case OP_COS:
4013 x = car (SCHEME_V->args);
4014 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4053 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4015
4016 case OP_TAN:
4017 x = car (SCHEME_V->args);
4018 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4054 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4019
4020 case OP_ASIN:
4021 x = car (SCHEME_V->args);
4022 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4055 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4023
4024 case OP_ACOS:
4025 x = car (SCHEME_V->args);
4026 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4056 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4027 4057
4028 case OP_ATAN: 4058 case OP_ATAN:
4029 x = car (SCHEME_V->args);
4030
4031 if (cdr (SCHEME_V->args) == NIL) 4059 if (cdr (args) == NIL)
4032 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4060 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4033 else 4061 else
4034 { 4062 {
4035 pointer y = cadr (SCHEME_V->args); 4063 pointer y = cadr (args);
4036
4037 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 4064 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4038 } 4065 }
4039 4066
4040 case OP_SQRT: 4067 case OP_SQRT:
4041 x = car (SCHEME_V->args);
4042 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 4068 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4043 4069
4044 case OP_EXPT: 4070 case OP_EXPT:
4045 { 4071 {
4046 RVALUE result; 4072 RVALUE result;
4047 int real_result = 1; 4073 int real_result = 1;
4048 pointer y = cadr (SCHEME_V->args); 4074 pointer y = cadr (args);
4049 4075
4050 x = car (SCHEME_V->args);
4051
4052 if (num_is_integer (x) && num_is_integer (y)) 4076 if (is_integer (x) && is_integer (y))
4053 real_result = 0; 4077 real_result = 0;
4054 4078
4055 /* This 'if' is an R5RS compatibility fix. */ 4079 /* This 'if' is an R5RS compatibility fix. */
4056 /* NOTE: Remove this 'if' fix for R6RS. */ 4080 /* NOTE: Remove this 'if' fix for R6RS. */
4057 if (rvalue (x) == 0 && rvalue (y) < 0) 4081 if (rvalue (x) == 0 && rvalue (y) < 0)
4058 result = 0.0; 4082 result = 0;
4059 else 4083 else
4060 result = pow (rvalue (x), rvalue (y)); 4084 result = pow (rvalue (x), rvalue (y));
4061 4085
4062 /* Before returning integer result make sure we can. */ 4086 /* Before returning integer result make sure we can. */
4063 /* If the test fails, result is too big for integer. */ 4087 /* If the test fails, result is too big for integer. */
4064 if (!real_result) 4088 if (!real_result)
4065 { 4089 {
4066 long result_as_long = (long) result; 4090 long result_as_long = result;
4067 4091
4068 if (result != (RVALUE) result_as_long) 4092 if (result != result_as_long)
4069 real_result = 1; 4093 real_result = 1;
4070 } 4094 }
4071 4095
4072 if (real_result) 4096 if (real_result)
4073 s_return (mk_real (SCHEME_A_ result)); 4097 s_return (mk_real (SCHEME_A_ result));
4074 else 4098 else
4075 s_return (mk_integer (SCHEME_A_ result)); 4099 s_return (mk_integer (SCHEME_A_ result));
4076 } 4100 }
4077 4101
4078 case OP_FLOOR:
4079 x = car (SCHEME_V->args);
4080 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 4102 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4081
4082 case OP_CEILING:
4083 x = car (SCHEME_V->args);
4084 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 4103 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4085 4104
4086 case OP_TRUNCATE: 4105 case OP_TRUNCATE:
4087 { 4106 {
4088 RVALUE rvalue_of_x; 4107 RVALUE n = rvalue (x);
4089
4090 x = car (SCHEME_V->args);
4091 rvalue_of_x = rvalue (x);
4092
4093 if (rvalue_of_x > 0)
4094 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 4108 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4095 else
4096 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4097 } 4109 }
4098 4110
4099 case OP_ROUND: 4111 case OP_ROUND:
4100 x = car (SCHEME_V->args);
4101
4102 if (num_is_integer (x)) 4112 if (is_integer (x))
4103 s_return (x); 4113 s_return (x);
4104 4114
4105 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4115 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4106#endif 4116#endif
4107 4117
4108 case OP_ADD: /* + */ 4118 case OP_ADD: /* + */
4109 v = num_zero; 4119 v = num_zero;
4110 4120
4111 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4121 for (x = args; x != NIL; x = cdr (x))
4112 v = num_add (v, nvalue (car (x))); 4122 v = num_op (NUM_ADD, v, nvalue (car (x)));
4113 4123
4114 s_return (mk_number (SCHEME_A_ v)); 4124 s_return (mk_number (SCHEME_A_ v));
4115 4125
4116 case OP_MUL: /* * */ 4126 case OP_MUL: /* * */
4117 v = num_one; 4127 v = num_one;
4118 4128
4119 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4129 for (x = args; x != NIL; x = cdr (x))
4120 v = num_mul (v, nvalue (car (x))); 4130 v = num_op (NUM_MUL, v, nvalue (car (x)));
4121 4131
4122 s_return (mk_number (SCHEME_A_ v)); 4132 s_return (mk_number (SCHEME_A_ v));
4123 4133
4124 case OP_SUB: /* - */ 4134 case OP_SUB: /* - */
4125 if (cdr (SCHEME_V->args) == NIL) 4135 if (cdr (args) == NIL)
4126 { 4136 {
4127 x = SCHEME_V->args; 4137 x = args;
4128 v = num_zero; 4138 v = num_zero;
4129 } 4139 }
4130 else 4140 else
4131 { 4141 {
4132 x = cdr (SCHEME_V->args); 4142 x = cdr (args);
4133 v = nvalue (car (SCHEME_V->args)); 4143 v = nvalue (car (args));
4134 } 4144 }
4135 4145
4136 for (; x != NIL; x = cdr (x)) 4146 for (; x != NIL; x = cdr (x))
4137 v = num_sub (v, nvalue (car (x))); 4147 v = num_op (NUM_SUB, v, nvalue (car (x)));
4138 4148
4139 s_return (mk_number (SCHEME_A_ v)); 4149 s_return (mk_number (SCHEME_A_ v));
4140 4150
4141 case OP_DIV: /* / */ 4151 case OP_DIV: /* / */
4142 if (cdr (SCHEME_V->args) == NIL) 4152 if (cdr (args) == NIL)
4143 { 4153 {
4144 x = SCHEME_V->args; 4154 x = args;
4145 v = num_one; 4155 v = num_one;
4146 } 4156 }
4147 else 4157 else
4148 { 4158 {
4149 x = cdr (SCHEME_V->args); 4159 x = cdr (args);
4150 v = nvalue (car (SCHEME_V->args)); 4160 v = nvalue (car (args));
4151 } 4161 }
4152 4162
4153 for (; x != NIL; x = cdr (x)) 4163 for (; x != NIL; x = cdr (x))
4154 {
4155 if (!is_zero_rvalue (rvalue (car (x)))) 4164 if (!is_zero_rvalue (rvalue (car (x))))
4156 v = num_div (v, nvalue (car (x))); 4165 v = num_div (v, nvalue (car (x)));
4157 else 4166 else
4158 Error_0 ("/: division by zero"); 4167 Error_0 ("/: division by zero");
4159 }
4160 4168
4161 s_return (mk_number (SCHEME_A_ v)); 4169 s_return (mk_number (SCHEME_A_ v));
4162 4170
4163 case OP_INTDIV: /* quotient */ 4171 case OP_INTDIV: /* quotient */
4164 if (cdr (SCHEME_V->args) == NIL) 4172 if (cdr (args) == NIL)
4165 { 4173 {
4166 x = SCHEME_V->args; 4174 x = args;
4167 v = num_one; 4175 v = num_one;
4168 } 4176 }
4169 else 4177 else
4170 { 4178 {
4171 x = cdr (SCHEME_V->args); 4179 x = cdr (args);
4172 v = nvalue (car (SCHEME_V->args)); 4180 v = nvalue (car (args));
4173 } 4181 }
4174 4182
4175 for (; x != NIL; x = cdr (x)) 4183 for (; x != NIL; x = cdr (x))
4176 { 4184 {
4177 if (ivalue (car (x)) != 0) 4185 if (ivalue (car (x)) != 0)
4178 v = num_intdiv (v, nvalue (car (x))); 4186 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4179 else 4187 else
4180 Error_0 ("quotient: division by zero"); 4188 Error_0 ("quotient: division by zero");
4181 } 4189 }
4182 4190
4183 s_return (mk_number (SCHEME_A_ v)); 4191 s_return (mk_number (SCHEME_A_ v));
4184 4192
4185 case OP_REM: /* remainder */ 4193 case OP_REM: /* remainder */
4186 v = nvalue (car (SCHEME_V->args)); 4194 v = nvalue (x);
4187 4195
4188 if (ivalue (cadr (SCHEME_V->args)) != 0) 4196 if (ivalue (cadr (args)) != 0)
4189 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4197 v = num_rem (v, nvalue (cadr (args)));
4190 else 4198 else
4191 Error_0 ("remainder: division by zero"); 4199 Error_0 ("remainder: division by zero");
4192 4200
4193 s_return (mk_number (SCHEME_A_ v)); 4201 s_return (mk_number (SCHEME_A_ v));
4194 4202
4195 case OP_MOD: /* modulo */ 4203 case OP_MOD: /* modulo */
4196 v = nvalue (car (SCHEME_V->args)); 4204 v = nvalue (x);
4197 4205
4198 if (ivalue (cadr (SCHEME_V->args)) != 0) 4206 if (ivalue (cadr (args)) != 0)
4199 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4207 v = num_mod (v, nvalue (cadr (args)));
4200 else 4208 else
4201 Error_0 ("modulo: division by zero"); 4209 Error_0 ("modulo: division by zero");
4202 4210
4203 s_return (mk_number (SCHEME_A_ v)); 4211 s_return (mk_number (SCHEME_A_ v));
4204 4212
4205 case OP_CAR: /* car */ 4213 /* the compiler will optimize this mess... */
4206 s_return (caar (SCHEME_V->args)); 4214 case OP_CAR: op_car: s_return (car (x));
4207 4215 case OP_CDR: op_cdr: s_return (cdr (x));
4208 case OP_CDR: /* cdr */ 4216 case OP_CAAR: op_caar: x = car (x); goto op_car;
4209 s_return (cdar (SCHEME_V->args)); 4217 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4218 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4219 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4220 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4221 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4222 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4223 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4224 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4225 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4226 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4227 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4228 case OP_CAAAAR: x = car (x); goto op_caaar;
4229 case OP_CAAADR: x = cdr (x); goto op_caaar;
4230 case OP_CAADAR: x = car (x); goto op_caadr;
4231 case OP_CAADDR: x = cdr (x); goto op_caadr;
4232 case OP_CADAAR: x = car (x); goto op_cadar;
4233 case OP_CADADR: x = cdr (x); goto op_cadar;
4234 case OP_CADDAR: x = car (x); goto op_caddr;
4235 case OP_CADDDR: x = cdr (x); goto op_caddr;
4236 case OP_CDAAAR: x = car (x); goto op_cdaar;
4237 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4238 case OP_CDADAR: x = car (x); goto op_cdadr;
4239 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4240 case OP_CDDAAR: x = car (x); goto op_cddar;
4241 case OP_CDDADR: x = cdr (x); goto op_cddar;
4242 case OP_CDDDAR: x = car (x); goto op_cdddr;
4243 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4210 4244
4211 case OP_CONS: /* cons */ 4245 case OP_CONS: /* cons */
4212 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4246 set_cdr (args, cadr (args));
4213 s_return (SCHEME_V->args); 4247 s_return (args);
4214 4248
4215 case OP_SETCAR: /* set-car! */ 4249 case OP_SETCAR: /* set-car! */
4216 if (!is_immutable (car (SCHEME_V->args))) 4250 if (!is_immutable (x))
4217 { 4251 {
4218 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4252 set_car (x, cadr (args));
4219 s_return (car (SCHEME_V->args)); 4253 s_return (car (args));
4220 } 4254 }
4221 else 4255 else
4222 Error_0 ("set-car!: unable to alter immutable pair"); 4256 Error_0 ("set-car!: unable to alter immutable pair");
4223 4257
4224 case OP_SETCDR: /* set-cdr! */ 4258 case OP_SETCDR: /* set-cdr! */
4225 if (!is_immutable (car (SCHEME_V->args))) 4259 if (!is_immutable (x))
4226 { 4260 {
4227 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4261 set_cdr (x, cadr (args));
4228 s_return (car (SCHEME_V->args)); 4262 s_return (car (args));
4229 } 4263 }
4230 else 4264 else
4231 Error_0 ("set-cdr!: unable to alter immutable pair"); 4265 Error_0 ("set-cdr!: unable to alter immutable pair");
4232 4266
4233 case OP_CHAR2INT: /* char->integer */ 4267 case OP_CHAR2INT: /* char->integer */
4234 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4268 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4235 4269
4236 case OP_INT2CHAR: /* integer->char */ 4270 case OP_INT2CHAR: /* integer->char */
4237 s_return (mk_character (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4271 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4238 4272
4239 case OP_CHARUPCASE: 4273 case OP_CHARUPCASE:
4240 { 4274 {
4241 unsigned char c = ivalue (car (SCHEME_V->args)); 4275 unsigned char c = ivalue_unchecked (x);
4242 c = toupper (c); 4276 c = toupper (c);
4243 s_return (mk_character (SCHEME_A_ c)); 4277 s_return (mk_character (SCHEME_A_ c));
4244 } 4278 }
4245 4279
4246 case OP_CHARDNCASE: 4280 case OP_CHARDNCASE:
4247 { 4281 {
4248 unsigned char c = ivalue (car (SCHEME_V->args)); 4282 unsigned char c = ivalue_unchecked (x);
4249 c = tolower (c); 4283 c = tolower (c);
4250 s_return (mk_character (SCHEME_A_ c)); 4284 s_return (mk_character (SCHEME_A_ c));
4251 } 4285 }
4252 4286
4253 case OP_STR2SYM: /* string->symbol */ 4287 case OP_STR2SYM: /* string->symbol */
4254 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4288 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4255 4289
4256 case OP_STR2ATOM: /* string->atom */ 4290 case OP_STR2ATOM: /* string->atom */
4257 { 4291 {
4258 char *s = strvalue (car (SCHEME_V->args)); 4292 char *s = strvalue (x);
4259 long pf = 0; 4293 long pf = 0;
4260 4294
4261 if (cdr (SCHEME_V->args) != NIL) 4295 if (cdr (args) != NIL)
4262 { 4296 {
4263 /* we know cadr(SCHEME_V->args) is a natural number */ 4297 /* we know cadr(args) is a natural number */
4264 /* see if it is 2, 8, 10, or 16, or error */ 4298 /* see if it is 2, 8, 10, or 16, or error */
4265 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4299 pf = ivalue_unchecked (cadr (args));
4266 4300
4267 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4301 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4268 { 4302 {
4269 /* base is OK */ 4303 /* base is OK */
4270 } 4304 }
4271 else 4305 else
4272 pf = -1; 4306 pf = -1;
4273 } 4307 }
4274 4308
4275 if (pf < 0) 4309 if (pf < 0)
4276 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4310 Error_1 ("string->atom: bad base:", cadr (args));
4277 else if (*s == '#') /* no use of base! */ 4311 else if (*s == '#') /* no use of base! */
4278 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4312 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4279 else 4313 else
4280 { 4314 {
4281 if (pf == 0 || pf == 10) 4315 if (pf == 0 || pf == 10)
… …
4292 } 4326 }
4293 } 4327 }
4294 } 4328 }
4295 4329
4296 case OP_SYM2STR: /* symbol->string */ 4330 case OP_SYM2STR: /* symbol->string */
4297 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4331 x = mk_string (SCHEME_A_ symname (x));
4298 setimmutable (x); 4332 setimmutable (x);
4299 s_return (x); 4333 s_return (x);
4300 4334
4301 case OP_ATOM2STR: /* atom->string */ 4335 case OP_ATOM2STR: /* atom->string */
4302 { 4336 {
4303 long pf = 0; 4337 long pf = 0;
4304 4338
4305 x = car (SCHEME_V->args);
4306
4307 if (cdr (SCHEME_V->args) != NIL) 4339 if (cdr (args) != NIL)
4308 { 4340 {
4309 /* we know cadr(SCHEME_V->args) is a natural number */ 4341 /* we know cadr(args) is a natural number */
4310 /* see if it is 2, 8, 10, or 16, or error */ 4342 /* see if it is 2, 8, 10, or 16, or error */
4311 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4343 pf = ivalue_unchecked (cadr (args));
4312 4344
4313 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2)) 4345 if (is_number (x) && (pf == 16 || pf == 10 || pf == 8 || pf == 2))
4314 { 4346 {
4315 /* base is OK */ 4347 /* base is OK */
4316 } 4348 }
4317 else 4349 else
4318 pf = -1; 4350 pf = -1;
4319 } 4351 }
4320 4352
4321 if (pf < 0) 4353 if (pf < 0)
4322 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4354 Error_1 ("atom->string: bad base:", cadr (args));
4323 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x)) 4355 else if (is_number (x) || is_character (x) || is_string (x) || is_symbol (x))
4324 { 4356 {
4325 char *p; 4357 char *p;
4326 int len; 4358 int len;
4327 4359
… …
4332 Error_1 ("atom->string: not an atom:", x); 4364 Error_1 ("atom->string: not an atom:", x);
4333 } 4365 }
4334 4366
4335 case OP_MKSTRING: /* make-string */ 4367 case OP_MKSTRING: /* make-string */
4336 { 4368 {
4337 int fill = ' '; 4369 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4338 int len; 4370 int len = ivalue_unchecked (x);
4339 4371
4340 len = ivalue (car (SCHEME_V->args));
4341
4342 if (cdr (SCHEME_V->args) != NIL)
4343 fill = charvalue (cadr (SCHEME_V->args));
4344
4345 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4372 s_return (mk_empty_string (SCHEME_A_ len, fill));
4346 } 4373 }
4347 4374
4348 case OP_STRLEN: /* string-length */ 4375 case OP_STRLEN: /* string-length */
4349 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4376 s_return (mk_integer (SCHEME_A_ strlength (x)));
4350 4377
4351 case OP_STRREF: /* string-ref */ 4378 case OP_STRREF: /* string-ref */
4352 { 4379 {
4353 char *str; 4380 char *str = strvalue (x);
4354 int index;
4355
4356 str = strvalue (car (SCHEME_V->args));
4357
4358 index = ivalue (cadr (SCHEME_V->args)); 4381 int index = ivalue_unchecked (cadr (args));
4359 4382
4360 if (index >= strlength (car (SCHEME_V->args))) 4383 if (index >= strlength (x))
4361 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4384 Error_1 ("string-ref: out of bounds:", cadr (args));
4362 4385
4363 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4386 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4364 } 4387 }
4365 4388
4366 case OP_STRSET: /* string-set! */ 4389 case OP_STRSET: /* string-set! */
4367 { 4390 {
4368 char *str; 4391 char *str = strvalue (x);
4369 int index; 4392 int index = ivalue_unchecked (cadr (args));
4370 int c; 4393 int c;
4371 4394
4372 if (is_immutable (car (SCHEME_V->args))) 4395 if (is_immutable (x))
4373 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4396 Error_1 ("string-set!: unable to alter immutable string:", x);
4374 4397
4375 str = strvalue (car (SCHEME_V->args));
4376
4377 index = ivalue (cadr (SCHEME_V->args));
4378
4379 if (index >= strlength (car (SCHEME_V->args))) 4398 if (index >= strlength (x))
4380 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4399 Error_1 ("string-set!: out of bounds:", cadr (args));
4381 4400
4382 c = charvalue (caddr (SCHEME_V->args)); 4401 c = charvalue (caddr (args));
4383 4402
4384 str[index] = (char) c; 4403 str[index] = c;
4385 s_return (car (SCHEME_V->args)); 4404 s_return (car (args));
4386 } 4405 }
4387 4406
4388 case OP_STRAPPEND: /* string-append */ 4407 case OP_STRAPPEND: /* string-append */
4389 { 4408 {
4390 /* in 1.29 string-append was in Scheme in init.scm but was too slow */ 4409 /* in 1.29 string-append was in Scheme in init.scm but was too slow */
4391 int len = 0; 4410 int len = 0;
4392 pointer newstr; 4411 pointer newstr;
4393 char *pos; 4412 char *pos;
4394 4413
4395 /* compute needed length for new string */ 4414 /* compute needed length for new string */
4396 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4415 for (x = args; x != NIL; x = cdr (x))
4397 len += strlength (car (x)); 4416 len += strlength (car (x));
4398 4417
4399 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4418 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4400 4419
4401 /* store the contents of the argument strings into the new string */ 4420 /* store the contents of the argument strings into the new string */
4402 for (pos = strvalue (newstr), x = SCHEME_V->args; x != NIL; pos += strlength (car (x)), x = cdr (x)) 4421 for (pos = strvalue (newstr), x = args; x != NIL; pos += strlength (car (x)), x = cdr (x))
4403 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4422 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4404 4423
4405 s_return (newstr); 4424 s_return (newstr);
4406 } 4425 }
4407 4426
4408 case OP_SUBSTR: /* substring */ 4427 case OP_SUBSTR: /* substring */
4409 { 4428 {
4410 char *str; 4429 char *str = strvalue (x);
4411 int index0; 4430 int index0 = ivalue_unchecked (cadr (args));
4412 int index1; 4431 int index1;
4413 int len; 4432 int len;
4414 4433
4415 str = strvalue (car (SCHEME_V->args));
4416
4417 index0 = ivalue (cadr (SCHEME_V->args));
4418
4419 if (index0 > strlength (car (SCHEME_V->args))) 4434 if (index0 > strlength (x))
4420 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args)); 4435 Error_1 ("substring: start out of bounds:", cadr (args));
4421 4436
4422 if (cddr (SCHEME_V->args) != NIL) 4437 if (cddr (args) != NIL)
4423 { 4438 {
4424 index1 = ivalue (caddr (SCHEME_V->args)); 4439 index1 = ivalue_unchecked (caddr (args));
4425 4440
4426 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4441 if (index1 > strlength (x) || index1 < index0)
4427 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4442 Error_1 ("substring: end out of bounds:", caddr (args));
4428 } 4443 }
4429 else 4444 else
4430 index1 = strlength (car (SCHEME_V->args)); 4445 index1 = strlength (x);
4431 4446
4432 len = index1 - index0; 4447 len = index1 - index0;
4433 x = mk_empty_string (SCHEME_A_ len, ' '); 4448 x = mk_empty_string (SCHEME_A_ len, ' ');
4434 memcpy (strvalue (x), str + index0, len); 4449 memcpy (strvalue (x), str + index0, len);
4435 strvalue (x)[len] = 0; 4450 strvalue (x)[len] = 0;
… …
4439 4454
4440 case OP_VECTOR: /* vector */ 4455 case OP_VECTOR: /* vector */
4441 { 4456 {
4442 int i; 4457 int i;
4443 pointer vec; 4458 pointer vec;
4444 int len = list_length (SCHEME_A_ SCHEME_V->args); 4459 int len = list_length (SCHEME_A_ args);
4445 4460
4446 if (len < 0) 4461 if (len < 0)
4447 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4462 Error_1 ("vector: not a proper list:", args);
4448 4463
4449 vec = mk_vector (SCHEME_A_ len); 4464 vec = mk_vector (SCHEME_A_ len);
4450 4465
4451#if USE_ERROR_CHECKING 4466#if USE_ERROR_CHECKING
4452 if (SCHEME_V->no_memory) 4467 if (SCHEME_V->no_memory)
4453 s_return (S_SINK); 4468 s_return (S_SINK);
4454#endif 4469#endif
4455 4470
4456 for (x = SCHEME_V->args, i = 0; is_pair (x); x = cdr (x), i++) 4471 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4457 set_vector_elem (vec, i, car (x)); 4472 vector_set (vec, i, car (x));
4458 4473
4459 s_return (vec); 4474 s_return (vec);
4460 } 4475 }
4461 4476
4462 case OP_MKVECTOR: /* make-vector */ 4477 case OP_MKVECTOR: /* make-vector */
4463 { 4478 {
4464 pointer fill = NIL; 4479 pointer fill = NIL;
4465 int len;
4466 pointer vec; 4480 pointer vec;
4481 int len = ivalue_unchecked (x);
4467 4482
4468 len = ivalue (car (SCHEME_V->args));
4469
4470 if (cdr (SCHEME_V->args) != NIL) 4483 if (cdr (args) != NIL)
4471 fill = cadr (SCHEME_V->args); 4484 fill = cadr (args);
4472 4485
4473 vec = mk_vector (SCHEME_A_ len); 4486 vec = mk_vector (SCHEME_A_ len);
4474 4487
4475#if USE_ERROR_CHECKING 4488#if USE_ERROR_CHECKING
4476 if (SCHEME_V->no_memory) 4489 if (SCHEME_V->no_memory)
4477 s_return (S_SINK); 4490 s_return (S_SINK);
4478#endif 4491#endif
4479 4492
4480 if (fill != NIL) 4493 if (fill != NIL)
4481 fill_vector (vec, fill); 4494 fill_vector (vec, 0, fill);
4482 4495
4483 s_return (vec); 4496 s_return (vec);
4484 } 4497 }
4485 4498
4486 case OP_VECLEN: /* vector-length */ 4499 case OP_VECLEN: /* vector-length */
4487 s_return (mk_integer (SCHEME_A_ veclength (car (SCHEME_V->args)))); 4500 s_return (mk_integer (SCHEME_A_ veclength (x)));
4501
4502 case OP_VECRESIZE:
4503 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4504 s_return (x);
4488 4505
4489 case OP_VECREF: /* vector-ref */ 4506 case OP_VECREF: /* vector-ref */
4490 { 4507 {
4491 int index;
4492
4493 index = ivalue (cadr (SCHEME_V->args)); 4508 int index = ivalue_unchecked (cadr (args));
4494 4509
4495 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4510 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4496 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4511 Error_1 ("vector-ref: out of bounds:", cadr (args));
4497 4512
4498 s_return (vector_elem (car (SCHEME_V->args), index)); 4513 s_return (vector_get (x, index));
4499 } 4514 }
4500 4515
4501 case OP_VECSET: /* vector-set! */ 4516 case OP_VECSET: /* vector-set! */
4502 { 4517 {
4503 int index; 4518 int index = ivalue_unchecked (cadr (args));
4504 4519
4505 if (is_immutable (car (SCHEME_V->args))) 4520 if (is_immutable (x))
4506 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4521 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4507 4522
4508 index = ivalue (cadr (SCHEME_V->args));
4509
4510 if (index >= veclength (car (SCHEME_V->args)) && USE_ERROR_CHECKING) 4523 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4511 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4524 Error_1 ("vector-set!: out of bounds:", cadr (args));
4512 4525
4513 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4526 vector_set (x, index, caddr (args));
4514 s_return (car (SCHEME_V->args)); 4527 s_return (x);
4515 } 4528 }
4516 } 4529 }
4517 4530
4518 return S_T; 4531 if (USE_ERROR_CHECKING) abort ();
4519} 4532}
4520 4533
4521INTERFACE int 4534static int
4522is_list (SCHEME_P_ pointer a) 4535opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4536{
4524 return list_length (SCHEME_A_ a) >= 0; 4537 pointer x = SCHEME_V->args;
4525}
4526 4538
4527/* Result is: 4539 for (;;)
4528 proper list: length
4529 circular list: -1
4530 not even a pair: -2
4531 dotted list: -2 minus length before dot
4532*/
4533INTERFACE int
4534list_length (SCHEME_P_ pointer a)
4535{
4536 int i = 0;
4537 pointer slow, fast;
4538
4539 slow = fast = a;
4540
4541 while (1)
4542 { 4540 {
4541 num v = nvalue (car (x));
4542 x = cdr (x);
4543
4543 if (fast == NIL) 4544 if (x == NIL)
4544 return i; 4545 break;
4545 4546
4546 if (!is_pair (fast)) 4547 int r = num_cmp (v, nvalue (car (x)));
4547 return -2 - i;
4548 4548
4549 fast = cdr (fast); 4549 switch (op)
4550 ++i;
4551
4552 if (fast == NIL)
4553 return i;
4554
4555 if (!is_pair (fast))
4556 return -2 - i;
4557
4558 ++i;
4559 fast = cdr (fast);
4560
4561 /* Safe because we would have already returned if `fast'
4562 encountered a non-pair. */
4563 slow = cdr (slow);
4564
4565 if (fast == slow)
4566 { 4550 {
4567 /* the fast pointer has looped back around and caught up 4551 case OP_NUMEQ: r = r == 0; break;
4568 with the slow pointer, hence the structure is circular, 4552 case OP_LESS: r = r < 0; break;
4569 not of finite length, and therefore not a list */ 4553 case OP_GRE: r = r > 0; break;
4570 return -1; 4554 case OP_LEQ: r = r <= 0; break;
4555 case OP_GEQ: r = r >= 0; break;
4571 } 4556 }
4572 }
4573}
4574 4557
4558 if (!r)
4559 s_return (S_F);
4560 }
4561
4562 s_return (S_T);
4563}
4564
4575static pointer 4565static int
4576opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4566opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4577{ 4567{
4578 pointer x; 4568 pointer args = SCHEME_V->args;
4579 num v; 4569 pointer a = car (args);
4580 int (*comp_func) (num, num); 4570 pointer d = cdr (args);
4571 int r;
4581 4572
4582 switch (op) 4573 switch (op)
4583 { 4574 {
4584 case OP_NOT: /* not */ 4575 case OP_NOT: /* not */ r = is_false (a) ; break;
4585 s_retbool (is_false (car (SCHEME_V->args))); 4576 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4577 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4578 case OP_NULLP: /* null? */ r = a == NIL ; break;
4579 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4580 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4581 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4582 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4583 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4584 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4585 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4586 4586
4587 case OP_BOOLP: /* boolean? */
4588 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4589
4590 case OP_EOFOBJP: /* boolean? */
4591 s_retbool (car (SCHEME_V->args) == S_EOF);
4592
4593 case OP_NULLP: /* null? */
4594 s_retbool (car (SCHEME_V->args) == NIL);
4595
4596 case OP_NUMEQ: /* = */
4597 case OP_LESS: /* < */
4598 case OP_GRE: /* > */
4599 case OP_LEQ: /* <= */
4600 case OP_GEQ: /* >= */
4601 switch (op)
4602 {
4603 case OP_NUMEQ:
4604 comp_func = num_eq;
4605 break;
4606
4607 case OP_LESS:
4608 comp_func = num_lt;
4609 break;
4610
4611 case OP_GRE:
4612 comp_func = num_gt;
4613 break;
4614
4615 case OP_LEQ:
4616 comp_func = num_le;
4617 break;
4618
4619 case OP_GEQ:
4620 comp_func = num_ge;
4621 break;
4622 }
4623
4624 x = SCHEME_V->args;
4625 v = nvalue (car (x));
4626 x = cdr (x);
4627
4628 for (; x != NIL; x = cdr (x))
4629 {
4630 if (!comp_func (v, nvalue (car (x))))
4631 s_retbool (0);
4632
4633 v = nvalue (car (x));
4634 }
4635
4636 s_retbool (1);
4637
4638 case OP_SYMBOLP: /* symbol? */
4639 s_retbool (is_symbol (car (SCHEME_V->args)));
4640
4641 case OP_NUMBERP: /* number? */
4642 s_retbool (is_number (car (SCHEME_V->args)));
4643
4644 case OP_STRINGP: /* string? */
4645 s_retbool (is_string (car (SCHEME_V->args)));
4646
4647 case OP_INTEGERP: /* integer? */
4648 s_retbool (is_integer (car (SCHEME_V->args)));
4649
4650 case OP_REALP: /* real? */
4651 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4652
4653 case OP_CHARP: /* char? */
4654 s_retbool (is_character (car (SCHEME_V->args)));
4655#if USE_CHAR_CLASSIFIERS 4587#if USE_CHAR_CLASSIFIERS
4656 4588 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4657 case OP_CHARAP: /* char-alphabetic? */ 4589 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4658 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4590 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4659 4591 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4660 case OP_CHARNP: /* char-numeric? */ 4592 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4661 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
4662
4663 case OP_CHARWP: /* char-whitespace? */
4664 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
4665
4666 case OP_CHARUP: /* char-upper-case? */
4667 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
4668
4669 case OP_CHARLP: /* char-lower-case? */
4670 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
4671#endif 4593#endif
4594
4672#if USE_PORTS 4595#if USE_PORTS
4673 4596 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4674 case OP_PORTP: /* port? */
4675 s_retbool (is_port (car (SCHEME_V->args)));
4676
4677 case OP_INPORTP: /* input-port? */ 4597 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
4678 s_retbool (is_inport (car (SCHEME_V->args)));
4679
4680 case OP_OUTPORTP: /* output-port? */ 4598 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
4681 s_retbool (is_outport (car (SCHEME_V->args)));
4682#endif 4599#endif
4683 4600
4684 case OP_PROCP: /* procedure? */ 4601 case OP_PROCP: /* procedure? */
4685 4602
4686 /*-- 4603 /*--
4687 * continuation should be procedure by the example 4604 * continuation should be procedure by the example
4688 * (call-with-current-continuation procedure?) ==> #t 4605 * (call-with-current-continuation procedure?) ==> #t
4689 * in R^3 report sec. 6.9 4606 * in R^3 report sec. 6.9
4690 */ 4607 */
4691 s_retbool (is_proc (car (SCHEME_V->args)) || is_closure (car (SCHEME_V->args)) 4608 r = is_proc (a) || is_closure (a) || is_continuation (a) || is_foreign (a);
4692 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4609 break;
4693 4610
4694 case OP_PAIRP: /* pair? */ 4611 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
4695 s_retbool (is_pair (car (SCHEME_V->args))); 4612 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
4696 4613 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
4697 case OP_LISTP: /* list? */ 4614 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
4698 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4615 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
4699 4616 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
4700 case OP_ENVP: /* environment? */
4701 s_retbool (is_environment (car (SCHEME_V->args)));
4702
4703 case OP_VECTORP: /* vector? */
4704 s_retbool (is_vector (car (SCHEME_V->args)));
4705
4706 case OP_EQ: /* eq? */
4707 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
4708
4709 case OP_EQV: /* eqv? */
4710 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
4711 } 4617 }
4712 4618
4713 return S_T; 4619 s_retbool (r);
4714} 4620}
4715 4621
4716static pointer 4622static int
4717opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4623opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4718{ 4624{
4625 pointer args = SCHEME_V->args;
4626 pointer a = car (args);
4719 pointer x, y; 4627 pointer x, y;
4720 4628
4721 switch (op) 4629 switch (op)
4722 { 4630 {
4723 case OP_FORCE: /* force */ 4631 case OP_FORCE: /* force */
4724 SCHEME_V->code = car (SCHEME_V->args); 4632 SCHEME_V->code = a;
4725 4633
4726 if (is_promise (SCHEME_V->code)) 4634 if (is_promise (SCHEME_V->code))
4727 { 4635 {
4728 /* Should change type to closure here */ 4636 /* Should change type to closure here */
4729 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4637 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
… …
4732 } 4640 }
4733 else 4641 else
4734 s_return (SCHEME_V->code); 4642 s_return (SCHEME_V->code);
4735 4643
4736 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4644 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4737 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4645 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4738 s_return (SCHEME_V->value); 4646 s_return (SCHEME_V->value);
4739 4647
4740#if USE_PORTS 4648#if USE_PORTS
4741 4649
4742 case OP_WRITE: /* write */ 4650 case OP_WRITE: /* write */
… …
4750 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4658 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4751 SCHEME_V->outport = cadr (SCHEME_V->args); 4659 SCHEME_V->outport = cadr (SCHEME_V->args);
4752 } 4660 }
4753 } 4661 }
4754 4662
4755 SCHEME_V->args = car (SCHEME_V->args); 4663 SCHEME_V->args = a;
4756 4664
4757 if (op == OP_WRITE) 4665 if (op == OP_WRITE)
4758 SCHEME_V->print_flag = 1; 4666 SCHEME_V->print_flag = 1;
4759 else 4667 else
4760 SCHEME_V->print_flag = 0; 4668 SCHEME_V->print_flag = 0;
4761 4669
4762 s_goto (OP_P0LIST); 4670 s_goto (OP_P0LIST);
4763 4671
4764 case OP_NEWLINE: /* newline */ 4672 case OP_NEWLINE: /* newline */
4765 if (is_pair (SCHEME_V->args)) 4673 if (is_pair (args))
4766 { 4674 {
4767 if (car (SCHEME_V->args) != SCHEME_V->outport) 4675 if (a != SCHEME_V->outport)
4768 { 4676 {
4769 x = cons (SCHEME_V->outport, NIL); 4677 x = cons (SCHEME_V->outport, NIL);
4770 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4678 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4771 SCHEME_V->outport = car (SCHEME_V->args); 4679 SCHEME_V->outport = a;
4772 } 4680 }
4773 } 4681 }
4774 4682
4775 putstr (SCHEME_A_ "\n"); 4683 putstr (SCHEME_A_ "\n");
4776 s_return (S_T); 4684 s_return (S_T);
4777#endif 4685#endif
4778 4686
4779 case OP_ERR0: /* error */ 4687 case OP_ERR0: /* error */
4780 SCHEME_V->retcode = -1; 4688 SCHEME_V->retcode = -1;
4781 4689
4782 if (!is_string (car (SCHEME_V->args))) 4690 if (!is_string (a))
4783 { 4691 {
4784 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4692 args = cons (mk_string (SCHEME_A_ " -- "), args);
4785 setimmutable (car (SCHEME_V->args)); 4693 setimmutable (car (args));
4786 } 4694 }
4787 4695
4788 putstr (SCHEME_A_ "Error: "); 4696 putstr (SCHEME_A_ "Error: ");
4789 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4697 putstr (SCHEME_A_ strvalue (car (args)));
4790 SCHEME_V->args = cdr (SCHEME_V->args); 4698 SCHEME_V->args = cdr (args);
4791 s_goto (OP_ERR1); 4699 s_goto (OP_ERR1);
4792 4700
4793 case OP_ERR1: /* error */ 4701 case OP_ERR1: /* error */
4794 putstr (SCHEME_A_ " "); 4702 putstr (SCHEME_A_ " ");
4795 4703
4796 if (SCHEME_V->args != NIL) 4704 if (args != NIL)
4797 { 4705 {
4798 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4706 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4799 SCHEME_V->args = car (SCHEME_V->args); 4707 SCHEME_V->args = a;
4800 SCHEME_V->print_flag = 1; 4708 SCHEME_V->print_flag = 1;
4801 s_goto (OP_P0LIST); 4709 s_goto (OP_P0LIST);
4802 } 4710 }
4803 else 4711 else
4804 { 4712 {
4805 putstr (SCHEME_A_ "\n"); 4713 putstr (SCHEME_A_ "\n");
4806 4714
4807 if (SCHEME_V->interactive_repl) 4715 if (SCHEME_V->interactive_repl)
4808 s_goto (OP_T0LVL); 4716 s_goto (OP_T0LVL);
4809 else 4717 else
4810 return NIL; 4718 return -1;
4811 } 4719 }
4812 4720
4813 case OP_REVERSE: /* reverse */ 4721 case OP_REVERSE: /* reverse */
4814 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4722 s_return (reverse (SCHEME_A_ a));
4815 4723
4816 case OP_LIST_STAR: /* list* */ 4724 case OP_LIST_STAR: /* list* */
4817 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4725 s_return (list_star (SCHEME_A_ SCHEME_V->args));
4818 4726
4819 case OP_APPEND: /* append */ 4727 case OP_APPEND: /* append */
4820 x = NIL; 4728 x = NIL;
4821 y = SCHEME_V->args; 4729 y = args;
4822 4730
4823 if (y == x) 4731 if (y == x)
4824 s_return (x); 4732 s_return (x);
4825 4733
4826 /* cdr() in the while condition is not a typo. If car() */ 4734 /* cdr() in the while condition is not a typo. If car() */
… …
4837 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4745 s_return (reverse_in_place (SCHEME_A_ car (y), x));
4838 4746
4839#if USE_PLIST 4747#if USE_PLIST
4840 4748
4841 case OP_PUT: /* put */ 4749 case OP_PUT: /* put */
4842 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4750 if (!hasprop (a) || !hasprop (cadr (args)))
4843 Error_0 ("illegal use of put"); 4751 Error_0 ("illegal use of put");
4844 4752
4845 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4753 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4846 { 4754 {
4847 if (caar (x) == y) 4755 if (caar (x) == y)
4848 break; 4756 break;
4849 } 4757 }
4850 4758
4851 if (x != NIL) 4759 if (x != NIL)
4852 cdar (x) = caddr (SCHEME_V->args); 4760 cdar (x) = caddr (args);
4853 else 4761 else
4854 symprop (car (SCHEME_V->args)) = cons (cons (y, caddr (SCHEME_V->args)), symprop (car (SCHEME_V->args))); 4762 symprop (a) = cons (cons (y, caddr (args)), symprop (a));
4855 4763
4856 s_return (S_T); 4764 s_return (S_T);
4857 4765
4858 case OP_GET: /* get */ 4766 case OP_GET: /* get */
4859 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4767 if (!hasprop (a) || !hasprop (cadr (args)))
4860 Error_0 ("illegal use of get"); 4768 Error_0 ("illegal use of get");
4861 4769
4862 for (x = symprop (car (SCHEME_V->args)), y = cadr (SCHEME_V->args); x != NIL; x = cdr (x)) 4770 for (x = symprop (a), y = cadr (args); x != NIL; x = cdr (x))
4863 if (caar (x) == y) 4771 if (caar (x) == y)
4864 break; 4772 break;
4865 4773
4866 if (x != NIL) 4774 if (x != NIL)
4867 s_return (cdar (x)); 4775 s_return (cdar (x));
… …
4869 s_return (NIL); 4777 s_return (NIL);
4870 4778
4871#endif /* USE_PLIST */ 4779#endif /* USE_PLIST */
4872 4780
4873 case OP_QUIT: /* quit */ 4781 case OP_QUIT: /* quit */
4874 if (is_pair (SCHEME_V->args)) 4782 if (is_pair (args))
4875 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4783 SCHEME_V->retcode = ivalue (a);
4876 4784
4877 return NIL; 4785 return -1;
4878 4786
4879 case OP_GC: /* gc */ 4787 case OP_GC: /* gc */
4880 gc (SCHEME_A_ NIL, NIL); 4788 gc (SCHEME_A_ NIL, NIL);
4881 s_return (S_T); 4789 s_return (S_T);
4882 4790
4883 case OP_GCVERB: /* gc-verbose */ 4791 case OP_GCVERB: /* gc-verbose */
4884 { 4792 {
4885 int was = SCHEME_V->gc_verbose; 4793 int was = SCHEME_V->gc_verbose;
4886 4794
4887 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4795 SCHEME_V->gc_verbose = (a != S_F);
4888 s_retbool (was); 4796 s_retbool (was);
4889 } 4797 }
4890 4798
4891 case OP_NEWSEGMENT: /* new-segment */ 4799 case OP_NEWSEGMENT: /* new-segment */
4800#if 0
4892 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4801 if (!is_pair (args) || !is_number (a))
4893 Error_0 ("new-segment: argument must be a number"); 4802 Error_0 ("new-segment: argument must be a number");
4894 4803#endif
4895 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4804 s_retbool (alloc_cellseg (SCHEME_A));
4896
4897 s_return (S_T);
4898 4805
4899 case OP_OBLIST: /* oblist */ 4806 case OP_OBLIST: /* oblist */
4900 s_return (oblist_all_symbols (SCHEME_A)); 4807 s_return (oblist_all_symbols (SCHEME_A));
4901 4808
4902#if USE_PORTS 4809#if USE_PORTS
… …
4927 case OP_OPEN_INOUTFILE: 4834 case OP_OPEN_INOUTFILE:
4928 prop = port_input | port_output; 4835 prop = port_input | port_output;
4929 break; 4836 break;
4930 } 4837 }
4931 4838
4932 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4839 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4933 4840
4934 if (p == NIL) 4841 s_return (p == NIL ? S_F : p);
4935 s_return (S_F);
4936
4937 s_return (p);
4938 } 4842 }
4939 4843
4940# if USE_STRING_PORTS 4844# if USE_STRING_PORTS
4941 4845
4942 case OP_OPEN_INSTRING: /* open-input-string */ 4846 case OP_OPEN_INSTRING: /* open-input-string */
… …
4954 case OP_OPEN_INOUTSTRING: 4858 case OP_OPEN_INOUTSTRING:
4955 prop = port_input | port_output; 4859 prop = port_input | port_output;
4956 break; 4860 break;
4957 } 4861 }
4958 4862
4959 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4863 p = port_from_string (SCHEME_A_ strvalue (a),
4960 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4864 strvalue (a) + strlength (a), prop);
4961 4865
4962 if (p == NIL) 4866 s_return (p == NIL ? S_F : p);
4963 s_return (S_F);
4964
4965 s_return (p);
4966 } 4867 }
4967 4868
4968 case OP_OPEN_OUTSTRING: /* open-output-string */ 4869 case OP_OPEN_OUTSTRING: /* open-output-string */
4969 { 4870 {
4970 pointer p; 4871 pointer p;
4971 4872
4972 if (car (SCHEME_V->args) == NIL) 4873 if (a == NIL)
4973 {
4974 p = port_from_scratch (SCHEME_A); 4874 p = port_from_scratch (SCHEME_A);
4975
4976 if (p == NIL)
4977 s_return (S_F);
4978 }
4979 else 4875 else
4980 {
4981 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4876 p = port_from_string (SCHEME_A_ strvalue (a),
4982 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4877 strvalue (a) + strlength (a), port_output);
4983 4878
4984 if (p == NIL) 4879 s_return (p == NIL ? S_F : p);
4985 s_return (S_F);
4986 }
4987
4988 s_return (p);
4989 } 4880 }
4990 4881
4991 case OP_GET_OUTSTRING: /* get-output-string */ 4882 case OP_GET_OUTSTRING: /* get-output-string */
4992 { 4883 {
4993 port *p; 4884 port *p = port (a);
4994 4885
4995 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4886 if (p->kind & port_string)
4996 { 4887 {
4997 off_t size; 4888 off_t size;
4998 char *str; 4889 char *str;
4999 4890
5000 size = p->rep.string.curr - p->rep.string.start + 1; 4891 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5016 } 4907 }
5017 4908
5018# endif 4909# endif
5019 4910
5020 case OP_CLOSE_INPORT: /* close-input-port */ 4911 case OP_CLOSE_INPORT: /* close-input-port */
5021 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4912 port_close (SCHEME_A_ a, port_input);
5022 s_return (S_T); 4913 s_return (S_T);
5023 4914
5024 case OP_CLOSE_OUTPORT: /* close-output-port */ 4915 case OP_CLOSE_OUTPORT: /* close-output-port */
5025 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4916 port_close (SCHEME_A_ a, port_output);
5026 s_return (S_T); 4917 s_return (S_T);
5027#endif 4918#endif
5028 4919
5029 case OP_INT_ENV: /* interaction-environment */ 4920 case OP_INT_ENV: /* interaction-environment */
5030 s_return (SCHEME_V->global_env); 4921 s_return (SCHEME_V->global_env);
… …
5032 case OP_CURR_ENV: /* current-environment */ 4923 case OP_CURR_ENV: /* current-environment */
5033 s_return (SCHEME_V->envir); 4924 s_return (SCHEME_V->envir);
5034 4925
5035 } 4926 }
5036 4927
5037 return S_T; 4928 if (USE_ERROR_CHECKING) abort ();
5038} 4929}
5039 4930
5040static pointer 4931static int
5041opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4932opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5042{ 4933{
4934 pointer args = SCHEME_V->args;
5043 pointer x; 4935 pointer x;
5044 4936
5045 if (SCHEME_V->nesting != 0) 4937 if (SCHEME_V->nesting != 0)
5046 { 4938 {
5047 int n = SCHEME_V->nesting; 4939 int n = SCHEME_V->nesting;
… …
5054 switch (op) 4946 switch (op)
5055 { 4947 {
5056 /* ========== reading part ========== */ 4948 /* ========== reading part ========== */
5057#if USE_PORTS 4949#if USE_PORTS
5058 case OP_READ: 4950 case OP_READ:
5059 if (!is_pair (SCHEME_V->args)) 4951 if (!is_pair (args))
5060 s_goto (OP_READ_INTERNAL); 4952 s_goto (OP_READ_INTERNAL);
5061 4953
5062 if (!is_inport (car (SCHEME_V->args))) 4954 if (!is_inport (car (args)))
5063 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4955 Error_1 ("read: not an input port:", car (args));
5064 4956
5065 if (car (SCHEME_V->args) == SCHEME_V->inport) 4957 if (car (args) == SCHEME_V->inport)
5066 s_goto (OP_READ_INTERNAL); 4958 s_goto (OP_READ_INTERNAL);
5067 4959
5068 x = SCHEME_V->inport; 4960 x = SCHEME_V->inport;
5069 SCHEME_V->inport = car (SCHEME_V->args); 4961 SCHEME_V->inport = car (args);
5070 x = cons (x, NIL); 4962 x = cons (x, NIL);
5071 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4963 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5072 s_goto (OP_READ_INTERNAL); 4964 s_goto (OP_READ_INTERNAL);
5073 4965
5074 case OP_READ_CHAR: /* read-char */ 4966 case OP_READ_CHAR: /* read-char */
5075 case OP_PEEK_CHAR: /* peek-char */ 4967 case OP_PEEK_CHAR: /* peek-char */
5076 { 4968 {
5077 int c; 4969 int c;
5078 4970
5079 if (is_pair (SCHEME_V->args)) 4971 if (is_pair (args))
5080 { 4972 {
5081 if (car (SCHEME_V->args) != SCHEME_V->inport) 4973 if (car (args) != SCHEME_V->inport)
5082 { 4974 {
5083 x = SCHEME_V->inport; 4975 x = SCHEME_V->inport;
5084 x = cons (x, NIL); 4976 x = cons (x, NIL);
5085 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4977 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5086 SCHEME_V->inport = car (SCHEME_V->args); 4978 SCHEME_V->inport = car (args);
5087 } 4979 }
5088 } 4980 }
5089 4981
5090 c = inchar (SCHEME_A); 4982 c = inchar (SCHEME_A);
5091 4983
… …
5101 case OP_CHAR_READY: /* char-ready? */ 4993 case OP_CHAR_READY: /* char-ready? */
5102 { 4994 {
5103 pointer p = SCHEME_V->inport; 4995 pointer p = SCHEME_V->inport;
5104 int res; 4996 int res;
5105 4997
5106 if (is_pair (SCHEME_V->args)) 4998 if (is_pair (args))
5107 p = car (SCHEME_V->args); 4999 p = car (args);
5108 5000
5109 res = p->object.port->kind & port_string; 5001 res = port (p)->kind & port_string;
5110 5002
5111 s_retbool (res); 5003 s_retbool (res);
5112 } 5004 }
5113 5005
5114 case OP_SET_INPORT: /* set-input-port */ 5006 case OP_SET_INPORT: /* set-input-port */
5115 SCHEME_V->inport = car (SCHEME_V->args); 5007 SCHEME_V->inport = car (args);
5116 s_return (SCHEME_V->value); 5008 s_return (SCHEME_V->value);
5117 5009
5118 case OP_SET_OUTPORT: /* set-output-port */ 5010 case OP_SET_OUTPORT: /* set-output-port */
5119 SCHEME_V->outport = car (SCHEME_V->args); 5011 SCHEME_V->outport = car (args);
5120 s_return (SCHEME_V->value); 5012 s_return (SCHEME_V->value);
5121#endif 5013#endif
5122 5014
5123 case OP_RDSEXPR: 5015 case OP_RDSEXPR:
5124 switch (SCHEME_V->tok) 5016 switch (SCHEME_V->tok)
… …
5173 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5065 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5174 SCHEME_V->tok = token (SCHEME_A); 5066 SCHEME_V->tok = token (SCHEME_A);
5175 s_goto (OP_RDSEXPR); 5067 s_goto (OP_RDSEXPR);
5176 5068
5177 case TOK_ATOM: 5069 case TOK_ATOM:
5178 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5070 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5071
5072 case TOK_DOTATOM:
5073 SCHEME_V->strbuff[0] = '.';
5074 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5075
5076 case TOK_STRATOM:
5077 x = readstrexp (SCHEME_A_ '|');
5078 //TODO: haven't checked whether the garbage collector could interfere
5079 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5179 5080
5180 case TOK_DQUOTE: 5081 case TOK_DQUOTE:
5181 x = readstrexp (SCHEME_A); 5082 x = readstrexp (SCHEME_A_ '"');
5182 5083
5183 if (x == S_F) 5084 if (x == S_F)
5184 Error_0 ("Error reading string"); 5085 Error_0 ("Error reading string");
5185 5086
5186 setimmutable (x); 5087 setimmutable (x);
… …
5198 s_goto (OP_EVAL); 5099 s_goto (OP_EVAL);
5199 } 5100 }
5200 } 5101 }
5201 5102
5202 case TOK_SHARP_CONST: 5103 case TOK_SHARP_CONST:
5203 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5104 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5204 Error_0 ("undefined sharp expression"); 5105 Error_0 ("undefined sharp expression");
5205 else 5106 else
5206 s_return (x); 5107 s_return (x);
5207 5108
5208 default: 5109 default:
… …
5210 } 5111 }
5211 5112
5212 break; 5113 break;
5213 5114
5214 case OP_RDLIST: 5115 case OP_RDLIST:
5215 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5116 SCHEME_V->args = cons (SCHEME_V->value, args);
5216 SCHEME_V->tok = token (SCHEME_A); 5117 SCHEME_V->tok = token (SCHEME_A);
5217 5118
5218 switch (SCHEME_V->tok) 5119 switch (SCHEME_V->tok)
5219 { 5120 {
5220 case TOK_EOF: 5121 case TOK_EOF:
… …
5248 case OP_RDDOT: 5149 case OP_RDDOT:
5249 if (token (SCHEME_A) != TOK_RPAREN) 5150 if (token (SCHEME_A) != TOK_RPAREN)
5250 Error_0 ("syntax error: illegal dot expression"); 5151 Error_0 ("syntax error: illegal dot expression");
5251 5152
5252 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5153 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5253 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, SCHEME_V->args)); 5154 s_return (reverse_in_place (SCHEME_A_ SCHEME_V->value, args));
5254 5155
5255 case OP_RDQUOTE: 5156 case OP_RDQUOTE:
5256 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5157 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5257 5158
5258 case OP_RDQQUOTE: 5159 case OP_RDQQUOTE:
… …
5280 SCHEME_V->args = SCHEME_V->value; 5181 SCHEME_V->args = SCHEME_V->value;
5281 s_goto (OP_VECTOR); 5182 s_goto (OP_VECTOR);
5282 5183
5283 /* ========== printing part ========== */ 5184 /* ========== printing part ========== */
5284 case OP_P0LIST: 5185 case OP_P0LIST:
5285 if (is_vector (SCHEME_V->args)) 5186 if (is_vector (args))
5286 { 5187 {
5287 putstr (SCHEME_A_ "#("); 5188 putstr (SCHEME_A_ "#(");
5288 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5189 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5289 s_goto (OP_PVECFROM); 5190 s_goto (OP_PVECFROM);
5290 } 5191 }
5291 else if (is_environment (SCHEME_V->args)) 5192 else if (is_environment (args))
5292 { 5193 {
5293 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5194 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5294 s_return (S_T); 5195 s_return (S_T);
5295 } 5196 }
5296 else if (!is_pair (SCHEME_V->args)) 5197 else if (!is_pair (args))
5297 { 5198 {
5298 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5199 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5299 s_return (S_T); 5200 s_return (S_T);
5300 } 5201 }
5301 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5202 else
5302 { 5203 {
5204 pointer a = car (args);
5205 pointer b = cdr (args);
5206 int ok_abbr = ok_abbrev (b);
5207 SCHEME_V->args = car (b);
5208
5209 if (a == SCHEME_V->QUOTE && ok_abbr)
5303 putstr (SCHEME_A_ "'"); 5210 putstr (SCHEME_A_ "'");
5304 SCHEME_V->args = cadr (SCHEME_V->args); 5211 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5212 putstr (SCHEME_A_ "`");
5213 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5214 putstr (SCHEME_A_ ",");
5215 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5216 putstr (SCHEME_A_ ",@");
5217 else
5218 {
5219 putstr (SCHEME_A_ "(");
5220 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5221 SCHEME_V->args = a;
5222 }
5223
5305 s_goto (OP_P0LIST); 5224 s_goto (OP_P0LIST);
5306 } 5225 }
5307 else if (car (SCHEME_V->args) == SCHEME_V->QQUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5226
5227 case OP_P1LIST:
5228 if (is_pair (args))
5308 { 5229 {
5230 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5309 putstr (SCHEME_A_ "`"); 5231 putstr (SCHEME_A_ " ");
5310 SCHEME_V->args = cadr (SCHEME_V->args); 5232 SCHEME_V->args = car (args);
5311 s_goto (OP_P0LIST); 5233 s_goto (OP_P0LIST);
5312 } 5234 }
5313 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5314 {
5315 putstr (SCHEME_A_ ",");
5316 SCHEME_V->args = cadr (SCHEME_V->args);
5317 s_goto (OP_P0LIST);
5318 }
5319 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5320 {
5321 putstr (SCHEME_A_ ",@");
5322 SCHEME_V->args = cadr (SCHEME_V->args);
5323 s_goto (OP_P0LIST);
5324 }
5325 else
5326 {
5327 putstr (SCHEME_A_ "(");
5328 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5329 SCHEME_V->args = car (SCHEME_V->args);
5330 s_goto (OP_P0LIST);
5331 }
5332
5333 case OP_P1LIST:
5334 if (is_pair (SCHEME_V->args))
5335 {
5336 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5337 putstr (SCHEME_A_ " ");
5338 SCHEME_V->args = car (SCHEME_V->args);
5339 s_goto (OP_P0LIST);
5340 }
5341 else if (is_vector (SCHEME_V->args)) 5235 else if (is_vector (args))
5342 { 5236 {
5343 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5237 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5344 putstr (SCHEME_A_ " . "); 5238 putstr (SCHEME_A_ " . ");
5345 s_goto (OP_P0LIST); 5239 s_goto (OP_P0LIST);
5346 } 5240 }
5347 else 5241 else
5348 { 5242 {
5349 if (SCHEME_V->args != NIL) 5243 if (args != NIL)
5350 { 5244 {
5351 putstr (SCHEME_A_ " . "); 5245 putstr (SCHEME_A_ " . ");
5352 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5246 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5353 } 5247 }
5354 5248
5355 putstr (SCHEME_A_ ")"); 5249 putstr (SCHEME_A_ ")");
5356 s_return (S_T); 5250 s_return (S_T);
5357 } 5251 }
5358 5252
5359 case OP_PVECFROM: 5253 case OP_PVECFROM:
5360 { 5254 {
5361 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5255 int i = ivalue_unchecked (cdr (args));
5362 pointer vec = car (SCHEME_V->args); 5256 pointer vec = car (args);
5363 int len = veclength (vec); 5257 int len = veclength (vec);
5364 5258
5365 if (i == len) 5259 if (i == len)
5366 { 5260 {
5367 putstr (SCHEME_A_ ")"); 5261 putstr (SCHEME_A_ ")");
5368 s_return (S_T); 5262 s_return (S_T);
5369 } 5263 }
5370 else 5264 else
5371 { 5265 {
5372 pointer elem = vector_elem (vec, i); 5266 pointer elem = vector_get (vec, i);
5373 5267
5374 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5268 ivalue_unchecked (cdr (args)) = i + 1;
5375 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5269 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5376 SCHEME_V->args = elem; 5270 SCHEME_V->args = elem;
5377 5271
5378 if (i > 0) 5272 if (i > 0)
5379 putstr (SCHEME_A_ " "); 5273 putstr (SCHEME_A_ " ");
5380 5274
5381 s_goto (OP_P0LIST); 5275 s_goto (OP_P0LIST);
5382 } 5276 }
5383 } 5277 }
5384 } 5278 }
5385 5279
5386 return S_T; 5280 if (USE_ERROR_CHECKING) abort ();
5387} 5281}
5388 5282
5389static pointer 5283static int
5390opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5391{ 5285{
5286 pointer args = SCHEME_V->args;
5287 pointer a = car (args);
5392 pointer x, y; 5288 pointer x, y;
5393 5289
5394 switch (op) 5290 switch (op)
5395 { 5291 {
5396 case OP_LIST_LENGTH: /* length *//* a.k */ 5292 case OP_LIST_LENGTH: /* length *//* a.k */
5397 { 5293 {
5398 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5294 long v = list_length (SCHEME_A_ a);
5399 5295
5400 if (v < 0) 5296 if (v < 0)
5401 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5297 Error_1 ("length: not a list:", a);
5402 5298
5403 s_return (mk_integer (SCHEME_A_ v)); 5299 s_return (mk_integer (SCHEME_A_ v));
5404 } 5300 }
5405 5301
5406 case OP_ASSQ: /* assq *//* a.k */ 5302 case OP_ASSQ: /* assq *//* a.k */
5407 x = car (SCHEME_V->args); 5303 x = a;
5408 5304
5409 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5305 for (y = cadr (args); is_pair (y); y = cdr (y))
5410 { 5306 {
5411 if (!is_pair (car (y))) 5307 if (!is_pair (car (y)))
5412 Error_0 ("unable to handle non pair element"); 5308 Error_0 ("unable to handle non pair element");
5413 5309
5414 if (x == caar (y)) 5310 if (x == caar (y))
… …
5420 else 5316 else
5421 s_return (S_F); 5317 s_return (S_F);
5422 5318
5423 5319
5424 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5320 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5425 SCHEME_V->args = car (SCHEME_V->args); 5321 SCHEME_V->args = a;
5426 5322
5427 if (SCHEME_V->args == NIL) 5323 if (SCHEME_V->args == NIL)
5428 s_return (S_F); 5324 s_return (S_F);
5429 else if (is_closure (SCHEME_V->args)) 5325 else if (is_closure (SCHEME_V->args))
5430 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5326 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5435 5331
5436 case OP_CLOSUREP: /* closure? */ 5332 case OP_CLOSUREP: /* closure? */
5437 /* 5333 /*
5438 * Note, macro object is also a closure. 5334 * Note, macro object is also a closure.
5439 * Therefore, (closure? <#MACRO>) ==> #t 5335 * Therefore, (closure? <#MACRO>) ==> #t
5336 * (schmorp) well, obviously not, fix? TODO
5440 */ 5337 */
5441 s_retbool (is_closure (car (SCHEME_V->args))); 5338 s_retbool (is_closure (a));
5442 5339
5443 case OP_MACROP: /* macro? */ 5340 case OP_MACROP: /* macro? */
5444 s_retbool (is_macro (car (SCHEME_V->args))); 5341 s_retbool (is_macro (a));
5445 } 5342 }
5446 5343
5447 return S_T; /* NOTREACHED */ 5344 if (USE_ERROR_CHECKING) abort ();
5448} 5345}
5449 5346
5347/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5450typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5348typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5451 5349
5452typedef int (*test_predicate) (pointer); 5350typedef int (*test_predicate)(pointer);
5453static int 5351static int
5454is_any (pointer p) 5352tst_any (pointer p)
5455{ 5353{
5456 return 1; 5354 return 1;
5457} 5355}
5458 5356
5459static int 5357static int
5460is_nonneg (pointer p) 5358tst_inonneg (pointer p)
5461{ 5359{
5462 return ivalue (p) >= 0 && is_integer (p); 5360 return is_integer (p) && ivalue_unchecked (p) >= 0;
5361}
5362
5363static int
5364tst_is_list (SCHEME_P_ pointer p)
5365{
5366 return p == NIL || is_pair (p);
5463} 5367}
5464 5368
5465/* Correspond carefully with following defines! */ 5369/* Correspond carefully with following defines! */
5466static struct 5370static struct
5467{ 5371{
5468 test_predicate fct; 5372 test_predicate fct;
5469 const char *kind; 5373 const char *kind;
5470} tests[] = 5374} tests[] = {
5471{ 5375 { tst_any , 0 },
5472 { 0, 0}, /* unused */ 5376 { is_string , "string" },
5473 { is_any, 0}, 5377 { is_symbol , "symbol" },
5474 { is_string, "string" }, 5378 { is_port , "port" },
5475 { is_symbol, "symbol" },
5476 { is_port, "port" },
5477 { is_inport, "input port" }, 5379 { is_inport , "input port" },
5478 { is_outport, "output port" }, 5380 { is_outport , "output port" },
5479 { is_environment, "environment" }, 5381 { is_environment, "environment" },
5480 { is_pair, "pair" }, 5382 { is_pair , "pair" },
5481 { 0, "pair or '()" }, 5383 { 0 , "pair or '()" },
5482 { is_character, "character" }, 5384 { is_character , "character" },
5483 { is_vector, "vector" }, 5385 { is_vector , "vector" },
5484 { is_number, "number" }, 5386 { is_number , "number" },
5485 { is_integer, "integer" }, 5387 { is_integer , "integer" },
5486 { is_nonneg, "non-negative integer" } 5388 { tst_inonneg , "non-negative integer" }
5487}; 5389};
5488 5390
5489#define TST_NONE 0 5391#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5490#define TST_ANY "\001" 5392#define TST_ANY "\001"
5491#define TST_STRING "\002" 5393#define TST_STRING "\002"
5492#define TST_SYMBOL "\003" 5394#define TST_SYMBOL "\003"
5493#define TST_PORT "\004" 5395#define TST_PORT "\004"
5494#define TST_INPORT "\005" 5396#define TST_INPORT "\005"
5495#define TST_OUTPORT "\006" 5397#define TST_OUTPORT "\006"
5496#define TST_ENVIRONMENT "\007" 5398#define TST_ENVIRONMENT "\007"
5497#define TST_PAIR "\010" 5399#define TST_PAIR "\010"
5498#define TST_LIST "\011" 5400#define TST_LIST "\011"
5499#define TST_CHAR "\012" 5401#define TST_CHAR "\012"
5500#define TST_VECTOR "\013" 5402#define TST_VECTOR "\013"
5501#define TST_NUMBER "\014" 5403#define TST_NUMBER "\014"
5502#define TST_INTEGER "\015" 5404#define TST_INTEGER "\015"
5503#define TST_NATURAL "\016" 5405#define TST_NATURAL "\016"
5406
5407#define INF_ARG 0xff
5408#define UNNAMED_OP ""
5409
5410static const char opnames[] =
5411#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5412#include "opdefines.h"
5413#undef OP_DEF
5414;
5415
5416static const char *
5417opname (int idx)
5418{
5419 const char *name = opnames;
5420
5421 /* should do this at compile time, but would require external program, right? */
5422 while (idx--)
5423 name += strlen (name) + 1;
5424
5425 return *name ? name : "ILLEGAL";
5426}
5427
5428static const char *
5429procname (pointer x)
5430{
5431 return opname (procnum (x));
5432}
5504 5433
5505typedef struct 5434typedef struct
5506{ 5435{
5507 dispatch_func func; 5436 uint8_t func;
5508 char *name; 5437 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5438 uint8_t builtin;
5439#if USE_ERROR_CHECKING
5509 int min_arity; 5440 uint8_t min_arity;
5510 int max_arity; 5441 uint8_t max_arity;
5511 char *arg_tests_encoding; 5442 char arg_tests_encoding[3];
5443#endif
5512} op_code_info; 5444} op_code_info;
5513 5445
5514#define INF_ARG 0xffff
5515
5516static op_code_info dispatch_table[] = { 5446static const op_code_info dispatch_table[] = {
5517#define OP_DEF(A,B,C,D,E,OP) {A,B,C,D,E}, 5447#if USE_ERROR_CHECKING
5448#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5449#else
5450#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5451#endif
5518#include "opdefines.h" 5452#include "opdefines.h"
5453#undef OP_DEF
5519 {0} 5454 {0}
5520}; 5455};
5521 5456
5522static const char *
5523procname (pointer x)
5524{
5525 int n = procnum (x);
5526 const char *name = dispatch_table[n].name;
5527
5528 if (name == 0)
5529 name = "ILLEGAL!";
5530
5531 return name;
5532}
5533
5534/* kernel of this interpreter */ 5457/* kernel of this interpreter */
5535static void 5458static void ecb_hot
5536Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5459Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5537{ 5460{
5538 SCHEME_V->op = op; 5461 SCHEME_V->op = op;
5539 5462
5540 for (;;) 5463 for (;;)
5541 { 5464 {
5542 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5465 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5543 5466
5544#if USE_ERROR_CHECKING 5467#if USE_ERROR_CHECKING
5545 if (pcd->name) /* if built-in function, check arguments */ 5468 if (pcd->builtin) /* if built-in function, check arguments */
5546 { 5469 {
5547 int ok = 1;
5548 char msg[STRBUFFSIZE]; 5470 char msg[STRBUFFSIZE];
5549 int n = list_length (SCHEME_A_ SCHEME_V->args); 5471 int n = list_length (SCHEME_A_ SCHEME_V->args);
5550 5472
5551 /* Check number of arguments */ 5473 /* Check number of arguments */
5552 if (ecb_expect_false (n < pcd->min_arity)) 5474 if (ecb_expect_false (n < pcd->min_arity))
5553 { 5475 {
5554 ok = 0;
5555 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5476 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5556 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5477 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5478 xError_1 (SCHEME_A_ msg, 0);
5479 continue;
5557 } 5480 }
5558 else if (ecb_excpect_false (n > pcd->max_arity)) 5481 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5559 { 5482 {
5560 ok = 0;
5561 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5483 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5562 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5484 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5485 xError_1 (SCHEME_A_ msg, 0);
5486 continue;
5563 } 5487 }
5564 5488 else
5565 if (ecb_expect_false (ok))
5566 { 5489 {
5567 if (pcd->arg_tests_encoding) 5490 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5568 { 5491 {
5569 int i = 0; 5492 int i = 0;
5570 int j; 5493 int j;
5571 const char *t = pcd->arg_tests_encoding; 5494 const char *t = pcd->arg_tests_encoding;
5572 pointer arglist = SCHEME_V->args; 5495 pointer arglist = SCHEME_V->args;
5573 5496
5574 do 5497 do
5575 { 5498 {
5576 pointer arg = car (arglist); 5499 pointer arg = car (arglist);
5577 5500
5578 j = (int) t[0]; 5501 j = t[0];
5579 5502
5503 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5580 if (j == TST_LIST[0]) 5504 if (j == TST_LIST[0])
5581 { 5505 {
5582 if (arg != NIL && !is_pair (arg)) 5506 if (!tst_is_list (SCHEME_A_ arg))
5583 break; 5507 break;
5584 } 5508 }
5585 else 5509 else
5586 { 5510 {
5587 if (!tests[j].fct (arg)) 5511 if (!tests[j - 1].fct (arg))
5588 break; 5512 break;
5589 } 5513 }
5590 5514
5591 if (t[1] != 0) /* last test is replicated as necessary */ 5515 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5592 t++; 5516 t++;
5593 5517
5594 arglist = cdr (arglist); 5518 arglist = cdr (arglist);
5595 i++; 5519 i++;
5596 } 5520 }
5597 while (i < n); 5521 while (i < n);
5598 5522
5599 if (i < n) 5523 if (i < n)
5600 { 5524 {
5601 ok = 0;
5602 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5525 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5526 xError_1 (SCHEME_A_ msg, 0);
5527 continue;
5603 } 5528 }
5604 } 5529 }
5605 } 5530 }
5606
5607 if (!ok)
5608 {
5609 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5610 return;
5611
5612 pcd = dispatch_table + SCHEME_V->op;
5613 }
5614 } 5531 }
5615#endif 5532#endif
5616 5533
5617 ok_to_freely_gc (SCHEME_A); 5534 ok_to_freely_gc (SCHEME_A);
5618 5535
5536 static const dispatch_func dispatch_funcs[] = {
5537 opexe_0,
5538 opexe_1,
5539 opexe_2,
5540 opexe_3,
5541 opexe_4,
5542 opexe_5,
5543 opexe_6,
5544 };
5545
5619 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5546 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5620 return; 5547 return;
5621 5548
5622 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5549 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5623 { 5550 {
5624 xwrstr ("No memory!\n"); 5551 xwrstr ("No memory!\n");
… …
5648mk_proc (SCHEME_P_ enum scheme_opcodes op) 5575mk_proc (SCHEME_P_ enum scheme_opcodes op)
5649{ 5576{
5650 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5577 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5651 set_typeflag (y, (T_PROC | T_ATOM)); 5578 set_typeflag (y, (T_PROC | T_ATOM));
5652 ivalue_unchecked (y) = op; 5579 ivalue_unchecked (y) = op;
5653 set_num_integer (y);
5654 return y; 5580 return y;
5655} 5581}
5656 5582
5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5583/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5658static int 5584static int
5659syntaxnum (pointer p) 5585syntaxnum (pointer p)
5660{ 5586{
5661 const char *s = strvalue (car (p)); 5587 const char *s = strvalue (p);
5662 5588
5663 switch (strlength (car (p))) 5589 switch (strlength (p))
5664 { 5590 {
5665 case 2: 5591 case 2:
5666 if (s[0] == 'i') 5592 if (s[0] == 'i')
5667 return OP_IF0; /* if */ 5593 return OP_IF0; /* if */
5668 else 5594 else
… …
5723 return OP_C0STREAM; /* cons-stream */ 5649 return OP_C0STREAM; /* cons-stream */
5724 } 5650 }
5725} 5651}
5726 5652
5727#if USE_MULTIPLICITY 5653#if USE_MULTIPLICITY
5728scheme * 5654ecb_cold scheme *
5729scheme_init_new () 5655scheme_init_new ()
5730{ 5656{
5731 scheme *sc = malloc (sizeof (scheme)); 5657 scheme *sc = malloc (sizeof (scheme));
5732 5658
5733 if (!scheme_init (SCHEME_A)) 5659 if (!scheme_init (SCHEME_A))
… …
5738 else 5664 else
5739 return sc; 5665 return sc;
5740} 5666}
5741#endif 5667#endif
5742 5668
5743int 5669ecb_cold int
5744scheme_init (SCHEME_P) 5670scheme_init (SCHEME_P)
5745{ 5671{
5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5672 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5747 pointer x; 5673 pointer x;
5674
5675 /* this memset is not strictly correct, as we assume (intcache)
5676 * that memset 0 will also set pointers to 0, but memset does
5677 * of course not guarantee that. screw such systems.
5678 */
5679 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5748 5680
5749 num_set_fixnum (num_zero, 1); 5681 num_set_fixnum (num_zero, 1);
5750 num_set_ivalue (num_zero, 0); 5682 num_set_ivalue (num_zero, 0);
5751 num_set_fixnum (num_one, 1); 5683 num_set_fixnum (num_one, 1);
5752 num_set_ivalue (num_one, 1); 5684 num_set_ivalue (num_one, 1);
… …
5764 SCHEME_V->save_inport = NIL; 5696 SCHEME_V->save_inport = NIL;
5765 SCHEME_V->loadport = NIL; 5697 SCHEME_V->loadport = NIL;
5766 SCHEME_V->nesting = 0; 5698 SCHEME_V->nesting = 0;
5767 SCHEME_V->interactive_repl = 0; 5699 SCHEME_V->interactive_repl = 0;
5768 5700
5769 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5701 if (!alloc_cellseg (SCHEME_A))
5770 { 5702 {
5771#if USE_ERROR_CHECKING 5703#if USE_ERROR_CHECKING
5772 SCHEME_V->no_memory = 1; 5704 SCHEME_V->no_memory = 1;
5773 return 0; 5705 return 0;
5774#endif 5706#endif
… …
5821 5753
5822 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5754 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5823 assign_syntax (SCHEME_A_ syntax_names[i]); 5755 assign_syntax (SCHEME_A_ syntax_names[i]);
5824 } 5756 }
5825 5757
5758 // TODO: should iterate via strlen, to avoid n² complexity
5826 for (i = 0; i < n; i++) 5759 for (i = 0; i < n; i++)
5827 if (dispatch_table[i].name != 0) 5760 if (dispatch_table[i].builtin)
5828 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5761 assign_proc (SCHEME_A_ i, opname (i));
5829 5762
5830 /* initialization of global pointers to special symbols */ 5763 /* initialization of global pointers to special symbols */
5831 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5764 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5832 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5765 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5833 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5766 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5872scheme_set_external_data (SCHEME_P_ void *p) 5805scheme_set_external_data (SCHEME_P_ void *p)
5873{ 5806{
5874 SCHEME_V->ext_data = p; 5807 SCHEME_V->ext_data = p;
5875} 5808}
5876 5809
5877void 5810ecb_cold void
5878scheme_deinit (SCHEME_P) 5811scheme_deinit (SCHEME_P)
5879{ 5812{
5880 int i; 5813 int i;
5881 5814
5882#if SHOW_ERROR_LINE 5815#if SHOW_ERROR_LINE
… …
5974{ 5907{
5975 dump_stack_reset (SCHEME_A); 5908 dump_stack_reset (SCHEME_A);
5976 SCHEME_V->envir = SCHEME_V->global_env; 5909 SCHEME_V->envir = SCHEME_V->global_env;
5977 SCHEME_V->file_i = 0; 5910 SCHEME_V->file_i = 0;
5978 SCHEME_V->load_stack[0].kind = port_input | port_string; 5911 SCHEME_V->load_stack[0].kind = port_input | port_string;
5979 SCHEME_V->load_stack[0].rep.string.start = (char *) cmd; /* This func respects const */ 5912 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5980 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *) cmd + strlen (cmd); 5913 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5981 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5914 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5982#if USE_PORTS 5915#if USE_PORTS
5983 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5916 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5984#endif 5917#endif
5985 SCHEME_V->retcode = 0; 5918 SCHEME_V->retcode = 0;
5986 SCHEME_V->interactive_repl = 0; 5919 SCHEME_V->interactive_repl = 0;
… …
6103# endif 6036# endif
6104 int fin; 6037 int fin;
6105 char *file_name = InitFile; 6038 char *file_name = InitFile;
6106 int retcode; 6039 int retcode;
6107 int isfile = 1; 6040 int isfile = 1;
6041 system ("ps v $PPID");//D
6108 6042
6109 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6043 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6110 { 6044 {
6111 xwrstr ("Usage: tinyscheme -?\n"); 6045 xwrstr ("Usage: tinyscheme -?\n");
6112 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6046 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

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