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

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

Diff Legend

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