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.35 by root, Sun Nov 29 00:02:21 2015 UTC vs.
Revision 1.49 by root, Mon Nov 30 13:09:56 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"
74 TOK_SHARP_CONST, 76 TOK_SHARP_CONST,
75 TOK_VEC 77 TOK_VEC
76}; 78};
77 79
78#define BACKQUOTE '`' 80#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 81#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE
80 83
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0?
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value?
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value?
84#define S_SINK (&SCHEME_V->xsink) 87#define S_SINK (&SCHEME_V->xsink)
406} 409}
407 410
408INTERFACE char * 411INTERFACE char *
409symname (pointer p) 412symname (pointer p)
410{ 413{
411 return strvalue (car (p)); 414 return strvalue (p);
412} 415}
413 416
414#if USE_PLIST 417#if USE_PLIST
418#error plists are broken because symbols are no longer pairs
419#define symprop(p) cdr(p)
415SCHEME_EXPORT int 420SCHEME_EXPORT int
416hasprop (pointer p) 421hasprop (pointer p)
417{ 422{
418 return typeflag (p) & T_SYMBOL; 423 return typeflag (p) & T_SYMBOL;
419} 424}
420
421# define symprop(p) cdr(p)
422#endif 425#endif
423 426
424INTERFACE int 427INTERFACE int
425is_syntax (pointer p) 428is_syntax (pointer p)
426{ 429{
440} 443}
441 444
442INTERFACE char * 445INTERFACE char *
443syntaxname (pointer p) 446syntaxname (pointer p)
444{ 447{
445 return strvalue (car (p)); 448 return strvalue (p);
446} 449}
447 450
448#define procnum(p) ivalue_unchecked (p) 451#define procnum(p) ivalue_unchecked (p)
449static const char *procname (pointer x); 452static const char *procname (pointer x);
450 453
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 970 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 971 return S_SINK;
969 972
970 if (SCHEME_V->free_cell == NIL) 973 if (SCHEME_V->free_cell == NIL)
971 { 974 {
972 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;
973 976
974 gc (SCHEME_A_ a, b); 977 gc (SCHEME_A_ a, b);
975 978
976 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)
977 { 980 {
1028} 1031}
1029 1032
1030static pointer 1033static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1034get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 1035{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1036 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1037 pointer *e = malloc (len * sizeof (pointer));
1035 1038
1036 if (!e && USE_ERROR_CHECKING) 1039 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1040 return S_SINK;
1038 1041
1092 set_cdr (x, b); 1095 set_cdr (x, b);
1093 1096
1094 return x; 1097 return x;
1095} 1098}
1096 1099
1097/* ========== oblist implementation ========== */
1098
1099static pointer 1100static pointer
1100generate_symbol (SCHEME_P_ const char *name) 1101generate_symbol (SCHEME_P_ const char *name)
1101{ 1102{
1102 pointer x = mk_string (SCHEME_A_ name); 1103 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1104 setimmutable (x);
1104 x = immutable_cons (x, NIL);
1105 set_typeflag (x, T_SYMBOL); 1105 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1106 return x;
1107} 1107}
1108
1109/* ========== oblist implementation ========== */
1108 1110
1109#ifndef USE_OBJECT_LIST 1111#ifndef USE_OBJECT_LIST
1110 1112
1111static int 1113static int
1112hash_fn (const char *key, int table_size) 1114hash_fn (const char *key, int table_size)
1199 1201
1200/* returns the new symbol */ 1202/* returns the new symbol */
1201static pointer 1203static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1204oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1205{
1204 pointer x = mk_string (SCHEME_A_ name); 1206 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1208 return x;
1209} 1209}
1210 1210
1211static pointer 1211static pointer
1232pointer 1232pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1233mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1234{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1235 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1236
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1237 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1238 x->object.ff = f;
1239 1239
1240 return x; 1240 return x;
1241} 1241}
1242 1242
1243INTERFACE pointer 1243INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1244mk_character (SCHEME_P_ int c)
1245{ 1245{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1246 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1247
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1248 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1249 set_ivalue (x, c & 0xff);
1250 1250
1251 return x; 1251 return x;
1252} 1252}
1253 1253
1254/* get number atom (integer) */ 1254/* get number atom (integer) */
1255INTERFACE pointer 1255INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1256mk_integer (SCHEME_P_ long n)
1257{ 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 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1268 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1269
1260 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 */
1261 set_ivalue (x, n); 1272 set_ivalue (x, n);
1262 1273
1274 *pp = x;
1275 }
1276
1263 return x; 1277 return *pp;
1264} 1278}
1265 1279
1266INTERFACE pointer 1280INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1281mk_real (SCHEME_P_ RVALUE n)
1268{ 1282{
1269#if USE_REAL 1283#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1284 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1285
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1286 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1287 set_rvalue (x, n);
1274 1288
1275 return x; 1289 return x;
1276#else 1290#else
1277 return mk_integer (SCHEME_A_ n); 1291 return mk_integer (SCHEME_A_ n);
1354 1368
1355 for (i = start; i < veclength (vec); i++) 1369 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1370 vecvalue (vec)[i] = obj;
1357} 1371}
1358 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);
1380}
1381
1359INTERFACE pointer 1382INTERFACE pointer
1360vector_get (pointer vec, uint32_t ielem) 1383vector_get (pointer vec, uint32_t ielem)
1361{ 1384{
1362 return vecvalue(vec)[ielem]; 1385 return vecvalue(vec)[ielem];
1363} 1386}
1384INTERFACE pointer 1407INTERFACE pointer
1385gensym (SCHEME_P) 1408gensym (SCHEME_P)
1386{ 1409{
1387 pointer x; 1410 pointer x;
1388 char name[40] = "gensym-"; 1411 char name[40] = "gensym-";
1389 xnum (name + 7, SCHEME_V->gensym_cnt); 1412 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1390 1413
1391 return generate_symbol (SCHEME_A_ name); 1414 return generate_symbol (SCHEME_A_ name);
1415}
1416
1417static int
1418is_gensym (SCHEME_P_ pointer x)
1419{
1420 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1392} 1421}
1393 1422
1394/* make symbol or number atom from string */ 1423/* make symbol or number atom from string */
1395static pointer 1424static pointer
1396mk_atom (SCHEME_P_ char *q) 1425mk_atom (SCHEME_P_ char *q)
1631 /* Mark recent objects the interpreter doesn't know about yet. */ 1660 /* Mark recent objects the interpreter doesn't know about yet. */
1632 mark (car (S_SINK)); 1661 mark (car (S_SINK));
1633 /* Mark any older stuff above nested C calls */ 1662 /* Mark any older stuff above nested C calls */
1634 mark (SCHEME_V->c_nest); 1663 mark (SCHEME_V->c_nest);
1635 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
1636 /* mark variables a, b */ 1672 /* mark variables a, b */
1637 mark (a); 1673 mark (a);
1638 mark (b); 1674 mark (b);
1639 1675
1640 /* garbage collect */ 1676 /* garbage collect */
1641 clrmark (NIL); 1677 clrmark (NIL);
1642 SCHEME_V->fcells = 0; 1678 SCHEME_V->fcells = 0;
1643 SCHEME_V->free_cell = NIL; 1679 SCHEME_V->free_cell = NIL;
1644 1680
1645 /* free-list is kept sorted by address so as to maintain consecutive 1681 if (SCHEME_V->gc_verbose)
1646 ranges, if possible, for use with vectors. Here we scan the cells 1682 xwrstr ("freeing...");
1647 (which are also kept sorted by address) downwards to build the 1683
1648 free-list in sorted order. 1684 uint32_t total = 0;
1649 */ 1685
1686 /* Here we scan the cells to build the free-list. */
1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--) 1687 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1651 { 1688 {
1652 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];
1653 1691
1654 while (--p >= SCHEME_V->cell_seg[i]) 1692 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1655 { 1693 {
1656 if (is_mark (p)) 1694 if (is_mark (p))
1657 clrmark (p); 1695 clrmark (p);
1658 else 1696 else
1659 { 1697 {
1672 } 1710 }
1673 } 1711 }
1674 1712
1675 if (SCHEME_V->gc_verbose) 1713 if (SCHEME_V->gc_verbose)
1676 { 1714 {
1677 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");
1678 } 1716 }
1679} 1717}
1680 1718
1681static void 1719static void
1682finalize_cell (SCHEME_P_ pointer a) 1720finalize_cell (SCHEME_P_ pointer a)
1683{ 1721{
1684 /* TODO, fast bitmap check? */ 1722 /* TODO, fast bitmap check? */
1685 if (is_string (a)) 1723 if (is_string (a) || is_symbol (a))
1686 free (strvalue (a)); 1724 free (strvalue (a));
1687 else if (is_vector (a)) 1725 else if (is_vector (a))
1688 free (vecvalue (a)); 1726 free (vecvalue (a));
1689#if USE_PORTS 1727#if USE_PORTS
1690 else if (is_port (a)) 1728 else if (is_port (a))
2256 2294
2257/* check c is in chars */ 2295/* check c is in chars */
2258ecb_inline int 2296ecb_inline int
2259is_one_of (const char *s, int c) 2297is_one_of (const char *s, int c)
2260{ 2298{
2261 if (c == EOF)
2262 return 1;
2263
2264 return !!strchr (s, c); 2299 return c == EOF || !!strchr (s, c);
2265} 2300}
2266 2301
2267/* skip white characters */ 2302/* skip white characters */
2268ecb_inline int 2303ecb_inline int
2269skipspace (SCHEME_P) 2304skipspace (SCHEME_P)
2271 int c, curr_line = 0; 2306 int c, curr_line = 0;
2272 2307
2273 do 2308 do
2274 { 2309 {
2275 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2311
2276#if SHOW_ERROR_LINE 2312#if SHOW_ERROR_LINE
2277 if (c == '\n') 2313 if (ecb_expect_false (c == '\n'))
2278 curr_line++; 2314 curr_line++;
2279#endif 2315#endif
2316
2317 if (ecb_expect_false (c == EOF))
2318 return c;
2280 } 2319 }
2281 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2320 while (is_one_of (WHITESPACE, c));
2282 2321
2283 /* record it */ 2322 /* record it */
2284#if SHOW_ERROR_LINE 2323#if SHOW_ERROR_LINE
2285 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)
2286 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;
2287#endif 2326#endif
2288 2327
2289 if (c != EOF)
2290 {
2291 backchar (SCHEME_A_ c); 2328 backchar (SCHEME_A_ c);
2292 return 1; 2329 return 1;
2293 }
2294 else
2295 return EOF;
2296} 2330}
2297 2331
2298/* get token */ 2332/* get token */
2299static int 2333static int
2300token (SCHEME_P) 2334token (SCHEME_P)
2316 return TOK_RPAREN; 2350 return TOK_RPAREN;
2317 2351
2318 case '.': 2352 case '.':
2319 c = inchar (SCHEME_A); 2353 c = inchar (SCHEME_A);
2320 2354
2321 if (is_one_of (" \n\t", c)) 2355 if (is_one_of (WHITESPACE, c))
2322 return TOK_DOT; 2356 return TOK_DOT;
2323 else 2357 else
2324 { 2358 {
2325 backchar (SCHEME_A_ c); 2359 backchar (SCHEME_A_ c);
2326 return TOK_DOTATOM; 2360 return TOK_DOTATOM;
2467 } 2501 }
2468 2502
2469 putcharacter (SCHEME_A_ '"'); 2503 putcharacter (SCHEME_A_ '"');
2470} 2504}
2471 2505
2472
2473/* print atoms */ 2506/* print atoms */
2474static void 2507static void
2475printatom (SCHEME_P_ pointer l, int f) 2508printatom (SCHEME_P_ pointer l, int f)
2476{ 2509{
2477 char *p; 2510 char *p;
2478 int len; 2511 int len;
2479 2512
2480 atom2str (SCHEME_A_ l, f, &p, &len); 2513 atom2str (SCHEME_A_ l, f, &p, &len);
2481 putchars (SCHEME_A_ p, len); 2514 putchars (SCHEME_A_ p, len);
2482} 2515}
2483
2484 2516
2485/* Uses internal buffer unless string pointer is already available */ 2517/* Uses internal buffer unless string pointer is already available */
2486static void 2518static void
2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2519atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2488{ 2520{
2649#endif 2681#endif
2650 } 2682 }
2651 else if (is_continuation (l)) 2683 else if (is_continuation (l))
2652 p = "#<CONTINUATION>"; 2684 p = "#<CONTINUATION>";
2653 else 2685 else
2686 {
2687#if USE_PRINTF
2688 p = SCHEME_V->strbuff;
2689 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2690#else
2654 p = "#<ERROR>"; 2691 p = "#<ERROR>";
2692#endif
2693 }
2655 2694
2656 *pp = p; 2695 *pp = p;
2657 *plen = strlen (p); 2696 *plen = strlen (p);
2658} 2697}
2659 2698
2929#endif /* USE_ALIST_ENV else */ 2968#endif /* USE_ALIST_ENV else */
2930 2969
2931ecb_inline void 2970ecb_inline void
2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2971new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2933{ 2972{
2973 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2934 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);
2935} 2975}
2936 2976
2937ecb_inline void 2977ecb_inline void
2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2978set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
3230 3270
3231#endif 3271#endif
3232 3272
3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3273#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3234 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
3235static int 3333static int
3236opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3334opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3237{ 3335{
3238 pointer args = SCHEME_V->args; 3336 pointer args = SCHEME_V->args;
3239 pointer x, y; 3337 pointer x, y;
3240 3338
3241 switch (op) 3339 switch (op)
3242 { 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
3243 case OP_LOAD: /* load */ 3347 case OP_LOAD: /* load */
3244 if (file_interactive (SCHEME_A)) 3348 if (file_interactive (SCHEME_A))
3245 { 3349 {
3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3350 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");
3247 //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)));
3370 } 3474 }
3371 else 3475 else
3372 s_return (SCHEME_V->code); 3476 s_return (SCHEME_V->code);
3373 3477
3374 case OP_E0ARGS: /* eval arguments */ 3478 case OP_E0ARGS: /* eval arguments */
3375 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3479 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3376 { 3480 {
3377 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3481 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3378 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3482 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3379 SCHEME_V->code = SCHEME_V->value; 3483 SCHEME_V->code = SCHEME_V->value;
3380 s_goto (OP_APPLY); 3484 s_goto (OP_APPLY);
3481 3585
3482 case OP_DOMACRO: /* do macro */ 3586 case OP_DOMACRO: /* do macro */
3483 SCHEME_V->code = SCHEME_V->value; 3587 SCHEME_V->code = SCHEME_V->value;
3484 s_goto (OP_EVAL); 3588 s_goto (OP_EVAL);
3485 3589
3486#if 1
3487
3488 case OP_LAMBDA: /* lambda */ 3590 case OP_LAMBDA: /* lambda */
3489 /* 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
3490 set SCHEME_V->value fall thru */ 3592 set SCHEME_V->value fall thru */
3491 { 3593 {
3492 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);
3498 SCHEME_V->code = slot_value_in_env (f); 3600 SCHEME_V->code = slot_value_in_env (f);
3499 s_goto (OP_APPLY); 3601 s_goto (OP_APPLY);
3500 } 3602 }
3501 3603
3502 SCHEME_V->value = SCHEME_V->code; 3604 SCHEME_V->value = SCHEME_V->code;
3503 /* Fallthru */
3504 } 3605 }
3606 /* Fallthru */
3505 3607
3506 case OP_LAMBDA1: 3608 case OP_LAMBDA1:
3507 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));
3508
3509#else
3510
3511 case OP_LAMBDA: /* lambda */
3512 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3513
3514#endif
3515 3610
3516 case OP_MKCLOSURE: /* make-closure */ 3611 case OP_MKCLOSURE: /* make-closure */
3517 x = car (args); 3612 x = car (args);
3518 3613
3519 if (car (x) == SCHEME_V->LAMBDA) 3614 if (car (x) == SCHEME_V->LAMBDA)
4115 else 4210 else
4116 Error_0 ("modulo: division by zero"); 4211 Error_0 ("modulo: division by zero");
4117 4212
4118 s_return (mk_number (SCHEME_A_ v)); 4213 s_return (mk_number (SCHEME_A_ v));
4119 4214
4120 case OP_CAR: /* car */ 4215 /* the compiler will optimize this mess... */
4121 s_return (caar (args)); 4216 case OP_CAR: op_car: s_return (car (x));
4122 4217 case OP_CDR: op_cdr: s_return (cdr (x));
4123 case OP_CDR: /* cdr */ 4218 case OP_CAAR: op_caar: x = car (x); goto op_car;
4124 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;
4125 4246
4126 case OP_CONS: /* cons */ 4247 case OP_CONS: /* cons */
4127 set_cdr (args, cadr (args)); 4248 set_cdr (args, cadr (args));
4128 s_return (args); 4249 s_return (args);
4129 4250
4378 } 4499 }
4379 4500
4380 case OP_VECLEN: /* vector-length */ 4501 case OP_VECLEN: /* vector-length */
4381 s_return (mk_integer (SCHEME_A_ veclength (x))); 4502 s_return (mk_integer (SCHEME_A_ veclength (x)));
4382 4503
4504 case OP_VECRESIZE:
4505 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4506 s_return (x);
4507
4383 case OP_VECREF: /* vector-ref */ 4508 case OP_VECREF: /* vector-ref */
4384 { 4509 {
4385 int index = ivalue_unchecked (cadr (args)); 4510 int index = ivalue_unchecked (cadr (args));
4386 4511
4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4512 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4447 pointer d = cdr (args); 4572 pointer d = cdr (args);
4448 int r; 4573 int r;
4449 4574
4450 switch (op) 4575 switch (op)
4451 { 4576 {
4452 case OP_NOT: /* not */ r = is_false (a) ; break; 4577 case OP_NOT: /* not */ r = is_false (a) ; break;
4453 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;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4579 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break; 4580 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 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;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4583 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4584 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4585 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 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 */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4587 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4462 4588
4463#if USE_CHAR_CLASSIFIERS 4589#if USE_CHAR_CLASSIFIERS
4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4590 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4591 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4592 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))); 5073 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948 5074
4949 case TOK_DOTATOM: 5075 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.'; 5076 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 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)));
4952 5083
4953 case TOK_DQUOTE: 5084 case TOK_DQUOTE:
4954 x = readstrexp (SCHEME_A_ '"'); 5085 x = readstrexp (SCHEME_A_ '"');
4955 5086
4956 if (x == S_F) 5087 if (x == S_F)
5203 5334
5204 case OP_CLOSUREP: /* closure? */ 5335 case OP_CLOSUREP: /* closure? */
5205 /* 5336 /*
5206 * Note, macro object is also a closure. 5337 * Note, macro object is also a closure.
5207 * Therefore, (closure? <#MACRO>) ==> #t 5338 * Therefore, (closure? <#MACRO>) ==> #t
5339 * (schmorp) well, obviously not, fix? TODO
5208 */ 5340 */
5209 s_retbool (is_closure (a)); 5341 s_retbool (is_closure (a));
5210 5342
5211 case OP_MACROP: /* macro? */ 5343 case OP_MACROP: /* macro? */
5212 s_retbool (is_macro (a)); 5344 s_retbool (is_macro (a));
5453 5585
5454/* 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! */
5455static int 5587static int
5456syntaxnum (pointer p) 5588syntaxnum (pointer p)
5457{ 5589{
5458 const char *s = strvalue (car (p)); 5590 const char *s = strvalue (p);
5459 5591
5460 switch (strlength (car (p))) 5592 switch (strlength (p))
5461 { 5593 {
5462 case 2: 5594 case 2:
5463 if (s[0] == 'i') 5595 if (s[0] == 'i')
5464 return OP_IF0; /* if */ 5596 return OP_IF0; /* if */
5465 else 5597 else
5540ecb_cold int 5672ecb_cold int
5541scheme_init (SCHEME_P) 5673scheme_init (SCHEME_P)
5542{ 5674{
5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5675 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5544 pointer x; 5676 pointer x;
5677
5678 /* this memset is not strictly correct, as we assume (intcache)
5679 * that memset 0 will also set pointers to 0, but memset does
5680 * of course not guarantee that. screw such systems.
5681 */
5682 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5545 5683
5546 num_set_fixnum (num_zero, 1); 5684 num_set_fixnum (num_zero, 1);
5547 num_set_ivalue (num_zero, 0); 5685 num_set_ivalue (num_zero, 0);
5548 num_set_fixnum (num_one, 1); 5686 num_set_fixnum (num_one, 1);
5549 num_set_ivalue (num_one, 1); 5687 num_set_ivalue (num_one, 1);
5901# endif 6039# endif
5902 int fin; 6040 int fin;
5903 char *file_name = InitFile; 6041 char *file_name = InitFile;
5904 int retcode; 6042 int retcode;
5905 int isfile = 1; 6043 int isfile = 1;
6044 system ("ps v $PPID");//D
5906 6045
5907 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6046 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5908 { 6047 {
5909 xwrstr ("Usage: tinyscheme -?\n"); 6048 xwrstr ("Usage: tinyscheme -?\n");
5910 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6049 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines