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

Comparing microscheme/scheme.c (file contents):
Revision 1.29 by root, Sat Nov 28 10:31:06 2015 UTC vs.
Revision 1.48 by root, Mon Nov 30 13:07:34 2015 UTC

16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1
22
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 24#include "malloc.c"
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52//#include <ctype.h>
53
54#if '1' != '0' + 1 \
55 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
56 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
57 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
58 || 'f' != 'a' + 5
59# error "execution character set digits not consecutive"
60#endif
46 61
47enum { 62enum {
48 TOK_EOF, 63 TOK_EOF,
49 TOK_LPAREN, 64 TOK_LPAREN,
50 TOK_RPAREN, 65 TOK_RPAREN,
51 TOK_DOT, 66 TOK_DOT,
52 TOK_ATOM, 67 TOK_ATOM,
68 TOK_DOTATOM, /* atom name starting with '.' */
69 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 70 TOK_QUOTE,
54 TOK_DQUOTE, 71 TOK_DQUOTE,
55 TOK_BQUOTE, 72 TOK_BQUOTE,
56 TOK_COMMA, 73 TOK_COMMA,
57 TOK_ATMARK, 74 TOK_ATMARK,
59 TOK_SHARP_CONST, 76 TOK_SHARP_CONST,
60 TOK_VEC 77 TOK_VEC
61}; 78};
62 79
63#define BACKQUOTE '`' 80#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 81#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE
65 83
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
69#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK (&SCHEME_V->xsink)
391} 409}
392 410
393INTERFACE char * 411INTERFACE char *
394symname (pointer p) 412symname (pointer p)
395{ 413{
396 return strvalue (car (p)); 414 return strvalue (p);
397} 415}
398 416
399#if USE_PLIST 417#if USE_PLIST
418#error plists are broken because symbols are no longer pairs
419#define symprop(p) cdr(p)
400SCHEME_EXPORT int 420SCHEME_EXPORT int
401hasprop (pointer p) 421hasprop (pointer p)
402{ 422{
403 return typeflag (p) & T_SYMBOL; 423 return typeflag (p) & T_SYMBOL;
404} 424}
405
406# define symprop(p) cdr(p)
407#endif 425#endif
408 426
409INTERFACE int 427INTERFACE int
410is_syntax (pointer p) 428is_syntax (pointer p)
411{ 429{
425} 443}
426 444
427INTERFACE char * 445INTERFACE char *
428syntaxname (pointer p) 446syntaxname (pointer p)
429{ 447{
430 return strvalue (car (p)); 448 return strvalue (p);
431} 449}
432 450
433#define procnum(p) ivalue_unchecked (p) 451#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 452static const char *procname (pointer x);
435 453
651#endif 669#endif
652 670
653static int file_push (SCHEME_P_ const char *fname); 671static int file_push (SCHEME_P_ const char *fname);
654static void file_pop (SCHEME_P); 672static void file_pop (SCHEME_P);
655static int file_interactive (SCHEME_P); 673static int file_interactive (SCHEME_P);
656ecb_inline int is_one_of (char *s, int c); 674ecb_inline int is_one_of (const char *s, int c);
657static int alloc_cellseg (SCHEME_P_ int n); 675static int alloc_cellseg (SCHEME_P_ int n);
658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659static void finalize_cell (SCHEME_P_ pointer a); 677static void finalize_cell (SCHEME_P_ pointer a);
660static int count_consecutive_cells (pointer x, int needed); 678static int count_consecutive_cells (pointer x, int needed);
661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 679static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static void mark (pointer a); 696static void mark (pointer a);
679static void gc (SCHEME_P_ pointer a, pointer b); 697static void gc (SCHEME_P_ pointer a, pointer b);
680static int basic_inchar (port *pt); 698static int basic_inchar (port *pt);
681static int inchar (SCHEME_P); 699static int inchar (SCHEME_P);
682static void backchar (SCHEME_P_ int c); 700static void backchar (SCHEME_P_ int c);
683static char *readstr_upto (SCHEME_P_ char *delim); 701static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684static pointer readstrexp (SCHEME_P); 702static pointer readstrexp (SCHEME_P_ char delim);
685ecb_inline int skipspace (SCHEME_P); 703ecb_inline int skipspace (SCHEME_P);
686static int token (SCHEME_P); 704static int token (SCHEME_P);
687static void printslashstring (SCHEME_P_ char *s, int len); 705static void printslashstring (SCHEME_P_ char *s, int len);
688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 706static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689static void printatom (SCHEME_P_ pointer l, int f); 707static void printatom (SCHEME_P_ pointer l, int f);
952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953 return S_SINK; 971 return S_SINK;
954 972
955 if (SCHEME_V->free_cell == NIL) 973 if (SCHEME_V->free_cell == NIL)
956 { 974 {
957 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 975 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
958 976
959 gc (SCHEME_A_ a, b); 977 gc (SCHEME_A_ a, b);
960 978
961 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 979 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
962 { 980 {
1013} 1031}
1014 1032
1015static pointer 1033static pointer
1016get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1034get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017{ 1035{
1018 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1036 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019 pointer *e = malloc (len * sizeof (pointer)); 1037 pointer *e = malloc (len * sizeof (pointer));
1020 1038
1021 if (!e && USE_ERROR_CHECKING) 1039 if (!e && USE_ERROR_CHECKING)
1022 return S_SINK; 1040 return S_SINK;
1023 1041
1077 set_cdr (x, b); 1095 set_cdr (x, b);
1078 1096
1079 return x; 1097 return x;
1080} 1098}
1081 1099
1100static pointer
1101generate_symbol (SCHEME_P_ const char *name)
1102{
1103 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x;
1107}
1108
1082/* ========== oblist implementation ========== */ 1109/* ========== oblist implementation ========== */
1083 1110
1084#ifndef USE_OBJECT_LIST 1111#ifndef USE_OBJECT_LIST
1085 1112
1113static int
1086static int hash_fn (const char *key, int table_size); 1114hash_fn (const char *key, int table_size)
1115{
1116 const unsigned char *p = key;
1117 uint32_t hash = 2166136261;
1118
1119 while (*p)
1120 hash = (hash ^ *p++) * 16777619;
1121
1122 return hash % table_size;
1123}
1087 1124
1088static pointer 1125static pointer
1089oblist_initial_value (SCHEME_P) 1126oblist_initial_value (SCHEME_P)
1090{ 1127{
1091 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1093 1130
1094/* returns the new symbol */ 1131/* returns the new symbol */
1095static pointer 1132static pointer
1096oblist_add_by_name (SCHEME_P_ const char *name) 1133oblist_add_by_name (SCHEME_P_ const char *name)
1097{ 1134{
1098 int location; 1135 pointer x = generate_symbol (SCHEME_A_ name);
1099
1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1101 set_typeflag (x, T_SYMBOL);
1102 setimmutable (car (x));
1103
1104 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1136 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1137 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1106 return x; 1138 return x;
1107} 1139}
1108 1140
1109ecb_inline pointer 1141ecb_inline pointer
1169 1201
1170/* returns the new symbol */ 1202/* returns the new symbol */
1171static pointer 1203static pointer
1172oblist_add_by_name (SCHEME_P_ const char *name) 1204oblist_add_by_name (SCHEME_P_ const char *name)
1173{ 1205{
1174 pointer x; 1206 pointer x = generate_symbol (SCHEME_A_ name);
1175
1176 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1177 set_typeflag (x, T_SYMBOL);
1178 setimmutable (car (x));
1179 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1180 return x; 1208 return x;
1181} 1209}
1182 1210
1183static pointer 1211static pointer
1204pointer 1232pointer
1205mk_foreign_func (SCHEME_P_ foreign_func f) 1233mk_foreign_func (SCHEME_P_ foreign_func f)
1206{ 1234{
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1235 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1236
1209 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1237 set_typeflag (x, T_FOREIGN | T_ATOM);
1210 x->object.ff = f; 1238 x->object.ff = f;
1211 1239
1212 return x; 1240 return x;
1213} 1241}
1214 1242
1215INTERFACE pointer 1243INTERFACE pointer
1216mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1217{ 1245{
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1247
1220 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, T_CHARACTER | T_ATOM);
1221 set_ivalue (x, c & 0xff); 1249 set_ivalue (x, c & 0xff);
1222 1250
1223 return x; 1251 return x;
1224} 1252}
1225 1253
1226/* get number atom (integer) */ 1254/* get number atom (integer) */
1227INTERFACE pointer 1255INTERFACE pointer
1228mk_integer (SCHEME_P_ long n) 1256mk_integer (SCHEME_P_ long n)
1229{ 1257{
1258 pointer p = 0;
1259 pointer *pp = &p;
1260
1261#if USE_INTCACHE
1262 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1263 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1264#endif
1265
1266 if (!*pp)
1267 {
1230 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1231 1269
1232 set_typeflag (x, (T_INTEGER | T_ATOM)); 1270 set_typeflag (x, T_INTEGER | T_ATOM);
1271 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1233 set_ivalue (x, n); 1272 set_ivalue (x, n);
1234 1273
1274 *pp = x;
1275 }
1276
1235 return x; 1277 return *pp;
1236} 1278}
1237 1279
1238INTERFACE pointer 1280INTERFACE pointer
1239mk_real (SCHEME_P_ RVALUE n) 1281mk_real (SCHEME_P_ RVALUE n)
1240{ 1282{
1241#if USE_REAL 1283#if USE_REAL
1242 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1284 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1243 1285
1244 set_typeflag (x, (T_REAL | T_ATOM)); 1286 set_typeflag (x, T_REAL | T_ATOM);
1245 set_rvalue (x, n); 1287 set_rvalue (x, n);
1246 1288
1247 return x; 1289 return x;
1248#else 1290#else
1249 return mk_integer (SCHEME_A_ n); 1291 return mk_integer (SCHEME_A_ n);
1273 SCHEME_V->no_memory = 1; 1315 SCHEME_V->no_memory = 1;
1274 return SCHEME_V->strbuff; 1316 return SCHEME_V->strbuff;
1275 } 1317 }
1276 1318
1277 if (str) 1319 if (str)
1278 { 1320 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1279 int l = strlen (str);
1280
1281 if (l > len_str)
1282 l = len_str;
1283
1284 memcpy (q, str, l);
1285 q[l] = 0;
1286 }
1287 else 1321 else
1288 {
1289 memset (q, fill, len_str); 1322 memset (q, fill, len_str);
1323
1290 q[len_str] = 0; 1324 q[len_str] = 0;
1291 }
1292 1325
1293 return q; 1326 return q;
1294} 1327}
1295 1328
1296INTERFACE pointer 1329INTERFACE pointer
1310 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1343 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1311 1344
1312 set_typeflag (x, T_STRING | T_ATOM); 1345 set_typeflag (x, T_STRING | T_ATOM);
1313 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1346 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1314 strlength (x) = len; 1347 strlength (x) = len;
1348
1315 return x; 1349 return x;
1316} 1350}
1317 1351
1318INTERFACE pointer 1352INTERFACE pointer
1319mk_string (SCHEME_P_ const char *str) 1353mk_string (SCHEME_P_ const char *str)
1332{ 1366{
1333 int i; 1367 int i;
1334 1368
1335 for (i = start; i < veclength (vec); i++) 1369 for (i = start; i < veclength (vec); i++)
1336 vecvalue (vec)[i] = obj; 1370 vecvalue (vec)[i] = obj;
1371}
1372
1373INTERFACE void
1374vector_resize (pointer vec, uint32_t newsize, pointer fill)
1375{
1376 uint32_t oldsize = veclength (vec);
1377 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1378 veclength (vec) = newsize;
1379 fill_vector (vec, oldsize, fill);
1337} 1380}
1338 1381
1339INTERFACE pointer 1382INTERFACE pointer
1340vector_get (pointer vec, uint32_t ielem) 1383vector_get (pointer vec, uint32_t ielem)
1341{ 1384{
1363 1406
1364INTERFACE pointer 1407INTERFACE pointer
1365gensym (SCHEME_P) 1408gensym (SCHEME_P)
1366{ 1409{
1367 pointer x; 1410 pointer x;
1368
1369 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1370 {
1371 char name[40] = "gensym-"; 1411 char name[40] = "gensym-";
1372 xnum (name + 7, SCHEME_V->gensym_cnt); 1412 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1373 1413
1374 /* first check oblist */ 1414 return generate_symbol (SCHEME_A_ name);
1375 x = oblist_find_by_name (SCHEME_A_ name); 1415}
1376 1416
1377 if (x == NIL) 1417static int
1378 { 1418is_gensym (SCHEME_P_ pointer x)
1379 x = oblist_add_by_name (SCHEME_A_ name); 1419{
1380 return x; 1420 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1381 }
1382 }
1383
1384 return NIL;
1385} 1421}
1386 1422
1387/* make symbol or number atom from string */ 1423/* make symbol or number atom from string */
1388static pointer 1424static pointer
1389mk_atom (SCHEME_P_ char *q) 1425mk_atom (SCHEME_P_ char *q)
1624 /* Mark recent objects the interpreter doesn't know about yet. */ 1660 /* Mark recent objects the interpreter doesn't know about yet. */
1625 mark (car (S_SINK)); 1661 mark (car (S_SINK));
1626 /* Mark any older stuff above nested C calls */ 1662 /* Mark any older stuff above nested C calls */
1627 mark (SCHEME_V->c_nest); 1663 mark (SCHEME_V->c_nest);
1628 1664
1665#if USE_INTCACHE
1666 /* mark intcache */
1667 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1668 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1669 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1670#endif
1671
1629 /* mark variables a, b */ 1672 /* mark variables a, b */
1630 mark (a); 1673 mark (a);
1631 mark (b); 1674 mark (b);
1632 1675
1633 /* garbage collect */ 1676 /* garbage collect */
1634 clrmark (NIL); 1677 clrmark (NIL);
1635 SCHEME_V->fcells = 0; 1678 SCHEME_V->fcells = 0;
1636 SCHEME_V->free_cell = NIL; 1679 SCHEME_V->free_cell = NIL;
1637 1680
1638 /* free-list is kept sorted by address so as to maintain consecutive 1681 if (SCHEME_V->gc_verbose)
1639 ranges, if possible, for use with vectors. Here we scan the cells 1682 xwrstr ("freeing...");
1640 (which are also kept sorted by address) downwards to build the 1683
1641 free-list in sorted order. 1684 uint32_t total = 0;
1642 */ 1685
1686 /* Here we scan the cells to build the free-list. */
1643 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1687 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1644 { 1688 {
1645 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i]; 1689 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1690 total += SCHEME_V->cell_segsize [i];
1646 1691
1647 while (--p >= SCHEME_V->cell_seg[i]) 1692 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1648 { 1693 {
1649 if (is_mark (p)) 1694 if (is_mark (p))
1650 clrmark (p); 1695 clrmark (p);
1651 else 1696 else
1652 { 1697 {
1665 } 1710 }
1666 } 1711 }
1667 1712
1668 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1669 { 1714 {
1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1715 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1671 } 1716 }
1672} 1717}
1673 1718
1674static void 1719static void
1675finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1676{ 1721{
1677 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1678 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1679 free (strvalue (a)); 1724 free (strvalue (a));
1680 else if (is_vector (a)) 1725 else if (is_vector (a))
1681 free (vecvalue (a)); 1726 free (vecvalue (a));
1682#if USE_PORTS 1727#if USE_PORTS
1683 else if (is_port (a)) 1728 else if (is_port (a))
2105#endif 2150#endif
2106} 2151}
2107 2152
2108/* read characters up to delimiter, but cater to character constants */ 2153/* read characters up to delimiter, but cater to character constants */
2109static char * 2154static char *
2110readstr_upto (SCHEME_P_ char *delim) 2155readstr_upto (SCHEME_P_ int skip, const char *delim)
2111{ 2156{
2112 char *p = SCHEME_V->strbuff; 2157 char *p = SCHEME_V->strbuff + skip;
2113 2158
2114 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2159 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2115 2160
2116 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2161 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2117 *p = 0; 2162 *p = 0;
2124 return SCHEME_V->strbuff; 2169 return SCHEME_V->strbuff;
2125} 2170}
2126 2171
2127/* read string expression "xxx...xxx" */ 2172/* read string expression "xxx...xxx" */
2128static pointer 2173static pointer
2129readstrexp (SCHEME_P) 2174readstrexp (SCHEME_P_ char delim)
2130{ 2175{
2131 char *p = SCHEME_V->strbuff; 2176 char *p = SCHEME_V->strbuff;
2132 int c; 2177 int c;
2133 int c1 = 0; 2178 int c1 = 0;
2134 enum
2135 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2179 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2136 2180
2137 for (;;) 2181 for (;;)
2138 { 2182 {
2139 c = inchar (SCHEME_A); 2183 c = inchar (SCHEME_A);
2140 2184
2142 return S_F; 2186 return S_F;
2143 2187
2144 switch (state) 2188 switch (state)
2145 { 2189 {
2146 case st_ok: 2190 case st_ok:
2147 switch (c) 2191 if (ecb_expect_false (c == delim))
2148 {
2149 case '\\':
2150 state = st_bsl;
2151 break;
2152
2153 case '"':
2154 *p = 0;
2155 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2192 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2156 2193
2157 default: 2194 if (ecb_expect_false (c == '\\'))
2195 state = st_bsl;
2196 else
2158 *p++ = c; 2197 *p++ = c;
2159 break;
2160 }
2161 2198
2162 break; 2199 break;
2163 2200
2164 case st_bsl: 2201 case st_bsl:
2165 switch (c) 2202 switch (c)
2195 case 'r': 2232 case 'r':
2196 *p++ = '\r'; 2233 *p++ = '\r';
2197 state = st_ok; 2234 state = st_ok;
2198 break; 2235 break;
2199 2236
2200 case '"':
2201 *p++ = '"';
2202 state = st_ok;
2203 break;
2204
2205 default: 2237 default:
2206 *p++ = c; 2238 *p++ = c;
2207 state = st_ok; 2239 state = st_ok;
2208 break; 2240 break;
2209 } 2241 }
2210 2242
2211 break; 2243 break;
2212 2244
2213 case st_x1: 2245 case st_x1:
2214 case st_x2: 2246 case st_x2:
2215 c = toupper (c); 2247 c = tolower (c);
2216 2248
2217 if (c >= '0' && c <= 'F') 2249 if (c >= '0' && c <= '9')
2218 {
2219 if (c <= '9')
2220 c1 = (c1 << 4) + c - '0'; 2250 c1 = (c1 << 4) + c - '0';
2221 else 2251 else if (c >= 'a' && c <= 'f')
2222 c1 = (c1 << 4) + c - 'A' + 10; 2252 c1 = (c1 << 4) + c - 'a' + 10;
2223
2224 if (state == st_x1)
2225 state = st_x2;
2226 else
2227 {
2228 *p++ = c1;
2229 state = st_ok;
2230 }
2231 }
2232 else 2253 else
2233 return S_F; 2254 return S_F;
2255
2256 if (state == st_x1)
2257 state = st_x2;
2258 else
2259 {
2260 *p++ = c1;
2261 state = st_ok;
2262 }
2234 2263
2235 break; 2264 break;
2236 2265
2237 case st_oct1: 2266 case st_oct1:
2238 case st_oct2: 2267 case st_oct2:
2242 backchar (SCHEME_A_ c); 2271 backchar (SCHEME_A_ c);
2243 state = st_ok; 2272 state = st_ok;
2244 } 2273 }
2245 else 2274 else
2246 { 2275 {
2247 if (state == st_oct2 && c1 >= 32) 2276 if (state == st_oct2 && c1 >= ' ')
2248 return S_F; 2277 return S_F;
2249 2278
2250 c1 = (c1 << 3) + (c - '0'); 2279 c1 = (c1 << 3) + (c - '0');
2251 2280
2252 if (state == st_oct1) 2281 if (state == st_oct1)
2257 state = st_ok; 2286 state = st_ok;
2258 } 2287 }
2259 } 2288 }
2260 2289
2261 break; 2290 break;
2262
2263 } 2291 }
2264 } 2292 }
2265} 2293}
2266 2294
2267/* check c is in chars */ 2295/* check c is in chars */
2268ecb_inline int 2296ecb_inline int
2269is_one_of (char *s, int c) 2297is_one_of (const char *s, int c)
2270{ 2298{
2271 if (c == EOF)
2272 return 1;
2273
2274 return !!strchr (s, c); 2299 return c == EOF || !!strchr (s, c);
2275} 2300}
2276 2301
2277/* skip white characters */ 2302/* skip white characters */
2278ecb_inline int 2303ecb_inline int
2279skipspace (SCHEME_P) 2304skipspace (SCHEME_P)
2281 int c, curr_line = 0; 2306 int c, curr_line = 0;
2282 2307
2283 do 2308 do
2284 { 2309 {
2285 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2311
2286#if SHOW_ERROR_LINE 2312#if SHOW_ERROR_LINE
2287 if (c == '\n') 2313 if (ecb_expect_false (c == '\n'))
2288 curr_line++; 2314 curr_line++;
2289#endif 2315#endif
2316
2317 if (ecb_expect_false (c == EOF))
2318 return c;
2290 } 2319 }
2291 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2320 while (is_one_of (WHITESPACE, c));
2292 2321
2293 /* record it */ 2322 /* record it */
2294#if SHOW_ERROR_LINE 2323#if SHOW_ERROR_LINE
2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2324 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2325 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2297#endif 2326#endif
2298 2327
2299 if (c != EOF)
2300 {
2301 backchar (SCHEME_A_ c); 2328 backchar (SCHEME_A_ c);
2302 return 1; 2329 return 1;
2303 }
2304 else
2305 return EOF;
2306} 2330}
2307 2331
2308/* get token */ 2332/* get token */
2309static int 2333static int
2310token (SCHEME_P) 2334token (SCHEME_P)
2326 return TOK_RPAREN; 2350 return TOK_RPAREN;
2327 2351
2328 case '.': 2352 case '.':
2329 c = inchar (SCHEME_A); 2353 c = inchar (SCHEME_A);
2330 2354
2331 if (is_one_of (" \n\t", c)) 2355 if (is_one_of (WHITESPACE, c))
2332 return TOK_DOT; 2356 return TOK_DOT;
2333 else 2357 else
2334 { 2358 {
2335 //TODO: ungetc twice in a row is not supported in C
2336 backchar (SCHEME_A_ c); 2359 backchar (SCHEME_A_ c);
2337 backchar (SCHEME_A_ '.');
2338 return TOK_ATOM; 2360 return TOK_DOTATOM;
2339 } 2361 }
2362
2363 case '|':
2364 return TOK_STRATOM;
2340 2365
2341 case '\'': 2366 case '\'':
2342 return TOK_QUOTE; 2367 return TOK_QUOTE;
2343 2368
2344 case ';': 2369 case ';':
2476 } 2501 }
2477 2502
2478 putcharacter (SCHEME_A_ '"'); 2503 putcharacter (SCHEME_A_ '"');
2479} 2504}
2480 2505
2481
2482/* print atoms */ 2506/* print atoms */
2483static void 2507static void
2484printatom (SCHEME_P_ pointer l, int f) 2508printatom (SCHEME_P_ pointer l, int f)
2485{ 2509{
2486 char *p; 2510 char *p;
2487 int len; 2511 int len;
2488 2512
2489 atom2str (SCHEME_A_ l, f, &p, &len); 2513 atom2str (SCHEME_A_ l, f, &p, &len);
2490 putchars (SCHEME_A_ p, len); 2514 putchars (SCHEME_A_ p, len);
2491} 2515}
2492
2493 2516
2494/* Uses internal buffer unless string pointer is already available */ 2517/* Uses internal buffer unless string pointer is already available */
2495static void 2518static void
2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2519atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497{ 2520{
2658#endif 2681#endif
2659 } 2682 }
2660 else if (is_continuation (l)) 2683 else if (is_continuation (l))
2661 p = "#<CONTINUATION>"; 2684 p = "#<CONTINUATION>";
2662 else 2685 else
2686 {
2687#if USE_PRINTF
2688 p = SCHEME_V->strbuff;
2689 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2690#else
2663 p = "#<ERROR>"; 2691 p = "#<ERROR>";
2692#endif
2693 }
2664 2694
2665 *pp = p; 2695 *pp = p;
2666 *plen = strlen (p); 2696 *plen = strlen (p);
2667} 2697}
2668 2698
2812/* () is #t in R5RS */ 2842/* () is #t in R5RS */
2813#define is_true(p) ((p) != S_F) 2843#define is_true(p) ((p) != S_F)
2814#define is_false(p) ((p) == S_F) 2844#define is_false(p) ((p) == S_F)
2815 2845
2816/* ========== Environment implementation ========== */ 2846/* ========== Environment implementation ========== */
2817
2818#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2819
2820static int
2821hash_fn (const char *key, int table_size)
2822{
2823 const unsigned char *p = key;
2824 uint32_t hash = 2166136261;
2825
2826 while (*p)
2827 hash = (hash ^ *p++) * 16777619;
2828
2829 return hash % table_size;
2830}
2831#endif
2832 2847
2833#ifndef USE_ALIST_ENV 2848#ifndef USE_ALIST_ENV
2834 2849
2835/* 2850/*
2836 * In this implementation, each frame of the environment may be 2851 * In this implementation, each frame of the environment may be
2853 2868
2854 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2869 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2855 setenvironment (SCHEME_V->envir); 2870 setenvironment (SCHEME_V->envir);
2856} 2871}
2857 2872
2873static uint32_t
2874sym_hash (pointer sym, uint32_t size)
2875{
2876 uintptr_t ptr = (uintptr_t)sym;
2877
2878#if 0
2879 /* table size is prime, so why mix */
2880 ptr += ptr >> 32;
2881 ptr += ptr >> 16;
2882 ptr += ptr >> 8;
2883#endif
2884
2885 return ptr % size;
2886}
2887
2858ecb_inline void 2888ecb_inline void
2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2889new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2860{ 2890{
2861 pointer slot = immutable_cons (variable, value); 2891 pointer slot = immutable_cons (variable, value);
2862 2892
2863 if (is_vector (car (env))) 2893 if (is_vector (car (env)))
2864 { 2894 {
2865 int location = hash_fn (symname (variable), veclength (car (env))); 2895 int location = sym_hash (variable, veclength (car (env)));
2866
2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location))); 2896 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2868 } 2897 }
2869 else 2898 else
2870 set_car (env, immutable_cons (slot, car (env))); 2899 set_car (env, immutable_cons (slot, car (env)));
2871} 2900}
2872 2901
2873static pointer 2902static pointer
2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2903find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2875{ 2904{
2876 pointer x, y; 2905 pointer x, y;
2877 int location;
2878 2906
2879 for (x = env; x != NIL; x = cdr (x)) 2907 for (x = env; x != NIL; x = cdr (x))
2880 { 2908 {
2881 if (is_vector (car (x))) 2909 if (is_vector (car (x)))
2882 { 2910 {
2883 location = hash_fn (symname (hdl), veclength (car (x))); 2911 int location = sym_hash (hdl, veclength (car (x)));
2884 y = vector_get (car (x), location); 2912 y = vector_get (car (x), location);
2885 } 2913 }
2886 else 2914 else
2887 y = car (x); 2915 y = car (x);
2888 2916
2925 for (y = car (x); y != NIL; y = cdr (y)) 2953 for (y = car (x); y != NIL; y = cdr (y))
2926 if (caar (y) == hdl) 2954 if (caar (y) == hdl)
2927 break; 2955 break;
2928 2956
2929 if (y != NIL) 2957 if (y != NIL)
2958 return car (y);
2930 break; 2959 break;
2931 2960
2932 if (!all) 2961 if (!all)
2933 return NIL; 2962 break;
2934 } 2963 }
2935
2936 if (x != NIL)
2937 return car (y);
2938 2964
2939 return NIL; 2965 return NIL;
2940} 2966}
2941 2967
2942#endif /* USE_ALIST_ENV else */ 2968#endif /* USE_ALIST_ENV else */
2943 2969
2944ecb_inline void 2970ecb_inline void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2971new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2972{
2973 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2974 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948} 2975}
2949 2976
2950ecb_inline void 2977ecb_inline void
2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2978set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3243 3270
3244#endif 3271#endif
3245 3272
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3273#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3274
3275#if EXPERIMENT
3276static int
3277debug (SCHEME_P_ int indent, pointer x)
3278{
3279 int c;
3280
3281 if (is_syntax (x))
3282 {
3283 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3284 return 8 + 8;
3285 }
3286
3287 if (x == NIL)
3288 {
3289 printf ("%*sNIL\n", indent, "");
3290 return 3;
3291 }
3292
3293 switch (type (x))
3294 {
3295 case T_INTEGER:
3296 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3297 return 32+8;
3298
3299 case T_SYMBOL:
3300 printf ("%*sS<%s>\n", indent, "", symname (x));
3301 return 24+8;
3302
3303 case T_CLOSURE:
3304 printf ("%*sS<%s>\n", indent, "", "closure");
3305 debug (SCHEME_A_ indent + 3, cdr(x));
3306 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3307
3308 case T_PAIR:
3309 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3310 c = debug (SCHEME_A_ indent + 3, car (x));
3311 c += debug (SCHEME_A_ indent + 3, cdr (x));
3312 return c + 1;
3313
3314 case T_PORT:
3315 printf ("%*sS<%s>\n", indent, "", "port");
3316 return 24+8;
3317
3318 case T_VECTOR:
3319 printf ("%*sS<%s>\n", indent, "", "vector");
3320 return 24+8;
3321
3322 case T_ENVIRONMENT:
3323 printf ("%*sS<%s>\n", indent, "", "environment");
3324 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3325
3326 default:
3327 printf ("unhandled type %d\n", type (x));
3328 break;
3329 }
3330}
3331#endif
3332
3248static int 3333static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3334opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3335{
3251 pointer args = SCHEME_V->args; 3336 pointer args = SCHEME_V->args;
3252 pointer x, y; 3337 pointer x, y;
3253 3338
3254 switch (op) 3339 switch (op)
3255 { 3340 {
3341#if EXPERIMENT //D
3342 case OP_DEBUG:
3343 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3344 printf ("\n");
3345 s_return (S_T);
3346#endif
3256 case OP_LOAD: /* load */ 3347 case OP_LOAD: /* load */
3257 if (file_interactive (SCHEME_A)) 3348 if (file_interactive (SCHEME_A))
3258 { 3349 {
3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3350 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3351 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3383 } 3474 }
3384 else 3475 else
3385 s_return (SCHEME_V->code); 3476 s_return (SCHEME_V->code);
3386 3477
3387 case OP_E0ARGS: /* eval arguments */ 3478 case OP_E0ARGS: /* eval arguments */
3388 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3479 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3389 { 3480 {
3390 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3481 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3391 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3482 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3392 SCHEME_V->code = SCHEME_V->value; 3483 SCHEME_V->code = SCHEME_V->value;
3393 s_goto (OP_APPLY); 3484 s_goto (OP_APPLY);
3494 3585
3495 case OP_DOMACRO: /* do macro */ 3586 case OP_DOMACRO: /* do macro */
3496 SCHEME_V->code = SCHEME_V->value; 3587 SCHEME_V->code = SCHEME_V->value;
3497 s_goto (OP_EVAL); 3588 s_goto (OP_EVAL);
3498 3589
3499#if 1
3500
3501 case OP_LAMBDA: /* lambda */ 3590 case OP_LAMBDA: /* lambda */
3502 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3591 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503 set SCHEME_V->value fall thru */ 3592 set SCHEME_V->value fall thru */
3504 { 3593 {
3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3594 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
3511 SCHEME_V->code = slot_value_in_env (f); 3600 SCHEME_V->code = slot_value_in_env (f);
3512 s_goto (OP_APPLY); 3601 s_goto (OP_APPLY);
3513 } 3602 }
3514 3603
3515 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3516 /* Fallthru */
3517 } 3605 }
3606 /* Fallthru */
3518 3607
3519 case OP_LAMBDA1: 3608 case OP_LAMBDA1:
3520 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3609 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522#else
3523
3524 case OP_LAMBDA: /* lambda */
3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527#endif
3528 3610
3529 case OP_MKCLOSURE: /* make-closure */ 3611 case OP_MKCLOSURE: /* make-closure */
3530 x = car (args); 3612 x = car (args);
3531 3613
3532 if (car (x) == SCHEME_V->LAMBDA) 3614 if (car (x) == SCHEME_V->LAMBDA)
4128 else 4210 else
4129 Error_0 ("modulo: division by zero"); 4211 Error_0 ("modulo: division by zero");
4130 4212
4131 s_return (mk_number (SCHEME_A_ v)); 4213 s_return (mk_number (SCHEME_A_ v));
4132 4214
4133 case OP_CAR: /* car */ 4215 /* the compiler will optimize this mess... */
4134 s_return (caar (args)); 4216 case OP_CAR: op_car: s_return (car (x));
4135 4217 case OP_CDR: op_cdr: s_return (cdr (x));
4136 case OP_CDR: /* cdr */ 4218 case OP_CAAR: op_caar: x = car (x); goto op_car;
4137 s_return (cdar (args)); 4219 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4220 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4221 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4222 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4223 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4224 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4225 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4226 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4227 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4228 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4229 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4230 case OP_CAAAAR: x = car (x); goto op_caaar;
4231 case OP_CAAADR: x = cdr (x); goto op_caaar;
4232 case OP_CAADAR: x = car (x); goto op_caadr;
4233 case OP_CAADDR: x = cdr (x); goto op_caadr;
4234 case OP_CADAAR: x = car (x); goto op_cadar;
4235 case OP_CADADR: x = cdr (x); goto op_cadar;
4236 case OP_CADDAR: x = car (x); goto op_caddr;
4237 case OP_CADDDR: x = cdr (x); goto op_caddr;
4238 case OP_CDAAAR: x = car (x); goto op_cdaar;
4239 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4240 case OP_CDADAR: x = car (x); goto op_cdadr;
4241 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4242 case OP_CDDAAR: x = car (x); goto op_cddar;
4243 case OP_CDDADR: x = cdr (x); goto op_cddar;
4244 case OP_CDDDAR: x = car (x); goto op_cdddr;
4245 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4138 4246
4139 case OP_CONS: /* cons */ 4247 case OP_CONS: /* cons */
4140 set_cdr (args, cadr (args)); 4248 set_cdr (args, cadr (args));
4141 s_return (args); 4249 s_return (args);
4142 4250
4391 } 4499 }
4392 4500
4393 case OP_VECLEN: /* vector-length */ 4501 case OP_VECLEN: /* vector-length */
4394 s_return (mk_integer (SCHEME_A_ veclength (x))); 4502 s_return (mk_integer (SCHEME_A_ veclength (x)));
4395 4503
4504 case OP_VECRESIZE:
4505 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4506 s_return (x);
4507
4396 case OP_VECREF: /* vector-ref */ 4508 case OP_VECREF: /* vector-ref */
4397 { 4509 {
4398 int index = ivalue_unchecked (cadr (args)); 4510 int index = ivalue_unchecked (cadr (args));
4399 4511
4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4512 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4460 pointer d = cdr (args); 4572 pointer d = cdr (args);
4461 int r; 4573 int r;
4462 4574
4463 switch (op) 4575 switch (op)
4464 { 4576 {
4465 case OP_NOT: /* not */ r = is_false (a) ; break; 4577 case OP_NOT: /* not */ r = is_false (a) ; break;
4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4578 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4579 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break; 4580 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4581 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4582 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4583 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4584 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4585 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4586 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4587 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475 4588
4476#if USE_CHAR_CLASSIFIERS 4589#if USE_CHAR_CLASSIFIERS
4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4590 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4591 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4592 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4955 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5068 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4956 SCHEME_V->tok = token (SCHEME_A); 5069 SCHEME_V->tok = token (SCHEME_A);
4957 s_goto (OP_RDSEXPR); 5070 s_goto (OP_RDSEXPR);
4958 5071
4959 case TOK_ATOM: 5072 case TOK_ATOM:
4960 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5073 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5074
5075 case TOK_DOTATOM:
5076 SCHEME_V->strbuff[0] = '.';
5077 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5078
5079 case TOK_STRATOM:
5080 x = readstrexp (SCHEME_A_ '|');
5081 //TODO: haven't checked whether the garbage collector could interfere
5082 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4961 5083
4962 case TOK_DQUOTE: 5084 case TOK_DQUOTE:
4963 x = readstrexp (SCHEME_A); 5085 x = readstrexp (SCHEME_A_ '"');
4964 5086
4965 if (x == S_F) 5087 if (x == S_F)
4966 Error_0 ("Error reading string"); 5088 Error_0 ("Error reading string");
4967 5089
4968 setimmutable (x); 5090 setimmutable (x);
4980 s_goto (OP_EVAL); 5102 s_goto (OP_EVAL);
4981 } 5103 }
4982 } 5104 }
4983 5105
4984 case TOK_SHARP_CONST: 5106 case TOK_SHARP_CONST:
4985 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5107 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4986 Error_0 ("undefined sharp expression"); 5108 Error_0 ("undefined sharp expression");
4987 else 5109 else
4988 s_return (x); 5110 s_return (x);
4989 5111
4990 default: 5112 default:
5212 5334
5213 case OP_CLOSUREP: /* closure? */ 5335 case OP_CLOSUREP: /* closure? */
5214 /* 5336 /*
5215 * Note, macro object is also a closure. 5337 * Note, macro object is also a closure.
5216 * Therefore, (closure? <#MACRO>) ==> #t 5338 * Therefore, (closure? <#MACRO>) ==> #t
5339 * (schmorp) well, obviously not, fix? TODO
5217 */ 5340 */
5218 s_retbool (is_closure (a)); 5341 s_retbool (is_closure (a));
5219 5342
5220 case OP_MACROP: /* macro? */ 5343 case OP_MACROP: /* macro? */
5221 s_retbool (is_macro (a)); 5344 s_retbool (is_macro (a));
5462 5585
5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5586/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5464static int 5587static int
5465syntaxnum (pointer p) 5588syntaxnum (pointer p)
5466{ 5589{
5467 const char *s = strvalue (car (p)); 5590 const char *s = strvalue (p);
5468 5591
5469 switch (strlength (car (p))) 5592 switch (strlength (p))
5470 { 5593 {
5471 case 2: 5594 case 2:
5472 if (s[0] == 'i') 5595 if (s[0] == 'i')
5473 return OP_IF0; /* if */ 5596 return OP_IF0; /* if */
5474 else 5597 else
5549ecb_cold int 5672ecb_cold int
5550scheme_init (SCHEME_P) 5673scheme_init (SCHEME_P)
5551{ 5674{
5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5675 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5553 pointer x; 5676 pointer x;
5677
5678 memset (SCHEME_V, 0, sizeof (*SCHEME_V));//TODO !iso c
5554 5679
5555 num_set_fixnum (num_zero, 1); 5680 num_set_fixnum (num_zero, 1);
5556 num_set_ivalue (num_zero, 0); 5681 num_set_ivalue (num_zero, 0);
5557 num_set_fixnum (num_one, 1); 5682 num_set_fixnum (num_one, 1);
5558 num_set_ivalue (num_one, 1); 5683 num_set_ivalue (num_one, 1);
5910# endif 6035# endif
5911 int fin; 6036 int fin;
5912 char *file_name = InitFile; 6037 char *file_name = InitFile;
5913 int retcode; 6038 int retcode;
5914 int isfile = 1; 6039 int isfile = 1;
6040 system ("ps v $PPID");//D
5915 6041
5916 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6042 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5917 { 6043 {
5918 xwrstr ("Usage: tinyscheme -?\n"); 6044 xwrstr ("Usage: tinyscheme -?\n");
5919 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6045 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines