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.1 by root, Wed Nov 25 05:02:56 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.
… …
23#endif 28#endif
24#if USE_MATH 29#if USE_MATH
25# include <math.h> 30# include <math.h>
26#endif 31#endif
27 32
33#include "ecb.h"
34
28#include <sys/types.h> 35#include <sys/types.h>
29#include <sys/stat.h> 36#include <sys/stat.h>
30#include <fcntl.h> 37#include <fcntl.h>
38
39#include <string.h>
40#include <stdlib.h>
31 41
32#include <limits.h> 42#include <limits.h>
33#include <inttypes.h> 43#include <inttypes.h>
34#include <float.h> 44#include <float.h>
35//#include <ctype.h> 45//#include <ctype.h>
… …
52 62
53#define BACKQUOTE '`' 63#define BACKQUOTE '`'
54#define DELIMITERS "()\";\f\t\v\n\r " 64#define DELIMITERS "()\";\f\t\v\n\r "
55 65
56#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
57#define S_T (&SCHEME_V->xT) 67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
58#define S_F (&SCHEME_V->xF) 68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
59#define S_SINK (&SCHEME_V->xsink) 69#define S_SINK (&SCHEME_V->xsink)
60#define S_EOF (&SCHEME_V->xEOF_OBJ) 70#define S_EOF (&SCHEME_V->xEOF_OBJ)
61
62/*
63 * Basic memory allocation units
64 */
65
66#define banner "TinyScheme 1.41-s"
67
68#include <string.h>
69#include <stdlib.h>
70 71
71#if !USE_MULTIPLICITY 72#if !USE_MULTIPLICITY
72static scheme sc; 73static scheme sc;
73#endif 74#endif
74 75
… …
134 c += 'a' - 'A'; 135 c += 'a' - 'A';
135 136
136 return c; 137 return c;
137} 138}
138 139
139#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
140static const char * 151static const char *
141strlwr (char *s) 152xstrlwr (char *s)
142{ 153{
143 const char *p = s; 154 const char *p = s;
144 155
145 while (*s) 156 while (*s)
146 { 157 {
… …
148 s++; 159 s++;
149 } 160 }
150 161
151 return p; 162 return p;
152} 163}
153#endif
154 164
165#define stricmp(a,b) strcasecmp (a, b)
166#define strlwr(s) xstrlwr (s)
167
168#else
155#define stricmp(a,b) strcmp (a, b) 169# define stricmp(a,b) strcmp (a, b)
156#define strlwr(s) (s) 170# define strlwr(s) (s)
157#define toupper(c) xtoupper(c) 171#endif
158#define tolower(c) xtolower(c)
159 172
160#ifndef prompt 173#ifndef prompt
161# define prompt "ts> " 174# define prompt "ts> "
162#endif 175#endif
163 176
… …
169# define FIRST_CELLSEGS 3 182# define FIRST_CELLSEGS 3
170#endif 183#endif
171 184
172enum scheme_types 185enum scheme_types
173{ 186{
174 T_NULL, 187 T_FREE,
175 T_STRING, 188 T_STRING,
176 T_NUMBER, 189 T_NUMBER,
177 T_SYMBOL, 190 T_SYMBOL,
178 T_PROC, 191 T_PROC,
179 T_PAIR, 192 T_PAIR,
… …
184 T_PORT, 197 T_PORT,
185 T_VECTOR, 198 T_VECTOR,
186 T_MACRO, 199 T_MACRO,
187 T_PROMISE, 200 T_PROMISE,
188 T_ENVIRONMENT, 201 T_ENVIRONMENT,
202 /* one more... */
189 T_NUM_SYSTEM_TYPES 203 T_NUM_SYSTEM_TYPES
190}; 204};
191 205
192#define T_MASKTYPE 31 /* 0000000000011111 */ 206#define T_MASKTYPE 0x000f
193#define T_SYNTAX 4096 /* 0001000000000000 */ 207#define T_SYNTAX 0x0010
194#define T_IMMUTABLE 8192 /* 0010000000000000 */ 208#define T_IMMUTABLE 0x0020
195#define T_ATOM 16384 /* 0100000000000000 */ /* only for gc */ 209#define T_ATOM 0x0040 /* only for gc */
196#define CLRATOM 49151 /* 1011111111111111 */ /* only for gc */ 210#define T_MARK 0x0080 /* only for gc */
197#define MARK 32768 /* 1000000000000000 */
198#define UNMARK 32767 /* 0111111111111111 */
199 211
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
200 213
201static num num_add (num a, num b); 214static num num_op (enum num_op op, num a, num b);
202static num num_mul (num a, num b);
203static num num_div (num a, num b);
204static num num_intdiv (num a, num b); 215static num num_intdiv (num a, num b);
205static num num_sub (num a, num b);
206static num num_rem (num a, num b); 216static num num_rem (num a, num b);
207static num num_mod (num a, num b); 217static num num_mod (num a, num b);
208static int num_eq (num a, num b);
209static int num_gt (num a, num b);
210static int num_ge (num a, num b);
211static int num_lt (num a, num b);
212static int num_le (num a, num b);
213 218
214#if USE_MATH 219#if USE_MATH
215static double round_per_R5RS (double x); 220static double round_per_R5RS (double x);
216#endif 221#endif
217static int is_zero_rvalue (RVALUE x); 222static int is_zero_rvalue (RVALUE x);
218
219static INLINE int
220num_is_integer (pointer p)
221{
222 return num_is_fixnum (p->object.number);
223}
224 223
225static num num_zero; 224static num num_zero;
226static num num_one; 225static num num_one;
227 226
228/* macros for cell operations */ 227/* macros for cell operations */
229#define typeflag(p) ((p)->flag + 0) 228#define typeflag(p) ((p)->flag + 0)
230#define set_typeflag(p,v) ((p)->flag = (v)) 229#define set_typeflag(p,v) ((p)->flag = (v))
231#define type(p) (typeflag (p) & T_MASKTYPE) 230#define type(p) (typeflag (p) & T_MASKTYPE)
232 231
233INTERFACE INLINE int 232INTERFACE int
234is_string (pointer p) 233is_string (pointer p)
235{ 234{
236 return type (p) == T_STRING; 235 return type (p) == T_STRING;
237} 236}
238 237
239#define strvalue(p) ((p)->object.string.svalue) 238#define strvalue(p) ((p)->object.string.svalue)
240#define strlength(p) ((p)->object.string.length) 239#define strlength(p) ((p)->object.string.length)
241 240
242INTERFACE int is_list (SCHEME_P_ pointer p); 241INTERFACE int is_list (SCHEME_P_ pointer p);
242
243INTERFACE INLINE int 243INTERFACE int
244is_vector (pointer p) 244is_vector (pointer p)
245{ 245{
246 return type (p) == T_VECTOR; 246 return type (p) == T_VECTOR;
247} 247}
248 248
249#define vecvalue(p) ((p)->object.vector.vvalue)
250#define veclength(p) ((p)->object.vector.length)
249INTERFACE void fill_vector (pointer vec, pointer obj); 251INTERFACE void fill_vector (pointer vec, pointer obj);
252INTERFACE uint32_t vector_length (pointer vec);
250INTERFACE pointer vector_elem (pointer vec, int ielem); 253INTERFACE pointer vector_elem (pointer vec, uint32_t ielem);
251INTERFACE void set_vector_elem (pointer vec, int ielem, pointer a); 254INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a);
252 255
256INTERFACE uint32_t
257vector_length (pointer vec)
258{
259 return vec->object.vector.length;
260}
261
253INTERFACE INLINE int 262INTERFACE int
254is_number (pointer p) 263is_number (pointer p)
255{ 264{
256 return type (p) == T_NUMBER; 265 return type (p) == T_NUMBER;
257} 266}
258 267
259INTERFACE INLINE int 268INTERFACE int
260is_integer (pointer p) 269is_integer (pointer p)
261{ 270{
262 if (!is_number (p)) 271 return is_number (p) && num_is_fixnum (p->object.number);
263 return 0;
264
265 if (num_is_integer (p) || ivalue (p) == rvalue (p))
266 return 1;
267
268 return 0;
269} 272}
270 273
271INTERFACE INLINE int 274INTERFACE int
272is_real (pointer p) 275is_real (pointer p)
273{ 276{
274 return is_number (p) && !num_is_fixnum (p->object.number); 277 return is_number (p) && !num_is_fixnum (p->object.number);
275} 278}
276 279
277INTERFACE INLINE int 280INTERFACE int
278is_character (pointer p) 281is_character (pointer p)
279{ 282{
280 return type (p) == T_CHARACTER; 283 return type (p) == T_CHARACTER;
281} 284}
282 285
283INTERFACE INLINE char * 286INTERFACE char *
284string_value (pointer p) 287string_value (pointer p)
285{ 288{
286 return strvalue (p); 289 return strvalue (p);
287} 290}
288 291
289INLINE num 292ecb_inline num
290nvalue (pointer p) 293nvalue (pointer p)
291{ 294{
292 return (p)->object.number; 295 return (p)->object.number;
293} 296}
294 297
295INTERFACE long 298static IVALUE
299num_get_ivalue (const num n)
300{
301 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
302}
303
304static RVALUE
305num_get_rvalue (const num n)
306{
307 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
308}
309
310INTERFACE IVALUE
296ivalue (pointer p) 311ivalue (pointer p)
297{ 312{
298 return num_is_integer (p) ? num_ivalue ((p)->object.number) : (long) num_rvalue ((p)->object.number); 313 return num_get_ivalue (p->object.number);
299} 314}
300 315
301INTERFACE RVALUE 316INTERFACE RVALUE
302rvalue (pointer p) 317rvalue (pointer p)
303{ 318{
304 return num_is_integer (p) ? (RVALUE) num_ivalue ((p)->object.number) : num_rvalue ((p)->object.number); 319 return num_get_rvalue (p->object.number);
305} 320}
306 321
307#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 322#define ivalue_unchecked(p) ((p)->object.number.value.ivalue)
308#if USE_FLOAT 323#if USE_REAL
309# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 324# define rvalue_unchecked(p) ((p)->object.number.value.rvalue)
310# define set_num_integer(p) (p)->object.number.is_fixnum=1; 325# define set_num_integer(p) (p)->object.number.is_fixnum=1;
311# define set_num_real(p) (p)->object.number.is_fixnum=0; 326# define set_num_real(p) (p)->object.number.is_fixnum=0;
312#else 327#else
313# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328# define rvalue_unchecked(p) ((p)->object.number.value.ivalue)
314# define set_num_integer(p) 0 329# define set_num_integer(p) 0
315# define set_num_real(p) 0 330# define set_num_real(p) 0
316#endif 331#endif
332
317INTERFACE long 333INTERFACE long
318charvalue (pointer p) 334charvalue (pointer p)
319{ 335{
320 return ivalue_unchecked (p); 336 return ivalue_unchecked (p);
321} 337}
322 338
323INTERFACE INLINE int 339INTERFACE int
324is_port (pointer p) 340is_port (pointer p)
325{ 341{
326 return type (p) == T_PORT; 342 return type (p) == T_PORT;
327} 343}
328 344
329INTERFACE INLINE int 345INTERFACE int
330is_inport (pointer p) 346is_inport (pointer p)
331{ 347{
332 return is_port (p) && p->object.port->kind & port_input; 348 return is_port (p) && p->object.port->kind & port_input;
333} 349}
334 350
335INTERFACE INLINE int 351INTERFACE int
336is_outport (pointer p) 352is_outport (pointer p)
337{ 353{
338 return is_port (p) && p->object.port->kind & port_output; 354 return is_port (p) && p->object.port->kind & port_output;
339} 355}
340 356
341INTERFACE INLINE int 357INTERFACE int
342is_pair (pointer p) 358is_pair (pointer p)
343{ 359{
344 return type (p) == T_PAIR; 360 return type (p) == T_PAIR;
345} 361}
346 362
347#define car(p) ((p)->object.cons.car + 0) 363#define car(p) ((p)->object.cons.car + 0)
348#define cdr(p) ((p)->object.cons.cdr) /* find_consecutive_cells uses &cdr */ 364#define cdr(p) ((p)->object.cons.cdr + 0)
349 365
350#define caar(p) car (car (p)) 366static pointer caar (pointer p) { return car (car (p)); }
351#define cadr(p) car (cdr (p)) 367static pointer cadr (pointer p) { return car (cdr (p)); }
352#define cdar(p) cdr (car (p)) 368static pointer cdar (pointer p) { return cdr (car (p)); }
353#define cddr(p) cdr (cdr (p)) 369static pointer cddr (pointer p) { return cdr (cdr (p)); }
354 370
355#define cadar(p) car (cdr (car (p))) 371static pointer cadar (pointer p) { return car (cdr (car (p))); }
356#define caddr(p) car (cdr (cdr (p))) 372static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
357#define cdaar(p) cdr (car (car (p))) 373static pointer cdaar (pointer p) { return cdr (car (car (p))); }
358 374
359INTERFACE void 375INTERFACE void
360set_car (pointer p, pointer q) 376set_car (pointer p, pointer q)
361{ 377{
362 p->object.cons.car = q; 378 p->object.cons.car = q;
… …
378pair_cdr (pointer p) 394pair_cdr (pointer p)
379{ 395{
380 return cdr (p); 396 return cdr (p);
381} 397}
382 398
383INTERFACE INLINE int 399INTERFACE int
384is_symbol (pointer p) 400is_symbol (pointer p)
385{ 401{
386 return type (p) == T_SYMBOL; 402 return type (p) == T_SYMBOL;
387} 403}
388 404
389INTERFACE INLINE char * 405INTERFACE char *
390symname (pointer p) 406symname (pointer p)
391{ 407{
392 return strvalue (car (p)); 408 return strvalue (car (p));
393} 409}
394 410
395#if USE_PLIST 411#if USE_PLIST
396SCHEME_EXPORT INLINE int 412SCHEME_EXPORT int
397hasprop (pointer p) 413hasprop (pointer p)
398{ 414{
399 return typeflag (p) & T_SYMBOL; 415 return typeflag (p) & T_SYMBOL;
400} 416}
401 417
402# define symprop(p) cdr(p) 418# define symprop(p) cdr(p)
403#endif 419#endif
404 420
405INTERFACE INLINE int 421INTERFACE int
406is_syntax (pointer p) 422is_syntax (pointer p)
407{ 423{
408 return typeflag (p) & T_SYNTAX; 424 return typeflag (p) & T_SYNTAX;
409} 425}
410 426
411INTERFACE INLINE int 427INTERFACE int
412is_proc (pointer p) 428is_proc (pointer p)
413{ 429{
414 return type (p) == T_PROC; 430 return type (p) == T_PROC;
415} 431}
416 432
417INTERFACE INLINE int 433INTERFACE int
418is_foreign (pointer p) 434is_foreign (pointer p)
419{ 435{
420 return type (p) == T_FOREIGN; 436 return type (p) == T_FOREIGN;
421} 437}
422 438
423INTERFACE INLINE char * 439INTERFACE char *
424syntaxname (pointer p) 440syntaxname (pointer p)
425{ 441{
426 return strvalue (car (p)); 442 return strvalue (car (p));
427} 443}
428 444
429#define procnum(p) ivalue(p) 445#define procnum(p) ivalue (p)
430static const char *procname (pointer x); 446static const char *procname (pointer x);
431 447
432INTERFACE INLINE int 448INTERFACE int
433is_closure (pointer p) 449is_closure (pointer p)
434{ 450{
435 return type (p) == T_CLOSURE; 451 return type (p) == T_CLOSURE;
436} 452}
437 453
438INTERFACE INLINE int 454INTERFACE int
439is_macro (pointer p) 455is_macro (pointer p)
440{ 456{
441 return type (p) == T_MACRO; 457 return type (p) == T_MACRO;
442} 458}
443 459
444INTERFACE INLINE pointer 460INTERFACE pointer
445closure_code (pointer p) 461closure_code (pointer p)
446{ 462{
447 return car (p); 463 return car (p);
448} 464}
449 465
450INTERFACE INLINE pointer 466INTERFACE pointer
451closure_env (pointer p) 467closure_env (pointer p)
452{ 468{
453 return cdr (p); 469 return cdr (p);
454} 470}
455 471
456INTERFACE INLINE int 472INTERFACE int
457is_continuation (pointer p) 473is_continuation (pointer p)
458{ 474{
459 return type (p) == T_CONTINUATION; 475 return type (p) == T_CONTINUATION;
460} 476}
461 477
462#define cont_dump(p) cdr (p) 478#define cont_dump(p) cdr (p)
463#define set_cont_dump(p,v) set_cdr ((p), (v)) 479#define set_cont_dump(p,v) set_cdr ((p), (v))
464 480
465/* To do: promise should be forced ONCE only */ 481/* To do: promise should be forced ONCE only */
466INTERFACE INLINE int 482INTERFACE int
467is_promise (pointer p) 483is_promise (pointer p)
468{ 484{
469 return type (p) == T_PROMISE; 485 return type (p) == T_PROMISE;
470} 486}
471 487
472INTERFACE INLINE int 488INTERFACE int
473is_environment (pointer p) 489is_environment (pointer p)
474{ 490{
475 return type (p) == T_ENVIRONMENT; 491 return type (p) == T_ENVIRONMENT;
476} 492}
477 493
478#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT) 494#define setenvironment(p) set_typeflag ((p), T_ENVIRONMENT)
479 495
480#define is_atom(p) (typeflag (p) & T_ATOM) 496#define is_atom(p) (typeflag (p) & T_ATOM)
481#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 497#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
482#define clratom(p) set_typeflag ((p), typeflag (p) & CLRATOM) 498#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
483 499
484#define is_mark(p) (typeflag (p) & MARK) 500#define is_mark(p) (typeflag (p) & T_MARK)
485#define setmark(p) set_typeflag ((p), typeflag (p) | MARK) 501#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
486#define clrmark(p) set_typeflag ((p), typeflag (p) & UNMARK) 502#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
487 503
488INTERFACE INLINE int 504INTERFACE int
489is_immutable (pointer p) 505is_immutable (pointer p)
490{ 506{
491 return typeflag (p) & T_IMMUTABLE; 507 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
492} 508}
493 509
494INTERFACE INLINE void 510INTERFACE void
495setimmutable (pointer p) 511setimmutable (pointer p)
496{ 512{
513#if USE_ERROR_CHECKING
497 set_typeflag (p, T_IMMUTABLE); 514 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
515#endif
498} 516}
499 517
500#if USE_CHAR_CLASSIFIERS 518#if USE_CHAR_CLASSIFIERS
501static INLINE int 519ecb_inline int
502Cisalpha (int c) 520Cisalpha (int c)
503{ 521{
504 return isascii (c) && isalpha (c); 522 return isascii (c) && isalpha (c);
505} 523}
506 524
507static INLINE int 525ecb_inline int
508Cisdigit (int c) 526Cisdigit (int c)
509{ 527{
510 return isascii (c) && isdigit (c); 528 return isascii (c) && isdigit (c);
511} 529}
512 530
513static INLINE int 531ecb_inline int
514Cisspace (int c) 532Cisspace (int c)
515{ 533{
516 return isascii (c) && isspace (c); 534 return isascii (c) && isspace (c);
517} 535}
518 536
519static INLINE int 537ecb_inline int
520Cisupper (int c) 538Cisupper (int c)
521{ 539{
522 return isascii (c) && isupper (c); 540 return isascii (c) && isupper (c);
523} 541}
524 542
525static INLINE int 543ecb_inline int
526Cislower (int c) 544Cislower (int c)
527{ 545{
528 return isascii (c) && islower (c); 546 return isascii (c) && islower (c);
529} 547}
530#endif 548#endif
… …
591#endif 609#endif
592 610
593static int file_push (SCHEME_P_ const char *fname); 611static int file_push (SCHEME_P_ const char *fname);
594static void file_pop (SCHEME_P); 612static void file_pop (SCHEME_P);
595static int file_interactive (SCHEME_P); 613static int file_interactive (SCHEME_P);
596static INLINE int is_one_of (char *s, int c); 614ecb_inline int is_one_of (char *s, int c);
597static int alloc_cellseg (SCHEME_P_ int n); 615static int alloc_cellseg (SCHEME_P_ int n);
598static long binary_decode (const char *s);
599static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b);
600static pointer xget_cell (SCHEME_P_ pointer a, pointer b); 616ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
601static pointer reserve_cells (SCHEME_P_ int n);
602static pointer get_consecutive_cells (SCHEME_P_ int n);
603static pointer find_consecutive_cells (SCHEME_P_ int n);
604static void finalize_cell (SCHEME_P_ pointer a); 617static void finalize_cell (SCHEME_P_ pointer a);
605static int count_consecutive_cells (pointer x, int needed); 618static int count_consecutive_cells (pointer x, int needed);
606static 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);
607static pointer mk_number (SCHEME_P_ num n); 620static pointer mk_number (SCHEME_P_ const num n);
608static 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);
609static pointer mk_vector (SCHEME_P_ int len); 622static pointer mk_vector (SCHEME_P_ uint32_t len);
610static pointer mk_atom (SCHEME_P_ char *q); 623static pointer mk_atom (SCHEME_P_ char *q);
611static pointer mk_sharp_const (SCHEME_P_ char *name); 624static pointer mk_sharp_const (SCHEME_P_ char *name);
612 625
613#if USE_PORTS 626#if USE_PORTS
614static pointer mk_port (SCHEME_P_ port *p); 627static pointer mk_port (SCHEME_P_ port *p);
… …
625static int basic_inchar (port *pt); 638static int basic_inchar (port *pt);
626static int inchar (SCHEME_P); 639static int inchar (SCHEME_P);
627static void backchar (SCHEME_P_ int c); 640static void backchar (SCHEME_P_ int c);
628static char *readstr_upto (SCHEME_P_ char *delim); 641static char *readstr_upto (SCHEME_P_ char *delim);
629static pointer readstrexp (SCHEME_P); 642static pointer readstrexp (SCHEME_P);
630static INLINE int skipspace (SCHEME_P); 643ecb_inline int skipspace (SCHEME_P);
631static int token (SCHEME_P); 644static int token (SCHEME_P);
632static void printslashstring (SCHEME_P_ char *s, int len); 645static void printslashstring (SCHEME_P_ char *s, int len);
633static 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);
634static void printatom (SCHEME_P_ pointer l, int f); 647static void printatom (SCHEME_P_ pointer l, int f);
635static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 648static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
639static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 652static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
640static pointer revappend (SCHEME_P_ pointer a, pointer b); 653static pointer revappend (SCHEME_P_ pointer a, pointer b);
641static pointer ss_get_cont (SCHEME_P); 654static pointer ss_get_cont (SCHEME_P);
642static void ss_set_cont (SCHEME_P_ pointer cont); 655static void ss_set_cont (SCHEME_P_ pointer cont);
643static void dump_stack_mark (SCHEME_P); 656static void dump_stack_mark (SCHEME_P);
644static 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);
645static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 659static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
646static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 660static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
647static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 661static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
648static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 662static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
649static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 663static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
650static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 664static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
651static void assign_syntax (SCHEME_P_ char *name); 665static void assign_syntax (SCHEME_P_ const char *name);
652static int syntaxnum (pointer p); 666static int syntaxnum (pointer p);
653static void assign_proc (SCHEME_P_ enum scheme_opcodes, char *name); 667static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
654 668
655static num 669static num
656num_add (num a, num b) 670num_op (enum num_op op, num a, num b)
657{ 671{
658 num ret; 672 num ret;
659 673
660 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));
661 675
662 if (num_is_fixnum (ret)) 676 if (num_is_fixnum (ret))
663 num_set_ivalue (ret, a.value.ivalue + b.value.ivalue); 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 }
664 else 691 else
665 num_set_rvalue (ret, num_rvalue (a) + num_rvalue (b)); 692 {
693 RVALUE av = num_get_rvalue (a);
694 RVALUE bv = num_get_rvalue (b);
666 695
667 return ret; 696 switch (op)
668} 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 }
669 703
670static num 704 num_set_rvalue (ret, av);
671num_mul (num a, num b) 705 }
672{
673 num ret;
674
675 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
676
677 if (num_is_fixnum (ret))
678 num_set_ivalue (ret, a.value.ivalue * b.value.ivalue);
679 else
680 num_set_rvalue (ret, num_rvalue (a) * num_rvalue (b));
681 706
682 return ret; 707 return ret;
683} 708}
684 709
685static num 710static num
686num_div (num a, num b) 711num_div (num a, num b)
687{ 712{
688 num ret; 713 num ret;
689 714
690 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && a.value.ivalue % b.value.ivalue == 0); 715 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0);
691 716
692 if (num_is_fixnum (ret)) 717 if (num_is_fixnum (ret))
693 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue); 718 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b));
694 else 719 else
695 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b)); 720 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b));
696
697 return ret;
698}
699
700static num
701num_intdiv (num a, num b)
702{
703 num ret;
704
705 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
706
707 if (num_is_fixnum (ret))
708 num_set_ivalue (ret, a.value.ivalue / b.value.ivalue);
709 else
710 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
711
712 return ret;
713}
714
715static num
716num_sub (num a, num b)
717{
718 num ret;
719
720 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
721
722 if (num_is_fixnum (ret))
723 num_set_ivalue (ret, a.value.ivalue - b.value.ivalue);
724 else
725 num_set_rvalue (ret, num_rvalue (a) - num_rvalue (b));
726 721
727 return ret; 722 return ret;
728} 723}
729 724
730static num 725static num
… …
732{ 727{
733 num ret; 728 num ret;
734 long e1, e2, res; 729 long e1, e2, res;
735 730
736 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 731 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
737 e1 = num_ivalue (a); 732 e1 = num_get_ivalue (a);
738 e2 = num_ivalue (b); 733 e2 = num_get_ivalue (b);
739 res = e1 % e2; 734 res = e1 % e2;
740 735
741 /* remainder should have same sign as second operand */ 736 /* remainder should have same sign as second operand */
742 if (res > 0) 737 if (res > 0)
743 { 738 {
… …
759{ 754{
760 num ret; 755 num ret;
761 long e1, e2, res; 756 long e1, e2, res;
762 757
763 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 758 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
764 e1 = num_ivalue (a); 759 e1 = num_get_ivalue (a);
765 e2 = num_ivalue (b); 760 e2 = num_get_ivalue (b);
766 res = e1 % e2; 761 res = e1 % e2;
767 762
768 /* modulo should have same sign as second operand */ 763 /* modulo should have same sign as second operand */
769 if (res * e2 < 0) 764 if (res * e2 < 0)
770 res += e2; 765 res += e2;
771 766
772 num_set_ivalue (ret, res); 767 num_set_ivalue (ret, res);
773 return ret; 768 return ret;
774} 769}
775 770
771/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
776static int 772static int
777num_eq (num a, num b) 773num_cmp (num a, num b)
778{ 774{
775 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
779 int ret; 776 int ret;
780 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
781 777
782 if (is_fixnum) 778 if (is_fixnum)
783 ret = a.value.ivalue == b.value.ivalue; 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 }
784 else 785 else
785 ret = num_rvalue (a) == num_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 }
786 792
787 return ret; 793 return ret;
788}
789
790
791static int
792num_gt (num a, num b)
793{
794 int ret;
795 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
796
797 if (is_fixnum)
798 ret = a.value.ivalue > b.value.ivalue;
799 else
800 ret = num_rvalue (a) > num_rvalue (b);
801
802 return ret;
803}
804
805static int
806num_ge (num a, num b)
807{
808 return !num_lt (a, b);
809}
810
811static int
812num_lt (num a, num b)
813{
814 int ret;
815 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
816
817 if (is_fixnum)
818 ret = a.value.ivalue < b.value.ivalue;
819 else
820 ret = num_rvalue (a) < num_rvalue (b);
821
822 return ret;
823}
824
825static int
826num_le (num a, num b)
827{
828 return !num_gt (a, b);
829} 794}
830 795
831#if USE_MATH 796#if USE_MATH
832 797
833/* Round to nearest. Round to even if midway */ 798/* Round to nearest. Round to even if midway */
… …
843 return ce; 808 return ce;
844 else if (dfl < dce) 809 else if (dfl < dce)
845 return fl; 810 return fl;
846 else 811 else
847 { 812 {
848 if (fmod (fl, 2.0) == 0.0) /* I imagine this holds */ 813 if (fmod (fl, 2) == 0) /* I imagine this holds */
849 return fl; 814 return fl;
850 else 815 else
851 return ce; 816 return ce;
852 } 817 }
853} 818}
854#endif 819#endif
855 820
856static int 821static int
857is_zero_rvalue (RVALUE x) 822is_zero_rvalue (RVALUE x)
858{ 823{
859#if USE_FLOAT 824 return x == 0;
825#if 0
826#if USE_REAL
860 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. */
861#else 828#else
862 return x == 0; 829 return x == 0;
863#endif 830#endif
864} 831#endif
865
866static long
867binary_decode (const char *s)
868{
869 long x = 0;
870
871 while (*s != 0 && (*s == '1' || *s == '0'))
872 {
873 x <<= 1;
874 x += *s - '0';
875 s++;
876 }
877
878 return x;
879} 832}
880 833
881/* allocate new cell segment */ 834/* allocate new cell segment */
882static int 835static int
883alloc_cellseg (SCHEME_P_ int n) 836alloc_cellseg (SCHEME_P_ int n)
… …
927 SCHEME_V->fcells += segsize; 880 SCHEME_V->fcells += segsize;
928 last = newp + segsize - 1; 881 last = newp + segsize - 1;
929 882
930 for (p = newp; p <= last; p++) 883 for (p = newp; p <= last; p++)
931 { 884 {
932 set_typeflag (p, 0); 885 set_typeflag (p, T_FREE);
886 set_car (p, NIL);
933 set_cdr (p, p + 1); 887 set_cdr (p, p + 1);
934 set_car (p, NIL);
935 } 888 }
936 889
937 /* insert new cells in address order on free list */ 890 /* insert new cells in address order on free list */
938 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell) 891 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
939 { 892 {
… …
953 } 906 }
954 907
955 return n; 908 return n;
956} 909}
957 910
958/* get new cell. parameter a, b is marked by gc. */ 911/* get new cell. parameter a, b is marked by gc. */
959static INLINE pointer 912ecb_inline pointer
960get_cell_x (SCHEME_P_ pointer a, pointer b) 913get_cell_x (SCHEME_P_ pointer a, pointer b)
961{ 914{
962 if (SCHEME_V->free_cell == NIL) 915 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
963 { 916 {
964 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 917 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
965 return S_SINK; 918 return S_SINK;
966 919
967 if (SCHEME_V->free_cell == NIL) 920 if (SCHEME_V->free_cell == NIL)
… …
991 --SCHEME_V->fcells; 944 --SCHEME_V->fcells;
992 return x; 945 return x;
993 } 946 }
994} 947}
995 948
996/* make sure that there is a given number of cells free */
997static pointer
998reserve_cells (SCHEME_P_ int n)
999{
1000 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1001 return NIL;
1002
1003 /* Are there enough cells available? */
1004 if (SCHEME_V->fcells < n)
1005 {
1006 /* If not, try gc'ing some */
1007 gc (SCHEME_A_ NIL, NIL);
1008
1009 if (SCHEME_V->fcells < n)
1010 {
1011 /* If there still aren't, try getting more heap */
1012 if (!alloc_cellseg (SCHEME_A_ 1) && USE_ERROR_CHECKING)
1013 {
1014 SCHEME_V->no_memory = 1;
1015 return NIL;
1016 }
1017 }
1018
1019 if (SCHEME_V->fcells < n && USE_ERROR_CHECKING)
1020 {
1021 /* If all fail, report failure */
1022 SCHEME_V->no_memory = 1;
1023 return NIL;
1024 }
1025 }
1026
1027 return S_T;
1028}
1029
1030static pointer
1031get_consecutive_cells (SCHEME_P_ int n)
1032{
1033 pointer x;
1034
1035 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
1036 return S_SINK;
1037
1038 /* Are there any cells available? */
1039 x = find_consecutive_cells (SCHEME_A_ n);
1040
1041 if (x != NIL)
1042 return x;
1043
1044 /* If not, try gc'ing some */
1045 gc (SCHEME_A_ NIL, NIL);
1046
1047 for (;;)
1048 {
1049 x = find_consecutive_cells (SCHEME_A_ n);
1050
1051 if (x != NIL)
1052 return x;
1053
1054 /* If there still aren't, try getting more heap */
1055 if (!alloc_cellseg (SCHEME_A_ 1))
1056 {
1057#if USE_ERROR_CHECKING
1058 SCHEME_V->no_memory = 1;
1059 return S_SINK;
1060#endif
1061 }
1062 }
1063}
1064
1065static int
1066count_consecutive_cells (pointer x, int needed)
1067{
1068 int n = 1;
1069
1070 while (cdr (x) == x + 1)
1071 {
1072 x = cdr (x);
1073 n++;
1074
1075 if (n > needed)
1076 return n;
1077 }
1078
1079 return n;
1080}
1081
1082static pointer
1083find_consecutive_cells (SCHEME_P_ int n)
1084{
1085 pointer *pp;
1086 int cnt;
1087
1088 pp = &SCHEME_V->free_cell;
1089
1090 while (*pp != NIL)
1091 {
1092 cnt = count_consecutive_cells (*pp, n);
1093
1094 if (cnt >= n)
1095 {
1096 pointer x = *pp;
1097
1098 *pp = cdr (*pp + n - 1);
1099 SCHEME_V->fcells -= n;
1100 return x;
1101 }
1102
1103 pp = &cdr (*pp + cnt - 1);
1104 }
1105
1106 return NIL;
1107}
1108
1109/* To retain recent allocs before interpreter knows about them - 949/* To retain recent allocs before interpreter knows about them -
1110 Tehom */ 950 Tehom */
1111 951
1112static void 952static void
1113push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 953push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1114{ 954{
1115 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 955 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1116 956
1117 set_typeflag (holder, T_PAIR | T_IMMUTABLE); 957 set_typeflag (holder, T_PAIR);
958 setimmutable (holder);
1118 set_car (holder, recent); 959 set_car (holder, recent);
1119 set_cdr (holder, car (S_SINK)); 960 set_cdr (holder, car (S_SINK));
1120 set_car (S_SINK, holder); 961 set_car (S_SINK, holder);
1121} 962}
1122 963
… …
1135 976
1136 return cell; 977 return cell;
1137} 978}
1138 979
1139static pointer 980static pointer
1140get_vector_object (SCHEME_P_ int len, pointer init) 981get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1141{ 982{
1142 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));
1143 985
1144#if USE_ERROR_CHECKING 986 if (!e && USE_ERROR_CHECKING)
1145 if (SCHEME_V->no_memory)
1146 return S_SINK; 987 return S_SINK;
1147#endif
1148 988
1149 /* Record it as a vector so that gc understands it. */ 989 /* Record it as a vector so that gc understands it. */
1150 set_typeflag (cells, T_VECTOR | T_ATOM); 990 set_typeflag (v, T_VECTOR | T_ATOM);
1151 ivalue_unchecked (cells) = len; 991
1152 set_num_integer (cells); 992 v->object.vector.vvalue = e;
993 v->object.vector.length = len;
1153 fill_vector (cells, init); 994 fill_vector (v, init);
1154 push_recent_alloc (SCHEME_A_ cells, NIL); 995 push_recent_alloc (SCHEME_A_ v, NIL);
1155 996
1156 return cells; 997 return v;
1157} 998}
1158 999
1159static INLINE void 1000ecb_inline void
1160ok_to_freely_gc (SCHEME_P) 1001ok_to_freely_gc (SCHEME_P)
1161{ 1002{
1162 set_car (S_SINK, NIL); 1003 set_car (S_SINK, NIL);
1163} 1004}
1164 1005
1165#if defined TSGRIND 1006#if defined TSGRIND
1166static void 1007static void
1167check_cell_alloced (pointer p, int expect_alloced) 1008check_cell_alloced (pointer p, int expect_alloced)
1168{ 1009{
1169 /* Can't use putstr(SCHEME_A_ str) because callers have no access to 1010 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1170 sc. */
1171 if (typeflag (p) & !expect_alloced) 1011 if (typeflag (p) & !expect_alloced)
1172 xwrstr ("Cell is already allocated!\n"); 1012 xwrstr ("Cell is already allocated!\n");
1173 1013
1174 if (!(typeflag (p)) & expect_alloced) 1014 if (!(typeflag (p)) & expect_alloced)
1175 xwrstr ("Cell is not allocated!\n"); 1015 xwrstr ("Cell is not allocated!\n");
… …
1198 if (immutable) 1038 if (immutable)
1199 setimmutable (x); 1039 setimmutable (x);
1200 1040
1201 set_car (x, a); 1041 set_car (x, a);
1202 set_cdr (x, b); 1042 set_cdr (x, b);
1043
1203 return x; 1044 return x;
1204} 1045}
1205 1046
1206/* ========== oblist implementation ========== */ 1047/* ========== oblist implementation ========== */
1207 1048
… …
1217 1058
1218/* returns the new symbol */ 1059/* returns the new symbol */
1219static pointer 1060static pointer
1220oblist_add_by_name (SCHEME_P_ const char *name) 1061oblist_add_by_name (SCHEME_P_ const char *name)
1221{ 1062{
1222 pointer x;
1223 int location; 1063 int location;
1224 1064
1225 x = immutable_cons (mk_string (SCHEME_A_ name), NIL); 1065 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1226 set_typeflag (x, T_SYMBOL); 1066 set_typeflag (x, T_SYMBOL);
1227 setimmutable (car (x)); 1067 setimmutable (car (x));
1228 1068
1229 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1069 location = hash_fn (name, veclength (SCHEME_V->oblist));
1230 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)));
1231 return x; 1071 return x;
1232} 1072}
1233 1073
1234static INLINE pointer 1074ecb_inline pointer
1235oblist_find_by_name (SCHEME_P_ const char *name) 1075oblist_find_by_name (SCHEME_P_ const char *name)
1236{ 1076{
1237 int location; 1077 int location;
1238 pointer x; 1078 pointer x;
1239 char *s; 1079 char *s;
1240 1080
1241 location = hash_fn (name, ivalue_unchecked (SCHEME_V->oblist)); 1081 location = hash_fn (name, veclength (SCHEME_V->oblist));
1242 1082
1243 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))
1244 { 1084 {
1245 s = symname (car (x)); 1085 s = symname (car (x));
1246 1086
… …
1257{ 1097{
1258 int i; 1098 int i;
1259 pointer x; 1099 pointer x;
1260 pointer ob_list = NIL; 1100 pointer ob_list = NIL;
1261 1101
1262 for (i = 0; i < ivalue_unchecked (SCHEME_V->oblist); i++) 1102 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1263 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))
1264 ob_list = cons (x, ob_list); 1104 ob_list = cons (x, ob_list);
1265 1105
1266 return ob_list; 1106 return ob_list;
1267} 1107}
… …
1272oblist_initial_value (SCHEME_P) 1112oblist_initial_value (SCHEME_P)
1273{ 1113{
1274 return NIL; 1114 return NIL;
1275} 1115}
1276 1116
1277static INLINE pointer 1117ecb_inline pointer
1278oblist_find_by_name (SCHEME_P_ const char *name) 1118oblist_find_by_name (SCHEME_P_ const char *name)
1279{ 1119{
1280 pointer x; 1120 pointer x;
1281 char *s; 1121 char *s;
1282 1122
… …
1341mk_character (SCHEME_P_ int c) 1181mk_character (SCHEME_P_ int c)
1342{ 1182{
1343 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1183 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1344 1184
1345 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1185 set_typeflag (x, (T_CHARACTER | T_ATOM));
1346 ivalue_unchecked (x) = c; 1186 ivalue_unchecked (x) = c & 0xff;
1347 set_num_integer (x); 1187 set_num_integer (x);
1348 return x; 1188 return x;
1349} 1189}
1350 1190
1351/* get number atom (integer) */ 1191/* get number atom (integer) */
… …
1370 set_num_real (x); 1210 set_num_real (x);
1371 return x; 1211 return x;
1372} 1212}
1373 1213
1374static pointer 1214static pointer
1375mk_number (SCHEME_P_ num n) 1215mk_number (SCHEME_P_ const num n)
1376{ 1216{
1377 if (num_is_fixnum (n)) 1217 if (num_is_fixnum (n))
1378 {
1379 return mk_integer (SCHEME_A_ num_ivalue (n)); 1218 return mk_integer (SCHEME_A_ num_get_ivalue (n));
1380 }
1381 else 1219 else
1382 {
1383 return mk_real (SCHEME_A_ num_rvalue (n)); 1220 return mk_real (SCHEME_A_ num_get_rvalue (n));
1384 }
1385} 1221}
1386 1222
1387/* allocate name to string area */ 1223/* allocate name to string area */
1388static char * 1224static char *
1389store_string (SCHEME_P_ int len_str, const char *str, char fill) 1225store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
1390{ 1226{
1391 char *q;
1392
1393 q = (char *)malloc (len_str + 1); 1227 char *q = malloc (len_str + 1);
1394 1228
1395 if (q == 0) 1229 if (q == 0 && USE_ERROR_CHECKING)
1396 { 1230 {
1397#if USE_ERROR_CHECKING
1398 SCHEME_V->no_memory = 1; 1231 SCHEME_V->no_memory = 1;
1399 return SCHEME_V->strbuff; 1232 return SCHEME_V->strbuff;
1400#endif
1401 } 1233 }
1402 1234
1403 if (str) 1235 if (str)
1404 { 1236 {
1405 int l = strlen (str); 1237 int l = strlen (str);
1406 1238
1407 if (l > len_str) 1239 if (l > len_str)
1408 l = len_str; 1240 l = len_str;
1409 1241
1410 memcpy (q, str, l + 1); 1242 memcpy (q, str, l);
1411 q[l + 1] = 0; 1243 q[l] = 0;
1412 } 1244 }
1413 else 1245 else
1414 { 1246 {
1415 memset (q, fill, len_str); 1247 memset (q, fill, len_str);
1416 q[len_str] = 0; 1248 q[len_str] = 0;
1417 } 1249 }
1418 1250
1419 return q; 1251 return q;
1420} 1252}
1421 1253
1422/* get new string */
1423INTERFACE pointer 1254INTERFACE pointer
1424mk_string (SCHEME_P_ const char *str) 1255mk_empty_string (SCHEME_P_ uint32_t len, char fill)
1425{ 1256{
1426 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;
1427} 1263}
1428 1264
1429INTERFACE pointer 1265INTERFACE pointer
1430mk_counted_string (SCHEME_P_ const char *str, int len) 1266mk_counted_string (SCHEME_P_ const char *str, uint32_t len)
1431{ 1267{
1432 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1433 1269
1434 set_typeflag (x, T_STRING | T_ATOM); 1270 set_typeflag (x, T_STRING | T_ATOM);
1435 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1271 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1436 strlength (x) = len; 1272 strlength (x) = len;
1437 return x; 1273 return x;
1438} 1274}
1439 1275
1440INTERFACE pointer 1276INTERFACE pointer
1441mk_empty_string (SCHEME_P_ int len, char fill) 1277mk_string (SCHEME_P_ const char *str)
1442{ 1278{
1443 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1279 return mk_counted_string (SCHEME_A_ str, strlen (str));
1444
1445 set_typeflag (x, T_STRING | T_ATOM);
1446 strvalue (x) = store_string (SCHEME_A_ len, 0, fill);
1447 strlength (x) = len;
1448 return x;
1449} 1280}
1450 1281
1451INTERFACE pointer 1282INTERFACE pointer
1452mk_vector (SCHEME_P_ int len) 1283mk_vector (SCHEME_P_ uint32_t len)
1453{ 1284{
1454 return get_vector_object (SCHEME_A_ len, NIL); 1285 return get_vector_object (SCHEME_A_ len, NIL);
1455} 1286}
1456 1287
1457INTERFACE void 1288INTERFACE void
1458fill_vector (pointer vec, pointer obj) 1289fill_vector (pointer vec, pointer obj)
1459{ 1290{
1460 int i; 1291 int i;
1461 int num = ivalue (vec) / 2 + ivalue (vec) % 2;
1462 1292
1463 for (i = 0; i < num; i++) 1293 for (i = 0; i < vec->object.vector.length; i++)
1464 { 1294 vecvalue (vec)[i] = obj;
1465 set_typeflag (vec + 1 + i, T_PAIR);
1466 setimmutable (vec + 1 + i);
1467 set_car (vec + 1 + i, obj);
1468 set_cdr (vec + 1 + i, obj);
1469 }
1470} 1295}
1471 1296
1472INTERFACE pointer 1297INTERFACE pointer
1473vector_elem (pointer vec, int ielem) 1298vector_elem (pointer vec, uint32_t ielem)
1474{ 1299{
1475 int n = ielem / 2; 1300 return vecvalue(vec)[ielem];
1476
1477 if (ielem % 2 == 0)
1478 return car (vec + 1 + n);
1479 else
1480 return cdr (vec + 1 + n);
1481} 1301}
1482 1302
1483INTERFACE void 1303INTERFACE void
1484set_vector_elem (pointer vec, int ielem, pointer a) 1304set_vector_elem (pointer vec, uint32_t ielem, pointer a)
1485{ 1305{
1486 int n = ielem / 2; 1306 vecvalue(vec)[ielem] = a;
1487
1488 if (ielem % 2 == 0)
1489 set_car (vec + 1 + n, a);
1490 else
1491 set_cdr (vec + 1 + n, a);
1492} 1307}
1493 1308
1494/* get new symbol */ 1309/* get new symbol */
1495INTERFACE pointer 1310INTERFACE pointer
1496mk_symbol (SCHEME_P_ const char *name) 1311mk_symbol (SCHEME_P_ const char *name)
1497{ 1312{
1498 pointer x;
1499
1500 /* first check oblist */ 1313 /* first check oblist */
1501 x = oblist_find_by_name (SCHEME_A_ name); 1314 pointer x = oblist_find_by_name (SCHEME_A_ name);
1502 1315
1503 if (x != NIL) 1316 if (x == NIL)
1504 return x;
1505 else
1506 {
1507 x = oblist_add_by_name (SCHEME_A_ name); 1317 x = oblist_add_by_name (SCHEME_A_ name);
1318
1508 return x; 1319 return x;
1509 }
1510} 1320}
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
… …
1567 has_dec_point = 1; 1372 has_dec_point = 1;
1568 c = *p++; 1373 c = *p++;
1569 } 1374 }
1570 1375
1571 if (!isdigit (c)) 1376 if (!isdigit (c))
1572 {
1573 return mk_symbol (SCHEME_A_ strlwr (q)); 1377 return mk_symbol (SCHEME_A_ strlwr (q));
1574 }
1575 } 1378 }
1576 else if (c == '.') 1379 else if (c == '.')
1577 { 1380 {
1578 has_dec_point = 1; 1381 has_dec_point = 1;
1579 c = *p++; 1382 c = *p++;
1580 1383
1581 if (!isdigit (c)) 1384 if (!isdigit (c))
1582 {
1583 return mk_symbol (SCHEME_A_ strlwr (q)); 1385 return mk_symbol (SCHEME_A_ strlwr (q));
1584 }
1585 } 1386 }
1586 else if (!isdigit (c)) 1387 else if (!isdigit (c))
1587 {
1588 return mk_symbol (SCHEME_A_ strlwr (q)); 1388 return mk_symbol (SCHEME_A_ strlwr (q));
1589 }
1590 1389
1591 for (; (c = *p) != 0; ++p) 1390 for (; (c = *p) != 0; ++p)
1592 { 1391 {
1593 if (!isdigit (c)) 1392 if (!isdigit (c))
1594 { 1393 {
… …
1607 has_dec_point = 1; /* decimal point illegal 1406 has_dec_point = 1; /* decimal point illegal
1608 from now on */ 1407 from now on */
1609 p++; 1408 p++;
1610 1409
1611 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1410 if ((*p == '-') || (*p == '+') || isdigit (*p))
1612 {
1613 continue; 1411 continue;
1614 }
1615 } 1412 }
1616 } 1413 }
1617 1414
1618 return mk_symbol (SCHEME_A_ strlwr (q)); 1415 return mk_symbol (SCHEME_A_ strlwr (q));
1619 } 1416 }
1620 } 1417 }
1621 1418
1622#if USE_FLOAT 1419#if USE_REAL
1623 if (has_dec_point) 1420 if (has_dec_point)
1624 return mk_real (SCHEME_A_ atof (q)); 1421 return mk_real (SCHEME_A_ atof (q));
1625#endif 1422#endif
1626 1423
1627 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1424 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
… …
1629 1426
1630/* make constant */ 1427/* make constant */
1631static pointer 1428static pointer
1632mk_sharp_const (SCHEME_P_ char *name) 1429mk_sharp_const (SCHEME_P_ char *name)
1633{ 1430{
1634 long x;
1635 char tmp[STRBUFFSIZE];
1636
1637 if (!strcmp (name, "t")) 1431 if (!strcmp (name, "t"))
1638 return S_T; 1432 return S_T;
1639 else if (!strcmp (name, "f")) 1433 else if (!strcmp (name, "f"))
1640 return S_F; 1434 return S_F;
1641 else if (*name == 'o') /* #o (octal) */
1642 {
1643 x = strtol (name + 1, 0, 8);
1644 return mk_integer (SCHEME_A_ x);
1645 }
1646 else if (*name == 'd') /* #d (decimal) */
1647 {
1648 x = strtol (name + 1, 0, 10);
1649 return mk_integer (SCHEME_A_ x);
1650 }
1651 else if (*name == 'x') /* #x (hex) */
1652 {
1653 x = strtol (name + 1, 0, 16);
1654 return mk_integer (SCHEME_A_ x);
1655 }
1656 else if (*name == 'b') /* #b (binary) */
1657 {
1658 x = binary_decode (name + 1);
1659 return mk_integer (SCHEME_A_ x);
1660 }
1661 else if (*name == '\\') /* #\w (character) */ 1435 else if (*name == '\\') /* #\w (character) */
1662 { 1436 {
1663 int c = 0; 1437 int c;
1664 1438
1665 if (stricmp (name + 1, "space") == 0) 1439 if (stricmp (name + 1, "space") == 0)
1666 c = ' '; 1440 c = ' ';
1667 else if (stricmp (name + 1, "newline") == 0) 1441 else if (stricmp (name + 1, "newline") == 0)
1668 c = '\n'; 1442 c = '\n';
… …
1670 c = '\r'; 1444 c = '\r';
1671 else if (stricmp (name + 1, "tab") == 0) 1445 else if (stricmp (name + 1, "tab") == 0)
1672 c = '\t'; 1446 c = '\t';
1673 else if (name[1] == 'x' && name[2] != 0) 1447 else if (name[1] == 'x' && name[2] != 0)
1674 { 1448 {
1675 int c1 = strtol (name + 2, 0, 16); 1449 long c1 = strtol (name + 2, 0, 16);
1676 1450
1677 if (c1 <= UCHAR_MAX) 1451 if (0 <= c1 && c1 <= UCHAR_MAX)
1678 c = c1; 1452 c = c1;
1679 else 1453 else
1680 return NIL; 1454 return NIL;
1681 1455 }
1682#if USE_ASCII_NAMES 1456#if USE_ASCII_NAMES
1683 }
1684 else if (is_ascii_name (name + 1, &c)) 1457 else if (is_ascii_name (name + 1, &c))
1685 {
1686 /* nothing */ 1458 /* nothing */;
1687#endif 1459#endif
1688 }
1689 else if (name[2] == 0) 1460 else if (name[2] == 0)
1690 c = name[1]; 1461 c = name[1];
1691 else 1462 else
1692 return NIL; 1463 return NIL;
1693 1464
1694 return mk_character (SCHEME_A_ c); 1465 return mk_character (SCHEME_A_ c);
1695 } 1466 }
1696 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
1697 return NIL; 1476 return NIL;
1477 }
1698} 1478}
1699 1479
1700/* ========== garbage collector ========== */ 1480/* ========== garbage collector ========== */
1701 1481
1702/*-- 1482/*--
1703 * 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,
1704 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1484 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1705 * 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
1706 */ 1490 */
1707static void 1491static void
1708mark (pointer a) 1492mark (pointer a)
1709{ 1493{
1710 pointer t, q, p; 1494 pointer t, q, p;
1711 1495
1712 t = (pointer) 0; 1496 t = 0;
1713 p = a; 1497 p = a;
1714E2: 1498E2:
1715 setmark (p); 1499 setmark (p);
1716 printf ("mark %p %x\n", p, p->flag);//D
1717 1500
1718 if (is_vector (p)) 1501 if (ecb_expect_false (is_vector (p)))
1719 { 1502 {
1720 int i; 1503 int i;
1721 int num = ivalue_unchecked (p) / 2 + ivalue_unchecked (p) % 2;
1722 1504
1723 for (i = 0; i < num; i++) 1505 for (i = 0; i < p->object.vector.length; i++)
1724 { 1506 mark (vecvalue (p)[i]);
1725 /* Vector cells will be treated like ordinary cells */
1726 mark (p + 1 + i);
1727 }
1728 } 1507 }
1729 1508
1730 if (is_atom (p)) 1509 if (is_atom (p))
1731 goto E6; 1510 goto E6;
1732 1511
… …
1742 goto E2; 1521 goto E2;
1743 } 1522 }
1744 1523
1745E5: 1524E5:
1746 q = cdr (p); /* down cdr */ 1525 q = cdr (p); /* down cdr */
1747 printf ("mark+ %p\n", q, q->flag);//D
1748 1526
1749 if (q && !is_mark (q)) 1527 if (q && !is_mark (q))
1750 { 1528 {
1751 set_cdr (p, t); 1529 set_cdr (p, t);
1752 t = p; 1530 t = p;
1753 p = q; 1531 p = q;
1754 goto E2; 1532 goto E2;
1755 } 1533 }
1756 1534
1757E6: /* up. Undo the link switching from steps E4 and E5. */ 1535E6: /* up. Undo the link switching from steps E4 and E5. */
1758
1759 if (!t) 1536 if (!t)
1760 return; 1537 return;
1761 1538
1762 q = t; 1539 q = t;
1763 1540
… …
1831 if (is_mark (p)) 1608 if (is_mark (p))
1832 clrmark (p); 1609 clrmark (p);
1833 else 1610 else
1834 { 1611 {
1835 /* reclaim cell */ 1612 /* reclaim cell */
1836 if (typeflag (p) != 0) 1613 if (typeflag (p) != T_FREE)
1837 { 1614 {
1838 finalize_cell (SCHEME_A_ p); 1615 finalize_cell (SCHEME_A_ p);
1839 set_typeflag (p, 0); 1616 set_typeflag (p, T_FREE);
1840 set_car (p, NIL); 1617 set_car (p, NIL);
1841 } 1618 }
1842 1619
1843 ++SCHEME_V->fcells; 1620 ++SCHEME_V->fcells;
1844 set_cdr (p, SCHEME_V->free_cell); 1621 set_cdr (p, SCHEME_V->free_cell);
… …
1852} 1629}
1853 1630
1854static void 1631static void
1855finalize_cell (SCHEME_P_ pointer a) 1632finalize_cell (SCHEME_P_ pointer a)
1856{ 1633{
1634 /* TODO, fast bitmap check? */
1857 if (is_string (a)) 1635 if (is_string (a))
1858 free (strvalue (a)); 1636 free (strvalue (a));
1637 else if (is_vector (a))
1638 free (vecvalue (a));
1859#if USE_PORTS 1639#if USE_PORTS
1860 else if (is_port (a)) 1640 else if (is_port (a))
1861 { 1641 {
1862 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)
1863 port_close (SCHEME_A_ a, port_input | port_output); 1643 port_close (SCHEME_A_ a, port_input | port_output);
… …
2289 char *p = SCHEME_V->strbuff; 2069 char *p = SCHEME_V->strbuff;
2290 2070
2291 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2071 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2292 2072
2293 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2073 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2294 {
2295 *p = 0; 2074 *p = 0;
2296 }
2297 else 2075 else
2298 { 2076 {
2299 backchar (SCHEME_A_ p[-1]); 2077 backchar (SCHEME_A_ p[-1]);
2300 *--p = '\0'; 2078 *--p = '\0';
2301 } 2079 }
… …
2316 for (;;) 2094 for (;;)
2317 { 2095 {
2318 c = inchar (SCHEME_A); 2096 c = inchar (SCHEME_A);
2319 2097
2320 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1) 2098 if (c == EOF || p - SCHEME_V->strbuff > sizeof (SCHEME_V->strbuff) - 1)
2321 {
2322 return S_F; 2099 return S_F;
2323 }
2324 2100
2325 switch (state) 2101 switch (state)
2326 { 2102 {
2327 case st_ok: 2103 case st_ok:
2328 switch (c) 2104 switch (c)
… …
2396 c = toupper (c); 2172 c = toupper (c);
2397 2173
2398 if (c >= '0' && c <= 'F') 2174 if (c >= '0' && c <= 'F')
2399 { 2175 {
2400 if (c <= '9') 2176 if (c <= '9')
2401 {
2402 c1 = (c1 << 4) + c - '0'; 2177 c1 = (c1 << 4) + c - '0';
2403 }
2404 else 2178 else
2405 {
2406 c1 = (c1 << 4) + c - 'A' + 10; 2179 c1 = (c1 << 4) + c - 'A' + 10;
2407 }
2408 2180
2409 if (state == st_x1) 2181 if (state == st_x1)
2410 {
2411 state = st_x2; 2182 state = st_x2;
2412 }
2413 else 2183 else
2414 { 2184 {
2415 *p++ = c1; 2185 *p++ = c1;
2416 state = st_ok; 2186 state = st_ok;
2417 } 2187 }
2418 } 2188 }
2419 else 2189 else
2420 {
2421 return S_F; 2190 return S_F;
2422 }
2423 2191
2424 break; 2192 break;
2425 2193
2426 case st_oct1: 2194 case st_oct1:
2427 case st_oct2: 2195 case st_oct2:
… …
2452 } 2220 }
2453 } 2221 }
2454} 2222}
2455 2223
2456/* check c is in chars */ 2224/* check c is in chars */
2457static INLINE int 2225ecb_inline int
2458is_one_of (char *s, int c) 2226is_one_of (char *s, int c)
2459{ 2227{
2460 if (c == EOF) 2228 if (c == EOF)
2461 return 1; 2229 return 1;
2462 2230
2463 while (*s) 2231 return !!strchr (s, c);
2464 if (*s++ == c)
2465 return 1;
2466
2467 return 0;
2468} 2232}
2469 2233
2470/* skip white characters */ 2234/* skip white characters */
2471static INLINE int 2235ecb_inline int
2472skipspace (SCHEME_P) 2236skipspace (SCHEME_P)
2473{ 2237{
2474 int c, curr_line = 0; 2238 int c, curr_line = 0;
2475 2239
2476 do 2240 do
2477 { 2241 {
2478 c = inchar (SCHEME_A); 2242 c = inchar (SCHEME_A);
2479#if SHOW_ERROR_LINE 2243#if SHOW_ERROR_LINE
2480 if (c == '\n') 2244 if (c == '\n')
2481 curr_line++; 2245 curr_line++;
2482
2483#endif 2246#endif
2484 } 2247 }
2485 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2248 while (c == ' ' || c == '\n' || c == '\r' || c == '\t');
2486 2249
2487 /* record it */ 2250 /* record it */
… …
2524 2287
2525 if (is_one_of (" \n\t", c)) 2288 if (is_one_of (" \n\t", c))
2526 return TOK_DOT; 2289 return TOK_DOT;
2527 else 2290 else
2528 { 2291 {
2292 //TODO: ungetc twice in a row is not supported in C
2529 backchar (SCHEME_A_ c); 2293 backchar (SCHEME_A_ c);
2530 backchar (SCHEME_A_ '.'); 2294 backchar (SCHEME_A_ '.');
2531 return TOK_ATOM; 2295 return TOK_ATOM;
2532 } 2296 }
2533 2297
… …
2647 int d = *s / 16; 2411 int d = *s / 16;
2648 2412
2649 putcharacter (SCHEME_A_ 'x'); 2413 putcharacter (SCHEME_A_ 'x');
2650 2414
2651 if (d < 10) 2415 if (d < 10)
2652 {
2653 putcharacter (SCHEME_A_ d + '0'); 2416 putcharacter (SCHEME_A_ d + '0');
2654 }
2655 else 2417 else
2656 {
2657 putcharacter (SCHEME_A_ d - 10 + 'A'); 2418 putcharacter (SCHEME_A_ d - 10 + 'A');
2658 }
2659 2419
2660 d = *s % 16; 2420 d = *s % 16;
2661 2421
2662 if (d < 10) 2422 if (d < 10)
2663 {
2664 putcharacter (SCHEME_A_ d + '0'); 2423 putcharacter (SCHEME_A_ d + '0');
2665 }
2666 else 2424 else
2667 {
2668 putcharacter (SCHEME_A_ d - 10 + 'A'); 2425 putcharacter (SCHEME_A_ d - 10 + 'A');
2669 }
2670 } 2426 }
2671 } 2427 }
2672 } 2428 }
2673 else 2429 else
2674 {
2675 putcharacter (SCHEME_A_ * s); 2430 putcharacter (SCHEME_A_ * s);
2676 }
2677 2431
2678 s++; 2432 s++;
2679 } 2433 }
2680 2434
2681 putcharacter (SCHEME_A_ '"'); 2435 putcharacter (SCHEME_A_ '"');
… …
2714 { 2468 {
2715 p = SCHEME_V->strbuff; 2469 p = SCHEME_V->strbuff;
2716 2470
2717 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 */
2718 { 2472 {
2719 if (num_is_integer (l)) 2473 if (is_integer (l))
2720 xnum (p, ivalue_unchecked (l)); 2474 xnum (p, ivalue_unchecked (l));
2721#if USE_FLOAT 2475#if USE_REAL
2722 else 2476 else
2723 { 2477 {
2724 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2478 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
2725 /* r5rs says there must be a '.' (unless 'e'?) */ 2479 /* r5rs says there must be a '.' (unless 'e'?) */
2726 f = strcspn (p, ".e"); 2480 f = strcspn (p, ".e");
… …
2898list_star (SCHEME_P_ pointer d) 2652list_star (SCHEME_P_ pointer d)
2899{ 2653{
2900 pointer p, q; 2654 pointer p, q;
2901 2655
2902 if (cdr (d) == NIL) 2656 if (cdr (d) == NIL)
2903 {
2904 return car (d); 2657 return car (d);
2905 }
2906 2658
2907 p = cons (car (d), cdr (d)); 2659 p = cons (car (d), cdr (d));
2908 q = p; 2660 q = p;
2909 2661
2910 while (cdr (cdr (p)) != NIL) 2662 while (cdr (cdr (p)) != NIL)
2911 { 2663 {
2912 d = cons (car (p), cdr (p)); 2664 d = cons (car (p), cdr (p));
2913 2665
2914 if (cdr (cdr (p)) != NIL) 2666 if (cdr (cdr (p)) != NIL)
2915 {
2916 p = cdr (d); 2667 p = cdr (d);
2917 }
2918 } 2668 }
2919 2669
2920 set_cdr (p, car (cdr (p))); 2670 set_cdr (p, car (cdr (p)));
2921 return q; 2671 return q;
2922} 2672}
… …
2936 2686
2937/* reverse list --- in-place */ 2687/* reverse list --- in-place */
2938static pointer 2688static pointer
2939reverse_in_place (SCHEME_P_ pointer term, pointer list) 2689reverse_in_place (SCHEME_P_ pointer term, pointer list)
2940{ 2690{
2941 pointer p = list, result = term, q; 2691 pointer result = term;
2692 pointer p = list;
2942 2693
2943 while (p != NIL) 2694 while (p != NIL)
2944 { 2695 {
2945 q = cdr (p); 2696 pointer q = cdr (p);
2946 set_cdr (p, result); 2697 set_cdr (p, result);
2947 result = p; 2698 result = p;
2948 p = q; 2699 p = q;
2949 } 2700 }
2950 2701
… …
2982 return 0; 2733 return 0;
2983 } 2734 }
2984 else if (is_number (a)) 2735 else if (is_number (a))
2985 { 2736 {
2986 if (is_number (b)) 2737 if (is_number (b))
2987 if (num_is_integer (a) == num_is_integer (b))
2988 return num_eq (nvalue (a), nvalue (b)); 2738 return num_cmp (nvalue (a), nvalue (b)) == 0;
2989 2739
2990 return 0; 2740 return 0;
2991 } 2741 }
2992 else if (is_character (a)) 2742 else if (is_character (a))
2993 { 2743 {
… …
3025#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST) 2775#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
3026 2776
3027static int 2777static int
3028hash_fn (const char *key, int table_size) 2778hash_fn (const char *key, int table_size)
3029{ 2779{
3030 unsigned int hashed = 0; 2780 const unsigned char *p = key;
3031 const char *c; 2781 uint32_t hash = 2166136261;
3032 int bits_per_int = sizeof (unsigned int) * 8;
3033 2782
3034 for (c = key; *c; c++) 2783 while (*p)
3035 { 2784 hash = (hash ^ *p++) * 16777619;
3036 /* letters have about 5 bits in them */
3037 hashed = (hashed << 5) | (hashed >> (bits_per_int - 5));
3038 hashed ^= *c;
3039 }
3040 2785
3041 return hashed % table_size; 2786 return hash % table_size;
3042} 2787}
3043#endif 2788#endif
3044 2789
3045#ifndef USE_ALIST_ENV 2790#ifndef USE_ALIST_ENV
3046 2791
… …
3065 2810
3066 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2811 SCHEME_V->envir = immutable_cons (new_frame, old_env);
3067 setenvironment (SCHEME_V->envir); 2812 setenvironment (SCHEME_V->envir);
3068} 2813}
3069 2814
3070static INLINE void 2815ecb_inline void
3071new_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)
3072{ 2817{
3073 pointer slot = immutable_cons (variable, value); 2818 pointer slot = immutable_cons (variable, value);
3074 2819
3075 if (is_vector (car (env))) 2820 if (is_vector (car (env)))
3076 { 2821 {
3077 int location = hash_fn (symname (variable), ivalue_unchecked (car (env))); 2822 int location = hash_fn (symname (variable), veclength (car (env)));
3078 2823
3079 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)));
3080 } 2825 }
3081 else 2826 else
3082 set_car (env, immutable_cons (slot, car (env))); 2827 set_car (env, immutable_cons (slot, car (env)));
… …
3090 2835
3091 for (x = env; x != NIL; x = cdr (x)) 2836 for (x = env; x != NIL; x = cdr (x))
3092 { 2837 {
3093 if (is_vector (car (x))) 2838 if (is_vector (car (x)))
3094 { 2839 {
3095 location = hash_fn (symname (hdl), ivalue_unchecked (car (x))); 2840 location = hash_fn (symname (hdl), veclength (car (x)));
3096 y = vector_elem (car (x), location); 2841 y = vector_elem (car (x), location);
3097 } 2842 }
3098 else 2843 else
3099 y = car (x); 2844 y = car (x);
3100 2845
… …
3115 return NIL; 2860 return NIL;
3116} 2861}
3117 2862
3118#else /* USE_ALIST_ENV */ 2863#else /* USE_ALIST_ENV */
3119 2864
3120static INLINE void 2865ecb_inline void
3121new_frame_in_env (SCHEME_P_ pointer old_env) 2866new_frame_in_env (SCHEME_P_ pointer old_env)
3122{ 2867{
3123 SCHEME_V->envir = immutable_cons (NIL, old_env); 2868 SCHEME_V->envir = immutable_cons (NIL, old_env);
3124 setenvironment (SCHEME_V->envir); 2869 setenvironment (SCHEME_V->envir);
3125} 2870}
3126 2871
3127static INLINE void 2872ecb_inline void
3128new_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)
3129{ 2874{
3130 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2875 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
3131} 2876}
3132 2877
… …
3154 return NIL; 2899 return NIL;
3155} 2900}
3156 2901
3157#endif /* USE_ALIST_ENV else */ 2902#endif /* USE_ALIST_ENV else */
3158 2903
3159static INLINE void 2904ecb_inline void
3160new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2905new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
3161{ 2906{
3162 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);
3163} 2908}
3164 2909
3165static INLINE void 2910ecb_inline void
3166set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2911set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3167{ 2912{
3168 set_cdr (slot, value); 2913 set_cdr (slot, value);
3169} 2914}
3170 2915
3171static INLINE pointer 2916ecb_inline pointer
3172slot_value_in_env (pointer slot) 2917slot_value_in_env (pointer slot)
3173{ 2918{
3174 return cdr (slot); 2919 return cdr (slot);
3175} 2920}
3176 2921
3177/* ========== Evaluation Cycle ========== */ 2922/* ========== Evaluation Cycle ========== */
3178 2923
3179static pointer 2924static int
3180xError_1 (SCHEME_P_ const char *s, pointer a) 2925xError_1 (SCHEME_P_ const char *s, pointer a)
3181{ 2926{
3182#if USE_ERROR_HOOK 2927#if USE_ERROR_HOOK
3183 pointer x; 2928 pointer x;
3184 pointer hdl = SCHEME_V->ERROR_HOOK; 2929 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3210#if USE_ERROR_HOOK 2955#if USE_ERROR_HOOK
3211 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);
3212 2957
3213 if (x != NIL) 2958 if (x != NIL)
3214 { 2959 {
3215 if (a) 2960 pointer code = a
3216 SCHEME_V->code = cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL); 2961 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
3217 else 2962 : NIL;
3218 SCHEME_V->code = NIL;
3219 2963
3220 SCHEME_V->code = cons (mk_string (SCHEME_A_ s), SCHEME_V->code); 2964 code = cons (mk_string (SCHEME_A_ s), code);
3221 setimmutable (car (SCHEME_V->code)); 2965 setimmutable (car (code));
3222 SCHEME_V->code = cons (slot_value_in_env (x), SCHEME_V->code); 2966 SCHEME_V->code = cons (slot_value_in_env (x), code);
3223 SCHEME_V->op = OP_EVAL; 2967 SCHEME_V->op = OP_EVAL;
3224 2968
3225 return S_T; 2969 return 0;
3226 } 2970 }
3227#endif 2971#endif
3228 2972
3229 if (a) 2973 if (a)
3230 SCHEME_V->args = cons (a, NIL); 2974 SCHEME_V->args = cons (a, NIL);
3231 else 2975 else
3232 SCHEME_V->args = NIL; 2976 SCHEME_V->args = NIL;
3233 2977
3234 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);
3235 setimmutable (car (SCHEME_V->args)); 2979 setimmutable (car (SCHEME_V->args));
3236 SCHEME_V->op = (int)OP_ERR0; 2980 SCHEME_V->op = OP_ERR0;
2981
3237 return S_T; 2982 return 0;
3238} 2983}
3239 2984
3240#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)
3241#define Error_0(s) Error_1 (s, 0) 2986#define Error_0(s) Error_1 (s, 0)
3242 2987
3243/* Too small to turn into function */ 2988/* Too small to turn into function */
3244#define BEGIN do { 2989#define BEGIN do {
3245#define END } while (0) 2990#define END } while (0)
3246#define s_goto(a) BEGIN \ 2991#define s_goto(a) BEGIN \
3247 SCHEME_V->op = (int)(a); \ 2992 SCHEME_V->op = a; \
3248 return S_T; END 2993 return 0; END
3249 2994
3250#define s_return(a) return xs_return(SCHEME_A_ a) 2995#define s_return(a) return xs_return (SCHEME_A_ a)
3251 2996
3252#ifndef USE_SCHEME_STACK 2997#ifndef USE_SCHEME_STACK
3253 2998
3254/* this structure holds all the interpreter's registers */ 2999/* this structure holds all the interpreter's registers */
3255struct dump_stack_frame 3000struct dump_stack_frame
… …
3274 SCHEME_V->dump_size += STACK_GROWTH; 3019 SCHEME_V->dump_size += STACK_GROWTH;
3275 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3020 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3276 } 3021 }
3277 3022
3278 next_frame = SCHEME_V->dump_base + nframes; 3023 next_frame = SCHEME_V->dump_base + nframes;
3024
3279 next_frame->op = op; 3025 next_frame->op = op;
3280 next_frame->args = args; 3026 next_frame->args = args;
3281 next_frame->envir = SCHEME_V->envir; 3027 next_frame->envir = SCHEME_V->envir;
3282 next_frame->code = code; 3028 next_frame->code = code;
3029
3283 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3030 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3284} 3031}
3285 3032
3286static pointer 3033static int
3287xs_return (SCHEME_P_ pointer a) 3034xs_return (SCHEME_P_ pointer a)
3288{ 3035{
3289 int nframes = (uintptr_t)SCHEME_V->dump; 3036 int nframes = (uintptr_t)SCHEME_V->dump;
3290 struct dump_stack_frame *frame; 3037 struct dump_stack_frame *frame;
3291 3038
3292 SCHEME_V->value = a; 3039 SCHEME_V->value = a;
3293 3040
3294 if (nframes <= 0) 3041 if (nframes <= 0)
3295 return NIL; 3042 return -1;
3296 3043
3297 nframes--;
3298 frame = SCHEME_V->dump_base + nframes; 3044 frame = &SCHEME_V->dump_base[--nframes];
3299 SCHEME_V->op = frame->op; 3045 SCHEME_V->op = frame->op;
3300 SCHEME_V->args = frame->args; 3046 SCHEME_V->args = frame->args;
3301 SCHEME_V->envir = frame->envir; 3047 SCHEME_V->envir = frame->envir;
3302 SCHEME_V->code = frame->code; 3048 SCHEME_V->code = frame->code;
3303 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3049 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3304 3050
3305 return S_T; 3051 return 0;
3306} 3052}
3307 3053
3308static INLINE void 3054ecb_inline void
3309dump_stack_reset (SCHEME_P) 3055dump_stack_reset (SCHEME_P)
3310{ 3056{
3311 /* 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 */
3312 SCHEME_V->dump = (pointer)0; 3058 SCHEME_V->dump = (pointer)+0;
3313} 3059}
3314 3060
3315static INLINE void 3061ecb_inline void
3316dump_stack_initialize (SCHEME_P) 3062dump_stack_initialize (SCHEME_P)
3317{ 3063{
3318 SCHEME_V->dump_size = 0; 3064 SCHEME_V->dump_size = 0;
3319 SCHEME_V->dump_base = NULL; 3065 SCHEME_V->dump_base = 0;
3320 dump_stack_reset (SCHEME_A); 3066 dump_stack_reset (SCHEME_A);
3321} 3067}
3322 3068
3323static void 3069static void
3324dump_stack_free (SCHEME_P) 3070dump_stack_free (SCHEME_P)
3325{ 3071{
3326 free (SCHEME_V->dump_base); 3072 free (SCHEME_V->dump_base);
3327 SCHEME_V->dump_base = NULL; 3073 SCHEME_V->dump_base = 0;
3328 SCHEME_V->dump = (pointer)0; 3074 SCHEME_V->dump = (pointer)0;
3329 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3330} 3076}
3331 3077
3332static void 3078static void
… …
3374 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3120 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3375 3121
3376 while (cont != NIL) 3122 while (cont != NIL)
3377 { 3123 {
3378 frame->op = ivalue (car (cont)); cont = cdr (cont); 3124 frame->op = ivalue (car (cont)); cont = cdr (cont);
3379 frame->args = car (cont) ; cont = cdr (cont); 3125 frame->args = car (cont) ; cont = cdr (cont);
3380 frame->envir = car (cont) ; cont = cdr (cont); 3126 frame->envir = car (cont) ; cont = cdr (cont);
3381 frame->code = car (cont) ; cont = cdr (cont); 3127 frame->code = car (cont) ; cont = cdr (cont);
3382 3128
3383 ++frame; 3129 ++frame;
3384 ++i; 3130 ++i;
3385 } 3131 }
3386 3132
3387 SCHEME_V->dump = (pointer)(uintptr_t)i; 3133 SCHEME_V->dump = (pointer)(uintptr_t)i;
3388} 3134}
3389 3135
3390#else 3136#else
3391 3137
3392static INLINE void 3138ecb_inline void
3393dump_stack_reset (SCHEME_P) 3139dump_stack_reset (SCHEME_P)
3394{ 3140{
3395 SCHEME_V->dump = NIL; 3141 SCHEME_V->dump = NIL;
3396} 3142}
3397 3143
3398static INLINE void 3144ecb_inline void
3399dump_stack_initialize (SCHEME_P) 3145dump_stack_initialize (SCHEME_P)
3400{ 3146{
3401 dump_stack_reset (SCHEME_A); 3147 dump_stack_reset (SCHEME_A);
3402} 3148}
3403 3149
… …
3405dump_stack_free (SCHEME_P) 3151dump_stack_free (SCHEME_P)
3406{ 3152{
3407 SCHEME_V->dump = NIL; 3153 SCHEME_V->dump = NIL;
3408} 3154}
3409 3155
3410static pointer 3156static int
3411xs_return (SCHEME_P_ pointer a) 3157xs_return (SCHEME_P_ pointer a)
3412{ 3158{
3413 pointer dump = SCHEME_V->dump; 3159 pointer dump = SCHEME_V->dump;
3414 3160
3415 SCHEME_V->value = a; 3161 SCHEME_V->value = a;
3416 3162
3417 if (dump == NIL) 3163 if (dump == NIL)
3418 return NIL; 3164 return -1;
3419 3165
3420 SCHEME_V->op = ivalue (car (dump)); 3166 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump);
3421 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3167 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3422 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3168 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3423 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3169 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3424 3170
3425 SCHEME_V->dump = dump; 3171 SCHEME_V->dump = dump;
3426 3172
3427 return S_T; 3173 return 0;
3428} 3174}
3429 3175
3430static void 3176static void
3431s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3177s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3432{ 3178{
… …
3457 3203
3458#endif 3204#endif
3459 3205
3460#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3206#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3461 3207
3462static pointer 3208static int
3463opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3209opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3464{ 3210{
3211 pointer args = SCHEME_V->args;
3465 pointer x, y; 3212 pointer x, y;
3466 3213
3467 switch (op) 3214 switch (op)
3468 { 3215 {
3469 case OP_LOAD: /* load */ 3216 case OP_LOAD: /* load */
3470 if (file_interactive (SCHEME_A)) 3217 if (file_interactive (SCHEME_A))
3471 { 3218 {
3472 xwrstr ("Loading "); xwrstr (strvalue (car (SCHEME_V->args))); xwrstr ("\n"); 3219 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3473 //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)));
3474 } 3221 }
3475 3222
3476 if (!file_push (SCHEME_A_ strvalue (car (SCHEME_V->args)))) 3223 if (!file_push (SCHEME_A_ strvalue (car (args))))
3477 Error_1 ("unable to open", car (SCHEME_V->args)); 3224 Error_1 ("unable to open", car (args));
3478 else 3225 else
3479 { 3226 {
3480 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3227 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3481 s_goto (OP_T0LVL); 3228 s_goto (OP_T0LVL);
3482 } 3229 }
… …
3517 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL); 3264 s_save (SCHEME_A_ OP_VALUEPRINT, NIL, NIL);
3518 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL); 3265 s_save (SCHEME_A_ OP_T1LVL, NIL, NIL);
3519 s_goto (OP_READ_INTERNAL); 3266 s_goto (OP_READ_INTERNAL);
3520 3267
3521 case OP_T1LVL: /* top level */ 3268 case OP_T1LVL: /* top level */
3522 SCHEME_V->code = SCHEME_V->value; 3269 SCHEME_V->code = SCHEME_V->value;
3523 SCHEME_V->inport = SCHEME_V->save_inport; 3270 SCHEME_V->inport = SCHEME_V->save_inport;
3524 s_goto (OP_EVAL); 3271 s_goto (OP_EVAL);
3525 3272
3526 case OP_READ_INTERNAL: /* internal read */ 3273 case OP_READ_INTERNAL: /* internal read */
3527 SCHEME_V->tok = token (SCHEME_A); 3274 SCHEME_V->tok = token (SCHEME_A);
3528 3275
3529 if (SCHEME_V->tok == TOK_EOF) 3276 if (SCHEME_V->tok == TOK_EOF)
3530 {
3531 s_return (S_EOF); 3277 s_return (S_EOF);
3532 }
3533 3278
3534 s_goto (OP_RDSEXPR); 3279 s_goto (OP_RDSEXPR);
3535 3280
3536 case OP_GENSYM: 3281 case OP_GENSYM:
3537 s_return (gensym (SCHEME_A)); 3282 s_return (gensym (SCHEME_A));
… …
3541 /* OP_VALUEPRINT is always pushed, because when changing from 3286 /* OP_VALUEPRINT is always pushed, because when changing from
3542 non-interactive to interactive mode, it needs to be 3287 non-interactive to interactive mode, it needs to be
3543 already on the stack */ 3288 already on the stack */
3544#if USE_TRACING 3289#if USE_TRACING
3545 if (SCHEME_V->tracing) 3290 if (SCHEME_V->tracing)
3546 {
3547 putstr (SCHEME_A_ "\nGives: "); 3291 putstr (SCHEME_A_ "\nGives: ");
3548 }
3549#endif 3292#endif
3550 3293
3551 if (file_interactive (SCHEME_A)) 3294 if (file_interactive (SCHEME_A))
3552 { 3295 {
3553 SCHEME_V->print_flag = 1; 3296 SCHEME_V->print_flag = 1;
3554 SCHEME_V->args = SCHEME_V->value; 3297 SCHEME_V->args = SCHEME_V->value;
3555 s_goto (OP_P0LIST); 3298 s_goto (OP_P0LIST);
3556 } 3299 }
3557 else 3300 else
3558 {
3559 s_return (SCHEME_V->value); 3301 s_return (SCHEME_V->value);
3560 }
3561 3302
3562 case OP_EVAL: /* main part of evaluation */ 3303 case OP_EVAL: /* main part of evaluation */
3563#if USE_TRACING 3304#if USE_TRACING
3564 if (SCHEME_V->tracing) 3305 if (SCHEME_V->tracing)
3565 { 3306 {
3566 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */ 3307 /*s_save(SCHEME_A_ OP_VALUEPRINT,NIL,NIL); */
3567 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);
3568 SCHEME_V->args = SCHEME_V->code; 3309 SCHEME_V->args = SCHEME_V->code;
3569 putstr (SCHEME_A_ "\nEval: "); 3310 putstr (SCHEME_A_ "\nEval: ");
3570 s_goto (OP_P0LIST); 3311 s_goto (OP_P0LIST);
3571 } 3312 }
3572 3313
3573 /* fall through */ 3314 /* fall through */
3315
3574 case OP_REAL_EVAL: 3316 case OP_REAL_EVAL:
3575#endif 3317#endif
3576 if (is_symbol (SCHEME_V->code)) /* symbol */ 3318 if (is_symbol (SCHEME_V->code)) /* symbol */
3577 { 3319 {
3578 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3320 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
… …
3582 else 3324 else
3583 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3325 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3584 } 3326 }
3585 else if (is_pair (SCHEME_V->code)) 3327 else if (is_pair (SCHEME_V->code))
3586 { 3328 {
3329 x = car (SCHEME_V->code);
3330
3587 if (is_syntax (x = car (SCHEME_V->code))) /* SYNTAX */ 3331 if (is_syntax (x)) /* SYNTAX */
3588 { 3332 {
3589 SCHEME_V->code = cdr (SCHEME_V->code); 3333 SCHEME_V->code = cdr (SCHEME_V->code);
3590 s_goto (syntaxnum (x)); 3334 s_goto (syntaxnum (x));
3591 } 3335 }
3592 else /* first, eval top element and eval arguments */ 3336 else /* first, eval top element and eval arguments */
3593 { 3337 {
3594 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code); 3338 s_save (SCHEME_A_ OP_E0ARGS, NIL, SCHEME_V->code);
3595 /* 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)); */
3596 SCHEME_V->code = car (SCHEME_V->code); 3340 SCHEME_V->code = x;
3597 s_goto (OP_EVAL); 3341 s_goto (OP_EVAL);
3598 } 3342 }
3599 } 3343 }
3600 else 3344 else
3601 s_return (SCHEME_V->code); 3345 s_return (SCHEME_V->code);
… …
3613 SCHEME_V->code = cdr (SCHEME_V->code); 3357 SCHEME_V->code = cdr (SCHEME_V->code);
3614 s_goto (OP_E1ARGS); 3358 s_goto (OP_E1ARGS);
3615 } 3359 }
3616 3360
3617 case OP_E1ARGS: /* eval arguments */ 3361 case OP_E1ARGS: /* eval arguments */
3618 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3362 args = cons (SCHEME_V->value, args);
3619 3363
3620 if (is_pair (SCHEME_V->code)) /* continue */ 3364 if (is_pair (SCHEME_V->code)) /* continue */
3621 { 3365 {
3622 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));
3623 SCHEME_V->code = car (SCHEME_V->code); 3367 SCHEME_V->code = car (SCHEME_V->code);
3624 SCHEME_V->args = NIL; 3368 SCHEME_V->args = NIL;
3625 s_goto (OP_EVAL); 3369 s_goto (OP_EVAL);
3626 } 3370 }
3627 else /* end */ 3371 else /* end */
3628 { 3372 {
3629 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3373 args = reverse_in_place (SCHEME_A_ NIL, args);
3630 SCHEME_V->code = car (SCHEME_V->args); 3374 SCHEME_V->code = car (args);
3631 SCHEME_V->args = cdr (SCHEME_V->args); 3375 SCHEME_V->args = cdr (args);
3632 s_goto (OP_APPLY); 3376 s_goto (OP_APPLY);
3633 } 3377 }
3634 3378
3635#if USE_TRACING 3379#if USE_TRACING
3636 3380
3637 case OP_TRACING: 3381 case OP_TRACING:
3638 { 3382 {
3639 int tr = SCHEME_V->tracing; 3383 int tr = SCHEME_V->tracing;
3640 3384
3641 SCHEME_V->tracing = ivalue (car (SCHEME_V->args)); 3385 SCHEME_V->tracing = ivalue (car (args));
3642 s_return (mk_integer (SCHEME_A_ tr)); 3386 s_return (mk_integer (SCHEME_A_ tr));
3643 } 3387 }
3644 3388
3645#endif 3389#endif
3646 3390
3647 case OP_APPLY: /* apply 'code' to 'args' */ 3391 case OP_APPLY: /* apply 'code' to 'args' */
3648#if USE_TRACING 3392#if USE_TRACING
3649 if (SCHEME_V->tracing) 3393 if (SCHEME_V->tracing)
3650 { 3394 {
3651 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);
3652 SCHEME_V->print_flag = 1; 3396 SCHEME_V->print_flag = 1;
3653 /* SCHEME_V->args=cons(SCHEME_V->code,SCHEME_V->args); */ 3397 /* args=cons(SCHEME_V->code,args); */
3654 putstr (SCHEME_A_ "\nApply to: "); 3398 putstr (SCHEME_A_ "\nApply to: ");
3655 s_goto (OP_P0LIST); 3399 s_goto (OP_P0LIST);
3656 } 3400 }
3657 3401
3658 /* fall through */ 3402 /* fall through */
3403
3659 case OP_REAL_APPLY: 3404 case OP_REAL_APPLY:
3660#endif 3405#endif
3661 if (is_proc (SCHEME_V->code)) 3406 if (is_proc (SCHEME_V->code))
3662 {
3663 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3407 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3664 }
3665 else if (is_foreign (SCHEME_V->code)) 3408 else if (is_foreign (SCHEME_V->code))
3666 { 3409 {
3667 /* Keep nested calls from GC'ing the arglist */ 3410 /* Keep nested calls from GC'ing the arglist */
3668 push_recent_alloc (SCHEME_A_ SCHEME_V->args, NIL); 3411 push_recent_alloc (SCHEME_A_ args, NIL);
3669 x = SCHEME_V->code->object.ff (SCHEME_A_ SCHEME_V->args); 3412 x = SCHEME_V->code->object.ff (SCHEME_A_ args);
3670 3413
3671 s_return (x); 3414 s_return (x);
3672 } 3415 }
3673 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 */
3674 { 3417 {
3675 /* Should not accept promise */ 3418 /* Should not accept promise */
3676 /* make environment */ 3419 /* make environment */
3677 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code)); 3420 new_frame_in_env (SCHEME_A_ closure_env (SCHEME_V->code));
3678 3421
3679 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))
3680 { 3423 {
3681 if (y == NIL) 3424 if (y == NIL)
3682 {
3683 Error_0 ("not enough arguments"); 3425 Error_0 ("not enough arguments");
3684 }
3685 else 3426 else
3686 {
3687 new_slot_in_env (SCHEME_A_ car (x), car (y)); 3427 new_slot_in_env (SCHEME_A_ car (x), car (y));
3688 }
3689 } 3428 }
3690 3429
3691 if (x == NIL) 3430 if (x == NIL)
3692 { 3431 {
3693
3694 /*-- 3432 /*--
3695 * if (y != NIL) { 3433 * if (y != NIL) {
3696 * Error_0("too many arguments"); 3434 * Error_0("too many arguments");
3697 * } 3435 * }
3698 */ 3436 */
3699 } 3437 }
3700 else if (is_symbol (x)) 3438 else if (is_symbol (x))
3701 new_slot_in_env (SCHEME_A_ x, y); 3439 new_slot_in_env (SCHEME_A_ x, y);
3702 else 3440 else
3703 {
3704 Error_1 ("syntax error in closure: not a symbol:", x); 3441 Error_1 ("syntax error in closure: not a symbol:", x);
3705 }
3706 3442
3707 SCHEME_V->code = cdr (closure_code (SCHEME_V->code)); 3443 SCHEME_V->code = cdr (closure_code (SCHEME_V->code));
3708 SCHEME_V->args = NIL; 3444 SCHEME_V->args = NIL;
3709 s_goto (OP_BEGIN); 3445 s_goto (OP_BEGIN);
3710 } 3446 }
3711 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3447 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3712 { 3448 {
3713 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3449 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3714 s_return (SCHEME_V->args != NIL ? car (SCHEME_V->args) : NIL); 3450 s_return (args != NIL ? car (args) : NIL);
3715 } 3451 }
3716 else 3452 else
3717 Error_0 ("illegal function"); 3453 Error_0 ("illegal function");
3718 3454
3719 case OP_DOMACRO: /* do macro */ 3455 case OP_DOMACRO: /* do macro */
… …
3728 { 3464 {
3729 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);
3730 3466
3731 if (f != NIL) 3467 if (f != NIL)
3732 { 3468 {
3733 s_save (SCHEME_A_ OP_LAMBDA1, SCHEME_V->args, SCHEME_V->code); 3469 s_save (SCHEME_A_ OP_LAMBDA1, args, SCHEME_V->code);
3734 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3470 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3735 SCHEME_V->code = slot_value_in_env (f); 3471 SCHEME_V->code = slot_value_in_env (f);
3736 s_goto (OP_APPLY); 3472 s_goto (OP_APPLY);
3737 } 3473 }
3738 3474
… …
3749 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));
3750 3486
3751#endif 3487#endif
3752 3488
3753 case OP_MKCLOSURE: /* make-closure */ 3489 case OP_MKCLOSURE: /* make-closure */
3754 x = car (SCHEME_V->args); 3490 x = car (args);
3755 3491
3756 if (car (x) == SCHEME_V->LAMBDA) 3492 if (car (x) == SCHEME_V->LAMBDA)
3757 x = cdr (x); 3493 x = cdr (x);
3758 3494
3759 if (cdr (SCHEME_V->args) == NIL) 3495 if (cdr (args) == NIL)
3760 y = SCHEME_V->envir; 3496 y = SCHEME_V->envir;
3761 else 3497 else
3762 y = cadr (SCHEME_V->args); 3498 y = cadr (args);
3763 3499
3764 s_return (mk_closure (SCHEME_A_ x, y)); 3500 s_return (mk_closure (SCHEME_A_ x, y));
3765 3501
3766 case OP_QUOTE: /* quote */ 3502 case OP_QUOTE: /* quote */
3767 s_return (car (SCHEME_V->code)); 3503 s_return (car (SCHEME_V->code));
… …
3780 x = car (SCHEME_V->code); 3516 x = car (SCHEME_V->code);
3781 SCHEME_V->code = cadr (SCHEME_V->code); 3517 SCHEME_V->code = cadr (SCHEME_V->code);
3782 } 3518 }
3783 3519
3784 if (!is_symbol (x)) 3520 if (!is_symbol (x))
3785 {
3786 Error_0 ("variable is not a symbol"); 3521 Error_0 ("variable is not a symbol");
3787 }
3788 3522
3789 s_save (SCHEME_A_ OP_DEF1, NIL, x); 3523 s_save (SCHEME_A_ OP_DEF1, NIL, x);
3790 s_goto (OP_EVAL); 3524 s_goto (OP_EVAL);
3791 3525
3792 case OP_DEF1: /* define */ 3526 case OP_DEF1: /* define */
3793 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3527 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
3794 3528
3795 if (x != NIL) 3529 if (x != NIL)
3796 {
3797 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3530 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
3798 }
3799 else 3531 else
3800 {
3801 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3532 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3802 }
3803 3533
3804 s_return (SCHEME_V->code); 3534 s_return (SCHEME_V->code);
3805 3535
3806 3536
3807 case OP_DEFP: /* defined? */ 3537 case OP_DEFP: /* defined? */
3808 x = SCHEME_V->envir; 3538 x = SCHEME_V->envir;
3809 3539
3810 if (cdr (SCHEME_V->args) != NIL) 3540 if (cdr (args) != NIL)
3811 {
3812 x = cadr (SCHEME_V->args); 3541 x = cadr (args);
3813 }
3814 3542
3815 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);
3816 3544
3817 case OP_SET0: /* set! */ 3545 case OP_SET0: /* set! */
3818 if (is_immutable (car (SCHEME_V->code))) 3546 if (is_immutable (car (SCHEME_V->code)))
3819 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));
3820 3548
… …
3829 { 3557 {
3830 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3558 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3831 s_return (SCHEME_V->value); 3559 s_return (SCHEME_V->value);
3832 } 3560 }
3833 else 3561 else
3834 {
3835 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3562 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3836 }
3837 3563
3838 3564
3839 case OP_BEGIN: /* begin */ 3565 case OP_BEGIN: /* begin */
3840 if (!is_pair (SCHEME_V->code)) 3566 if (!is_pair (SCHEME_V->code))
3841 {
3842 s_return (SCHEME_V->code); 3567 s_return (SCHEME_V->code);
3843 }
3844 3568
3845 if (cdr (SCHEME_V->code) != NIL) 3569 if (cdr (SCHEME_V->code) != NIL)
3846 {
3847 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code)); 3570 s_save (SCHEME_A_ OP_BEGIN, NIL, cdr (SCHEME_V->code));
3848 }
3849 3571
3850 SCHEME_V->code = car (SCHEME_V->code); 3572 SCHEME_V->code = car (SCHEME_V->code);
3851 s_goto (OP_EVAL); 3573 s_goto (OP_EVAL);
3852 3574
3853 case OP_IF0: /* if */ 3575 case OP_IF0: /* if */
… …
3857 3579
3858 case OP_IF1: /* if */ 3580 case OP_IF1: /* if */
3859 if (is_true (SCHEME_V->value)) 3581 if (is_true (SCHEME_V->value))
3860 SCHEME_V->code = car (SCHEME_V->code); 3582 SCHEME_V->code = car (SCHEME_V->code);
3861 else 3583 else
3862 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 */
3863
3864 * car(NIL) = NIL */
3865 s_goto (OP_EVAL); 3585 s_goto (OP_EVAL);
3866 3586
3867 case OP_LET0: /* let */ 3587 case OP_LET0: /* let */
3868 SCHEME_V->args = NIL; 3588 SCHEME_V->args = NIL;
3869 SCHEME_V->value = SCHEME_V->code; 3589 SCHEME_V->value = SCHEME_V->code;
3870 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);
3871 s_goto (OP_LET1); 3591 s_goto (OP_LET1);
3872 3592
3873 case OP_LET1: /* let (calculate parameters) */ 3593 case OP_LET1: /* let (calculate parameters) */
3874 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3594 args = cons (SCHEME_V->value, args);
3875 3595
3876 if (is_pair (SCHEME_V->code)) /* continue */ 3596 if (is_pair (SCHEME_V->code)) /* continue */
3877 { 3597 {
3878 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)))
3879 {
3880 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));
3881 }
3882 3600
3883 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));
3884 SCHEME_V->code = cadar (SCHEME_V->code); 3602 SCHEME_V->code = cadar (SCHEME_V->code);
3885 SCHEME_V->args = NIL; 3603 SCHEME_V->args = NIL;
3886 s_goto (OP_EVAL); 3604 s_goto (OP_EVAL);
3887 } 3605 }
3888 else /* end */ 3606 else /* end */
3889 { 3607 {
3890 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3608 args = reverse_in_place (SCHEME_A_ NIL, args);
3891 SCHEME_V->code = car (SCHEME_V->args); 3609 SCHEME_V->code = car (args);
3892 SCHEME_V->args = cdr (SCHEME_V->args); 3610 SCHEME_V->args = cdr (args);
3893 s_goto (OP_LET2); 3611 s_goto (OP_LET2);
3894 } 3612 }
3895 3613
3896 case OP_LET2: /* let */ 3614 case OP_LET2: /* let */
3897 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3615 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3898 3616
3899 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;
3900 y != NIL; x = cdr (x), y = cdr (y)) 3618 y != NIL; x = cdr (x), y = cdr (y))
3901 {
3902 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3619 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3903 }
3904 3620
3905 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3621 if (is_symbol (car (SCHEME_V->code))) /* named let */
3906 { 3622 {
3907 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))
3908 { 3624 {
3909 if (!is_pair (x)) 3625 if (!is_pair (x))
3910 Error_1 ("Bad syntax of binding in let :", x); 3626 Error_1 ("Bad syntax of binding in let :", x);
3911 3627
3912 if (!is_list (SCHEME_A_ car (x))) 3628 if (!is_list (SCHEME_A_ car (x)))
3913 Error_1 ("Bad syntax of binding in let :", car (x)); 3629 Error_1 ("Bad syntax of binding in let :", car (x));
3914 3630
3915 SCHEME_V->args = cons (caar (x), SCHEME_V->args); 3631 args = cons (caar (x), args);
3916 } 3632 }
3917 3633
3918 x =
3919 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)),
3920 SCHEME_V->envir); 3635 SCHEME_V->envir);
3921 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x); 3636 new_slot_in_env (SCHEME_A_ car (SCHEME_V->code), x);
3922 SCHEME_V->code = cddr (SCHEME_V->code); 3637 SCHEME_V->code = cddr (SCHEME_V->code);
3923 SCHEME_V->args = NIL;
3924 } 3638 }
3925 else 3639 else
3926 { 3640 {
3927 SCHEME_V->code = cdr (SCHEME_V->code); 3641 SCHEME_V->code = cdr (SCHEME_V->code);
3642 }
3643
3928 SCHEME_V->args = NIL; 3644 SCHEME_V->args = NIL;
3929 }
3930
3931 s_goto (OP_BEGIN); 3645 s_goto (OP_BEGIN);
3932 3646
3933 case OP_LET0AST: /* let* */ 3647 case OP_LET0AST: /* let* */
3934 if (car (SCHEME_V->code) == NIL) 3648 if (car (SCHEME_V->code) == NIL)
3935 { 3649 {
… …
3953 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);
3954 SCHEME_V->code = cdr (SCHEME_V->code); 3668 SCHEME_V->code = cdr (SCHEME_V->code);
3955 3669
3956 if (is_pair (SCHEME_V->code)) /* continue */ 3670 if (is_pair (SCHEME_V->code)) /* continue */
3957 { 3671 {
3958 s_save (SCHEME_A_ OP_LET2AST, SCHEME_V->args, SCHEME_V->code); 3672 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3959 SCHEME_V->code = cadar (SCHEME_V->code); 3673 SCHEME_V->code = cadar (SCHEME_V->code);
3960 SCHEME_V->args = NIL; 3674 SCHEME_V->args = NIL;
3961 s_goto (OP_EVAL); 3675 s_goto (OP_EVAL);
3962 } 3676 }
3963 else /* end */ 3677 else /* end */
3964 { 3678 {
3965 SCHEME_V->code = SCHEME_V->args; 3679 SCHEME_V->code = args;
3966 SCHEME_V->args = NIL; 3680 SCHEME_V->args = NIL;
3967 s_goto (OP_BEGIN); 3681 s_goto (OP_BEGIN);
3968 } 3682 }
3969 3683
3970 case OP_LET0REC: /* letrec */ 3684 case OP_LET0REC: /* letrec */
… …
3973 SCHEME_V->value = SCHEME_V->code; 3687 SCHEME_V->value = SCHEME_V->code;
3974 SCHEME_V->code = car (SCHEME_V->code); 3688 SCHEME_V->code = car (SCHEME_V->code);
3975 s_goto (OP_LET1REC); 3689 s_goto (OP_LET1REC);
3976 3690
3977 case OP_LET1REC: /* letrec (calculate parameters) */ 3691 case OP_LET1REC: /* letrec (calculate parameters) */
3978 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 3692 args = cons (SCHEME_V->value, args);
3979 3693
3980 if (is_pair (SCHEME_V->code)) /* continue */ 3694 if (is_pair (SCHEME_V->code)) /* continue */
3981 { 3695 {
3982 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)))
3983 {
3984 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));
3985 }
3986 3698
3987 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));
3988 SCHEME_V->code = cadar (SCHEME_V->code); 3700 SCHEME_V->code = cadar (SCHEME_V->code);
3989 SCHEME_V->args = NIL; 3701 SCHEME_V->args = NIL;
3990 s_goto (OP_EVAL); 3702 s_goto (OP_EVAL);
3991 } 3703 }
3992 else /* end */ 3704 else /* end */
3993 { 3705 {
3994 SCHEME_V->args = reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args); 3706 args = reverse_in_place (SCHEME_A_ NIL, args);
3995 SCHEME_V->code = car (SCHEME_V->args); 3707 SCHEME_V->code = car (args);
3996 SCHEME_V->args = cdr (SCHEME_V->args); 3708 SCHEME_V->args = cdr (args);
3997 s_goto (OP_LET2REC); 3709 s_goto (OP_LET2REC);
3998 } 3710 }
3999 3711
4000 case OP_LET2REC: /* letrec */ 3712 case OP_LET2REC: /* letrec */
4001 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))
4002 {
4003 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3714 new_slot_in_env (SCHEME_A_ caar (x), car (y));
4004 }
4005 3715
4006 SCHEME_V->code = cdr (SCHEME_V->code); 3716 SCHEME_V->code = cdr (SCHEME_V->code);
4007 SCHEME_V->args = NIL; 3717 SCHEME_V->args = NIL;
4008 s_goto (OP_BEGIN); 3718 s_goto (OP_BEGIN);
4009 3719
4010 case OP_COND0: /* cond */ 3720 case OP_COND0: /* cond */
4011 if (!is_pair (SCHEME_V->code)) 3721 if (!is_pair (SCHEME_V->code))
4012 {
4013 Error_0 ("syntax error in cond"); 3722 Error_0 ("syntax error in cond");
4014 }
4015 3723
4016 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3724 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4017 SCHEME_V->code = caar (SCHEME_V->code); 3725 SCHEME_V->code = caar (SCHEME_V->code);
4018 s_goto (OP_EVAL); 3726 s_goto (OP_EVAL);
4019 3727
4020 case OP_COND1: /* cond */ 3728 case OP_COND1: /* cond */
4021 if (is_true (SCHEME_V->value)) 3729 if (is_true (SCHEME_V->value))
4022 { 3730 {
4023 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL) 3731 if ((SCHEME_V->code = cdar (SCHEME_V->code)) == NIL)
4024 {
4025 s_return (SCHEME_V->value); 3732 s_return (SCHEME_V->value);
4026 }
4027 3733
4028 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO) 3734 if (car (SCHEME_V->code) == SCHEME_V->FEED_TO)
4029 { 3735 {
4030 if (!is_pair (cdr (SCHEME_V->code))) 3736 if (!is_pair (cdr (SCHEME_V->code)))
4031 {
4032 Error_0 ("syntax error in cond"); 3737 Error_0 ("syntax error in cond");
4033 }
4034 3738
4035 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)); 3739 x = cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL));
4036 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL)); 3740 SCHEME_V->code = cons (cadr (SCHEME_V->code), cons (x, NIL));
4037 s_goto (OP_EVAL); 3741 s_goto (OP_EVAL);
4038 } 3742 }
… …
4040 s_goto (OP_BEGIN); 3744 s_goto (OP_BEGIN);
4041 } 3745 }
4042 else 3746 else
4043 { 3747 {
4044 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3748 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
4045 {
4046 s_return (NIL); 3749 s_return (NIL);
4047 }
4048 else 3750 else
4049 { 3751 {
4050 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3752 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
4051 SCHEME_V->code = caar (SCHEME_V->code); 3753 SCHEME_V->code = caar (SCHEME_V->code);
4052 s_goto (OP_EVAL); 3754 s_goto (OP_EVAL);
… …
4058 set_typeflag (x, T_PROMISE); 3760 set_typeflag (x, T_PROMISE);
4059 s_return (x); 3761 s_return (x);
4060 3762
4061 case OP_AND0: /* and */ 3763 case OP_AND0: /* and */
4062 if (SCHEME_V->code == NIL) 3764 if (SCHEME_V->code == NIL)
4063 {
4064 s_return (S_T); 3765 s_return (S_T);
4065 }
4066 3766
4067 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3767 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4068 SCHEME_V->code = car (SCHEME_V->code); 3768 SCHEME_V->code = car (SCHEME_V->code);
4069 s_goto (OP_EVAL); 3769 s_goto (OP_EVAL);
4070 3770
4071 case OP_AND1: /* and */ 3771 case OP_AND1: /* and */
4072 if (is_false (SCHEME_V->value)) 3772 if (is_false (SCHEME_V->value))
4073 {
4074 s_return (SCHEME_V->value); 3773 s_return (SCHEME_V->value);
4075 }
4076 else if (SCHEME_V->code == NIL) 3774 else if (SCHEME_V->code == NIL)
4077 {
4078 s_return (SCHEME_V->value); 3775 s_return (SCHEME_V->value);
4079 }
4080 else 3776 else
4081 { 3777 {
4082 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3778 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
4083 SCHEME_V->code = car (SCHEME_V->code); 3779 SCHEME_V->code = car (SCHEME_V->code);
4084 s_goto (OP_EVAL); 3780 s_goto (OP_EVAL);
4085 } 3781 }
4086 3782
4087 case OP_OR0: /* or */ 3783 case OP_OR0: /* or */
4088 if (SCHEME_V->code == NIL) 3784 if (SCHEME_V->code == NIL)
4089 {
4090 s_return (S_F); 3785 s_return (S_F);
4091 }
4092 3786
4093 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3787 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4094 SCHEME_V->code = car (SCHEME_V->code); 3788 SCHEME_V->code = car (SCHEME_V->code);
4095 s_goto (OP_EVAL); 3789 s_goto (OP_EVAL);
4096 3790
4097 case OP_OR1: /* or */ 3791 case OP_OR1: /* or */
4098 if (is_true (SCHEME_V->value)) 3792 if (is_true (SCHEME_V->value))
4099 {
4100 s_return (SCHEME_V->value); 3793 s_return (SCHEME_V->value);
4101 }
4102 else if (SCHEME_V->code == NIL) 3794 else if (SCHEME_V->code == NIL)
4103 {
4104 s_return (SCHEME_V->value); 3795 s_return (SCHEME_V->value);
4105 }
4106 else 3796 else
4107 { 3797 {
4108 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3798 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
4109 SCHEME_V->code = car (SCHEME_V->code); 3799 SCHEME_V->code = car (SCHEME_V->code);
4110 s_goto (OP_EVAL); 3800 s_goto (OP_EVAL);
… …
4114 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 3804 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
4115 SCHEME_V->code = car (SCHEME_V->code); 3805 SCHEME_V->code = car (SCHEME_V->code);
4116 s_goto (OP_EVAL); 3806 s_goto (OP_EVAL);
4117 3807
4118 case OP_C1STREAM: /* cons-stream */ 3808 case OP_C1STREAM: /* cons-stream */
4119 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 */
4120 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);
4121 set_typeflag (x, T_PROMISE); 3811 set_typeflag (x, T_PROMISE);
4122 s_return (cons (SCHEME_V->args, x)); 3812 s_return (cons (args, x));
4123 3813
4124 case OP_MACRO0: /* macro */ 3814 case OP_MACRO0: /* macro */
4125 if (is_pair (car (SCHEME_V->code))) 3815 if (is_pair (car (SCHEME_V->code)))
4126 { 3816 {
4127 x = caar (SCHEME_V->code); 3817 x = caar (SCHEME_V->code);
… …
4132 x = car (SCHEME_V->code); 3822 x = car (SCHEME_V->code);
4133 SCHEME_V->code = cadr (SCHEME_V->code); 3823 SCHEME_V->code = cadr (SCHEME_V->code);
4134 } 3824 }
4135 3825
4136 if (!is_symbol (x)) 3826 if (!is_symbol (x))
4137 {
4138 Error_0 ("variable is not a symbol"); 3827 Error_0 ("variable is not a symbol");
4139 }
4140 3828
4141 s_save (SCHEME_A_ OP_MACRO1, NIL, x); 3829 s_save (SCHEME_A_ OP_MACRO1, NIL, x);
4142 s_goto (OP_EVAL); 3830 s_goto (OP_EVAL);
4143 3831
4144 case OP_MACRO1: /* macro */ 3832 case OP_MACRO1: /* macro */
4145 set_typeflag (SCHEME_V->value, T_MACRO); 3833 set_typeflag (SCHEME_V->value, T_MACRO);
4146 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0); 3834 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 0);
4147 3835
4148 if (x != NIL) 3836 if (x != NIL)
4149 {
4150 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value); 3837 set_slot_in_env (SCHEME_A_ x, SCHEME_V->value);
4151 }
4152 else 3838 else
4153 {
4154 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3839 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
4155 }
4156 3840
4157 s_return (SCHEME_V->code); 3841 s_return (SCHEME_V->code);
4158 3842
4159 case OP_CASE0: /* case */ 3843 case OP_CASE0: /* case */
4160 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code)); 3844 s_save (SCHEME_A_ OP_CASE1, NIL, cdr (SCHEME_V->code));
… …
4163 3847
4164 case OP_CASE1: /* case */ 3848 case OP_CASE1: /* case */
4165 for (x = SCHEME_V->code; x != NIL; x = cdr (x)) 3849 for (x = SCHEME_V->code; x != NIL; x = cdr (x))
4166 { 3850 {
4167 if (!is_pair (y = caar (x))) 3851 if (!is_pair (y = caar (x)))
4168 {
4169 break; 3852 break;
4170 }
4171 3853
4172 for (; y != NIL; y = cdr (y)) 3854 for (; y != NIL; y = cdr (y))
4173 {
4174 if (eqv (car (y), SCHEME_V->value)) 3855 if (eqv (car (y), SCHEME_V->value))
4175 {
4176 break; 3856 break;
4177 }
4178 }
4179 3857
4180 if (y != NIL) 3858 if (y != NIL)
4181 {
4182 break; 3859 break;
4183 }
4184 } 3860 }
4185 3861
4186 if (x != NIL) 3862 if (x != NIL)
4187 { 3863 {
4188 if (is_pair (caar (x))) 3864 if (is_pair (caar (x)))
… …
4196 SCHEME_V->code = caar (x); 3872 SCHEME_V->code = caar (x);
4197 s_goto (OP_EVAL); 3873 s_goto (OP_EVAL);
4198 } 3874 }
4199 } 3875 }
4200 else 3876 else
4201 {
4202 s_return (NIL); 3877 s_return (NIL);
4203 }
4204 3878
4205 case OP_CASE2: /* case */ 3879 case OP_CASE2: /* case */
4206 if (is_true (SCHEME_V->value)) 3880 if (is_true (SCHEME_V->value))
4207 {
4208 s_goto (OP_BEGIN); 3881 s_goto (OP_BEGIN);
4209 }
4210 else 3882 else
4211 {
4212 s_return (NIL); 3883 s_return (NIL);
4213 }
4214 3884
4215 case OP_PAPPLY: /* apply */ 3885 case OP_PAPPLY: /* apply */
4216 SCHEME_V->code = car (SCHEME_V->args); 3886 SCHEME_V->code = car (args);
4217 SCHEME_V->args = list_star (SCHEME_A_ cdr (SCHEME_V->args)); 3887 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
4218 /*SCHEME_V->args = cadr(SCHEME_V->args); */ 3888 /*SCHEME_V->args = cadr(args); */
4219 s_goto (OP_APPLY); 3889 s_goto (OP_APPLY);
4220 3890
4221 case OP_PEVAL: /* eval */ 3891 case OP_PEVAL: /* eval */
4222 if (cdr (SCHEME_V->args) != NIL) 3892 if (cdr (args) != NIL)
4223 {
4224 SCHEME_V->envir = cadr (SCHEME_V->args); 3893 SCHEME_V->envir = cadr (args);
4225 }
4226 3894
4227 SCHEME_V->code = car (SCHEME_V->args); 3895 SCHEME_V->code = car (args);
4228 s_goto (OP_EVAL); 3896 s_goto (OP_EVAL);
4229 3897
4230 case OP_CONTINUATION: /* call-with-current-continuation */ 3898 case OP_CONTINUATION: /* call-with-current-continuation */
4231 SCHEME_V->code = car (SCHEME_V->args); 3899 SCHEME_V->code = car (args);
4232 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);
4233 s_goto (OP_APPLY); 3901 s_goto (OP_APPLY);
4234 } 3902 }
4235 3903
4236 return S_T; 3904 if (USE_ERROR_CHECKING) abort ();
4237} 3905}
4238 3906
4239static pointer 3907static int
4240opexe_2 (SCHEME_P_ enum scheme_opcodes op) 3908opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4241{ 3909{
4242 pointer x; 3910 pointer args = SCHEME_V->args;
3911 pointer x = car (args);
4243 num v; 3912 num v;
4244 3913
4245#if USE_MATH 3914#if USE_MATH
4246 RVALUE dd; 3915 RVALUE dd;
4247#endif 3916#endif
4248 3917
4249 switch (op) 3918 switch (op)
4250 { 3919 {
4251#if USE_MATH 3920#if USE_MATH
4252
4253 case OP_INEX2EX: /* inexact->exact */ 3921 case OP_INEX2EX: /* inexact->exact */
4254 x = car (SCHEME_V->args);
4255
4256 if (num_is_integer (x)) 3922 if (is_integer (x))
4257 {
4258 s_return (x); 3923 s_return (x);
4259 }
4260 else if (modf (rvalue_unchecked (x), &dd) == 0.0) 3924 else if (modf (rvalue_unchecked (x), &dd) == 0)
4261 {
4262 s_return (mk_integer (SCHEME_A_ ivalue (x))); 3925 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4263 }
4264 else 3926 else
4265 {
4266 Error_1 ("inexact->exact: not integral:", x); 3927 Error_1 ("inexact->exact: not integral:", x);
4267 }
4268 3928
4269 case OP_EXP:
4270 x = car (SCHEME_V->args);
4271 s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 3929 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4272
4273 case OP_LOG:
4274 x = car (SCHEME_V->args);
4275 s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 3930 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));
4276
4277 case OP_SIN:
4278 x = car (SCHEME_V->args);
4279 s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 3931 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4280
4281 case OP_COS:
4282 x = car (SCHEME_V->args);
4283 s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 3932 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4284
4285 case OP_TAN:
4286 x = car (SCHEME_V->args);
4287 s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 3933 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4288
4289 case OP_ASIN:
4290 x = car (SCHEME_V->args);
4291 s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 3934 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4292
4293 case OP_ACOS:
4294 x = car (SCHEME_V->args);
4295 s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 3935 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4296 3936
4297 case OP_ATAN: 3937 case OP_ATAN:
4298 x = car (SCHEME_V->args);
4299
4300 if (cdr (SCHEME_V->args) == NIL) 3938 if (cdr (args) == NIL)
4301 {
4302 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 3939 s_return (mk_real (SCHEME_A_ atan (rvalue (x))));
4303 }
4304 else 3940 else
4305 { 3941 {
4306 pointer y = cadr (SCHEME_V->args); 3942 pointer y = cadr (args);
4307
4308 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y)))); 3943 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4309 } 3944 }
4310 3945
4311 case OP_SQRT: 3946 case OP_SQRT:
4312 x = car (SCHEME_V->args);
4313 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x)))); 3947 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4314 3948
4315 case OP_EXPT: 3949 case OP_EXPT:
4316 { 3950 {
4317 RVALUE result; 3951 RVALUE result;
4318 int real_result = 1; 3952 int real_result = 1;
4319 pointer y = cadr (SCHEME_V->args); 3953 pointer y = cadr (args);
4320 3954
4321 x = car (SCHEME_V->args);
4322
4323 if (num_is_integer (x) && num_is_integer (y)) 3955 if (is_integer (x) && is_integer (y))
4324 real_result = 0; 3956 real_result = 0;
4325 3957
4326 /* This 'if' is an R5RS compatibility fix. */ 3958 /* This 'if' is an R5RS compatibility fix. */
4327 /* NOTE: Remove this 'if' fix for R6RS. */ 3959 /* NOTE: Remove this 'if' fix for R6RS. */
4328 if (rvalue (x) == 0 && rvalue (y) < 0) 3960 if (rvalue (x) == 0 && rvalue (y) < 0)
4329 {
4330 result = 0.0; 3961 result = 0;
4331 }
4332 else 3962 else
4333 {
4334 result = pow (rvalue (x), rvalue (y)); 3963 result = pow (rvalue (x), rvalue (y));
4335 }
4336 3964
4337 /* Before returning integer result make sure we can. */ 3965 /* Before returning integer result make sure we can. */
4338 /* If the test fails, result is too big for integer. */ 3966 /* If the test fails, result is too big for integer. */
4339 if (!real_result) 3967 if (!real_result)
4340 { 3968 {
4341 long result_as_long = (long) result; 3969 long result_as_long = result;
4342 3970
4343 if (result != (RVALUE) result_as_long) 3971 if (result != (RVALUE) result_as_long)
4344 real_result = 1; 3972 real_result = 1;
4345 } 3973 }
4346 3974
4347 if (real_result) 3975 if (real_result)
4348 {
4349 s_return (mk_real (SCHEME_A_ result)); 3976 s_return (mk_real (SCHEME_A_ result));
4350 }
4351 else 3977 else
4352 {
4353 s_return (mk_integer (SCHEME_A_ result)); 3978 s_return (mk_integer (SCHEME_A_ result));
4354 }
4355 } 3979 }
4356 3980
4357 case OP_FLOOR:
4358 x = car (SCHEME_V->args);
4359 s_return (mk_real (SCHEME_A_ floor (rvalue (x)))); 3981 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4360
4361 case OP_CEILING:
4362 x = car (SCHEME_V->args);
4363 s_return (mk_real (SCHEME_A_ ceil (rvalue (x)))); 3982 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4364 3983
4365 case OP_TRUNCATE: 3984 case OP_TRUNCATE:
4366 { 3985 {
4367 RVALUE rvalue_of_x; 3986 RVALUE rvalue_of_x;
4368 3987
4369 x = car (SCHEME_V->args);
4370 rvalue_of_x = rvalue (x); 3988 rvalue_of_x = rvalue (x);
4371 3989
4372 if (rvalue_of_x > 0) 3990 if (rvalue_of_x > 0)
4373 {
4374 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x))); 3991 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4375 }
4376 else 3992 else
4377 {
4378 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x))); 3993 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4379 }
4380 } 3994 }
4381 3995
4382 case OP_ROUND: 3996 case OP_ROUND:
4383 x = car (SCHEME_V->args);
4384
4385 if (num_is_integer (x)) 3997 if (num_is_integer (x))
4386 s_return (x); 3998 s_return (x);
4387 3999
4388 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x)))); 4000 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4389#endif 4001#endif
4390 4002
4391 case OP_ADD: /* + */ 4003 case OP_ADD: /* + */
4392 v = num_zero; 4004 v = num_zero;
4393 4005
4394 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4006 for (x = args; x != NIL; x = cdr (x))
4395 v = num_add (v, nvalue (car (x))); 4007 v = num_op (NUM_ADD, v, nvalue (car (x)));
4396 4008
4397 s_return (mk_number (SCHEME_A_ v)); 4009 s_return (mk_number (SCHEME_A_ v));
4398 4010
4399 case OP_MUL: /* * */ 4011 case OP_MUL: /* * */
4400 v = num_one; 4012 v = num_one;
4401 4013
4402 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4014 for (x = args; x != NIL; x = cdr (x))
4403 v = num_mul (v, nvalue (car (x))); 4015 v = num_op (NUM_MUL, v, nvalue (car (x)));
4404 4016
4405 s_return (mk_number (SCHEME_A_ v)); 4017 s_return (mk_number (SCHEME_A_ v));
4406 4018
4407 case OP_SUB: /* - */ 4019 case OP_SUB: /* - */
4408 if (cdr (SCHEME_V->args) == NIL) 4020 if (cdr (args) == NIL)
4409 { 4021 {
4410 x = SCHEME_V->args; 4022 x = args;
4411 v = num_zero; 4023 v = num_zero;
4412 } 4024 }
4413 else 4025 else
4414 { 4026 {
4415 x = cdr (SCHEME_V->args); 4027 x = cdr (args);
4416 v = nvalue (car (SCHEME_V->args)); 4028 v = nvalue (car (args));
4417 } 4029 }
4418 4030
4419 for (; x != NIL; x = cdr (x)) 4031 for (; x != NIL; x = cdr (x))
4420 v = num_sub (v, nvalue (car (x))); 4032 v = num_op (NUM_SUB, v, nvalue (car (x)));
4421 4033
4422 s_return (mk_number (SCHEME_A_ v)); 4034 s_return (mk_number (SCHEME_A_ v));
4423 4035
4424 case OP_DIV: /* / */ 4036 case OP_DIV: /* / */
4425 if (cdr (SCHEME_V->args) == NIL) 4037 if (cdr (args) == NIL)
4426 { 4038 {
4427 x = SCHEME_V->args; 4039 x = args;
4428 v = num_one; 4040 v = num_one;
4429 } 4041 }
4430 else 4042 else
4431 { 4043 {
4432 x = cdr (SCHEME_V->args); 4044 x = cdr (args);
4433 v = nvalue (car (SCHEME_V->args)); 4045 v = nvalue (car (args));
4434 } 4046 }
4435 4047
4436 for (; x != NIL; x = cdr (x)) 4048 for (; x != NIL; x = cdr (x))
4437 {
4438 if (!is_zero_rvalue (rvalue (car (x)))) 4049 if (!is_zero_rvalue (rvalue (car (x))))
4439 v = num_div (v, nvalue (car (x))); 4050 v = num_div (v, nvalue (car (x)));
4440 else 4051 else
4441 Error_0 ("/: division by zero"); 4052 Error_0 ("/: division by zero");
4442 }
4443 4053
4444 s_return (mk_number (SCHEME_A_ v)); 4054 s_return (mk_number (SCHEME_A_ v));
4445 4055
4446 case OP_INTDIV: /* quotient */ 4056 case OP_INTDIV: /* quotient */
4447 if (cdr (SCHEME_V->args) == NIL) 4057 if (cdr (args) == NIL)
4448 { 4058 {
4449 x = SCHEME_V->args; 4059 x = args;
4450 v = num_one; 4060 v = num_one;
4451 } 4061 }
4452 else 4062 else
4453 { 4063 {
4454 x = cdr (SCHEME_V->args); 4064 x = cdr (args);
4455 v = nvalue (car (SCHEME_V->args)); 4065 v = nvalue (car (args));
4456 } 4066 }
4457 4067
4458 for (; x != NIL; x = cdr (x)) 4068 for (; x != NIL; x = cdr (x))
4459 { 4069 {
4460 if (ivalue (car (x)) != 0) 4070 if (ivalue (car (x)) != 0)
4461 v = num_intdiv (v, nvalue (car (x))); 4071 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4462 else 4072 else
4463 Error_0 ("quotient: division by zero"); 4073 Error_0 ("quotient: division by zero");
4464 } 4074 }
4465 4075
4466 s_return (mk_number (SCHEME_A_ v)); 4076 s_return (mk_number (SCHEME_A_ v));
4467 4077
4468 case OP_REM: /* remainder */ 4078 case OP_REM: /* remainder */
4469 v = nvalue (car (SCHEME_V->args)); 4079 v = nvalue (x);
4470 4080
4471 if (ivalue (cadr (SCHEME_V->args)) != 0) 4081 if (ivalue (cadr (args)) != 0)
4472 v = num_rem (v, nvalue (cadr (SCHEME_V->args))); 4082 v = num_rem (v, nvalue (cadr (args)));
4473 else 4083 else
4474 Error_0 ("remainder: division by zero"); 4084 Error_0 ("remainder: division by zero");
4475 4085
4476 s_return (mk_number (SCHEME_A_ v)); 4086 s_return (mk_number (SCHEME_A_ v));
4477 4087
4478 case OP_MOD: /* modulo */ 4088 case OP_MOD: /* modulo */
4479 v = nvalue (car (SCHEME_V->args)); 4089 v = nvalue (x);
4480 4090
4481 if (ivalue (cadr (SCHEME_V->args)) != 0) 4091 if (ivalue (cadr (args)) != 0)
4482 v = num_mod (v, nvalue (cadr (SCHEME_V->args))); 4092 v = num_mod (v, nvalue (cadr (args)));
4483 else 4093 else
4484 Error_0 ("modulo: division by zero"); 4094 Error_0 ("modulo: division by zero");
4485 4095
4486 s_return (mk_number (SCHEME_A_ v)); 4096 s_return (mk_number (SCHEME_A_ v));
4487 4097
4488 case OP_CAR: /* car */ 4098 case OP_CAR: /* car */
4489 s_return (caar (SCHEME_V->args)); 4099 s_return (caar (args));
4490 4100
4491 case OP_CDR: /* cdr */ 4101 case OP_CDR: /* cdr */
4492 s_return (cdar (SCHEME_V->args)); 4102 s_return (cdar (args));
4493 4103
4494 case OP_CONS: /* cons */ 4104 case OP_CONS: /* cons */
4495 set_cdr (SCHEME_V->args, cadr (SCHEME_V->args)); 4105 set_cdr (args, cadr (args));
4496 s_return (SCHEME_V->args); 4106 s_return (args);
4497 4107
4498 case OP_SETCAR: /* set-car! */ 4108 case OP_SETCAR: /* set-car! */
4499 if (!is_immutable (car (SCHEME_V->args))) 4109 if (!is_immutable (x))
4500 { 4110 {
4501 set_car (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4111 set_car (x, cadr (args));
4502 s_return (car (SCHEME_V->args)); 4112 s_return (car (args));
4503 } 4113 }
4504 else 4114 else
4505 Error_0 ("set-car!: unable to alter immutable pair"); 4115 Error_0 ("set-car!: unable to alter immutable pair");
4506 4116
4507 case OP_SETCDR: /* set-cdr! */ 4117 case OP_SETCDR: /* set-cdr! */
4508 if (!is_immutable (car (SCHEME_V->args))) 4118 if (!is_immutable (x))
4509 { 4119 {
4510 set_cdr (car (SCHEME_V->args), cadr (SCHEME_V->args)); 4120 set_cdr (x, cadr (args));
4511 s_return (car (SCHEME_V->args)); 4121 s_return (car (args));
4512 } 4122 }
4513 else 4123 else
4514 Error_0 ("set-cdr!: unable to alter immutable pair"); 4124 Error_0 ("set-cdr!: unable to alter immutable pair");
4515 4125
4516 case OP_CHAR2INT: /* char->integer */ 4126 case OP_CHAR2INT: /* char->integer */
4517 {
4518 char c;
4519
4520 c = (char) ivalue (car (SCHEME_V->args));
4521 s_return (mk_integer (SCHEME_A_ (unsigned char) c)); 4127 s_return (mk_integer (SCHEME_A_ ivalue (x)));
4522 }
4523 4128
4524 case OP_INT2CHAR: /* integer->char */ 4129 case OP_INT2CHAR: /* integer->char */
4525 {
4526 unsigned char c;
4527
4528 c = (unsigned char) ivalue (car (SCHEME_V->args));
4529 s_return (mk_character (SCHEME_A_ (char) c)); 4130 s_return (mk_character (SCHEME_A_ ivalue (x)));
4530 }
4531 4131
4532 case OP_CHARUPCASE: 4132 case OP_CHARUPCASE:
4533 { 4133 {
4534 unsigned char c; 4134 unsigned char c = ivalue (x);
4535
4536 c = (unsigned char) ivalue (car (SCHEME_V->args));
4537 c = toupper (c); 4135 c = toupper (c);
4538 s_return (mk_character (SCHEME_A_ (char) c)); 4136 s_return (mk_character (SCHEME_A_ c));
4539 } 4137 }
4540 4138
4541 case OP_CHARDNCASE: 4139 case OP_CHARDNCASE:
4542 { 4140 {
4543 unsigned char c; 4141 unsigned char c = ivalue (x);
4544
4545 c = (unsigned char) ivalue (car (SCHEME_V->args));
4546 c = tolower (c); 4142 c = tolower (c);
4547 s_return (mk_character (SCHEME_A_ (char) c)); 4143 s_return (mk_character (SCHEME_A_ c));
4548 } 4144 }
4549 4145
4550 case OP_STR2SYM: /* string->symbol */ 4146 case OP_STR2SYM: /* string->symbol */
4551 s_return (mk_symbol (SCHEME_A_ strvalue (car (SCHEME_V->args)))); 4147 s_return (mk_symbol (SCHEME_A_ strvalue (x)));
4552 4148
4553 case OP_STR2ATOM: /* string->atom */ 4149 case OP_STR2ATOM: /* string->atom */
4554 { 4150 {
4555 char *s = strvalue (car (SCHEME_V->args)); 4151 char *s = strvalue (x);
4556 long pf = 0; 4152 long pf = 0;
4557 4153
4558 if (cdr (SCHEME_V->args) != NIL) 4154 if (cdr (args) != NIL)
4559 { 4155 {
4560 /* we know cadr(SCHEME_V->args) is a natural number */ 4156 /* we know cadr(args) is a natural number */
4561 /* see if it is 2, 8, 10, or 16, or error */ 4157 /* see if it is 2, 8, 10, or 16, or error */
4562 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4158 pf = ivalue_unchecked (cadr (args));
4563 4159
4564 if (pf == 16 || pf == 10 || pf == 8 || pf == 2) 4160 if (pf == 16 || pf == 10 || pf == 8 || pf == 2)
4565 { 4161 {
4566 /* base is OK */ 4162 /* base is OK */
4567 } 4163 }
4568 else 4164 else
4569 {
4570 pf = -1; 4165 pf = -1;
4571 }
4572 } 4166 }
4573 4167
4574 if (pf < 0) 4168 if (pf < 0)
4575 {
4576 Error_1 ("string->atom: bad base:", cadr (SCHEME_V->args)); 4169 Error_1 ("string->atom: bad base:", cadr (args));
4577 }
4578 else if (*s == '#') /* no use of base! */ 4170 else if (*s == '#') /* no use of base! */
4579 {
4580 s_return (mk_sharp_const (SCHEME_A_ s + 1)); 4171 s_return (mk_sharp_const (SCHEME_A_ s + 1));
4581 }
4582 else 4172 else
4583 { 4173 {
4584 if (pf == 0 || pf == 10) 4174 if (pf == 0 || pf == 10)
4585 {
4586 s_return (mk_atom (SCHEME_A_ s)); 4175 s_return (mk_atom (SCHEME_A_ s));
4587 }
4588 else 4176 else
4589 { 4177 {
4590 char *ep; 4178 char *ep;
4591 long iv = strtol (s, &ep, (int) pf); 4179 long iv = strtol (s, &ep, (int) pf);
4592 4180
4593 if (*ep == 0) 4181 if (*ep == 0)
4594 {
4595 s_return (mk_integer (SCHEME_A_ iv)); 4182 s_return (mk_integer (SCHEME_A_ iv));
4596 }
4597 else 4183 else
4598 {
4599 s_return (S_F); 4184 s_return (S_F);
4600 }
4601 } 4185 }
4602 } 4186 }
4603 } 4187 }
4604 4188
4605 case OP_SYM2STR: /* symbol->string */ 4189 case OP_SYM2STR: /* symbol->string */
4606 x = mk_string (SCHEME_A_ symname (car (SCHEME_V->args))); 4190 x = mk_string (SCHEME_A_ symname (x));
4607 setimmutable (x); 4191 setimmutable (x);
4608 s_return (x); 4192 s_return (x);
4609 4193
4610 case OP_ATOM2STR: /* atom->string */ 4194 case OP_ATOM2STR: /* atom->string */
4611 { 4195 {
4612 long pf = 0; 4196 long pf = 0;
4613 4197
4614 x = car (SCHEME_V->args);
4615
4616 if (cdr (SCHEME_V->args) != NIL) 4198 if (cdr (args) != NIL)
4617 { 4199 {
4618 /* we know cadr(SCHEME_V->args) is a natural number */ 4200 /* we know cadr(args) is a natural number */
4619 /* see if it is 2, 8, 10, or 16, or error */ 4201 /* see if it is 2, 8, 10, or 16, or error */
4620 pf = ivalue_unchecked (cadr (SCHEME_V->args)); 4202 pf = ivalue_unchecked (cadr (args));
4621 4203
4622 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))
4623 { 4205 {
4624 /* base is OK */ 4206 /* base is OK */
4625 } 4207 }
4626 else 4208 else
4627 {
4628 pf = -1; 4209 pf = -1;
4629 }
4630 } 4210 }
4631 4211
4632 if (pf < 0) 4212 if (pf < 0)
4633 {
4634 Error_1 ("atom->string: bad base:", cadr (SCHEME_V->args)); 4213 Error_1 ("atom->string: bad base:", cadr (args));
4635 }
4636 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))
4637 { 4215 {
4638 char *p; 4216 char *p;
4639 int len; 4217 int len;
4640 4218
4641 atom2str (SCHEME_A_ x, (int) pf, &p, &len); 4219 atom2str (SCHEME_A_ x, pf, &p, &len);
4642 s_return (mk_counted_string (SCHEME_A_ p, len)); 4220 s_return (mk_counted_string (SCHEME_A_ p, len));
4643 } 4221 }
4644 else 4222 else
4645 {
4646 Error_1 ("atom->string: not an atom:", x); 4223 Error_1 ("atom->string: not an atom:", x);
4647 }
4648 } 4224 }
4649 4225
4650 case OP_MKSTRING: /* make-string */ 4226 case OP_MKSTRING: /* make-string */
4651 { 4227 {
4652 int fill = ' '; 4228 int fill = ' ';
4653 int len; 4229 int len;
4654 4230
4655 len = ivalue (car (SCHEME_V->args)); 4231 len = ivalue (x);
4656 4232
4657 if (cdr (SCHEME_V->args) != NIL) 4233 if (cdr (args) != NIL)
4658 {
4659 fill = charvalue (cadr (SCHEME_V->args)); 4234 fill = charvalue (cadr (args));
4660 }
4661 4235
4662 s_return (mk_empty_string (SCHEME_A_ len, (char) fill)); 4236 s_return (mk_empty_string (SCHEME_A_ len, fill));
4663 } 4237 }
4664 4238
4665 case OP_STRLEN: /* string-length */ 4239 case OP_STRLEN: /* string-length */
4666 s_return (mk_integer (SCHEME_A_ strlength (car (SCHEME_V->args)))); 4240 s_return (mk_integer (SCHEME_A_ strlength (x)));
4667 4241
4668 case OP_STRREF: /* string-ref */ 4242 case OP_STRREF: /* string-ref */
4669 { 4243 {
4670 char *str; 4244 char *str;
4671 int index; 4245 int index;
4672 4246
4673 str = strvalue (car (SCHEME_V->args)); 4247 str = strvalue (x);
4674 4248
4675 index = ivalue (cadr (SCHEME_V->args)); 4249 index = ivalue (cadr (args));
4676 4250
4677 if (index >= strlength (car (SCHEME_V->args))) 4251 if (index >= strlength (x))
4678 {
4679 Error_1 ("string-ref: out of bounds:", cadr (SCHEME_V->args)); 4252 Error_1 ("string-ref: out of bounds:", cadr (args));
4680 }
4681 4253
4682 s_return (mk_character (SCHEME_A_ ((unsigned char *) str)[index])); 4254 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4683 } 4255 }
4684 4256
4685 case OP_STRSET: /* string-set! */ 4257 case OP_STRSET: /* string-set! */
4686 { 4258 {
4687 char *str; 4259 char *str;
4688 int index; 4260 int index;
4689 int c; 4261 int c;
4690 4262
4691 if (is_immutable (car (SCHEME_V->args))) 4263 if (is_immutable (x))
4692 {
4693 Error_1 ("string-set!: unable to alter immutable string:", car (SCHEME_V->args)); 4264 Error_1 ("string-set!: unable to alter immutable string:", x);
4694 }
4695 4265
4696 str = strvalue (car (SCHEME_V->args)); 4266 str = strvalue (x);
4697 4267
4698 index = ivalue (cadr (SCHEME_V->args)); 4268 index = ivalue (cadr (args));
4699 4269
4700 if (index >= strlength (car (SCHEME_V->args))) 4270 if (index >= strlength (x))
4701 {
4702 Error_1 ("string-set!: out of bounds:", cadr (SCHEME_V->args)); 4271 Error_1 ("string-set!: out of bounds:", cadr (args));
4703 }
4704 4272
4705 c = charvalue (caddr (SCHEME_V->args)); 4273 c = charvalue (caddr (args));
4706 4274
4707 str[index] = (char) c; 4275 str[index] = c;
4708 s_return (car (SCHEME_V->args)); 4276 s_return (car (args));
4709 } 4277 }
4710 4278
4711 case OP_STRAPPEND: /* string-append */ 4279 case OP_STRAPPEND: /* string-append */
4712 { 4280 {
4713 /* 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 */
4714 int len = 0; 4282 int len = 0;
4715 pointer newstr; 4283 pointer newstr;
4716 char *pos; 4284 char *pos;
4717 4285
4718 /* compute needed length for new string */ 4286 /* compute needed length for new string */
4719 for (x = SCHEME_V->args; x != NIL; x = cdr (x)) 4287 for (x = args; x != NIL; x = cdr (x))
4720 {
4721 len += strlength (car (x)); 4288 len += strlength (car (x));
4722 }
4723 4289
4724 newstr = mk_empty_string (SCHEME_A_ len, ' '); 4290 newstr = mk_empty_string (SCHEME_A_ len, ' ');
4725 4291
4726 /* store the contents of the argument strings into the new string */ 4292 /* store the contents of the argument strings into the new string */
4727 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))
4728 {
4729 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4294 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4730 }
4731 4295
4732 s_return (newstr); 4296 s_return (newstr);
4733 } 4297 }
4734 4298
4735 case OP_SUBSTR: /* substring */ 4299 case OP_SUBSTR: /* substring */
… …
4737 char *str; 4301 char *str;
4738 int index0; 4302 int index0;
4739 int index1; 4303 int index1;
4740 int len; 4304 int len;
4741 4305
4742 str = strvalue (car (SCHEME_V->args)); 4306 str = strvalue (x);
4743 4307
4744 index0 = ivalue (cadr (SCHEME_V->args)); 4308 index0 = ivalue (cadr (args));
4745 4309
4746 if (index0 > strlength (car (SCHEME_V->args))) 4310 if (index0 > strlength (x))
4311 Error_1 ("substring: start out of bounds:", cadr (args));
4312
4313 if (cddr (args) != NIL)
4747 { 4314 {
4748 Error_1 ("substring: start out of bounds:", cadr (SCHEME_V->args));
4749 }
4750
4751 if (cddr (SCHEME_V->args) != NIL)
4752 {
4753 index1 = ivalue (caddr (SCHEME_V->args)); 4315 index1 = ivalue (caddr (args));
4754 4316
4755 if (index1 > strlength (car (SCHEME_V->args)) || index1 < index0) 4317 if (index1 > strlength (x) || index1 < index0)
4756 {
4757 Error_1 ("substring: end out of bounds:", caddr (SCHEME_V->args)); 4318 Error_1 ("substring: end out of bounds:", caddr (args));
4758 }
4759 } 4319 }
4760 else 4320 else
4761 { 4321 index1 = strlength (x);
4762 index1 = strlength (car (SCHEME_V->args));
4763 }
4764 4322
4765 len = index1 - index0; 4323 len = index1 - index0;
4766 x = mk_empty_string (SCHEME_A_ len, ' '); 4324 x = mk_empty_string (SCHEME_A_ len, ' ');
4767 memcpy (strvalue (x), str + index0, len); 4325 memcpy (strvalue (x), str + index0, len);
4768 strvalue (x)[len] = 0; 4326 strvalue (x)[len] = 0;
… …
4772 4330
4773 case OP_VECTOR: /* vector */ 4331 case OP_VECTOR: /* vector */
4774 { 4332 {
4775 int i; 4333 int i;
4776 pointer vec; 4334 pointer vec;
4777 int len = list_length (SCHEME_A_ SCHEME_V->args); 4335 int len = list_length (SCHEME_A_ args);
4778 4336
4779 if (len < 0) 4337 if (len < 0)
4780 {
4781 Error_1 ("vector: not a proper list:", SCHEME_V->args); 4338 Error_1 ("vector: not a proper list:", args);
4782 }
4783 4339
4784 vec = mk_vector (SCHEME_A_ len); 4340 vec = mk_vector (SCHEME_A_ len);
4785 4341
4786#if USE_ERROR_CHECKING 4342#if USE_ERROR_CHECKING
4787 if (SCHEME_V->no_memory) 4343 if (SCHEME_V->no_memory)
4788 s_return (S_SINK); 4344 s_return (S_SINK);
4789#endif 4345#endif
4790 4346
4791 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++)
4792 set_vector_elem (vec, i, car (x)); 4348 set_vector_elem (vec, i, car (x));
4793 4349
4794 s_return (vec); 4350 s_return (vec);
4795 } 4351 }
4796 4352
… …
4798 { 4354 {
4799 pointer fill = NIL; 4355 pointer fill = NIL;
4800 int len; 4356 int len;
4801 pointer vec; 4357 pointer vec;
4802 4358
4803 len = ivalue (car (SCHEME_V->args)); 4359 len = ivalue (x);
4804 4360
4805 if (cdr (SCHEME_V->args) != NIL) 4361 if (cdr (args) != NIL)
4806 fill = cadr (SCHEME_V->args); 4362 fill = cadr (args);
4807 4363
4808 vec = mk_vector (SCHEME_A_ len); 4364 vec = mk_vector (SCHEME_A_ len);
4809 4365
4810#if USE_ERROR_CHECKING 4366#if USE_ERROR_CHECKING
4811 if (SCHEME_V->no_memory) 4367 if (SCHEME_V->no_memory)
… …
4817 4373
4818 s_return (vec); 4374 s_return (vec);
4819 } 4375 }
4820 4376
4821 case OP_VECLEN: /* vector-length */ 4377 case OP_VECLEN: /* vector-length */
4822 s_return (mk_integer (SCHEME_A_ ivalue (car (SCHEME_V->args)))); 4378 s_return (mk_integer (SCHEME_A_ veclength (x)));
4823 4379
4824 case OP_VECREF: /* vector-ref */ 4380 case OP_VECREF: /* vector-ref */
4825 { 4381 {
4826 int index; 4382 int index;
4827 4383
4828 index = ivalue (cadr (SCHEME_V->args)); 4384 index = ivalue (cadr (args));
4829 4385
4830 if (index >= ivalue (car (SCHEME_V->args))) 4386 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4831 {
4832 Error_1 ("vector-ref: out of bounds:", cadr (SCHEME_V->args)); 4387 Error_1 ("vector-ref: out of bounds:", cadr (args));
4833 }
4834 4388
4835 s_return (vector_elem (car (SCHEME_V->args), index)); 4389 s_return (vector_elem (x, index));
4836 } 4390 }
4837 4391
4838 case OP_VECSET: /* vector-set! */ 4392 case OP_VECSET: /* vector-set! */
4839 { 4393 {
4840 int index; 4394 int index;
4841 4395
4842 if (is_immutable (car (SCHEME_V->args))) 4396 if (is_immutable (x))
4843 {
4844 Error_1 ("vector-set!: unable to alter immutable vector:", car (SCHEME_V->args)); 4397 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4845 }
4846 4398
4847 index = ivalue (cadr (SCHEME_V->args)); 4399 index = ivalue (cadr (args));
4848 4400
4849 if (index >= ivalue (car (SCHEME_V->args))) 4401 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4850 {
4851 Error_1 ("vector-set!: out of bounds:", cadr (SCHEME_V->args)); 4402 Error_1 ("vector-set!: out of bounds:", cadr (args));
4852 }
4853 4403
4854 set_vector_elem (car (SCHEME_V->args), index, caddr (SCHEME_V->args)); 4404 set_vector_elem (x, index, caddr (args));
4855 s_return (car (SCHEME_V->args)); 4405 s_return (x);
4856 } 4406 }
4857 } 4407 }
4858 4408
4859 return S_T; 4409 if (USE_ERROR_CHECKING) abort ();
4860} 4410}
4861 4411
4862INTERFACE int 4412INTERFACE int
4863is_list (SCHEME_P_ pointer a) 4413is_list (SCHEME_P_ pointer a)
4864{ 4414{
… …
4911 return -1; 4461 return -1;
4912 } 4462 }
4913 } 4463 }
4914} 4464}
4915 4465
4916static 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
4917opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4498opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4918{ 4499{
4919 pointer x; 4500 pointer args = SCHEME_V->args;
4920 num v; 4501 pointer a = car (args);
4921 int (*comp_func) (num, num); 4502 pointer d = cdr (args);
4503 int r;
4922 4504
4923 switch (op) 4505 switch (op)
4924 { 4506 {
4925 case OP_NOT: /* not */ 4507 case OP_NOT: /* not */ r = is_false (a) ; break;
4926 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;
4927 4517
4928 case OP_BOOLP: /* boolean? */
4929 s_retbool (car (SCHEME_V->args) == S_F || car (SCHEME_V->args) == S_T);
4930
4931 case OP_EOFOBJP: /* boolean? */
4932 s_retbool (car (SCHEME_V->args) == S_EOF);
4933
4934 case OP_NULLP: /* null? */
4935 s_retbool (car (SCHEME_V->args) == NIL);
4936
4937 case OP_NUMEQ: /* = */
4938 case OP_LESS: /* < */
4939 case OP_GRE: /* > */
4940 case OP_LEQ: /* <= */
4941 case OP_GEQ: /* >= */
4942 switch (op)
4943 {
4944 case OP_NUMEQ:
4945 comp_func = num_eq;
4946 break;
4947
4948 case OP_LESS:
4949 comp_func = num_lt;
4950 break;
4951
4952 case OP_GRE:
4953 comp_func = num_gt;
4954 break;
4955
4956 case OP_LEQ:
4957 comp_func = num_le;
4958 break;
4959
4960 case OP_GEQ:
4961 comp_func = num_ge;
4962 break;
4963 }
4964
4965 x = SCHEME_V->args;
4966 v = nvalue (car (x));
4967 x = cdr (x);
4968
4969 for (; x != NIL; x = cdr (x))
4970 {
4971 if (!comp_func (v, nvalue (car (x))))
4972 {
4973 s_retbool (0);
4974 }
4975
4976 v = nvalue (car (x));
4977 }
4978
4979 s_retbool (1);
4980
4981 case OP_SYMBOLP: /* symbol? */
4982 s_retbool (is_symbol (car (SCHEME_V->args)));
4983
4984 case OP_NUMBERP: /* number? */
4985 s_retbool (is_number (car (SCHEME_V->args)));
4986
4987 case OP_STRINGP: /* string? */
4988 s_retbool (is_string (car (SCHEME_V->args)));
4989
4990 case OP_INTEGERP: /* integer? */
4991 s_retbool (is_integer (car (SCHEME_V->args)));
4992
4993 case OP_REALP: /* real? */
4994 s_retbool (is_number (car (SCHEME_V->args))); /* All numbers are real */
4995
4996 case OP_CHARP: /* char? */
4997 s_retbool (is_character (car (SCHEME_V->args)));
4998#if USE_CHAR_CLASSIFIERS 4518#if USE_CHAR_CLASSIFIERS
4999
5000 case OP_CHARAP: /* char-alphabetic? */ 4519 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break;
5001 s_retbool (Cisalpha (ivalue (car (SCHEME_V->args)))); 4520 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break;
5002
5003 case OP_CHARNP: /* char-numeric? */
5004 s_retbool (Cisdigit (ivalue (car (SCHEME_V->args))));
5005
5006 case OP_CHARWP: /* char-whitespace? */ 4521 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break;
5007 s_retbool (Cisspace (ivalue (car (SCHEME_V->args))));
5008
5009 case OP_CHARUP: /* char-upper-case? */ 4522 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break;
5010 s_retbool (Cisupper (ivalue (car (SCHEME_V->args))));
5011
5012 case OP_CHARLP: /* char-lower-case? */ 4523 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break;
5013 s_retbool (Cislower (ivalue (car (SCHEME_V->args))));
5014#endif 4524#endif
4525
5015#if USE_PORTS 4526#if USE_PORTS
5016 4527 case OP_PORTP: /* port? */ r = is_port (a) ; break;
5017 case OP_PORTP: /* port? */
5018 s_retbool (is_port (car (SCHEME_V->args)));
5019
5020 case OP_INPORTP: /* input-port? */ 4528 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
5021 s_retbool (is_inport (car (SCHEME_V->args)));
5022
5023 case OP_OUTPORTP: /* output-port? */ 4529 case OP_OUTPORTP: /* output-port? */ r = is_outport (a); break;
5024 s_retbool (is_outport (car (SCHEME_V->args)));
5025#endif 4530#endif
5026 4531
5027 case OP_PROCP: /* procedure? */ 4532 case OP_PROCP: /* procedure? */
5028 4533
5029 /*-- 4534 /*--
5030 * continuation should be procedure by the example 4535 * continuation should be procedure by the example
5031 * (call-with-current-continuation procedure?) ==> #t 4536 * (call-with-current-continuation procedure?) ==> #t
5032 * in R^3 report sec. 6.9 4537 * in R^3 report sec. 6.9
5033 */ 4538 */
5034 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);
5035 || is_continuation (car (SCHEME_V->args)) || is_foreign (car (SCHEME_V->args))); 4540 break;
5036 4541
5037 case OP_PAIRP: /* pair? */ 4542 case OP_PAIRP: /* pair? */ r = is_pair (a) ; break;
5038 s_retbool (is_pair (car (SCHEME_V->args))); 4543 case OP_LISTP: /* list? */ r = list_length (SCHEME_A_ a) >= 0; break;
5039 4544 case OP_ENVP: /* environment? */ r = is_environment (a) ; break;
5040 case OP_LISTP: /* list? */ 4545 case OP_VECTORP: /* vector? */ r = is_vector (a) ; break;
5041 s_retbool (list_length (SCHEME_A_ car (SCHEME_V->args)) >= 0); 4546 case OP_EQ: /* eq? */ r = a == cadr (args) ; break;
5042 4547 case OP_EQV: /* eqv? */ r = eqv (a, cadr (args)) ; break;
5043 case OP_ENVP: /* environment? */
5044 s_retbool (is_environment (car (SCHEME_V->args)));
5045
5046 case OP_VECTORP: /* vector? */
5047 s_retbool (is_vector (car (SCHEME_V->args)));
5048
5049 case OP_EQ: /* eq? */
5050 s_retbool (car (SCHEME_V->args) == cadr (SCHEME_V->args));
5051
5052 case OP_EQV: /* eqv? */
5053 s_retbool (eqv (car (SCHEME_V->args), cadr (SCHEME_V->args)));
5054 } 4548 }
5055 4549
5056 return S_T; 4550 s_retbool (r);
5057} 4551}
5058 4552
5059static pointer 4553static int
5060opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4554opexe_4 (SCHEME_P_ enum scheme_opcodes op)
5061{ 4555{
4556 pointer args = SCHEME_V->args;
4557 pointer a = car (args);
5062 pointer x, y; 4558 pointer x, y;
5063 4559
5064 switch (op) 4560 switch (op)
5065 { 4561 {
5066 case OP_FORCE: /* force */ 4562 case OP_FORCE: /* force */
5067 SCHEME_V->code = car (SCHEME_V->args); 4563 SCHEME_V->code = a;
5068 4564
5069 if (is_promise (SCHEME_V->code)) 4565 if (is_promise (SCHEME_V->code))
5070 { 4566 {
5071 /* Should change type to closure here */ 4567 /* Should change type to closure here */
5072 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code); 4568 s_save (SCHEME_A_ OP_SAVE_FORCED, NIL, SCHEME_V->code);
5073 SCHEME_V->args = NIL; 4569 SCHEME_V->args = NIL;
5074 s_goto (OP_APPLY); 4570 s_goto (OP_APPLY);
5075 } 4571 }
5076 else 4572 else
5077 {
5078 s_return (SCHEME_V->code); 4573 s_return (SCHEME_V->code);
5079 }
5080 4574
5081 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4575 case OP_SAVE_FORCED: /* Save forced value replacing promise */
5082 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4576 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));
5083 s_return (SCHEME_V->value); 4577 s_return (SCHEME_V->value);
5084 4578
… …
5095 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4589 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5096 SCHEME_V->outport = cadr (SCHEME_V->args); 4590 SCHEME_V->outport = cadr (SCHEME_V->args);
5097 } 4591 }
5098 } 4592 }
5099 4593
5100 SCHEME_V->args = car (SCHEME_V->args); 4594 SCHEME_V->args = a;
5101 4595
5102 if (op == OP_WRITE) 4596 if (op == OP_WRITE)
5103 SCHEME_V->print_flag = 1; 4597 SCHEME_V->print_flag = 1;
5104 else 4598 else
5105 SCHEME_V->print_flag = 0; 4599 SCHEME_V->print_flag = 0;
5106 4600
5107 s_goto (OP_P0LIST); 4601 s_goto (OP_P0LIST);
5108 4602
5109 case OP_NEWLINE: /* newline */ 4603 case OP_NEWLINE: /* newline */
5110 if (is_pair (SCHEME_V->args)) 4604 if (is_pair (args))
5111 { 4605 {
5112 if (car (SCHEME_V->args) != SCHEME_V->outport) 4606 if (a != SCHEME_V->outport)
5113 { 4607 {
5114 x = cons (SCHEME_V->outport, NIL); 4608 x = cons (SCHEME_V->outport, NIL);
5115 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4609 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
5116 SCHEME_V->outport = car (SCHEME_V->args); 4610 SCHEME_V->outport = a;
5117 } 4611 }
5118 } 4612 }
5119 4613
5120 putstr (SCHEME_A_ "\n"); 4614 putstr (SCHEME_A_ "\n");
5121 s_return (S_T); 4615 s_return (S_T);
5122#endif 4616#endif
5123 4617
5124 case OP_ERR0: /* error */ 4618 case OP_ERR0: /* error */
5125 SCHEME_V->retcode = -1; 4619 SCHEME_V->retcode = -1;
5126 4620
5127 if (!is_string (car (SCHEME_V->args))) 4621 if (!is_string (a))
5128 { 4622 {
5129 SCHEME_V->args = cons (mk_string (SCHEME_A_ " -- "), SCHEME_V->args); 4623 args = cons (mk_string (SCHEME_A_ " -- "), args);
5130 setimmutable (car (SCHEME_V->args)); 4624 setimmutable (car (args));
5131 } 4625 }
5132 4626
5133 putstr (SCHEME_A_ "Error: "); 4627 putstr (SCHEME_A_ "Error: ");
5134 putstr (SCHEME_A_ strvalue (car (SCHEME_V->args))); 4628 putstr (SCHEME_A_ strvalue (car (args)));
5135 SCHEME_V->args = cdr (SCHEME_V->args); 4629 SCHEME_V->args = cdr (args);
5136 s_goto (OP_ERR1); 4630 s_goto (OP_ERR1);
5137 4631
5138 case OP_ERR1: /* error */ 4632 case OP_ERR1: /* error */
5139 putstr (SCHEME_A_ " "); 4633 putstr (SCHEME_A_ " ");
5140 4634
5141 if (SCHEME_V->args != NIL) 4635 if (args != NIL)
5142 { 4636 {
5143 s_save (SCHEME_A_ OP_ERR1, cdr (SCHEME_V->args), NIL); 4637 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
5144 SCHEME_V->args = car (SCHEME_V->args); 4638 SCHEME_V->args = a;
5145 SCHEME_V->print_flag = 1; 4639 SCHEME_V->print_flag = 1;
5146 s_goto (OP_P0LIST); 4640 s_goto (OP_P0LIST);
5147 } 4641 }
5148 else 4642 else
5149 { 4643 {
5150 putstr (SCHEME_A_ "\n"); 4644 putstr (SCHEME_A_ "\n");
5151 4645
5152 if (SCHEME_V->interactive_repl) 4646 if (SCHEME_V->interactive_repl)
5153 {
5154 s_goto (OP_T0LVL); 4647 s_goto (OP_T0LVL);
5155 }
5156 else 4648 else
5157 {
5158 return NIL; 4649 return -1;
5159 }
5160 } 4650 }
5161 4651
5162 case OP_REVERSE: /* reverse */ 4652 case OP_REVERSE: /* reverse */
5163 s_return (reverse (SCHEME_A_ car (SCHEME_V->args))); 4653 s_return (reverse (SCHEME_A_ a));
5164 4654
5165 case OP_LIST_STAR: /* list* */ 4655 case OP_LIST_STAR: /* list* */
5166 s_return (list_star (SCHEME_A_ SCHEME_V->args)); 4656 s_return (list_star (SCHEME_A_ SCHEME_V->args));
5167 4657
5168 case OP_APPEND: /* append */ 4658 case OP_APPEND: /* append */
5169 x = NIL; 4659 x = NIL;
5170 y = SCHEME_V->args; 4660 y = args;
5171 4661
5172 if (y == x) 4662 if (y == x)
5173 s_return (x); 4663 s_return (x);
5174 4664
5175 /* cdr() in the while condition is not a typo. If car() */ 4665 /* cdr() in the while condition is not a typo. If car() */
… …
5186 s_return (reverse_in_place (SCHEME_A_ car (y), x)); 4676 s_return (reverse_in_place (SCHEME_A_ car (y), x));
5187 4677
5188#if USE_PLIST 4678#if USE_PLIST
5189 4679
5190 case OP_PUT: /* put */ 4680 case OP_PUT: /* put */
5191 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4681 if (!hasprop (a) || !hasprop (cadr (args)))
5192 {
5193 Error_0 ("illegal use of put"); 4682 Error_0 ("illegal use of put");
5194 }
5195 4683
5196 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))
5197 { 4685 {
5198 if (caar (x) == y) 4686 if (caar (x) == y)
5199 {
5200 break; 4687 break;
5201 }
5202 } 4688 }
5203 4689
5204 if (x != NIL) 4690 if (x != NIL)
5205 cdar (x) = caddr (SCHEME_V->args); 4691 cdar (x) = caddr (args);
5206 else 4692 else
5207 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));
5208 4694
5209 s_return (S_T); 4695 s_return (S_T);
5210 4696
5211 case OP_GET: /* get */ 4697 case OP_GET: /* get */
5212 if (!hasprop (car (SCHEME_V->args)) || !hasprop (cadr (SCHEME_V->args))) 4698 if (!hasprop (a) || !hasprop (cadr (args)))
5213 Error_0 ("illegal use of get"); 4699 Error_0 ("illegal use of get");
5214 4700
5215 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))
5216 if (caar (x) == y) 4702 if (caar (x) == y)
5217 break; 4703 break;
5218 4704
5219 if (x != NIL) 4705 if (x != NIL)
5220 s_return (cdar (x)); 4706 s_return (cdar (x));
… …
5222 s_return (NIL); 4708 s_return (NIL);
5223 4709
5224#endif /* USE_PLIST */ 4710#endif /* USE_PLIST */
5225 4711
5226 case OP_QUIT: /* quit */ 4712 case OP_QUIT: /* quit */
5227 if (is_pair (SCHEME_V->args)) 4713 if (is_pair (args))
5228 SCHEME_V->retcode = ivalue (car (SCHEME_V->args)); 4714 SCHEME_V->retcode = ivalue (a);
5229 4715
5230 return NIL; 4716 return -1;
5231 4717
5232 case OP_GC: /* gc */ 4718 case OP_GC: /* gc */
5233 gc (SCHEME_A_ NIL, NIL); 4719 gc (SCHEME_A_ NIL, NIL);
5234 s_return (S_T); 4720 s_return (S_T);
5235 4721
5236 case OP_GCVERB: /* gc-verbose */ 4722 case OP_GCVERB: /* gc-verbose */
5237 { 4723 {
5238 int was = SCHEME_V->gc_verbose; 4724 int was = SCHEME_V->gc_verbose;
5239 4725
5240 SCHEME_V->gc_verbose = (car (SCHEME_V->args) != S_F); 4726 SCHEME_V->gc_verbose = (a != S_F);
5241 s_retbool (was); 4727 s_retbool (was);
5242 } 4728 }
5243 4729
5244 case OP_NEWSEGMENT: /* new-segment */ 4730 case OP_NEWSEGMENT: /* new-segment */
5245 if (!is_pair (SCHEME_V->args) || !is_number (car (SCHEME_V->args))) 4731 if (!is_pair (args) || !is_number (a))
5246 Error_0 ("new-segment: argument must be a number"); 4732 Error_0 ("new-segment: argument must be a number");
5247 4733
5248 alloc_cellseg (SCHEME_A_ (int)ivalue (car (SCHEME_V->args))); 4734 alloc_cellseg (SCHEME_A_ (int)ivalue (a));
5249 4735
5250 s_return (S_T); 4736 s_return (S_T);
5251 4737
5252 case OP_OBLIST: /* oblist */ 4738 case OP_OBLIST: /* oblist */
5253 s_return (oblist_all_symbols (SCHEME_A)); 4739 s_return (oblist_all_symbols (SCHEME_A));
… …
5280 case OP_OPEN_INOUTFILE: 4766 case OP_OPEN_INOUTFILE:
5281 prop = port_input | port_output; 4767 prop = port_input | port_output;
5282 break; 4768 break;
5283 } 4769 }
5284 4770
5285 p = port_from_filename (SCHEME_A_ strvalue (car (SCHEME_V->args)), prop); 4771 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
5286 4772
5287 if (p == NIL) 4773 s_return (p == NIL ? S_F : p);
5288 {
5289 s_return (S_F);
5290 }
5291
5292 s_return (p);
5293 } 4774 }
5294 4775
5295# if USE_STRING_PORTS 4776# if USE_STRING_PORTS
5296 4777
5297 case OP_OPEN_INSTRING: /* open-input-string */ 4778 case OP_OPEN_INSTRING: /* open-input-string */
… …
5309 case OP_OPEN_INOUTSTRING: 4790 case OP_OPEN_INOUTSTRING:
5310 prop = port_input | port_output; 4791 prop = port_input | port_output;
5311 break; 4792 break;
5312 } 4793 }
5313 4794
5314 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4795 p = port_from_string (SCHEME_A_ strvalue (a),
5315 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), prop); 4796 strvalue (a) + strlength (a), prop);
5316 4797
5317 if (p == NIL) 4798 s_return (p == NIL ? S_F : p);
5318 {
5319 s_return (S_F);
5320 }
5321
5322 s_return (p);
5323 } 4799 }
5324 4800
5325 case OP_OPEN_OUTSTRING: /* open-output-string */ 4801 case OP_OPEN_OUTSTRING: /* open-output-string */
5326 { 4802 {
5327 pointer p; 4803 pointer p;
5328 4804
5329 if (car (SCHEME_V->args) == NIL) 4805 if (a == NIL)
5330 {
5331 p = port_from_scratch (SCHEME_A); 4806 p = port_from_scratch (SCHEME_A);
5332
5333 if (p == NIL)
5334 {
5335 s_return (S_F);
5336 }
5337 }
5338 else 4807 else
5339 {
5340 p = port_from_string (SCHEME_A_ strvalue (car (SCHEME_V->args)), 4808 p = port_from_string (SCHEME_A_ strvalue (a),
5341 strvalue (car (SCHEME_V->args)) + strlength (car (SCHEME_V->args)), port_output); 4809 strvalue (a) + strlength (a), port_output);
5342 4810
5343 if (p == NIL) 4811 s_return (p == NIL ? S_F : p);
5344 {
5345 s_return (S_F);
5346 }
5347 }
5348
5349 s_return (p);
5350 } 4812 }
5351 4813
5352 case OP_GET_OUTSTRING: /* get-output-string */ 4814 case OP_GET_OUTSTRING: /* get-output-string */
5353 { 4815 {
5354 port *p; 4816 port *p;
5355 4817
5356 if ((p = car (SCHEME_V->args)->object.port)->kind & port_string) 4818 if ((p = a->object.port)->kind & port_string)
5357 { 4819 {
5358 off_t size; 4820 off_t size;
5359 char *str; 4821 char *str;
5360 4822
5361 size = p->rep.string.curr - p->rep.string.start + 1; 4823 size = p->rep.string.curr - p->rep.string.start + 1;
… …
5377 } 4839 }
5378 4840
5379# endif 4841# endif
5380 4842
5381 case OP_CLOSE_INPORT: /* close-input-port */ 4843 case OP_CLOSE_INPORT: /* close-input-port */
5382 port_close (SCHEME_A_ car (SCHEME_V->args), port_input); 4844 port_close (SCHEME_A_ a, port_input);
5383 s_return (S_T); 4845 s_return (S_T);
5384 4846
5385 case OP_CLOSE_OUTPORT: /* close-output-port */ 4847 case OP_CLOSE_OUTPORT: /* close-output-port */
5386 port_close (SCHEME_A_ car (SCHEME_V->args), port_output); 4848 port_close (SCHEME_A_ a, port_output);
5387 s_return (S_T); 4849 s_return (S_T);
5388#endif 4850#endif
5389 4851
5390 case OP_INT_ENV: /* interaction-environment */ 4852 case OP_INT_ENV: /* interaction-environment */
5391 s_return (SCHEME_V->global_env); 4853 s_return (SCHEME_V->global_env);
… …
5393 case OP_CURR_ENV: /* current-environment */ 4855 case OP_CURR_ENV: /* current-environment */
5394 s_return (SCHEME_V->envir); 4856 s_return (SCHEME_V->envir);
5395 4857
5396 } 4858 }
5397 4859
5398 return S_T; 4860 if (USE_ERROR_CHECKING) abort ();
5399} 4861}
5400 4862
5401static pointer 4863static int
5402opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4864opexe_5 (SCHEME_P_ enum scheme_opcodes op)
5403{ 4865{
4866 pointer args = SCHEME_V->args;
5404 pointer x; 4867 pointer x;
5405 4868
5406 if (SCHEME_V->nesting != 0) 4869 if (SCHEME_V->nesting != 0)
5407 { 4870 {
5408 int n = SCHEME_V->nesting; 4871 int n = SCHEME_V->nesting;
… …
5415 switch (op) 4878 switch (op)
5416 { 4879 {
5417 /* ========== reading part ========== */ 4880 /* ========== reading part ========== */
5418#if USE_PORTS 4881#if USE_PORTS
5419 case OP_READ: 4882 case OP_READ:
5420 if (!is_pair (SCHEME_V->args)) 4883 if (!is_pair (args))
5421 {
5422 s_goto (OP_READ_INTERNAL); 4884 s_goto (OP_READ_INTERNAL);
5423 }
5424 4885
5425 if (!is_inport (car (SCHEME_V->args))) 4886 if (!is_inport (car (args)))
5426 {
5427 Error_1 ("read: not an input port:", car (SCHEME_V->args)); 4887 Error_1 ("read: not an input port:", car (args));
5428 }
5429 4888
5430 if (car (SCHEME_V->args) == SCHEME_V->inport) 4889 if (car (args) == SCHEME_V->inport)
5431 {
5432 s_goto (OP_READ_INTERNAL); 4890 s_goto (OP_READ_INTERNAL);
5433 }
5434 4891
5435 x = SCHEME_V->inport; 4892 x = SCHEME_V->inport;
5436 SCHEME_V->inport = car (SCHEME_V->args); 4893 SCHEME_V->inport = car (args);
5437 x = cons (x, NIL); 4894 x = cons (x, NIL);
5438 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4895 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5439 s_goto (OP_READ_INTERNAL); 4896 s_goto (OP_READ_INTERNAL);
5440 4897
5441 case OP_READ_CHAR: /* read-char */ 4898 case OP_READ_CHAR: /* read-char */
5442 case OP_PEEK_CHAR: /* peek-char */ 4899 case OP_PEEK_CHAR: /* peek-char */
5443 { 4900 {
5444 int c; 4901 int c;
5445 4902
5446 if (is_pair (SCHEME_V->args)) 4903 if (is_pair (args))
5447 { 4904 {
5448 if (car (SCHEME_V->args) != SCHEME_V->inport) 4905 if (car (args) != SCHEME_V->inport)
5449 { 4906 {
5450 x = SCHEME_V->inport; 4907 x = SCHEME_V->inport;
5451 x = cons (x, NIL); 4908 x = cons (x, NIL);
5452 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL); 4909 s_save (SCHEME_A_ OP_SET_INPORT, x, NIL);
5453 SCHEME_V->inport = car (SCHEME_V->args); 4910 SCHEME_V->inport = car (args);
5454 } 4911 }
5455 } 4912 }
5456 4913
5457 c = inchar (SCHEME_A); 4914 c = inchar (SCHEME_A);
5458 4915
… …
5468 case OP_CHAR_READY: /* char-ready? */ 4925 case OP_CHAR_READY: /* char-ready? */
5469 { 4926 {
5470 pointer p = SCHEME_V->inport; 4927 pointer p = SCHEME_V->inport;
5471 int res; 4928 int res;
5472 4929
5473 if (is_pair (SCHEME_V->args)) 4930 if (is_pair (args))
5474 {
5475 p = car (SCHEME_V->args); 4931 p = car (args);
5476 }
5477 4932
5478 res = p->object.port->kind & port_string; 4933 res = p->object.port->kind & port_string;
5479 4934
5480 s_retbool (res); 4935 s_retbool (res);
5481 } 4936 }
5482 4937
5483 case OP_SET_INPORT: /* set-input-port */ 4938 case OP_SET_INPORT: /* set-input-port */
5484 SCHEME_V->inport = car (SCHEME_V->args); 4939 SCHEME_V->inport = car (args);
5485 s_return (SCHEME_V->value); 4940 s_return (SCHEME_V->value);
5486 4941
5487 case OP_SET_OUTPORT: /* set-output-port */ 4942 case OP_SET_OUTPORT: /* set-output-port */
5488 SCHEME_V->outport = car (SCHEME_V->args); 4943 SCHEME_V->outport = car (args);
5489 s_return (SCHEME_V->value); 4944 s_return (SCHEME_V->value);
5490#endif 4945#endif
5491 4946
5492 case OP_RDSEXPR: 4947 case OP_RDSEXPR:
5493 switch (SCHEME_V->tok) 4948 switch (SCHEME_V->tok)
… …
5496 s_return (S_EOF); 4951 s_return (S_EOF);
5497 /* NOTREACHED */ 4952 /* NOTREACHED */
5498 4953
5499 case TOK_VEC: 4954 case TOK_VEC:
5500 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 4955 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
5501
5502 /* fall through */ 4956 /* fall through */
4957
5503 case TOK_LPAREN: 4958 case TOK_LPAREN:
5504 SCHEME_V->tok = token (SCHEME_A); 4959 SCHEME_V->tok = token (SCHEME_A);
5505 4960
5506 if (SCHEME_V->tok == TOK_RPAREN) 4961 if (SCHEME_V->tok == TOK_RPAREN)
5507 s_return (NIL); 4962 s_return (NIL);
… …
5527 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 4982 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5528 SCHEME_V->tok = TOK_LPAREN; 4983 SCHEME_V->tok = TOK_LPAREN;
5529 s_goto (OP_RDSEXPR); 4984 s_goto (OP_RDSEXPR);
5530 } 4985 }
5531 else 4986 else
5532 {
5533 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 4987 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5534 }
5535 4988
5536 s_goto (OP_RDSEXPR); 4989 s_goto (OP_RDSEXPR);
5537 4990
5538 case TOK_COMMA: 4991 case TOK_COMMA:
5539 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 4992 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
… …
5581 } 5034 }
5582 5035
5583 break; 5036 break;
5584 5037
5585 case OP_RDLIST: 5038 case OP_RDLIST:
5586 {
5587 SCHEME_V->args = cons (SCHEME_V->value, SCHEME_V->args); 5039 SCHEME_V->args = cons (SCHEME_V->value, args);
5588 SCHEME_V->tok = token (SCHEME_A); 5040 SCHEME_V->tok = token (SCHEME_A);
5589 5041
5590 if (SCHEME_V->tok == TOK_EOF) 5042 switch (SCHEME_V->tok)
5043 {
5044 case TOK_EOF:
5591 s_return (S_EOF); 5045 s_return (S_EOF);
5592 else if (SCHEME_V->tok == TOK_RPAREN) 5046
5047 case TOK_RPAREN:
5593 { 5048 {
5594 int c = inchar (SCHEME_A); 5049 int c = inchar (SCHEME_A);
5595 5050
5596 if (c != '\n') 5051 if (c != '\n')
5597 backchar (SCHEME_A_ c); 5052 backchar (SCHEME_A_ c);
5598
5599#if SHOW_ERROR_LINE 5053#if SHOW_ERROR_LINE
5600 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 5054 else if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
5601 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++; 5055 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line++;
5602
5603#endif 5056#endif
5057
5604 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5058 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5605 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args)); 5059 s_return (reverse_in_place (SCHEME_A_ NIL, SCHEME_V->args));
5606 } 5060 }
5607 else if (SCHEME_V->tok == TOK_DOT) 5061
5608 { 5062 case TOK_DOT:
5609 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL); 5063 s_save (SCHEME_A_ OP_RDDOT, SCHEME_V->args, NIL);
5610 SCHEME_V->tok = token (SCHEME_A); 5064 SCHEME_V->tok = token (SCHEME_A);
5611 s_goto (OP_RDSEXPR); 5065 s_goto (OP_RDSEXPR);
5612 } 5066
5613 else 5067 default:
5614 {
5615 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);; 5068 s_save (SCHEME_A_ OP_RDLIST, SCHEME_V->args, NIL);
5616 s_goto (OP_RDSEXPR); 5069 s_goto (OP_RDSEXPR);
5617 } 5070 }
5618 }
5619 5071
5620 case OP_RDDOT: 5072 case OP_RDDOT:
5621 if (token (SCHEME_A) != TOK_RPAREN) 5073 if (token (SCHEME_A) != TOK_RPAREN)
5622 Error_0 ("syntax error: illegal dot expression"); 5074 Error_0 ("syntax error: illegal dot expression");
5623 else 5075
5624 {
5625 SCHEME_V->nesting_stack[SCHEME_V->file_i]--; 5076 SCHEME_V->nesting_stack[SCHEME_V->file_i]--;
5626 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));
5627 }
5628 5078
5629 case OP_RDQUOTE: 5079 case OP_RDQUOTE:
5630 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL))); 5080 s_return (cons (SCHEME_V->QUOTE, cons (SCHEME_V->value, NIL)));
5631 5081
5632 case OP_RDQQUOTE: 5082 case OP_RDQQUOTE:
… …
5654 SCHEME_V->args = SCHEME_V->value; 5104 SCHEME_V->args = SCHEME_V->value;
5655 s_goto (OP_VECTOR); 5105 s_goto (OP_VECTOR);
5656 5106
5657 /* ========== printing part ========== */ 5107 /* ========== printing part ========== */
5658 case OP_P0LIST: 5108 case OP_P0LIST:
5659 if (is_vector (SCHEME_V->args)) 5109 if (is_vector (args))
5660 { 5110 {
5661 putstr (SCHEME_A_ "#("); 5111 putstr (SCHEME_A_ "#(");
5662 SCHEME_V->args = cons (SCHEME_V->args, mk_integer (SCHEME_A_ 0)); 5112 SCHEME_V->args = cons (args, mk_integer (SCHEME_A_ 0));
5663 s_goto (OP_PVECFROM); 5113 s_goto (OP_PVECFROM);
5664 } 5114 }
5665 else if (is_environment (SCHEME_V->args)) 5115 else if (is_environment (args))
5666 { 5116 {
5667 putstr (SCHEME_A_ "#<ENVIRONMENT>"); 5117 putstr (SCHEME_A_ "#<ENVIRONMENT>");
5668 s_return (S_T); 5118 s_return (S_T);
5669 } 5119 }
5670 else if (!is_pair (SCHEME_V->args)) 5120 else if (!is_pair (args))
5671 { 5121 {
5672 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5122 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5673 s_return (S_T); 5123 s_return (S_T);
5674 } 5124 }
5675 else if (car (SCHEME_V->args) == SCHEME_V->QUOTE && ok_abbrev (cdr (SCHEME_V->args))) 5125 else
5676 { 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)
5677 putstr (SCHEME_A_ "'"); 5133 putstr (SCHEME_A_ "'");
5678 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
5679 s_goto (OP_P0LIST); 5147 s_goto (OP_P0LIST);
5680 } 5148 }
5681 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))
5682 { 5152 {
5153 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5683 putstr (SCHEME_A_ "`"); 5154 putstr (SCHEME_A_ " ");
5684 SCHEME_V->args = cadr (SCHEME_V->args); 5155 SCHEME_V->args = car (args);
5685 s_goto (OP_P0LIST); 5156 s_goto (OP_P0LIST);
5686 } 5157 }
5687 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTE && ok_abbrev (cdr (SCHEME_V->args)))
5688 {
5689 putstr (SCHEME_A_ ",");
5690 SCHEME_V->args = cadr (SCHEME_V->args);
5691 s_goto (OP_P0LIST);
5692 }
5693 else if (car (SCHEME_V->args) == SCHEME_V->UNQUOTESP && ok_abbrev (cdr (SCHEME_V->args)))
5694 {
5695 putstr (SCHEME_A_ ",@");
5696 SCHEME_V->args = cadr (SCHEME_V->args);
5697 s_goto (OP_P0LIST);
5698 }
5699 else
5700 {
5701 putstr (SCHEME_A_ "(");
5702 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5703 SCHEME_V->args = car (SCHEME_V->args);
5704 s_goto (OP_P0LIST);
5705 }
5706
5707 case OP_P1LIST:
5708 if (is_pair (SCHEME_V->args))
5709 {
5710 s_save (SCHEME_A_ OP_P1LIST, cdr (SCHEME_V->args), NIL);
5711 putstr (SCHEME_A_ " ");
5712 SCHEME_V->args = car (SCHEME_V->args);
5713 s_goto (OP_P0LIST);
5714 }
5715 else if (is_vector (SCHEME_V->args)) 5158 else if (is_vector (args))
5716 { 5159 {
5717 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL); 5160 s_save (SCHEME_A_ OP_P1LIST, NIL, NIL);
5718 putstr (SCHEME_A_ " . "); 5161 putstr (SCHEME_A_ " . ");
5719 s_goto (OP_P0LIST); 5162 s_goto (OP_P0LIST);
5720 } 5163 }
5721 else 5164 else
5722 { 5165 {
5723 if (SCHEME_V->args != NIL) 5166 if (args != NIL)
5724 { 5167 {
5725 putstr (SCHEME_A_ " . "); 5168 putstr (SCHEME_A_ " . ");
5726 printatom (SCHEME_A_ SCHEME_V->args, SCHEME_V->print_flag); 5169 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5727 } 5170 }
5728 5171
5729 putstr (SCHEME_A_ ")"); 5172 putstr (SCHEME_A_ ")");
5730 s_return (S_T); 5173 s_return (S_T);
5731 } 5174 }
5732 5175
5733 case OP_PVECFROM: 5176 case OP_PVECFROM:
5734 { 5177 {
5735 int i = ivalue_unchecked (cdr (SCHEME_V->args)); 5178 int i = ivalue_unchecked (cdr (args));
5736 pointer vec = car (SCHEME_V->args); 5179 pointer vec = car (args);
5737 int len = ivalue_unchecked (vec); 5180 int len = veclength (vec);
5738 5181
5739 if (i == len) 5182 if (i == len)
5740 { 5183 {
5741 putstr (SCHEME_A_ ")"); 5184 putstr (SCHEME_A_ ")");
5742 s_return (S_T); 5185 s_return (S_T);
5743 } 5186 }
5744 else 5187 else
5745 { 5188 {
5746 pointer elem = vector_elem (vec, i); 5189 pointer elem = vector_elem (vec, i);
5747 5190
5748 ivalue_unchecked (cdr (SCHEME_V->args)) = i + 1; 5191 ivalue_unchecked (cdr (args)) = i + 1;
5749 s_save (SCHEME_A_ OP_PVECFROM, SCHEME_V->args, NIL); 5192 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5750 SCHEME_V->args = elem; 5193 SCHEME_V->args = elem;
5751 5194
5752 if (i > 0) 5195 if (i > 0)
5753 putstr (SCHEME_A_ " "); 5196 putstr (SCHEME_A_ " ");
5754 5197
5755 s_goto (OP_P0LIST); 5198 s_goto (OP_P0LIST);
5756 } 5199 }
5757 } 5200 }
5758 } 5201 }
5759 5202
5760 return S_T; 5203 if (USE_ERROR_CHECKING) abort ();
5761} 5204}
5762 5205
5763static pointer 5206static int
5764opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5207opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5765{ 5208{
5209 pointer args = SCHEME_V->args;
5210 pointer a = car (args);
5766 pointer x, y; 5211 pointer x, y;
5767 5212
5768 switch (op) 5213 switch (op)
5769 { 5214 {
5770 case OP_LIST_LENGTH: /* length *//* a.k */ 5215 case OP_LIST_LENGTH: /* length *//* a.k */
5771 { 5216 {
5772 long v = list_length (SCHEME_A_ car (SCHEME_V->args)); 5217 long v = list_length (SCHEME_A_ a);
5773 5218
5774 if (v < 0) 5219 if (v < 0)
5775 Error_1 ("length: not a list:", car (SCHEME_V->args)); 5220 Error_1 ("length: not a list:", a);
5776 5221
5777 s_return (mk_integer (SCHEME_A_ v)); 5222 s_return (mk_integer (SCHEME_A_ v));
5778 } 5223 }
5779 5224
5780 case OP_ASSQ: /* assq *//* a.k */ 5225 case OP_ASSQ: /* assq *//* a.k */
5781 x = car (SCHEME_V->args); 5226 x = a;
5782 5227
5783 for (y = cadr (SCHEME_V->args); is_pair (y); y = cdr (y)) 5228 for (y = cadr (args); is_pair (y); y = cdr (y))
5784 { 5229 {
5785 if (!is_pair (car (y))) 5230 if (!is_pair (car (y)))
5786 Error_0 ("unable to handle non pair element"); 5231 Error_0 ("unable to handle non pair element");
5787 5232
5788 if (x == caar (y)) 5233 if (x == caar (y))
… …
5794 else 5239 else
5795 s_return (S_F); 5240 s_return (S_F);
5796 5241
5797 5242
5798 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5243 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5799 SCHEME_V->args = car (SCHEME_V->args); 5244 SCHEME_V->args = a;
5800 5245
5801 if (SCHEME_V->args == NIL) 5246 if (SCHEME_V->args == NIL)
5802 s_return (S_F); 5247 s_return (S_F);
5803 else if (is_closure (SCHEME_V->args)) 5248 else if (is_closure (SCHEME_V->args))
5804 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5249 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
… …
5810 case OP_CLOSUREP: /* closure? */ 5255 case OP_CLOSUREP: /* closure? */
5811 /* 5256 /*
5812 * Note, macro object is also a closure. 5257 * Note, macro object is also a closure.
5813 * Therefore, (closure? <#MACRO>) ==> #t 5258 * Therefore, (closure? <#MACRO>) ==> #t
5814 */ 5259 */
5815 s_retbool (is_closure (car (SCHEME_V->args))); 5260 s_retbool (is_closure (a));
5816 5261
5817 case OP_MACROP: /* macro? */ 5262 case OP_MACROP: /* macro? */
5818 s_retbool (is_macro (car (SCHEME_V->args))); 5263 s_retbool (is_macro (a));
5819 } 5264 }
5820 5265
5821 return S_T; /* NOTREACHED */ 5266 if (USE_ERROR_CHECKING) abort ();
5822} 5267}
5823 5268
5269/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5824typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5270typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5825 5271
5826typedef int (*test_predicate) (pointer); 5272typedef int (*test_predicate)(pointer);
5827static int 5273static int
5828is_any (pointer p) 5274is_any (pointer p)
5829{ 5275{
5830 return 1; 5276 return 1;
5831} 5277}
5832 5278
5833static int 5279static int
5834is_nonneg (pointer p) 5280is_nonneg (pointer p)
5835{ 5281{
5836 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);
5837} 5289}
5838 5290
5839/* Correspond carefully with following defines! */ 5291/* Correspond carefully with following defines! */
5840static struct 5292static struct
5841{ 5293{
5842 test_predicate fct; 5294 test_predicate fct;
5843 const char *kind; 5295 const char *kind;
5844} tests[] = 5296} tests[] =
5845{ 5297{
5846 { 0, 0}, /* unused */ 5298 { is_any, 0 },
5847 { is_any, 0}, 5299 { is_string, "string" },
5848 { is_string, "string" }, 5300 { is_symbol, "symbol" },
5849 { is_symbol, "symbol" }, 5301 { is_port, "port" },
5850 { is_port, "port" },
5851 { is_inport, "input port" }, 5302 { is_inport, "input port" },
5852 { is_outport, "output port" }, 5303 { is_outport, "output port" },
5853 { is_environment, "environment" }, 5304 { is_environment, "environment" },
5854 { is_pair, "pair" }, 5305 { is_pair, "pair" },
5855 { 0, "pair or '()" }, 5306 { tst_is_list, "pair or '()" },
5856 { is_character, "character" }, 5307 { is_character, "character" },
5857 { is_vector, "vector" }, 5308 { is_vector, "vector" },
5858 { is_number, "number" }, 5309 { is_number, "number" },
5859 { is_integer, "integer" }, 5310 { is_integer, "integer" },
5860 { is_nonneg, "non-negative integer" } 5311 { is_nonneg, "non-negative integer" }
5861}; 5312};
5862 5313
5863#define TST_NONE 0 5314#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5864#define TST_ANY "\001" 5315#define TST_ANY "\001"
5865#define TST_STRING "\002" 5316#define TST_STRING "\002"
5866#define TST_SYMBOL "\003" 5317#define TST_SYMBOL "\003"
5867#define TST_PORT "\004" 5318#define TST_PORT "\004"
5868#define TST_INPORT "\005" 5319#define TST_INPORT "\005"
5869#define TST_OUTPORT "\006" 5320#define TST_OUTPORT "\006"
5870#define TST_ENVIRONMENT "\007" 5321#define TST_ENVIRONMENT "\007"
5871#define TST_PAIR "\010" 5322#define TST_PAIR "\010"
5872#define TST_LIST "\011" 5323#define TST_LIST "\011"
5873#define TST_CHAR "\012" 5324#define TST_CHAR "\012"
5874#define TST_VECTOR "\013" 5325#define TST_VECTOR "\013"
5875#define TST_NUMBER "\014" 5326#define TST_NUMBER "\014"
5876#define TST_INTEGER "\015" 5327#define TST_INTEGER "\015"
5877#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}
5878 5356
5879typedef struct 5357typedef struct
5880{ 5358{
5881 dispatch_func func; 5359 uint8_t func;
5882 char *name; 5360 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5361 uint8_t builtin;
5883 int min_arity; 5362 uint8_t min_arity;
5884 int max_arity; 5363 uint8_t max_arity;
5885 char *arg_tests_encoding; 5364 char arg_tests_encoding[3];
5886} op_code_info; 5365} op_code_info;
5887 5366
5888#define INF_ARG 0xffff
5889
5890static op_code_info dispatch_table[] = { 5367static const op_code_info dispatch_table[] = {
5891#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 },
5892#include "opdefines.h" 5369#include "opdefines.h"
5370#undef OP_DEF
5893 {0} 5371 {0}
5894}; 5372};
5895 5373
5896static const char *
5897procname (pointer x)
5898{
5899 int n = procnum (x);
5900 const char *name = dispatch_table[n].name;
5901
5902 if (name == 0)
5903 {
5904 name = "ILLEGAL!";
5905 }
5906
5907 return name;
5908}
5909
5910/* kernel of this interpreter */ 5374/* kernel of this interpreter */
5911static void 5375static void ecb_hot
5912Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5376Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5913{ 5377{
5914 SCHEME_V->op = op; 5378 SCHEME_V->op = op;
5915 5379
5916 for (;;) 5380 for (;;)
5917 { 5381 {
5918 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5382 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5919 5383
5384#if USE_ERROR_CHECKING
5920 if (pcd->name != 0) /* if built-in function, check arguments */ 5385 if (pcd->builtin) /* if built-in function, check arguments */
5921 { 5386 {
5922 char msg[STRBUFFSIZE]; 5387 char msg[STRBUFFSIZE];
5923 int ok = 1;
5924 int n = list_length (SCHEME_A_ SCHEME_V->args); 5388 int n = list_length (SCHEME_A_ SCHEME_V->args);
5925 5389
5926#if USE_ERROR_CHECKING
5927 /* Check number of arguments */ 5390 /* Check number of arguments */
5928 if (n < pcd->min_arity) 5391 if (ecb_expect_false (n < pcd->min_arity))
5929 { 5392 {
5930 ok = 0;
5931 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5393 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5932 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;
5933 } 5397 }
5934 5398 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5935 if (ok && n > pcd->max_arity)
5936 { 5399 {
5937 ok = 0;
5938 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5400 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5939 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;
5940 } 5404 }
5941#endif 5405 else
5942
5943 if (ok)
5944 { 5406 {
5945 if (pcd->arg_tests_encoding != 0) 5407 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5946 { 5408 {
5947 int i = 0; 5409 int i = 0;
5948 int j; 5410 int j;
5949 const char *t = pcd->arg_tests_encoding; 5411 const char *t = pcd->arg_tests_encoding;
5950 pointer arglist = SCHEME_V->args; 5412 pointer arglist = SCHEME_V->args;
5951 5413
5952 do 5414 do
5953 { 5415 {
5954 pointer arg = car (arglist); 5416 pointer arg = car (arglist);
5955 5417
5956 j = (int) t[0]; 5418 j = t[0];
5957 5419
5958 if (j == TST_LIST[0]) 5420 if (!tests[j - 1].fct (arg))
5959 {
5960 if (arg != NIL && !is_pair (arg))
5961 break; 5421 break;
5962 }
5963 else
5964 {
5965 if (!tests[j].fct (arg))
5966 break;
5967 }
5968 5422
5969 if (t[1] != 0) /* last test is replicated as necessary */ 5423 if (t[1]) /* last test is replicated as necessary */
5970 {
5971 t++; 5424 t++;
5972 }
5973 5425
5974 arglist = cdr (arglist); 5426 arglist = cdr (arglist);
5975 i++; 5427 i++;
5976 } 5428 }
5977 while (i < n); 5429 while (i < n);
5978 5430
5979#if USE_ERROR_CHECKING
5980 if (i < n) 5431 if (i < n)
5981 { 5432 {
5982 ok = 0;
5983 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;
5984 } 5436 }
5985#endif
5986 } 5437 }
5987 } 5438 }
5988
5989 if (!ok)
5990 {
5991 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5992 return;
5993
5994 pcd = dispatch_table + SCHEME_V->op;
5995 }
5996 } 5439 }
5440#endif
5997 5441
5998 ok_to_freely_gc (SCHEME_A); 5442 ok_to_freely_gc (SCHEME_A);
5999 5443
6000 if (pcd->func (SCHEME_A_ (enum scheme_opcodes) 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))
6001 return; 5455 return;
6002 5456
6003#if USE_ERROR_CHECKING 5457 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
6004 if (SCHEME_V->no_memory)
6005 { 5458 {
6006 xwrstr ("No memory!\n"); 5459 xwrstr ("No memory!\n");
6007 return; 5460 return;
6008 } 5461 }
6009#endif
6010 } 5462 }
6011} 5463}
6012 5464
6013/* ========== Initialization of internal keywords ========== */ 5465/* ========== Initialization of internal keywords ========== */
6014 5466
6015static void 5467static void
6016assign_syntax (SCHEME_P_ char *name) 5468assign_syntax (SCHEME_P_ const char *name)
6017{ 5469{
6018 pointer x = oblist_add_by_name (SCHEME_A_ name); 5470 pointer x = oblist_add_by_name (SCHEME_A_ name);
6019 set_typeflag (x, typeflag (x) | T_SYNTAX); 5471 set_typeflag (x, typeflag (x) | T_SYNTAX);
6020} 5472}
6021 5473
6022static void 5474static void
6023assign_proc (SCHEME_P_ enum scheme_opcodes op, char *name) 5475assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
6024{ 5476{
6025 pointer x = mk_symbol (SCHEME_A_ name); 5477 pointer x = mk_symbol (SCHEME_A_ name);
6026 pointer y = mk_proc (SCHEME_A_ op); 5478 pointer y = mk_proc (SCHEME_A_ op);
6027 new_slot_in_env (SCHEME_A_ x, y); 5479 new_slot_in_env (SCHEME_A_ x, y);
6028} 5480}
… …
6030static pointer 5482static pointer
6031mk_proc (SCHEME_P_ enum scheme_opcodes op) 5483mk_proc (SCHEME_P_ enum scheme_opcodes op)
6032{ 5484{
6033 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5485 pointer y = get_cell (SCHEME_A_ NIL, NIL);
6034 set_typeflag (y, (T_PROC | T_ATOM)); 5486 set_typeflag (y, (T_PROC | T_ATOM));
6035 ivalue_unchecked (y) = (long) op; 5487 ivalue_unchecked (y) = op;
6036 set_num_integer (y); 5488 set_num_integer (y);
6037 return y; 5489 return y;
6038} 5490}
6039 5491
6040/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5492/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
… …
6065 5517
6066 case 'd': 5518 case 'd':
6067 return OP_COND0; /* cond */ 5519 return OP_COND0; /* cond */
6068 5520
6069 case '*': 5521 case '*':
6070 return OP_LET0AST; /* let* */ 5522 return OP_LET0AST;/* let* */
6071 5523
6072 default: 5524 default:
6073 return OP_SET0; /* set! */ 5525 return OP_SET0; /* set! */
6074 } 5526 }
6075 5527
… …
6097 5549
6098 case 'f': 5550 case 'f':
6099 return OP_DEF0; /* define */ 5551 return OP_DEF0; /* define */
6100 5552
6101 default: 5553 default:
6102 return OP_LET0REC; /* letrec */ 5554 return OP_LET0REC;/* letrec */
6103 } 5555 }
6104 5556
6105 default: 5557 default:
6106 return OP_C0STREAM; /* cons-stream */ 5558 return OP_C0STREAM; /* cons-stream */
6107 } 5559 }
6108} 5560}
6109 5561
6110#if USE_MULTIPLICITY 5562#if USE_MULTIPLICITY
6111scheme * 5563ecb_cold scheme *
6112scheme_init_new () 5564scheme_init_new ()
6113{ 5565{
6114 scheme *sc = malloc (sizeof (scheme)); 5566 scheme *sc = malloc (sizeof (scheme));
6115 5567
6116 if (!scheme_init (SCHEME_A)) 5568 if (!scheme_init (SCHEME_A))
… …
6121 else 5573 else
6122 return sc; 5574 return sc;
6123} 5575}
6124#endif 5576#endif
6125 5577
6126int 5578ecb_cold int
6127scheme_init (SCHEME_P) 5579scheme_init (SCHEME_P)
6128{ 5580{
6129 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5581 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
6130 pointer x; 5582 pointer x;
6131 5583
… …
6158 } 5610 }
6159 5611
6160 SCHEME_V->gc_verbose = 0; 5612 SCHEME_V->gc_verbose = 0;
6161 dump_stack_initialize (SCHEME_A); 5613 dump_stack_initialize (SCHEME_A);
6162 SCHEME_V->code = NIL; 5614 SCHEME_V->code = NIL;
5615 SCHEME_V->args = NIL;
5616 SCHEME_V->envir = NIL;
6163 SCHEME_V->tracing = 0; 5617 SCHEME_V->tracing = 0;
6164 5618
6165 /* init NIL */ 5619 /* init NIL */
6166 set_typeflag (NIL, T_ATOM | MARK); 5620 set_typeflag (NIL, T_ATOM | T_MARK);
6167 set_car (NIL, NIL); 5621 set_car (NIL, NIL);
6168 set_cdr (NIL, NIL); 5622 set_cdr (NIL, NIL);
6169 /* init T */ 5623 /* init T */
6170 set_typeflag (S_T, T_ATOM | MARK); 5624 set_typeflag (S_T, T_ATOM | T_MARK);
6171 set_car (S_T, S_T); 5625 set_car (S_T, S_T);
6172 set_cdr (S_T, S_T); 5626 set_cdr (S_T, S_T);
6173 /* init F */ 5627 /* init F */
6174 set_typeflag (S_F, T_ATOM | MARK); 5628 set_typeflag (S_F, T_ATOM | T_MARK);
6175 set_car (S_F, S_F); 5629 set_car (S_F, S_F);
6176 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);
6177 /* init sink */ 5635 /* init sink */
6178 set_typeflag (S_SINK, T_PAIR | MARK); 5636 set_typeflag (S_SINK, T_PAIR | T_MARK);
6179 set_car (S_SINK, NIL); 5637 set_car (S_SINK, NIL);
5638
6180 /* init c_nest */ 5639 /* init c_nest */
6181 SCHEME_V->c_nest = NIL; 5640 SCHEME_V->c_nest = NIL;
6182 5641
6183 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 5642 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
6184 /* init global_env */ 5643 /* init global_env */
… …
6186 SCHEME_V->global_env = SCHEME_V->envir; 5645 SCHEME_V->global_env = SCHEME_V->envir;
6187 /* init else */ 5646 /* init else */
6188 x = mk_symbol (SCHEME_A_ "else"); 5647 x = mk_symbol (SCHEME_A_ "else");
6189 new_slot_in_env (SCHEME_A_ x, S_T); 5648 new_slot_in_env (SCHEME_A_ x, S_T);
6190 5649
6191 assign_syntax (SCHEME_A_ "lambda"); 5650 {
6192 assign_syntax (SCHEME_A_ "quote"); 5651 static const char *syntax_names[] = {
6193 assign_syntax (SCHEME_A_ "define"); 5652 "lambda", "quote", "define", "if", "begin", "set!",
6194 assign_syntax (SCHEME_A_ "if"); 5653 "let", "let*", "letrec", "cond", "delay", "and",
6195 assign_syntax (SCHEME_A_ "begin"); 5654 "or", "cons-stream", "macro", "case"
6196 assign_syntax (SCHEME_A_ "set!"); 5655 };
6197 assign_syntax (SCHEME_A_ "let"); 5656
6198 assign_syntax (SCHEME_A_ "let*"); 5657 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
6199 assign_syntax (SCHEME_A_ "letrec");
6200 assign_syntax (SCHEME_A_ "cond");
6201 assign_syntax (SCHEME_A_ "delay");
6202 assign_syntax (SCHEME_A_ "and"); 5658 assign_syntax (SCHEME_A_ syntax_names[i]);
6203 assign_syntax (SCHEME_A_ "or"); 5659 }
6204 assign_syntax (SCHEME_A_ "cons-stream");
6205 assign_syntax (SCHEME_A_ "macro");
6206 assign_syntax (SCHEME_A_ "case");
6207 5660
5661 // TODO: should iterate via strlen, to avoid n² complexity
6208 for (i = 0; i < n; i++) 5662 for (i = 0; i < n; i++)
6209 {
6210 if (dispatch_table[i].name != 0) 5663 if (dispatch_table[i].builtin)
6211 { 5664 assign_proc (SCHEME_A_ i, opname (i));
6212 assign_proc (SCHEME_A_ (enum scheme_opcodes) i, dispatch_table[i].name);
6213 }
6214 }
6215 5665
6216 /* initialization of global pointers to special symbols */ 5666 /* initialization of global pointers to special symbols */
6217 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5667 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
6218 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5668 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
6219 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5669 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
6220 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote"); 5670 SCHEME_V->UNQUOTE = mk_symbol (SCHEME_A_ "unquote");
6221 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing"); 5671 SCHEME_V->UNQUOTESP = mk_symbol (SCHEME_A_ "unquote-splicing");
6222 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>"); 5672 SCHEME_V->FEED_TO = mk_symbol (SCHEME_A_ "=>");
6223 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*"); 5673 SCHEME_V->COLON_HOOK = mk_symbol (SCHEME_A_ "*colon-hook*");
6224 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*"); 5674 SCHEME_V->ERROR_HOOK = mk_symbol (SCHEME_A_ "*error-hook*");
6225 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*"); 5675 SCHEME_V->SHARP_HOOK = mk_symbol (SCHEME_A_ "*sharp-hook*");
6226 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*"); 5676 SCHEME_V->COMPILE_HOOK = mk_symbol (SCHEME_A_ "*compile-hook*");
6227 5677
6228 return !SCHEME_V->no_memory; 5678 return !SCHEME_V->no_memory;
6229} 5679}
6230 5680
… …
6258scheme_set_external_data (SCHEME_P_ void *p) 5708scheme_set_external_data (SCHEME_P_ void *p)
6259{ 5709{
6260 SCHEME_V->ext_data = p; 5710 SCHEME_V->ext_data = p;
6261} 5711}
6262 5712
6263void 5713ecb_cold void
6264scheme_deinit (SCHEME_P) 5714scheme_deinit (SCHEME_P)
6265{ 5715{
6266 int i; 5716 int i;
6267 5717
6268#if SHOW_ERROR_LINE 5718#if SHOW_ERROR_LINE
… …
6360{ 5810{
6361 dump_stack_reset (SCHEME_A); 5811 dump_stack_reset (SCHEME_A);
6362 SCHEME_V->envir = SCHEME_V->global_env; 5812 SCHEME_V->envir = SCHEME_V->global_env;
6363 SCHEME_V->file_i = 0; 5813 SCHEME_V->file_i = 0;
6364 SCHEME_V->load_stack[0].kind = port_input | port_string; 5814 SCHEME_V->load_stack[0].kind = port_input | port_string;
6365 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 */
6366 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);
6367 SCHEME_V->load_stack[0].rep.string.curr = (char *) cmd; 5817 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
6368#if USE_PORTS 5818#if USE_PORTS
6369 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5819 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
6370#endif 5820#endif
6371 SCHEME_V->retcode = 0; 5821 SCHEME_V->retcode = 0;
6372 SCHEME_V->interactive_repl = 0; 5822 SCHEME_V->interactive_repl = 0;
… …
6385 pointer x; 5835 pointer x;
6386 5836
6387 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5837 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
6388 5838
6389 if (x != NIL) 5839 if (x != NIL)
6390 {
6391 set_slot_in_env (SCHEME_A_ x, value); 5840 set_slot_in_env (SCHEME_A_ x, value);
6392 }
6393 else 5841 else
6394 {
6395 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5842 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
6396 }
6397} 5843}
6398 5844
6399#if !STANDALONE 5845#if !STANDALONE
5846
6400void 5847void
6401scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5848scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
6402{ 5849{
6403 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5850 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
6404} 5851}
… …
6407scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5854scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
6408{ 5855{
6409 int i; 5856 int i;
6410 5857
6411 for (i = 0; i < count; i++) 5858 for (i = 0; i < count; i++)
6412 {
6413 scheme_register_foreign_func (SCHEME_A_ list + i); 5859 scheme_register_foreign_func (SCHEME_A_ list + i);
6414 }
6415} 5860}
6416 5861
6417pointer 5862pointer
6418scheme_apply0 (SCHEME_P_ const char *procname) 5863scheme_apply0 (SCHEME_P_ const char *procname)
6419{ 5864{
… …
6476 SCHEME_V->interactive_repl = old_repl; 5921 SCHEME_V->interactive_repl = old_repl;
6477 restore_from_C_call (SCHEME_A); 5922 restore_from_C_call (SCHEME_A);
6478 return SCHEME_V->value; 5923 return SCHEME_V->value;
6479} 5924}
6480 5925
6481
6482#endif 5926#endif
6483 5927
6484/* ========== Main ========== */ 5928/* ========== Main ========== */
6485 5929
6486#if STANDALONE 5930#if STANDALONE
6487 5931
6488# if defined(__APPLE__) && !defined (OSX)
6489int
6490main ()
6491{
6492 extern MacTS_main (int argc, char **argv);
6493 char **argv;
6494 int argc = ccommand (&argv);
6495
6496 MacTS_main (argc, argv);
6497 return 0;
6498}
6499
6500int
6501MacTS_main (int argc, char **argv)
6502{
6503# else
6504int 5932int
6505main (int argc, char **argv) 5933main (int argc, char **argv)
6506{ 5934{
6507# endif
6508# if USE_MULTIPLICITY 5935# if USE_MULTIPLICITY
6509 scheme ssc; 5936 scheme ssc;
6510 scheme *const sc = &ssc; 5937 scheme *const SCHEME_V = &ssc;
6511# else 5938# else
6512# endif 5939# endif
6513 int fin; 5940 int fin;
6514 char *file_name = InitFile; 5941 char *file_name = InitFile;
6515 int retcode; 5942 int retcode;
6516 int isfile = 1; 5943 int isfile = 1;
6517
6518 if (argc == 1)
6519 xwrstr (banner);
6520 5944
6521 if (argc == 2 && strcmp (argv[1], "-?") == 0) 5945 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6522 { 5946 {
6523 xwrstr ("Usage: tinyscheme -?\n"); 5947 xwrstr ("Usage: tinyscheme -?\n");
6524 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 5948 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");
… …
6547 if (access (file_name, 0) != 0) 5971 if (access (file_name, 0) != 0)
6548 { 5972 {
6549 char *p = getenv ("TINYSCHEMEINIT"); 5973 char *p = getenv ("TINYSCHEMEINIT");
6550 5974
6551 if (p != 0) 5975 if (p != 0)
6552 {
6553 file_name = p; 5976 file_name = p;
6554 }
6555 } 5977 }
6556#endif 5978#endif
6557 5979
6558 do 5980 do
6559 { 5981 {

Diff Legend

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