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.25 by root, Fri Nov 27 04:37:26 2015 UTC vs.
Revision 1.57 by root, Tue Dec 1 04:57:49 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
… …
34 38
35#include <sys/types.h> 39#include <sys/types.h>
36#include <sys/stat.h> 40#include <sys/stat.h>
37#include <fcntl.h> 41#include <fcntl.h>
38 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
39#include <string.h> 49#include <string.h>
40#include <stdlib.h>
41 50
42#include <limits.h> 51#include <limits.h>
43#include <inttypes.h> 52#include <inttypes.h>
44#include <float.h> 53#include <float.h>
45//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
46 63
47enum { 64enum {
48 TOK_EOF, 65 TOK_EOF,
49 TOK_LPAREN, 66 TOK_LPAREN,
50 TOK_RPAREN, 67 TOK_RPAREN,
51 TOK_DOT, 68 TOK_DOT,
52 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 72 TOK_QUOTE,
54 TOK_DQUOTE, 73 TOK_DQUOTE,
55 TOK_BQUOTE, 74 TOK_BQUOTE,
56 TOK_COMMA, 75 TOK_COMMA,
57 TOK_ATMARK, 76 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
60 TOK_VEC 79 TOK_VEC
61}; 80};
62 81
63#define BACKQUOTE '`' 82#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
65 85
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 91
72#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
73static scheme sc; 93static scheme sc;
74#endif 94#endif
75 95
… …
83 } 103 }
84 104
85 char *p = s; 105 char *p = s;
86 106
87 do { 107 do {
88 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 109 n /= base;
90 } while (n); 110 } while (n);
91 111
92 *p-- = 0; 112 *p-- = 0;
93 113
… …
103{ 123{
104 xbase (s, n, 10); 124 xbase (s, n, 10);
105} 125}
106 126
107static void 127static void
108xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 129{
116 char buf[64]; 130 char buf[64];
117 131
118 xnum (buf, n); 132 xnum (buf, n);
119 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
120} 134}
121 135
122static char 136static char
123xtoupper (char c) 137xtoupper (char c)
124{ 138{
… …
176 190
177#ifndef InitFile 191#ifndef InitFile
178# define InitFile "init.scm" 192# define InitFile "init.scm"
179#endif 193#endif
180 194
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 195enum scheme_types
186{ 196{
197 T_INTEGER,
187 T_FREE, 198 T_REAL,
188 T_STRING, 199 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 200 T_SYMBOL,
191 T_PROC, 201 T_PROC,
192 T_PAIR, 202 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 203 T_CLOSURE,
194 T_CONTINUATION, 204 T_CONTINUATION,
195 T_FOREIGN, 205 T_FOREIGN,
196 T_CHARACTER, 206 T_CHARACTER,
197 T_PORT, 207 T_PORT,
… …
207#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
211 221
222/* num, for generic arithmetic */
223struct num
224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 249
214static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 252static num num_rem (num a, num b);
217static num num_mod (num a, num b); 253static num num_mod (num a, num b);
218 254
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
223 256
224static num num_zero; 257static num num_zero;
225static num num_one; 258static num num_one;
226 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
227/* macros for cell operations */ 264/* macros for cell operations */
228#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
229#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
230#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
231 268
232INTERFACE int 269INTERFACE int
233is_string (pointer p) 270is_string (pointer p)
234{ 271{
235 return type (p) == T_STRING; 272 return type (p) == T_STRING;
236} 273}
237 274
238#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
239#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
240
241INTERFACE int is_list (SCHEME_P_ pointer p);
242 277
243INTERFACE int 278INTERFACE int
244is_vector (pointer p) 279is_vector (pointer p)
245{ 280{
246 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
247} 282}
248 283
249#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
251INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
252INTERFACE uint32_t vector_length (pointer vec);
253INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
255 289
256INTERFACE uint32_t 290INTERFACE int
257vector_length (pointer vec) 291is_integer (pointer p)
258{ 292{
259 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
294}
295
296/* not the same as in scheme, where integers are (correctly :) reals */
297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
260} 301}
261 302
262INTERFACE int 303INTERFACE int
263is_number (pointer p) 304is_number (pointer p)
264{ 305{
265 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
266}
267
268INTERFACE int
269is_integer (pointer p)
270{
271 return is_number (p) && num_is_fixnum (p->object.number);
272}
273
274INTERFACE int
275is_real (pointer p)
276{
277 return is_number (p) && !num_is_fixnum (p->object.number);
278} 307}
279 308
280INTERFACE int 309INTERFACE int
281is_character (pointer p) 310is_character (pointer p)
282{ 311{
… …
287string_value (pointer p) 316string_value (pointer p)
288{ 317{
289 return strvalue (p); 318 return strvalue (p);
290} 319}
291 320
292ecb_inline num
293nvalue (pointer p)
294{
295 return (p)->object.number;
296}
297
298static IVALUE
299num_get_ivalue (const num n)
300{
301 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302}
303
304static RVALUE
305num_get_rvalue (const num n)
306{
307 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308}
309
310INTERFACE IVALUE
311ivalue (pointer p)
312{
313 return num_get_ivalue (p->object.number);
314}
315
316INTERFACE RVALUE
317rvalue (pointer p)
318{
319 return num_get_rvalue (p->object.number);
320}
321
322#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
323#if USE_REAL 324#if USE_REAL
324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
325# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
326# define set_num_real(p) (p)->object.number.is_fixnum=0;
327#else 327#else
328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
329# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
330# define set_num_real(p) 0
331#endif 330#endif
332 331
333INTERFACE long 332INTERFACE long
334charvalue (pointer p) 333charvalue (pointer p)
335{ 334{
336 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
337} 336}
338 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
339INTERFACE int 340INTERFACE int
340is_port (pointer p) 341is_port (pointer p)
341{ 342{
342 return type (p) == T_PORT; 343 return type (p) == T_PORT;
343} 344}
344 345
345INTERFACE int 346INTERFACE int
346is_inport (pointer p) 347is_inport (pointer p)
347{ 348{
348 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
349} 350}
350 351
351INTERFACE int 352INTERFACE int
352is_outport (pointer p) 353is_outport (pointer p)
353{ 354{
354 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
355} 356}
356 357
357INTERFACE int 358INTERFACE int
358is_pair (pointer p) 359is_pair (pointer p)
359{ 360{
360 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
361} 362}
362 363
363#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
364#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
365 366
366static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
367static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
368static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
369static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
373static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
374 375
375INTERFACE void 376INTERFACE void
376set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
377{ 378{
378 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
379} 380}
380 381
381INTERFACE void 382INTERFACE void
382set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
383{ 384{
384 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
385} 386}
386 387
387INTERFACE pointer 388INTERFACE pointer
388pair_car (pointer p) 389pair_car (pointer p)
389{ 390{
… …
403} 404}
404 405
405INTERFACE char * 406INTERFACE char *
406symname (pointer p) 407symname (pointer p)
407{ 408{
408 return strvalue (car (p)); 409 return strvalue (p);
409} 410}
410 411
411#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
412SCHEME_EXPORT int 415SCHEME_EXPORT int
413hasprop (pointer p) 416hasprop (pointer p)
414{ 417{
415 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
416} 419}
417
418# define symprop(p) cdr(p)
419#endif 420#endif
420 421
421INTERFACE int 422INTERFACE int
422is_syntax (pointer p) 423is_syntax (pointer p)
423{ 424{
… …
437} 438}
438 439
439INTERFACE char * 440INTERFACE char *
440syntaxname (pointer p) 441syntaxname (pointer p)
441{ 442{
442 return strvalue (car (p)); 443 return strvalue (p);
443} 444}
444 445
445#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
446static const char *procname (pointer x); 447static const char *procname (pointer x);
447 448
448INTERFACE int 449INTERFACE int
449is_closure (pointer p) 450is_closure (pointer p)
450{ 451{
… …
511setimmutable (pointer p) 512setimmutable (pointer p)
512{ 513{
513#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
514 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif 516#endif
517}
518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
516} 571}
517 572
518#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
519ecb_inline int 574ecb_inline int
520Cisalpha (int c) 575Cisalpha (int c)
… …
609#endif 664#endif
610 665
611static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
612static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
613static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
614ecb_inline int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
615static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
617static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
618static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
619static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
620static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
… …
636static void mark (pointer a); 691static void mark (pointer a);
637static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
638static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
639static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
640static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
641static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
642static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
643ecb_inline int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
644static int token (SCHEME_P); 699static int token (SCHEME_P);
645static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
646static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
647static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
… …
664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
665static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
666static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
668 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
669static num 751static num
670num_op (enum num_op op, num a, num b) 752num_op (enum num_op op, num a, num b)
671{ 753{
672 num ret; 754 num ret;
673 755
674 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
675 757
676 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
677 { 759 {
678 IVALUE av = num_get_ivalue (a);
679 IVALUE bv = num_get_ivalue (b);
680
681 switch (op) 760 switch (op)
682 { 761 {
683 case NUM_ADD: av += bv; break; 762 case NUM_ADD: a.ivalue += b.ivalue; break;
684 case NUM_SUB: av -= bv; break; 763 case NUM_SUB: a.ivalue -= b.ivalue; break;
685 case NUM_MUL: av *= bv; break; 764 case NUM_MUL: a.ivalue *= b.ivalue; break;
686 case NUM_INTDIV: av /= bv; break; 765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
687 } 766 }
688 767
689 num_set_ivalue (ret, av); 768 num_set_ivalue (ret, a.ivalue);
690 } 769 }
770#if USE_REAL
691 else 771 else
692 { 772 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
695
696 switch (op) 773 switch (op)
697 { 774 {
698 case NUM_ADD: av += bv; break; 775 case NUM_ADD: a.rvalue += b.rvalue; break;
699 case NUM_SUB: av -= bv; break; 776 case NUM_SUB: a.rvalue -= b.rvalue; break;
700 case NUM_MUL: av *= bv; break; 777 case NUM_MUL: a.rvalue *= b.rvalue; break;
701 case NUM_INTDIV: av /= bv; break; 778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
702 } 779 }
703 780
704 num_set_rvalue (ret, av); 781 num_set_rvalue (ret, a.rvalue);
705 } 782 }
783#endif
706 784
707 return ret; 785 return ret;
708} 786}
709 787
710static num 788static num
711num_div (num a, num b) 789num_div (num a, num b)
712{ 790{
713 num ret; 791 num ret;
714 792
715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
716 794
717 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
719 else 797 else
720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
721 799
722 return ret; 800 return ret;
723} 801}
724 802
725static num 803static num
… …
727{ 805{
728 num ret; 806 num ret;
729 long e1, e2, res; 807 long e1, e2, res;
730 808
731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
732 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
733 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
734 res = e1 % e2; 812 res = e1 % e2;
735 813
736 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
737 if (res > 0) 815 if (res > 0)
738 { 816 {
… …
754{ 832{
755 num ret; 833 num ret;
756 long e1, e2, res; 834 long e1, e2, res;
757 835
758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
759 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
760 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
761 res = e1 % e2; 839 res = e1 % e2;
762 840
763 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
764 if (res * e2 < 0) 842 if (res * e2 < 0)
765 res += e2; 843 res += e2;
… …
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
776 int ret; 854 int ret;
777 855
778 if (is_fixnum) 856 if (is_fixnum)
779 { 857 {
780 IVALUE av = num_get_ivalue (a); 858 IVALUE av = num_ivalue (a);
781 IVALUE bv = num_get_ivalue (b); 859 IVALUE bv = num_ivalue (b);
782 860
783 ret = av == bv ? 0 : av < bv ? -1 : +1; 861 ret = av == bv ? 0 : av < bv ? -1 : +1;
784 } 862 }
785 else 863 else
786 { 864 {
787 RVALUE av = num_get_rvalue (a); 865 RVALUE av = num_rvalue (a);
788 RVALUE bv = num_get_rvalue (b); 866 RVALUE bv = num_rvalue (b);
789 867
790 ret = av == bv ? 0 : av < bv ? -1 : +1; 868 ret = av == bv ? 0 : av < bv ? -1 : +1;
791 } 869 }
792 870
793 return ret; 871 return ret;
794} 872}
795
796#if USE_MATH
797
798/* Round to nearest. Round to even if midway */
799static double
800round_per_R5RS (double x)
801{
802 double fl = floor (x);
803 double ce = ceil (x);
804 double dfl = x - fl;
805 double dce = ce - x;
806
807 if (dfl > dce)
808 return ce;
809 else if (dfl < dce)
810 return fl;
811 else
812 {
813 if (fmod (fl, 2) == 0) /* I imagine this holds */
814 return fl;
815 else
816 return ce;
817 }
818}
819#endif
820 873
821static int 874static int
822is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
823{ 876{
824 return x == 0; 877 return x == 0;
… …
831#endif 884#endif
832} 885}
833 886
834/* allocate new cell segment */ 887/* allocate new cell segment */
835static int 888static int
836alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
837{ 890{
838 pointer newp; 891 struct cell *newp;
839 pointer last; 892 struct cell *last;
840 pointer p; 893 struct cell *p;
841 char *cp; 894 char *cp;
842 long i; 895 long i;
843 int k; 896 int k;
844 897
845 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
846 segsize <<= 1; 899 segsize <<= 1;
847 900
848 for (k = 0; k < n; k++)
849 {
850 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
851 return k;
852
853 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
854 902
855 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
856 return k; 904 return k;
857 905
858 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
859 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
860 908
861 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
862 newp = (pointer)cp;
863 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
864 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
865
866 //TODO: insert, not swap
867 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
868 {
869 p = SCHEME_V->cell_seg[i];
870 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
871 SCHEME_V->cell_seg[i - 1] = p;
872
873 k = SCHEME_V->cell_segsize[i];
874 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
875 SCHEME_V->cell_segsize[i - 1] = k;
876
877 --i;
878 }
879
880 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
881 last = newp + segsize - 1; 913 last = newp + segsize - 1;
882 914
883 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
884 { 916 {
917 pointer cp = POINTER (p);
885 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
886 set_car (p, NIL); 919 set_car (cp, NIL);
887 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
888 } 921 }
889 922
890 /* insert new cells in address order on free list */
891 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
892 {
893 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
894 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
895 }
896 else
897 {
898 p = SCHEME_V->free_cell;
899 925
900 while (cdr (p) != NIL && newp > cdr (p))
901 p = cdr (p);
902
903 set_cdr (last, cdr (p));
904 set_cdr (p, newp);
905 }
906 }
907
908 return n; 926 return 1;
909} 927}
910 928
911/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
912ecb_inline pointer 930ecb_inline pointer
913get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
918 return S_SINK; 936 return S_SINK;
919 937
920 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
921 { 939 {
922 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
923 941
924 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
925 943
926 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
927 { 945 {
928 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
929 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
930 { 948 {
931#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
932 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
933 return S_SINK; 951 return S_SINK;
934#endif 952#endif
… …
946 } 964 }
947} 965}
948 966
949/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
950 Tehom */ 968 Tehom */
951
952static void 969static void
953push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
954{ 971{
955 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
956 973
… …
978} 995}
979 996
980static pointer 997static pointer
981get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
982{ 999{
983 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
984 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
985 1002
986 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
987 return S_SINK; 1004 return S_SINK;
988 1005
989 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
990 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
991 1008
992 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
993 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
994 fill_vector (v, init); 1011 fill_vector (v, 0, init);
995 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
996 1013
997 return v; 1014 return v;
998} 1015}
999 1016
… …
1007static void 1024static void
1008check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1009{ 1026{
1010 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1011 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1012 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1013 1030
1014 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1015 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1016} 1033}
1017 1034
1018static void 1035static void
1019check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1020{ 1037{
… …
1042 set_cdr (x, b); 1059 set_cdr (x, b);
1043 1060
1044 return x; 1061 return x;
1045} 1062}
1046 1063
1064static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1047/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1048 1074
1049#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1050 1076
1077static int
1051static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1052 1088
1053static pointer 1089static pointer
1054oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1055{ 1091{
1056 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
… …
1058 1094
1059/* returns the new symbol */ 1095/* returns the new symbol */
1060static pointer 1096static pointer
1061oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1062{ 1098{
1063 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1064
1065 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1066 set_typeflag (x, T_SYMBOL);
1067 setimmutable (car (x));
1068
1069 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1070 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1071 return x; 1102 return x;
1072} 1103}
1073 1104
1074ecb_inline pointer 1105ecb_inline pointer
1075oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
… …
1078 pointer x; 1109 pointer x;
1079 char *s; 1110 char *s;
1080 1111
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 1113
1083 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1084 { 1115 {
1085 s = symname (car (x)); 1116 s = symname (car (x));
1086 1117
1087 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1088 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1098 int i; 1129 int i;
1099 pointer x; 1130 pointer x;
1100 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1101 1132
1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1103 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1104 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1105 1136
1106 return ob_list; 1137 return ob_list;
1107} 1138}
1108 1139
… …
1134 1165
1135/* returns the new symbol */ 1166/* returns the new symbol */
1136static pointer 1167static pointer
1137oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1138{ 1169{
1139 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1140
1141 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1142 set_typeflag (x, T_SYMBOL);
1143 setimmutable (car (x));
1144 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1145 return x; 1172 return x;
1146} 1173}
1147 1174
1148static pointer 1175static pointer
… …
1158mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1159{ 1186{
1160 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1161 1188
1162 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1163 x->object.port = p; 1190 set_port (x, p);
1164 1191
1165 return x; 1192 return x;
1166} 1193}
1167#endif 1194#endif
1168 1195
1169pointer 1196pointer
1170mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1171{ 1198{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1200
1174 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1175 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1176 1203
1177 return x; 1204 return x;
1178} 1205}
1179 1206
1180INTERFACE pointer 1207INTERFACE pointer
1181mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1182{ 1209{
1183 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1184 1211
1185 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1186 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1187 set_num_integer (x); 1214
1188 return x; 1215 return x;
1189} 1216}
1190 1217
1191/* get number atom (integer) */ 1218/* get number atom (integer) */
1192INTERFACE pointer 1219INTERFACE pointer
1193mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1194{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1233
1197 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1198 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1199 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1200 return x; 1241 return *pp;
1201} 1242}
1202 1243
1203INTERFACE pointer 1244INTERFACE pointer
1204mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1205{ 1246{
1247#if USE_REAL
1206 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1207 1249
1208 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1209 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1210 set_num_real (x); 1252
1211 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1212} 1257}
1213 1258
1214static pointer 1259static pointer
1215mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1216{ 1261{
1262#if USE_REAL
1217 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1218 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1219 else 1268#endif
1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1221} 1269}
1222 1270
1223/* allocate name to string area */ 1271/* allocate name to string area */
1224static char * 1272static char *
1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1231 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1232 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1233 } 1281 }
1234 1282
1235 if (str) 1283 if (str)
1236 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1237 int l = strlen (str);
1238
1239 if (l > len_str)
1240 l = len_str;
1241
1242 memcpy (q, str, l);
1243 q[l] = 0;
1244 }
1245 else 1285 else
1246 {
1247 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1248 q[len_str] = 0; 1288 q[len_str] = 0;
1249 }
1250 1289
1251 return q; 1290 return q;
1252} 1291}
1253 1292
1254INTERFACE pointer 1293INTERFACE pointer
… …
1268 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1269 1308
1270 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1272 strlength (x) = len; 1311 strlength (x) = len;
1312
1273 return x; 1313 return x;
1274} 1314}
1275 1315
1276INTERFACE pointer 1316INTERFACE pointer
1277mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1284{ 1324{
1285 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1286} 1326}
1287 1327
1288INTERFACE void 1328INTERFACE void
1289fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1290{ 1330{
1291 int i; 1331 int i;
1292 1332
1293 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1294 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1295} 1335}
1296 1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1344}
1345
1297INTERFACE pointer 1346INTERFACE pointer
1298vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1299{ 1348{
1300 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1301} 1350}
1302 1351
1303INTERFACE void 1352INTERFACE void
1304set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1305{ 1354{
1306 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1307} 1356}
1308 1357
1309/* get new symbol */ 1358/* get new symbol */
… …
1321 1370
1322INTERFACE pointer 1371INTERFACE pointer
1323gensym (SCHEME_P) 1372gensym (SCHEME_P)
1324{ 1373{
1325 pointer x; 1374 pointer x;
1326
1327 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1328 {
1329 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1330 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1331 1377
1332 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1333 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1334 1380
1335 if (x == NIL) 1381static int
1336 { 1382is_gensym (SCHEME_P_ pointer x)
1337 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1338 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1339 }
1340 }
1341
1342 return NIL;
1343} 1385}
1344 1386
1345/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1346static pointer 1388static pointer
1347mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
… …
1401 } 1443 }
1402 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1403 { 1445 {
1404 if (!has_fp_exp) 1446 if (!has_fp_exp)
1405 { 1447 {
1406 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1407 from now on */
1408 p++; 1449 p++;
1409 1450
1410 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1411 continue; 1452 continue;
1412 } 1453 }
… …
1434 return S_F; 1475 return S_F;
1435 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1436 { 1477 {
1437 int c; 1478 int c;
1438 1479
1480 // TODO: optimise
1439 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1440 c = ' '; 1482 c = ' ';
1441 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1442 c = '\n'; 1484 c = '\n';
1443 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1444 c = '\r'; 1486 c = '\r';
1445 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1446 c = '\t'; 1488 c = '\t';
1489 else if (stricmp (name + 1, "alarm") == 0)
1490 c = 0x07;
1491 else if (stricmp (name + 1, "backspace") == 0)
1492 c = 0x08;
1493 else if (stricmp (name + 1, "escape") == 0)
1494 c = 0x1b;
1495 else if (stricmp (name + 1, "delete") == 0)
1496 c = 0x7f;
1497 else if (stricmp (name + 1, "null") == 0)
1498 c = 0;
1447 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1448 { 1500 {
1449 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1450 1502
1451 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1500 1552
1501 if (ecb_expect_false (is_vector (p))) 1553 if (ecb_expect_false (is_vector (p)))
1502 { 1554 {
1503 int i; 1555 int i;
1504 1556
1505 for (i = 0; i < p->object.vector.length; i++) 1557 for (i = 0; i < veclength (p); i++)
1506 mark (vecvalue (p)[i]); 1558 mark (vecvalue (p)[i]);
1507 } 1559 }
1508 1560
1509 if (is_atom (p)) 1561 if (is_atom (p))
1510 goto E6; 1562 goto E6;
… …
1557 1609
1558/* garbage collection. parameter a, b is marked. */ 1610/* garbage collection. parameter a, b is marked. */
1559static void 1611static void
1560gc (SCHEME_P_ pointer a, pointer b) 1612gc (SCHEME_P_ pointer a, pointer b)
1561{ 1613{
1562 pointer p;
1563 int i; 1614 int i;
1564 1615
1565 if (SCHEME_V->gc_verbose) 1616 if (SCHEME_V->gc_verbose)
1566 putstr (SCHEME_A_ "gc..."); 1617 putstr (SCHEME_A_ "gc...");
1567 1618
… …
1583 /* Mark recent objects the interpreter doesn't know about yet. */ 1634 /* Mark recent objects the interpreter doesn't know about yet. */
1584 mark (car (S_SINK)); 1635 mark (car (S_SINK));
1585 /* Mark any older stuff above nested C calls */ 1636 /* Mark any older stuff above nested C calls */
1586 mark (SCHEME_V->c_nest); 1637 mark (SCHEME_V->c_nest);
1587 1638
1639#if USE_INTCACHE
1640 /* mark intcache */
1641 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1642 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1643 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1644#endif
1645
1588 /* mark variables a, b */ 1646 /* mark variables a, b */
1589 mark (a); 1647 mark (a);
1590 mark (b); 1648 mark (b);
1591 1649
1592 /* garbage collect */ 1650 /* garbage collect */
1593 clrmark (NIL); 1651 clrmark (NIL);
1594 SCHEME_V->fcells = 0; 1652 SCHEME_V->fcells = 0;
1595 SCHEME_V->free_cell = NIL; 1653 SCHEME_V->free_cell = NIL;
1596 1654
1597 /* free-list is kept sorted by address so as to maintain consecutive 1655 if (SCHEME_V->gc_verbose)
1598 ranges, if possible, for use with vectors. Here we scan the cells 1656 putstr (SCHEME_A_ "freeing...");
1599 (which are also kept sorted by address) downwards to build the 1657
1600 free-list in sorted order. 1658 uint32_t total = 0;
1601 */ 1659
1660 /* Here we scan the cells to build the free-list. */
1602 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1661 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1603 { 1662 {
1604 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1663 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1664 struct cell *p;
1665 total += SCHEME_V->cell_segsize [i];
1605 1666
1606 while (--p >= SCHEME_V->cell_seg[i]) 1667 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1607 { 1668 {
1669 pointer c = POINTER (p);
1670
1608 if (is_mark (p)) 1671 if (is_mark (c))
1609 clrmark (p); 1672 clrmark (c);
1610 else 1673 else
1611 { 1674 {
1612 /* reclaim cell */ 1675 /* reclaim cell */
1613 if (typeflag (p) != T_FREE) 1676 if (typeflag (c) != T_PAIR)
1614 { 1677 {
1615 finalize_cell (SCHEME_A_ p); 1678 finalize_cell (SCHEME_A_ c);
1616 set_typeflag (p, T_FREE); 1679 set_typeflag (c, T_PAIR);
1617 set_car (p, NIL); 1680 set_car (c, NIL);
1618 } 1681 }
1619 1682
1620 ++SCHEME_V->fcells; 1683 ++SCHEME_V->fcells;
1621 set_cdr (p, SCHEME_V->free_cell); 1684 set_cdr (c, SCHEME_V->free_cell);
1622 SCHEME_V->free_cell = p; 1685 SCHEME_V->free_cell = c;
1623 } 1686 }
1624 } 1687 }
1625 } 1688 }
1626 1689
1627 if (SCHEME_V->gc_verbose) 1690 if (SCHEME_V->gc_verbose)
1628 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1691 {
1692 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1693 }
1629} 1694}
1630 1695
1631static void 1696static void
1632finalize_cell (SCHEME_P_ pointer a) 1697finalize_cell (SCHEME_P_ pointer a)
1633{ 1698{
1634 /* TODO, fast bitmap check? */ 1699 /* TODO, fast bitmap check? */
1635 if (is_string (a)) 1700 if (is_string (a) || is_symbol (a))
1636 free (strvalue (a)); 1701 free (strvalue (a));
1637 else if (is_vector (a)) 1702 else if (is_vector (a))
1638 free (vecvalue (a)); 1703 free (vecvalue (a));
1639#if USE_PORTS 1704#if USE_PORTS
1640 else if (is_port (a)) 1705 else if (is_port (a))
1641 { 1706 {
1642 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit) 1707 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1643 port_close (SCHEME_A_ a, port_input | port_output); 1708 port_close (SCHEME_A_ a, port_input | port_output);
1644 1709
1645 free (a->object.port); 1710 free (port (a));
1646 } 1711 }
1647#endif 1712#endif
1648} 1713}
1649 1714
1650/* ========== Routines for Reading ========== */ 1715/* ========== Routines for Reading ========== */
… …
1666 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1731 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1667 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1732 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1668 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1669 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1734 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1670 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1735 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1671 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1736 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1672 1737
1673#if SHOW_ERROR_LINE 1738#if SHOW_ERROR_LINE
1674 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1739 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1675 1740
1676 if (fname) 1741 if (fname)
… …
1693 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1758 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1694#if USE_PORTS 1759#if USE_PORTS
1695 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1760 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1696#endif 1761#endif
1697 SCHEME_V->file_i--; 1762 SCHEME_V->file_i--;
1698 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1699 } 1764 }
1700} 1765}
1701 1766
1702static int 1767static int
1703file_interactive (SCHEME_P) 1768file_interactive (SCHEME_P)
1704{ 1769{
1705#if USE_PORTS 1770#if USE_PORTS
1706 return SCHEME_V->file_i == 0 1771 return SCHEME_V->file_i == 0
1707 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1772 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1708 && (SCHEME_V->inport->object.port->kind & port_file); 1773 && (port (SCHEME_V->inport)->kind & port_file);
1709#else 1774#else
1710 return 0; 1775 return 0;
1711#endif 1776#endif
1712} 1777}
1713 1778
… …
1847} 1912}
1848 1913
1849static void 1914static void
1850port_close (SCHEME_P_ pointer p, int flag) 1915port_close (SCHEME_P_ pointer p, int flag)
1851{ 1916{
1852 port *pt = p->object.port; 1917 port *pt = port (p);
1853 1918
1854 pt->kind &= ~flag; 1919 pt->kind &= ~flag;
1855 1920
1856 if ((pt->kind & (port_input | port_output)) == 0) 1921 if ((pt->kind & (port_input | port_output)) == 0)
1857 { 1922 {
… …
1878/* get new character from input file */ 1943/* get new character from input file */
1879static int 1944static int
1880inchar (SCHEME_P) 1945inchar (SCHEME_P)
1881{ 1946{
1882 int c; 1947 int c;
1883 port *pt; 1948 port *pt = port (SCHEME_V->inport);
1884
1885 pt = SCHEME_V->inport->object.port;
1886 1949
1887 if (pt->kind & port_saw_EOF) 1950 if (pt->kind & port_saw_EOF)
1888 return EOF; 1951 return EOF;
1889 1952
1890 c = basic_inchar (pt); 1953 c = basic_inchar (pt);
… …
1957 port *pt; 2020 port *pt;
1958 2021
1959 if (c == EOF) 2022 if (c == EOF)
1960 return; 2023 return;
1961 2024
1962 pt = SCHEME_V->inport->object.port; 2025 pt = port (SCHEME_V->inport);
1963 pt->unget = c; 2026 pt->unget = c;
1964#else 2027#else
1965 if (c == EOF) 2028 if (c == EOF)
1966 return; 2029 return;
1967 2030
… …
1995 2058
1996INTERFACE void 2059INTERFACE void
1997putstr (SCHEME_P_ const char *s) 2060putstr (SCHEME_P_ const char *s)
1998{ 2061{
1999#if USE_PORTS 2062#if USE_PORTS
2000 port *pt = SCHEME_V->outport->object.port; 2063 port *pt = port (SCHEME_V->outport);
2001 2064
2002 if (pt->kind & port_file) 2065 if (pt->kind & port_file)
2003 write (pt->rep.stdio.file, s, strlen (s)); 2066 write (pt->rep.stdio.file, s, strlen (s));
2004 else 2067 else
2005 for (; *s; s++) 2068 for (; *s; s++)
… …
2007 *pt->rep.string.curr++ = *s; 2070 *pt->rep.string.curr++ = *s;
2008 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2071 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2009 *pt->rep.string.curr++ = *s; 2072 *pt->rep.string.curr++ = *s;
2010 2073
2011#else 2074#else
2012 xwrstr (s); 2075 write (pt->rep.stdio.file, s, strlen (s));
2013#endif 2076#endif
2014} 2077}
2015 2078
2016static void 2079static void
2017putchars (SCHEME_P_ const char *s, int len) 2080putchars (SCHEME_P_ const char *s, int len)
2018{ 2081{
2019#if USE_PORTS 2082#if USE_PORTS
2020 port *pt = SCHEME_V->outport->object.port; 2083 port *pt = port (SCHEME_V->outport);
2021 2084
2022 if (pt->kind & port_file) 2085 if (pt->kind & port_file)
2023 write (pt->rep.stdio.file, s, len); 2086 write (pt->rep.stdio.file, s, len);
2024 else 2087 else
2025 { 2088 {
… …
2039 2102
2040INTERFACE void 2103INTERFACE void
2041putcharacter (SCHEME_P_ int c) 2104putcharacter (SCHEME_P_ int c)
2042{ 2105{
2043#if USE_PORTS 2106#if USE_PORTS
2044 port *pt = SCHEME_V->outport->object.port; 2107 port *pt = port (SCHEME_V->outport);
2045 2108
2046 if (pt->kind & port_file) 2109 if (pt->kind & port_file)
2047 { 2110 {
2048 char cc = c; 2111 char cc = c;
2049 write (pt->rep.stdio.file, &cc, 1); 2112 write (pt->rep.stdio.file, &cc, 1);
… …
2062#endif 2125#endif
2063} 2126}
2064 2127
2065/* read characters up to delimiter, but cater to character constants */ 2128/* read characters up to delimiter, but cater to character constants */
2066static char * 2129static char *
2067readstr_upto (SCHEME_P_ char *delim) 2130readstr_upto (SCHEME_P_ int skip, const char *delim)
2068{ 2131{
2069 char *p = SCHEME_V->strbuff; 2132 char *p = SCHEME_V->strbuff + skip;
2070 2133
2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2134 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2072 2135
2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2136 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2074 *p = 0; 2137 *p = 0;
… …
2081 return SCHEME_V->strbuff; 2144 return SCHEME_V->strbuff;
2082} 2145}
2083 2146
2084/* read string expression "xxx...xxx" */ 2147/* read string expression "xxx...xxx" */
2085static pointer 2148static pointer
2086readstrexp (SCHEME_P) 2149readstrexp (SCHEME_P_ char delim)
2087{ 2150{
2088 char *p = SCHEME_V->strbuff; 2151 char *p = SCHEME_V->strbuff;
2089 int c; 2152 int c;
2090 int c1 = 0; 2153 int c1 = 0;
2091 enum
2092 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2154 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2093 2155
2094 for (;;) 2156 for (;;)
2095 { 2157 {
2096 c = inchar (SCHEME_A); 2158 c = inchar (SCHEME_A);
2097 2159
… …
2099 return S_F; 2161 return S_F;
2100 2162
2101 switch (state) 2163 switch (state)
2102 { 2164 {
2103 case st_ok: 2165 case st_ok:
2104 switch (c) 2166 if (ecb_expect_false (c == delim))
2105 {
2106 case '\\':
2107 state = st_bsl;
2108 break;
2109
2110 case '"':
2111 *p = 0;
2112 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2167 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2113 2168
2114 default: 2169 if (ecb_expect_false (c == '\\'))
2170 state = st_bsl;
2171 else
2115 *p++ = c; 2172 *p++ = c;
2116 break;
2117 }
2118 2173
2119 break; 2174 break;
2120 2175
2121 case st_bsl: 2176 case st_bsl:
2122 switch (c) 2177 switch (c)
… …
2131 case '7': 2186 case '7':
2132 state = st_oct1; 2187 state = st_oct1;
2133 c1 = c - '0'; 2188 c1 = c - '0';
2134 break; 2189 break;
2135 2190
2191 case 'a': *p++ = '\a'; state = st_ok; break;
2192 case 'n': *p++ = '\n'; state = st_ok; break;
2193 case 'r': *p++ = '\r'; state = st_ok; break;
2194 case 't': *p++ = '\t'; state = st_ok; break;
2195
2196 //TODO: \whitespace eol whitespace
2197
2198 //TODO: x should end in ;, not two-digit hex
2136 case 'x': 2199 case 'x':
2137 case 'X': 2200 case 'X':
2138 state = st_x1; 2201 state = st_x1;
2139 c1 = 0; 2202 c1 = 0;
2140 break; 2203 break;
2141 2204
2142 case 'n':
2143 *p++ = '\n';
2144 state = st_ok;
2145 break;
2146
2147 case 't':
2148 *p++ = '\t';
2149 state = st_ok;
2150 break;
2151
2152 case 'r':
2153 *p++ = '\r';
2154 state = st_ok;
2155 break;
2156
2157 case '"':
2158 *p++ = '"';
2159 state = st_ok;
2160 break;
2161
2162 default: 2205 default:
2163 *p++ = c; 2206 *p++ = c;
2164 state = st_ok; 2207 state = st_ok;
2165 break; 2208 break;
2166 } 2209 }
2167 2210
2168 break; 2211 break;
2169 2212
2170 case st_x1: 2213 case st_x1:
2171 case st_x2: 2214 case st_x2:
2172 c = toupper (c); 2215 c = tolower (c);
2173 2216
2174 if (c >= '0' && c <= 'F') 2217 if (c >= '0' && c <= '9')
2175 {
2176 if (c <= '9')
2177 c1 = (c1 << 4) + c - '0'; 2218 c1 = (c1 << 4) + c - '0';
2178 else 2219 else if (c >= 'a' && c <= 'f')
2179 c1 = (c1 << 4) + c - 'A' + 10; 2220 c1 = (c1 << 4) + c - 'a' + 10;
2180
2181 if (state == st_x1)
2182 state = st_x2;
2183 else
2184 {
2185 *p++ = c1;
2186 state = st_ok;
2187 }
2188 }
2189 else 2221 else
2190 return S_F; 2222 return S_F;
2223
2224 if (state == st_x1)
2225 state = st_x2;
2226 else
2227 {
2228 *p++ = c1;
2229 state = st_ok;
2230 }
2191 2231
2192 break; 2232 break;
2193 2233
2194 case st_oct1: 2234 case st_oct1:
2195 case st_oct2: 2235 case st_oct2:
… …
2199 backchar (SCHEME_A_ c); 2239 backchar (SCHEME_A_ c);
2200 state = st_ok; 2240 state = st_ok;
2201 } 2241 }
2202 else 2242 else
2203 { 2243 {
2204 if (state == st_oct2 && c1 >= 32) 2244 if (state == st_oct2 && c1 >= ' ')
2205 return S_F; 2245 return S_F;
2206 2246
2207 c1 = (c1 << 3) + (c - '0'); 2247 c1 = (c1 << 3) + (c - '0');
2208 2248
2209 if (state == st_oct1) 2249 if (state == st_oct1)
… …
2214 state = st_ok; 2254 state = st_ok;
2215 } 2255 }
2216 } 2256 }
2217 2257
2218 break; 2258 break;
2219
2220 } 2259 }
2221 } 2260 }
2222} 2261}
2223 2262
2224/* check c is in chars */ 2263/* check c is in chars */
2225ecb_inline int 2264ecb_inline int
2226is_one_of (char *s, int c) 2265is_one_of (const char *s, int c)
2227{ 2266{
2228 if (c == EOF)
2229 return 1;
2230
2231 return !!strchr (s, c); 2267 return c == EOF || !!strchr (s, c);
2232} 2268}
2233 2269
2234/* skip white characters */ 2270/* skip white characters */
2235ecb_inline int 2271ecb_inline int
2236skipspace (SCHEME_P) 2272skipspace (SCHEME_P)
… …
2238 int c, curr_line = 0; 2274 int c, curr_line = 0;
2239 2275
2240 do 2276 do
2241 { 2277 {
2242 c = inchar (SCHEME_A); 2278 c = inchar (SCHEME_A);
2279
2243#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2244 if (c == '\n') 2281 if (ecb_expect_false (c == '\n'))
2245 curr_line++; 2282 curr_line++;
2246#endif 2283#endif
2284
2285 if (ecb_expect_false (c == EOF))
2286 return c;
2247 } 2287 }
2248 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2288 while (is_one_of (WHITESPACE, c));
2249 2289
2250 /* record it */ 2290 /* record it */
2251#if SHOW_ERROR_LINE 2291#if SHOW_ERROR_LINE
2252 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2292 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2253 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2293 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2254#endif 2294#endif
2255 2295
2256 if (c != EOF)
2257 {
2258 backchar (SCHEME_A_ c); 2296 backchar (SCHEME_A_ c);
2259 return 1; 2297 return 1;
2260 }
2261 else
2262 return EOF;
2263} 2298}
2264 2299
2265/* get token */ 2300/* get token */
2266static int 2301static int
2267token (SCHEME_P) 2302token (SCHEME_P)
… …
2283 return TOK_RPAREN; 2318 return TOK_RPAREN;
2284 2319
2285 case '.': 2320 case '.':
2286 c = inchar (SCHEME_A); 2321 c = inchar (SCHEME_A);
2287 2322
2288 if (is_one_of (" \n\t", c)) 2323 if (is_one_of (WHITESPACE, c))
2289 return TOK_DOT; 2324 return TOK_DOT;
2290 else 2325 else
2291 { 2326 {
2292 //TODO: ungetc twice in a row is not supported in C
2293 backchar (SCHEME_A_ c); 2327 backchar (SCHEME_A_ c);
2294 backchar (SCHEME_A_ '.');
2295 return TOK_ATOM; 2328 return TOK_DOTATOM;
2296 } 2329 }
2330
2331 case '|':
2332 return TOK_STRATOM;
2297 2333
2298 case '\'': 2334 case '\'':
2299 return TOK_QUOTE; 2335 return TOK_QUOTE;
2300 2336
2301 case ';': 2337 case ';':
… …
2433 } 2469 }
2434 2470
2435 putcharacter (SCHEME_A_ '"'); 2471 putcharacter (SCHEME_A_ '"');
2436} 2472}
2437 2473
2438
2439/* print atoms */ 2474/* print atoms */
2440static void 2475static void
2441printatom (SCHEME_P_ pointer l, int f) 2476printatom (SCHEME_P_ pointer l, int f)
2442{ 2477{
2443 char *p; 2478 char *p;
2444 int len; 2479 int len;
2445 2480
2446 atom2str (SCHEME_A_ l, f, &p, &len); 2481 atom2str (SCHEME_A_ l, f, &p, &len);
2447 putchars (SCHEME_A_ p, len); 2482 putchars (SCHEME_A_ p, len);
2448} 2483}
2449
2450 2484
2451/* Uses internal buffer unless string pointer is already available */ 2485/* Uses internal buffer unless string pointer is already available */
2452static void 2486static void
2453atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2454{ 2488{
… …
2615#endif 2649#endif
2616 } 2650 }
2617 else if (is_continuation (l)) 2651 else if (is_continuation (l))
2618 p = "#<CONTINUATION>"; 2652 p = "#<CONTINUATION>";
2619 else 2653 else
2654 {
2655#if USE_PRINTF
2656 p = SCHEME_V->strbuff;
2657 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2658#else
2620 p = "#<ERROR>"; 2659 p = "#<ERROR>";
2660#endif
2661 }
2621 2662
2622 *pp = p; 2663 *pp = p;
2623 *plen = strlen (p); 2664 *plen = strlen (p);
2624} 2665}
2625 2666
… …
2769/* () is #t in R5RS */ 2810/* () is #t in R5RS */
2770#define is_true(p) ((p) != S_F) 2811#define is_true(p) ((p) != S_F)
2771#define is_false(p) ((p) == S_F) 2812#define is_false(p) ((p) == S_F)
2772 2813
2773/* ========== Environment implementation ========== */ 2814/* ========== Environment implementation ========== */
2774
2775#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2776
2777static int
2778hash_fn (const char *key, int table_size)
2779{
2780 const unsigned char *p = key;
2781 uint32_t hash = 2166136261;
2782
2783 while (*p)
2784 hash = (hash ^ *p++) * 16777619;
2785
2786 return hash % table_size;
2787}
2788#endif
2789 2815
2790#ifndef USE_ALIST_ENV 2816#ifndef USE_ALIST_ENV
2791 2817
2792/* 2818/*
2793 * In this implementation, each frame of the environment may be 2819 * In this implementation, each frame of the environment may be
… …
2810 2836
2811 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2837 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2812 setenvironment (SCHEME_V->envir); 2838 setenvironment (SCHEME_V->envir);
2813} 2839}
2814 2840
2841static uint32_t
2842sym_hash (pointer sym, uint32_t size)
2843{
2844 uintptr_t ptr = (uintptr_t)sym;
2845
2846#if 0
2847 /* table size is prime, so why mix */
2848 ptr += ptr >> 32;
2849 ptr += ptr >> 16;
2850 ptr += ptr >> 8;
2851#endif
2852
2853 return ptr % size;
2854}
2855
2815ecb_inline void 2856ecb_inline void
2816new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2857new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2817{ 2858{
2818 pointer slot = immutable_cons (variable, value); 2859 pointer slot = immutable_cons (variable, value);
2819 2860
2820 if (is_vector (car (env))) 2861 if (is_vector (car (env)))
2821 { 2862 {
2822 int location = hash_fn (symname (variable), veclength (car (env))); 2863 int location = sym_hash (variable, veclength (car (env)));
2823
2824 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2864 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2825 } 2865 }
2826 else 2866 else
2827 set_car (env, immutable_cons (slot, car (env))); 2867 set_car (env, immutable_cons (slot, car (env)));
2828} 2868}
2829 2869
2830static pointer 2870static pointer
2831find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2871find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2832{ 2872{
2833 pointer x, y; 2873 pointer x, y;
2834 int location;
2835 2874
2836 for (x = env; x != NIL; x = cdr (x)) 2875 for (x = env; x != NIL; x = cdr (x))
2837 { 2876 {
2838 if (is_vector (car (x))) 2877 if (is_vector (car (x)))
2839 { 2878 {
2840 location = hash_fn (symname (hdl), veclength (car (x))); 2879 int location = sym_hash (hdl, veclength (car (x)));
2841 y = vector_elem (car (x), location); 2880 y = vector_get (car (x), location);
2842 } 2881 }
2843 else 2882 else
2844 y = car (x); 2883 y = car (x);
2845 2884
2846 for (; y != NIL; y = cdr (y)) 2885 for (; y != NIL; y = cdr (y))
2847 if (caar (y) == hdl) 2886 if (caar (y) == hdl)
2848 break; 2887 break;
2849 2888
2850 if (y != NIL) 2889 if (y != NIL)
2890 return car (y);
2891
2892 if (!all)
2851 break; 2893 break;
2852
2853 if (!all)
2854 return NIL;
2855 } 2894 }
2856
2857 if (x != NIL)
2858 return car (y);
2859 2895
2860 return NIL; 2896 return NIL;
2861} 2897}
2862 2898
2863#else /* USE_ALIST_ENV */ 2899#else /* USE_ALIST_ENV */
… …
2885 for (y = car (x); y != NIL; y = cdr (y)) 2921 for (y = car (x); y != NIL; y = cdr (y))
2886 if (caar (y) == hdl) 2922 if (caar (y) == hdl)
2887 break; 2923 break;
2888 2924
2889 if (y != NIL) 2925 if (y != NIL)
2926 return car (y);
2890 break; 2927 break;
2891 2928
2892 if (!all) 2929 if (!all)
2893 return NIL; 2930 break;
2894 } 2931 }
2895
2896 if (x != NIL)
2897 return car (y);
2898 2932
2899 return NIL; 2933 return NIL;
2900} 2934}
2901 2935
2902#endif /* USE_ALIST_ENV else */ 2936#endif /* USE_ALIST_ENV else */
2903 2937
2904ecb_inline void 2938ecb_inline void
2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2939new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2906{ 2940{
2941 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2907 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2942 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2908} 2943}
2909 2944
2910ecb_inline void 2945ecb_inline void
2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2946set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
… …
3012{ 3047{
3013 int nframes = (uintptr_t)SCHEME_V->dump; 3048 int nframes = (uintptr_t)SCHEME_V->dump;
3014 struct dump_stack_frame *next_frame; 3049 struct dump_stack_frame *next_frame;
3015 3050
3016 /* enough room for the next frame? */ 3051 /* enough room for the next frame? */
3017 if (nframes >= SCHEME_V->dump_size) 3052 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3018 { 3053 {
3019 SCHEME_V->dump_size += STACK_GROWTH; 3054 SCHEME_V->dump_size += STACK_GROWTH;
3020 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3055 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3021 } 3056 }
3022 3057
… …
3119 int i = 0; 3154 int i = 0;
3120 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3155 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3121 3156
3122 while (cont != NIL) 3157 while (cont != NIL)
3123 { 3158 {
3124 frame->op = ivalue (car (cont)); cont = cdr (cont); 3159 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3125 frame->args = car (cont) ; cont = cdr (cont); 3160 frame->args = car (cont) ; cont = cdr (cont);
3126 frame->envir = car (cont) ; cont = cdr (cont); 3161 frame->envir = car (cont) ; cont = cdr (cont);
3127 frame->code = car (cont) ; cont = cdr (cont); 3162 frame->code = car (cont) ; cont = cdr (cont);
3128 3163
3129 ++frame; 3164 ++frame;
3130 ++i; 3165 ++i;
3131 } 3166 }
3132 3167
… …
3161 SCHEME_V->value = a; 3196 SCHEME_V->value = a;
3162 3197
3163 if (dump == NIL) 3198 if (dump == NIL)
3164 return -1; 3199 return -1;
3165 3200
3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3201 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3167 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3202 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3203 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3169 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3204 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3170 3205
3171 SCHEME_V->dump = dump; 3206 SCHEME_V->dump = dump;
3172 3207
3173 return 0; 3208 return 0;
3174} 3209}
… …
3203 3238
3204#endif 3239#endif
3205 3240
3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3241#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3207 3242
3243#if EXPERIMENT
3244static int
3245debug (SCHEME_P_ int indent, pointer x)
3246{
3247 int c;
3248
3249 if (is_syntax (x))
3250 {
3251 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3252 return 8 + 8;
3253 }
3254
3255 if (x == NIL)
3256 {
3257 printf ("%*sNIL\n", indent, "");
3258 return 3;
3259 }
3260
3261 switch (type (x))
3262 {
3263 case T_INTEGER:
3264 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3265 return 32+8;
3266
3267 case T_SYMBOL:
3268 printf ("%*sS<%s>\n", indent, "", symname (x));
3269 return 24+8;
3270
3271 case T_CLOSURE:
3272 printf ("%*sS<%s>\n", indent, "", "closure");
3273 debug (SCHEME_A_ indent + 3, cdr(x));
3274 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3275
3276 case T_PAIR:
3277 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3278 c = debug (SCHEME_A_ indent + 3, car (x));
3279 c += debug (SCHEME_A_ indent + 3, cdr (x));
3280 return c + 1;
3281
3282 case T_PORT:
3283 printf ("%*sS<%s>\n", indent, "", "port");
3284 return 24+8;
3285
3286 case T_VECTOR:
3287 printf ("%*sS<%s>\n", indent, "", "vector");
3288 return 24+8;
3289
3290 case T_ENVIRONMENT:
3291 printf ("%*sS<%s>\n", indent, "", "environment");
3292 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3293
3294 default:
3295 printf ("unhandled type %d\n", type (x));
3296 break;
3297 }
3298}
3299#endif
3300
3208static int 3301static int
3209opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3302opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3210{ 3303{
3211 pointer args = SCHEME_V->args; 3304 pointer args = SCHEME_V->args;
3212 pointer x, y; 3305 pointer x, y;
3213 3306
3214 switch (op) 3307 switch (op)
3215 { 3308 {
3309#if EXPERIMENT //D
3310 case OP_DEBUG:
3311 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3312 printf ("\n");
3313 s_return (S_T);
3314#endif
3216 case OP_LOAD: /* load */ 3315 case OP_LOAD: /* load */
3217 if (file_interactive (SCHEME_A)) 3316 if (file_interactive (SCHEME_A))
3218 { 3317 {
3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3318 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3220 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3319 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3221 } 3320 }
3222 3321
3223 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3322 if (!file_push (SCHEME_A_ strvalue (car (args))))
3224 Error_1 ("unable to open", car (args)); 3323 Error_1 ("unable to open", car (args));
3225 else 3324 else
… …
3229 } 3328 }
3230 3329
3231 case OP_T0LVL: /* top level */ 3330 case OP_T0LVL: /* top level */
3232 3331
3233 /* If we reached the end of file, this loop is done. */ 3332 /* If we reached the end of file, this loop is done. */
3234 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3333 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3235 { 3334 {
3236 if (SCHEME_V->file_i == 0) 3335 if (SCHEME_V->file_i == 0)
3237 { 3336 {
3238 SCHEME_V->args = NIL; 3337 SCHEME_V->args = NIL;
3239 s_goto (OP_QUIT); 3338 s_goto (OP_QUIT);
… …
3317#endif 3416#endif
3318 if (is_symbol (SCHEME_V->code)) /* symbol */ 3417 if (is_symbol (SCHEME_V->code)) /* symbol */
3319 { 3418 {
3320 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3419 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3321 3420
3322 if (x != NIL) 3421 if (x == NIL)
3323 s_return (slot_value_in_env (x));
3324 else
3325 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3422 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3423
3424 s_return (slot_value_in_env (x));
3326 } 3425 }
3327 else if (is_pair (SCHEME_V->code)) 3426 else if (is_pair (SCHEME_V->code))
3328 { 3427 {
3329 x = car (SCHEME_V->code); 3428 x = car (SCHEME_V->code);
3330 3429
… …
3343 } 3442 }
3344 else 3443 else
3345 s_return (SCHEME_V->code); 3444 s_return (SCHEME_V->code);
3346 3445
3347 case OP_E0ARGS: /* eval arguments */ 3446 case OP_E0ARGS: /* eval arguments */
3348 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3447 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3349 { 3448 {
3350 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3449 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3351 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3450 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3352 SCHEME_V->code = SCHEME_V->value; 3451 SCHEME_V->code = SCHEME_V->value;
3353 s_goto (OP_APPLY); 3452 s_goto (OP_APPLY);
… …
3380 3479
3381 case OP_TRACING: 3480 case OP_TRACING:
3382 { 3481 {
3383 int tr = SCHEME_V->tracing; 3482 int tr = SCHEME_V->tracing;
3384 3483
3385 SCHEME_V->tracing = ivalue (car (args)); 3484 SCHEME_V->tracing = ivalue_unchecked (car (args));
3386 s_return (mk_integer (SCHEME_A_ tr)); 3485 s_return (mk_integer (SCHEME_A_ tr));
3387 } 3486 }
3388 3487
3389#endif 3488#endif
3390 3489
… …
3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3506 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3408 else if (is_foreign (SCHEME_V->code)) 3507 else if (is_foreign (SCHEME_V->code))
3409 { 3508 {
3410 /* Keep nested calls from GC'ing the arglist */ 3509 /* Keep nested calls from GC'ing the arglist */
3411 push_recent_alloc (SCHEME_A_ args, NIL); 3510 push_recent_alloc (SCHEME_A_ args, NIL);
3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3511 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3413 3512
3414 s_return (x); 3513 s_return (x);
3415 } 3514 }
3416 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3515 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3417 { 3516 {
… …
3454 3553
3455 case OP_DOMACRO: /* do macro */ 3554 case OP_DOMACRO: /* do macro */
3456 SCHEME_V->code = SCHEME_V->value; 3555 SCHEME_V->code = SCHEME_V->value;
3457 s_goto (OP_EVAL); 3556 s_goto (OP_EVAL);
3458 3557
3459#if 1
3460
3461 case OP_LAMBDA: /* lambda */ 3558 case OP_LAMBDA: /* lambda */
3462 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3559 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3463 set SCHEME_V->value fall thru */ 3560 set SCHEME_V->value fall thru */
3464 { 3561 {
3465 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3562 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3471 SCHEME_V->code = slot_value_in_env (f); 3568 SCHEME_V->code = slot_value_in_env (f);
3472 s_goto (OP_APPLY); 3569 s_goto (OP_APPLY);
3473 } 3570 }
3474 3571
3475 SCHEME_V->value = SCHEME_V->code; 3572 SCHEME_V->value = SCHEME_V->code;
3476 /* Fallthru */
3477 } 3573 }
3574 /* Fallthru */
3478 3575
3479 case OP_LAMBDA1: 3576 case OP_LAMBDA1:
3480 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3577 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3481
3482#else
3483
3484 case OP_LAMBDA: /* lambda */
3485 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3486
3487#endif
3488 3578
3489 case OP_MKCLOSURE: /* make-closure */ 3579 case OP_MKCLOSURE: /* make-closure */
3490 x = car (args); 3580 x = car (args);
3491 3581
3492 if (car (x) == SCHEME_V->LAMBDA) 3582 if (car (x) == SCHEME_V->LAMBDA)
… …
3909{ 3999{
3910 pointer args = SCHEME_V->args; 4000 pointer args = SCHEME_V->args;
3911 pointer x = car (args); 4001 pointer x = car (args);
3912 num v; 4002 num v;
3913 4003
3914#if USE_MATH
3915 RVALUE dd;
3916#endif
3917
3918 switch (op) 4004 switch (op)
3919 { 4005 {
3920#if USE_MATH 4006#if USE_MATH
3921 case OP_INEX2EX: /* inexact->exact */ 4007 case OP_INEX2EX: /* inexact->exact */
3922 if (is_integer (x)) 4008 if (!is_integer (x))
3923 s_return (x); 4009 {
3924 else if (modf (rvalue_unchecked (x), &dd) == 0) 4010 RVALUE r = rvalue_unchecked (x);
3925 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4011
4012 if (r == (RVALUE)(IVALUE)r)
4013 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3926 else 4014 else
3927 Error_1 ("inexact->exact: not integral:", x); 4015 Error_1 ("inexact->exact: not integral:", x);
4016 }
3928 4017
4018 s_return (x);
4019
4020 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4021 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4022 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4023 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4024
4025 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4026 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4027 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4028 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4029 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4030 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4031 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4032 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4033 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3936 4034
3937 case OP_ATAN: 4035 case OP_ATAN:
4036 s_return (mk_real (SCHEME_A_
3938 if (cdr (args) == NIL) 4037 cdr (args) == NIL
3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4038 ? atan (rvalue (x))
3940 else 4039 : atan2 (rvalue (x), rvalue (cadr (args)))));
3941 {
3942 pointer y = cadr (args);
3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3944 }
3945
3946 case OP_SQRT:
3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3948 4040
3949 case OP_EXPT: 4041 case OP_EXPT:
3950 { 4042 {
3951 RVALUE result; 4043 RVALUE result;
3952 int real_result = 1; 4044 int real_result = 1;
… …
3966 /* If the test fails, result is too big for integer. */ 4058 /* If the test fails, result is too big for integer. */
3967 if (!real_result) 4059 if (!real_result)
3968 { 4060 {
3969 long result_as_long = result; 4061 long result_as_long = result;
3970 4062
3971 if (result != (RVALUE) result_as_long) 4063 if (result != result_as_long)
3972 real_result = 1; 4064 real_result = 1;
3973 } 4065 }
3974 4066
3975 if (real_result) 4067 if (real_result)
3976 s_return (mk_real (SCHEME_A_ result)); 4068 s_return (mk_real (SCHEME_A_ result));
3977 else 4069 else
3978 s_return (mk_integer (SCHEME_A_ result)); 4070 s_return (mk_integer (SCHEME_A_ result));
3979 } 4071 }
3980
3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3983
3984 case OP_TRUNCATE:
3985 {
3986 RVALUE rvalue_of_x;
3987
3988 rvalue_of_x = rvalue (x);
3989
3990 if (rvalue_of_x > 0)
3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
3992 else
3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
3994 }
3995
3996 case OP_ROUND:
3997 if (num_is_integer (x))
3998 s_return (x);
3999
4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4001#endif 4072#endif
4002 4073
4003 case OP_ADD: /* + */ 4074 case OP_ADD: /* + */
4004 v = num_zero; 4075 v = num_zero;
4005 4076
… …
4093 else 4164 else
4094 Error_0 ("modulo: division by zero"); 4165 Error_0 ("modulo: division by zero");
4095 4166
4096 s_return (mk_number (SCHEME_A_ v)); 4167 s_return (mk_number (SCHEME_A_ v));
4097 4168
4098 case OP_CAR: /* car */ 4169 /* the compiler will optimize this mess... */
4099 s_return (caar (args)); 4170 case OP_CAR: op_car: s_return (car (x));
4100 4171 case OP_CDR: op_cdr: s_return (cdr (x));
4101 case OP_CDR: /* cdr */ 4172 case OP_CAAR: op_caar: x = car (x); goto op_car;
4102 s_return (cdar (args)); 4173 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4174 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4175 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4176 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4177 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4178 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4179 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4180 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4181 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4182 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4183 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4184 case OP_CAAAAR: x = car (x); goto op_caaar;
4185 case OP_CAAADR: x = cdr (x); goto op_caaar;
4186 case OP_CAADAR: x = car (x); goto op_caadr;
4187 case OP_CAADDR: x = cdr (x); goto op_caadr;
4188 case OP_CADAAR: x = car (x); goto op_cadar;
4189 case OP_CADADR: x = cdr (x); goto op_cadar;
4190 case OP_CADDAR: x = car (x); goto op_caddr;
4191 case OP_CADDDR: x = cdr (x); goto op_caddr;
4192 case OP_CDAAAR: x = car (x); goto op_cdaar;
4193 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4194 case OP_CDADAR: x = car (x); goto op_cdadr;
4195 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4196 case OP_CDDAAR: x = car (x); goto op_cddar;
4197 case OP_CDDADR: x = cdr (x); goto op_cddar;
4198 case OP_CDDDAR: x = car (x); goto op_cdddr;
4199 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4103 4200
4104 case OP_CONS: /* cons */ 4201 case OP_CONS: /* cons */
4105 set_cdr (args, cadr (args)); 4202 set_cdr (args, cadr (args));
4106 s_return (args); 4203 s_return (args);
4107 4204
… …
4122 } 4219 }
4123 else 4220 else
4124 Error_0 ("set-cdr!: unable to alter immutable pair"); 4221 Error_0 ("set-cdr!: unable to alter immutable pair");
4125 4222
4126 case OP_CHAR2INT: /* char->integer */ 4223 case OP_CHAR2INT: /* char->integer */
4127 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4224 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4128 4225
4129 case OP_INT2CHAR: /* integer->char */ 4226 case OP_INT2CHAR: /* integer->char */
4130 s_return (mk_character (SCHEME_A_ ivalue (x))); 4227 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4131 4228
4132 case OP_CHARUPCASE: 4229 case OP_CHARUPCASE:
4133 { 4230 {
4134 unsigned char c = ivalue (x); 4231 unsigned char c = ivalue_unchecked (x);
4135 c = toupper (c); 4232 c = toupper (c);
4136 s_return (mk_character (SCHEME_A_ c)); 4233 s_return (mk_character (SCHEME_A_ c));
4137 } 4234 }
4138 4235
4139 case OP_CHARDNCASE: 4236 case OP_CHARDNCASE:
4140 { 4237 {
4141 unsigned char c = ivalue (x); 4238 unsigned char c = ivalue_unchecked (x);
4142 c = tolower (c); 4239 c = tolower (c);
4143 s_return (mk_character (SCHEME_A_ c)); 4240 s_return (mk_character (SCHEME_A_ c));
4144 } 4241 }
4145 4242
4146 case OP_STR2SYM: /* string->symbol */ 4243 case OP_STR2SYM: /* string->symbol */
… …
4223 Error_1 ("atom->string: not an atom:", x); 4320 Error_1 ("atom->string: not an atom:", x);
4224 } 4321 }
4225 4322
4226 case OP_MKSTRING: /* make-string */ 4323 case OP_MKSTRING: /* make-string */
4227 { 4324 {
4228 int fill = ' '; 4325 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4229 int len;
4230
4231 len = ivalue (x); 4326 int len = ivalue_unchecked (x);
4232
4233 if (cdr (args) != NIL)
4234 fill = charvalue (cadr (args));
4235 4327
4236 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4328 s_return (mk_empty_string (SCHEME_A_ len, fill));
4237 } 4329 }
4238 4330
4239 case OP_STRLEN: /* string-length */ 4331 case OP_STRLEN: /* string-length */
4240 s_return (mk_integer (SCHEME_A_ strlength (x))); 4332 s_return (mk_integer (SCHEME_A_ strlength (x)));
4241 4333
4242 case OP_STRREF: /* string-ref */ 4334 case OP_STRREF: /* string-ref */
4243 { 4335 {
4244 char *str;
4245 int index;
4246
4247 str = strvalue (x); 4336 char *str = strvalue (x);
4248
4249 index = ivalue (cadr (args)); 4337 int index = ivalue_unchecked (cadr (args));
4250 4338
4251 if (index >= strlength (x)) 4339 if (index >= strlength (x))
4252 Error_1 ("string-ref: out of bounds:", cadr (args)); 4340 Error_1 ("string-ref: out of bounds:", cadr (args));
4253 4341
4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4342 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4255 } 4343 }
4256 4344
4257 case OP_STRSET: /* string-set! */ 4345 case OP_STRSET: /* string-set! */
4258 { 4346 {
4259 char *str; 4347 char *str = strvalue (x);
4260 int index; 4348 int index = ivalue_unchecked (cadr (args));
4261 int c; 4349 int c;
4262 4350
4263 if (is_immutable (x)) 4351 if (is_immutable (x))
4264 Error_1 ("string-set!: unable to alter immutable string:", x); 4352 Error_1 ("string-set!: unable to alter immutable string:", x);
4265
4266 str = strvalue (x);
4267
4268 index = ivalue (cadr (args));
4269 4353
4270 if (index >= strlength (x)) 4354 if (index >= strlength (x))
4271 Error_1 ("string-set!: out of bounds:", cadr (args)); 4355 Error_1 ("string-set!: out of bounds:", cadr (args));
4272 4356
4273 c = charvalue (caddr (args)); 4357 c = charvalue (caddr (args));
… …
4294 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4378 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4295 4379
4296 s_return (newstr); 4380 s_return (newstr);
4297 } 4381 }
4298 4382
4299 case OP_SUBSTR: /* substring */ 4383 case OP_STRING_COPY: /* substring/string-copy */
4300 { 4384 {
4301 char *str; 4385 char *str = strvalue (x);
4302 int index0; 4386 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4303 int index1; 4387 int index1;
4304 int len; 4388 int len;
4305 4389
4306 str = strvalue (x);
4307
4308 index0 = ivalue (cadr (args));
4309
4310 if (index0 > strlength (x)) 4390 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args)); 4391 Error_1 ("string->copy: start out of bounds:", cadr (args));
4312 4392
4313 if (cddr (args) != NIL) 4393 if (cddr (args) != NIL)
4314 { 4394 {
4315 index1 = ivalue (caddr (args)); 4395 index1 = ivalue_unchecked (caddr (args));
4316 4396
4317 if (index1 > strlength (x) || index1 < index0) 4397 if (index1 > strlength (x) || index1 < index0)
4318 Error_1 ("substring: end out of bounds:", caddr (args)); 4398 Error_1 ("string->copy: end out of bounds:", caddr (args));
4319 } 4399 }
4320 else 4400 else
4321 index1 = strlength (x); 4401 index1 = strlength (x);
4322 4402
4323 len = index1 - index0; 4403 len = index1 - index0;
4324 x = mk_empty_string (SCHEME_A_ len, ' '); 4404 x = mk_counted_string (SCHEME_A_ str + index0, len);
4325 memcpy (strvalue (x), str + index0, len);
4326 strvalue (x)[len] = 0;
4327 4405
4328 s_return (x); 4406 s_return (x);
4329 } 4407 }
4330 4408
4331 case OP_VECTOR: /* vector */ 4409 case OP_VECTOR: /* vector */
… …
4343 if (SCHEME_V->no_memory) 4421 if (SCHEME_V->no_memory)
4344 s_return (S_SINK); 4422 s_return (S_SINK);
4345#endif 4423#endif
4346 4424
4347 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4425 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4348 set_vector_elem (vec, i, car (x)); 4426 vector_set (vec, i, car (x));
4349 4427
4350 s_return (vec); 4428 s_return (vec);
4351 } 4429 }
4352 4430
4353 case OP_MKVECTOR: /* make-vector */ 4431 case OP_MKVECTOR: /* make-vector */
4354 { 4432 {
4355 pointer fill = NIL; 4433 pointer fill = NIL;
4356 int len;
4357 pointer vec; 4434 pointer vec;
4358
4359 len = ivalue (x); 4435 int len = ivalue_unchecked (x);
4360 4436
4361 if (cdr (args) != NIL) 4437 if (cdr (args) != NIL)
4362 fill = cadr (args); 4438 fill = cadr (args);
4363 4439
4364 vec = mk_vector (SCHEME_A_ len); 4440 vec = mk_vector (SCHEME_A_ len);
… …
4367 if (SCHEME_V->no_memory) 4443 if (SCHEME_V->no_memory)
4368 s_return (S_SINK); 4444 s_return (S_SINK);
4369#endif 4445#endif
4370 4446
4371 if (fill != NIL) 4447 if (fill != NIL)
4372 fill_vector (vec, fill); 4448 fill_vector (vec, 0, fill);
4373 4449
4374 s_return (vec); 4450 s_return (vec);
4375 } 4451 }
4376 4452
4377 case OP_VECLEN: /* vector-length */ 4453 case OP_VECLEN: /* vector-length */
4378 s_return (mk_integer (SCHEME_A_ veclength (x))); 4454 s_return (mk_integer (SCHEME_A_ veclength (x)));
4379 4455
4456 case OP_VECRESIZE:
4457 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4458 s_return (x);
4459
4380 case OP_VECREF: /* vector-ref */ 4460 case OP_VECREF: /* vector-ref */
4381 { 4461 {
4382 int index;
4383
4384 index = ivalue (cadr (args)); 4462 int index = ivalue_unchecked (cadr (args));
4385 4463
4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4464 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4387 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4465 Error_1 ("vector-ref: out of bounds:", cadr (args));
4388 4466
4389 s_return (vector_elem (x, index)); 4467 s_return (vector_get (x, index));
4390 } 4468 }
4391 4469
4392 case OP_VECSET: /* vector-set! */ 4470 case OP_VECSET: /* vector-set! */
4393 { 4471 {
4394 int index; 4472 int index = ivalue_unchecked (cadr (args));
4395 4473
4396 if (is_immutable (x)) 4474 if (is_immutable (x))
4397 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4475 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4398 4476
4399 index = ivalue (cadr (args));
4400
4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4477 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4402 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4478 Error_1 ("vector-set!: out of bounds:", cadr (args));
4403 4479
4404 set_vector_elem (x, index, caddr (args)); 4480 vector_set (x, index, caddr (args));
4405 s_return (x); 4481 s_return (x);
4406 } 4482 }
4407 } 4483 }
4408 4484
4409 if (USE_ERROR_CHECKING) abort (); 4485 if (USE_ERROR_CHECKING) abort ();
4410}
4411
4412INTERFACE int
4413is_list (SCHEME_P_ pointer a)
4414{
4415 return list_length (SCHEME_A_ a) >= 0;
4416}
4417
4418/* Result is:
4419 proper list: length
4420 circular list: -1
4421 not even a pair: -2
4422 dotted list: -2 minus length before dot
4423*/
4424INTERFACE int
4425list_length (SCHEME_P_ pointer a)
4426{
4427 int i = 0;
4428 pointer slow, fast;
4429
4430 slow = fast = a;
4431
4432 while (1)
4433 {
4434 if (fast == NIL)
4435 return i;
4436
4437 if (!is_pair (fast))
4438 return -2 - i;
4439
4440 fast = cdr (fast);
4441 ++i;
4442
4443 if (fast == NIL)
4444 return i;
4445
4446 if (!is_pair (fast))
4447 return -2 - i;
4448
4449 ++i;
4450 fast = cdr (fast);
4451
4452 /* Safe because we would have already returned if `fast'
4453 encountered a non-pair. */
4454 slow = cdr (slow);
4455
4456 if (fast == slow)
4457 {
4458 /* the fast pointer has looped back around and caught up
4459 with the slow pointer, hence the structure is circular,
4460 not of finite length, and therefore not a list */
4461 return -1;
4462 }
4463 }
4464} 4486}
4465 4487
4466static int 4488static int
4467opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4489opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4468{ 4490{
… …
4502 pointer d = cdr (args); 4524 pointer d = cdr (args);
4503 int r; 4525 int r;
4504 4526
4505 switch (op) 4527 switch (op)
4506 { 4528 {
4507 case OP_NOT: /* not */ r = is_false (a) ; break; 4529 case OP_NOT: /* not */ r = is_false (a) ; break;
4508 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4530 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4509 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4531 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4510 case OP_NULLP: /* null? */ r = a == NIL ; break; 4532 case OP_NULLP: /* null? */ r = a == NIL ; break;
4511 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4533 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4534 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4512 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4535 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4513 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4536 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4514 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4537 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4515 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4538 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4516 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4539 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4517 4540
4518#if USE_CHAR_CLASSIFIERS 4541#if USE_CHAR_CLASSIFIERS
4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4542 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4543 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4544 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4545 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4546 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4524#endif 4547#endif
4525 4548
4526#if USE_PORTS 4549#if USE_PORTS
4527 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4550 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4551 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4571 } 4594 }
4572 else 4595 else
4573 s_return (SCHEME_V->code); 4596 s_return (SCHEME_V->code);
4574 4597
4575 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4598 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4576 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4599 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4577 s_return (SCHEME_V->value); 4600 s_return (SCHEME_V->value);
4578 4601
4579#if USE_PORTS 4602#if USE_PORTS
4580 4603
4581 case OP_WRITE: /* write */ 4604 case OP_WRITE: /* write */
… …
4726 SCHEME_V->gc_verbose = (a != S_F); 4749 SCHEME_V->gc_verbose = (a != S_F);
4727 s_retbool (was); 4750 s_retbool (was);
4728 } 4751 }
4729 4752
4730 case OP_NEWSEGMENT: /* new-segment */ 4753 case OP_NEWSEGMENT: /* new-segment */
4754#if 0
4731 if (!is_pair (args) || !is_number (a)) 4755 if (!is_pair (args) || !is_number (a))
4732 Error_0 ("new-segment: argument must be a number"); 4756 Error_0 ("new-segment: argument must be a number");
4733 4757#endif
4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4758 s_retbool (alloc_cellseg (SCHEME_A));
4735
4736 s_return (S_T);
4737 4759
4738 case OP_OBLIST: /* oblist */ 4760 case OP_OBLIST: /* oblist */
4739 s_return (oblist_all_symbols (SCHEME_A)); 4761 s_return (oblist_all_symbols (SCHEME_A));
4740 4762
4741#if USE_PORTS 4763#if USE_PORTS
… …
4811 s_return (p == NIL ? S_F : p); 4833 s_return (p == NIL ? S_F : p);
4812 } 4834 }
4813 4835
4814 case OP_GET_OUTSTRING: /* get-output-string */ 4836 case OP_GET_OUTSTRING: /* get-output-string */
4815 { 4837 {
4816 port *p; 4838 port *p = port (a);
4817 4839
4818 if ((p = a->object.port)->kind & port_string) 4840 if (p->kind & port_string)
4819 { 4841 {
4820 off_t size; 4842 off_t size;
4821 char *str; 4843 char *str;
4822 4844
4823 size = p->rep.string.curr - p->rep.string.start + 1; 4845 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4928 int res; 4950 int res;
4929 4951
4930 if (is_pair (args)) 4952 if (is_pair (args))
4931 p = car (args); 4953 p = car (args);
4932 4954
4933 res = p->object.port->kind & port_string; 4955 res = port (p)->kind & port_string;
4934 4956
4935 s_retbool (res); 4957 s_retbool (res);
4936 } 4958 }
4937 4959
4938 case OP_SET_INPORT: /* set-input-port */ 4960 case OP_SET_INPORT: /* set-input-port */
… …
4997 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5019 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 5020 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 5021 s_goto (OP_RDSEXPR);
5000 5022
5001 case TOK_ATOM: 5023 case TOK_ATOM:
5002 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5024 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5025
5026 case TOK_DOTATOM:
5027 SCHEME_V->strbuff[0] = '.';
5028 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5029
5030 case TOK_STRATOM:
5031 x = readstrexp (SCHEME_A_ '|');
5032 //TODO: haven't checked whether the garbage collector could interfere
5033 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5003 5034
5004 case TOK_DQUOTE: 5035 case TOK_DQUOTE:
5005 x = readstrexp (SCHEME_A); 5036 x = readstrexp (SCHEME_A_ '"');
5006 5037
5007 if (x == S_F) 5038 if (x == S_F)
5008 Error_0 ("Error reading string"); 5039 Error_0 ("Error reading string");
5009 5040
5010 setimmutable (x); 5041 setimmutable (x);
… …
5022 s_goto (OP_EVAL); 5053 s_goto (OP_EVAL);
5023 } 5054 }
5024 } 5055 }
5025 5056
5026 case TOK_SHARP_CONST: 5057 case TOK_SHARP_CONST:
5027 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5058 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5028 Error_0 ("undefined sharp expression"); 5059 Error_0 ("undefined sharp expression");
5029 else 5060 else
5030 s_return (x); 5061 s_return (x);
5031 5062
5032 default: 5063 default:
… …
5184 putstr (SCHEME_A_ ")"); 5215 putstr (SCHEME_A_ ")");
5185 s_return (S_T); 5216 s_return (S_T);
5186 } 5217 }
5187 else 5218 else
5188 { 5219 {
5189 pointer elem = vector_elem (vec, i); 5220 pointer elem = vector_get (vec, i);
5190 5221
5191 ivalue_unchecked (cdr (args)) = i + 1; 5222 ivalue_unchecked (cdr (args)) = i + 1;
5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5223 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5193 SCHEME_V->args = elem; 5224 SCHEME_V->args = elem;
5194 5225
… …
5254 5285
5255 case OP_CLOSUREP: /* closure? */ 5286 case OP_CLOSUREP: /* closure? */
5256 /* 5287 /*
5257 * Note, macro object is also a closure. 5288 * Note, macro object is also a closure.
5258 * Therefore, (closure? <#MACRO>) ==> #t 5289 * Therefore, (closure? <#MACRO>) ==> #t
5290 * (schmorp) well, obviously not, fix? TODO
5259 */ 5291 */
5260 s_retbool (is_closure (a)); 5292 s_retbool (is_closure (a));
5261 5293
5262 case OP_MACROP: /* macro? */ 5294 case OP_MACROP: /* macro? */
5263 s_retbool (is_macro (a)); 5295 s_retbool (is_macro (a));
… …
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5301/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5302typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5271 5303
5272typedef int (*test_predicate)(pointer); 5304typedef int (*test_predicate)(pointer);
5273static int 5305static int
5274is_any (pointer p) 5306tst_any (pointer p)
5275{ 5307{
5276 return 1; 5308 return 1;
5277} 5309}
5278 5310
5279static int 5311static int
5280is_nonneg (pointer p) 5312tst_inonneg (pointer p)
5281{ 5313{
5282 return ivalue (p) >= 0 && is_integer (p); 5314 return is_integer (p) && ivalue_unchecked (p) >= 0;
5283} 5315}
5284 5316
5285static int 5317static int
5286tst_is_list (pointer p) 5318tst_is_list (SCHEME_P_ pointer p)
5287{ 5319{
5288 return p == NIL || is_pair (p); 5320 return p == NIL || is_pair (p);
5289} 5321}
5290 5322
5291/* Correspond carefully with following defines! */ 5323/* Correspond carefully with following defines! */
5292static struct 5324static struct
5293{ 5325{
5294 test_predicate fct; 5326 test_predicate fct;
5295 const char *kind; 5327 const char *kind;
5296} tests[] = 5328} tests[] = {
5297{
5298 { is_any, 0 }, 5329 { tst_any , 0 },
5299 { is_string, "string" }, 5330 { is_string , "string" },
5300 { is_symbol, "symbol" }, 5331 { is_symbol , "symbol" },
5301 { is_port, "port" }, 5332 { is_port , "port" },
5302 { is_inport, "input port" }, 5333 { is_inport , "input port" },
5303 { is_outport, "output port" }, 5334 { is_outport , "output port" },
5304 { is_environment, "environment" }, 5335 { is_environment, "environment" },
5305 { is_pair, "pair" }, 5336 { is_pair , "pair" },
5306 { tst_is_list, "pair or '()" }, 5337 { 0 , "pair or '()" },
5307 { is_character, "character" }, 5338 { is_character , "character" },
5308 { is_vector, "vector" }, 5339 { is_vector , "vector" },
5309 { is_number, "number" }, 5340 { is_number , "number" },
5310 { is_integer, "integer" }, 5341 { is_integer , "integer" },
5311 { is_nonneg, "non-negative integer" } 5342 { tst_inonneg , "non-negative integer" }
5312}; 5343};
5313 5344
5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5345#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5315#define TST_ANY "\001" 5346#define TST_ANY "\001"
5316#define TST_STRING "\002" 5347#define TST_STRING "\002"
… …
5357typedef struct 5388typedef struct
5358{ 5389{
5359 uint8_t func; 5390 uint8_t func;
5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5391 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin; 5392 uint8_t builtin;
5393#if USE_ERROR_CHECKING
5362 uint8_t min_arity; 5394 uint8_t min_arity;
5363 uint8_t max_arity; 5395 uint8_t max_arity;
5364 char arg_tests_encoding[3]; 5396 char arg_tests_encoding[3];
5397#endif
5365} op_code_info; 5398} op_code_info;
5366 5399
5367static const op_code_info dispatch_table[] = { 5400static const op_code_info dispatch_table[] = {
5401#if USE_ERROR_CHECKING
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5402#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5403#else
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5405#endif
5369#include "opdefines.h" 5406#include "opdefines.h"
5370#undef OP_DEF 5407#undef OP_DEF
5371 {0} 5408 {0}
5372}; 5409};
5373 5410
… …
5415 { 5452 {
5416 pointer arg = car (arglist); 5453 pointer arg = car (arglist);
5417 5454
5418 j = t[0]; 5455 j = t[0];
5419 5456
5457 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5458 if (j == TST_LIST[0])
5459 {
5460 if (!tst_is_list (SCHEME_A_ arg))
5461 break;
5462 }
5463 else
5464 {
5420 if (!tests[j - 1].fct (arg)) 5465 if (!tests[j - 1].fct (arg))
5421 break; 5466 break;
5467 }
5422 5468
5423 if (t[1]) /* last test is replicated as necessary */ 5469 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5424 t++; 5470 t++;
5425 5471
5426 arglist = cdr (arglist); 5472 arglist = cdr (arglist);
5427 i++; 5473 i++;
5428 } 5474 }
… …
5454 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5500 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5455 return; 5501 return;
5456 5502
5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5503 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5458 { 5504 {
5459 xwrstr ("No memory!\n"); 5505 putstr (SCHEME_A_ "No memory!\n");
5460 return; 5506 return;
5461 } 5507 }
5462 } 5508 }
5463} 5509}
5464 5510
… …
5483mk_proc (SCHEME_P_ enum scheme_opcodes op) 5529mk_proc (SCHEME_P_ enum scheme_opcodes op)
5484{ 5530{
5485 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5531 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5486 set_typeflag (y, (T_PROC | T_ATOM)); 5532 set_typeflag (y, (T_PROC | T_ATOM));
5487 ivalue_unchecked (y) = op; 5533 ivalue_unchecked (y) = op;
5488 set_num_integer (y);
5489 return y; 5534 return y;
5490} 5535}
5491 5536
5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5537/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5493static int 5538static int
5494syntaxnum (pointer p) 5539syntaxnum (pointer p)
5495{ 5540{
5496 const char *s = strvalue (car (p)); 5541 const char *s = strvalue (p);
5497 5542
5498 switch (strlength (car (p))) 5543 switch (strlength (p))
5499 { 5544 {
5500 case 2: 5545 case 2:
5501 if (s[0] == 'i') 5546 if (s[0] == 'i')
5502 return OP_IF0; /* if */ 5547 return OP_IF0; /* if */
5503 else 5548 else
… …
5578ecb_cold int 5623ecb_cold int
5579scheme_init (SCHEME_P) 5624scheme_init (SCHEME_P)
5580{ 5625{
5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5626 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5582 pointer x; 5627 pointer x;
5628
5629 /* this memset is not strictly correct, as we assume (intcache)
5630 * that memset 0 will also set pointers to 0, but memset does
5631 * of course not guarantee that. screw such systems.
5632 */
5633 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5583 5634
5584 num_set_fixnum (num_zero, 1); 5635 num_set_fixnum (num_zero, 1);
5585 num_set_ivalue (num_zero, 0); 5636 num_set_ivalue (num_zero, 0);
5586 num_set_fixnum (num_one, 1); 5637 num_set_fixnum (num_one, 1);
5587 num_set_ivalue (num_one, 1); 5638 num_set_ivalue (num_one, 1);
… …
5599 SCHEME_V->save_inport = NIL; 5650 SCHEME_V->save_inport = NIL;
5600 SCHEME_V->loadport = NIL; 5651 SCHEME_V->loadport = NIL;
5601 SCHEME_V->nesting = 0; 5652 SCHEME_V->nesting = 0;
5602 SCHEME_V->interactive_repl = 0; 5653 SCHEME_V->interactive_repl = 0;
5603 5654
5604 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5655 if (!alloc_cellseg (SCHEME_A))
5605 { 5656 {
5606#if USE_ERROR_CHECKING 5657#if USE_ERROR_CHECKING
5607 SCHEME_V->no_memory = 1; 5658 SCHEME_V->no_memory = 1;
5608 return 0; 5659 return 0;
5609#endif 5660#endif
… …
5939# endif 5990# endif
5940 int fin; 5991 int fin;
5941 char *file_name = InitFile; 5992 char *file_name = InitFile;
5942 int retcode; 5993 int retcode;
5943 int isfile = 1; 5994 int isfile = 1;
5995 system ("ps v $PPID");//D
5944 5996
5945 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5997 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5946 { 5998 {
5947 xwrstr ("Usage: tinyscheme -?\n"); 5999 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6000 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5949 xwrstr ("followed by\n"); 6001 putstr (SCHEME_A_ "followed by\n");
5950 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6002 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5951 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6003 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5952 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6004 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5953 xwrstr ("Use - as filename for stdin.\n"); 6005 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5954 return 1; 6006 return 1;
5955 } 6007 }
5956 6008
5957 if (!scheme_init (SCHEME_A)) 6009 if (!scheme_init (SCHEME_A))
5958 { 6010 {
5959 xwrstr ("Could not initialize!\n"); 6011 putstr (SCHEME_A_ "Could not initialize!\n");
5960 return 2; 6012 return 2;
5961 } 6013 }
5962 6014
5963# if USE_PORTS 6015# if USE_PORTS
5964 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6016 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6009 fin = open (file_name, O_RDONLY); 6061 fin = open (file_name, O_RDONLY);
6010#endif 6062#endif
6011 6063
6012 if (isfile && fin < 0) 6064 if (isfile && fin < 0)
6013 { 6065 {
6014 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6066 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6015 } 6067 }
6016 else 6068 else
6017 { 6069 {
6018 if (isfile) 6070 if (isfile)
6019 scheme_load_named_file (SCHEME_A_ fin, file_name); 6071 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6023#if USE_PORTS 6075#if USE_PORTS
6024 if (!isfile || fin != STDIN_FILENO) 6076 if (!isfile || fin != STDIN_FILENO)
6025 { 6077 {
6026 if (SCHEME_V->retcode != 0) 6078 if (SCHEME_V->retcode != 0)
6027 { 6079 {
6028 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6080 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6029 } 6081 }
6030 6082
6031 if (isfile) 6083 if (isfile)
6032 close (fin); 6084 close (fin);
6033 } 6085 }

Diff Legend

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