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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.2 by root, Wed Nov 25 10:01:39 2015 UTC vs.
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC

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

Diff Legend

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