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

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

Diff Legend

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