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.5 by root, Wed Nov 25 10:50:24 2015 UTC vs.
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC

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

Diff Legend

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