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

Comparing microscheme/scheme.c (file contents):
Revision 1.34 by root, Sat Nov 28 22:14:49 2015 UTC vs.
Revision 1.35 by root, Sun Nov 29 00:02:21 2015 UTC

… …
34 34
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/stat.h> 36#include <sys/stat.h>
37#include <fcntl.h> 37#include <fcntl.h>
38 38
39#if !USE_ERROR_CHECKING
40# define NDEBUG
41#endif
42
43#include <assert.h>
44#include <stdlib.h>
39#include <string.h> 45#include <string.h>
40#include <stdlib.h>
41 46
42#include <limits.h> 47#include <limits.h>
43#include <inttypes.h> 48#include <inttypes.h>
44#include <float.h> 49#include <float.h>
45//#include <ctype.h> 50//#include <ctype.h>
51
52#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
56 || 'f' != 'a' + 5
57# error "execution character set digits not consecutive"
58#endif
46 59
47enum { 60enum {
48 TOK_EOF, 61 TOK_EOF,
49 TOK_LPAREN, 62 TOK_LPAREN,
50 TOK_RPAREN, 63 TOK_RPAREN,
51 TOK_DOT, 64 TOK_DOT,
52 TOK_ATOM, 65 TOK_ATOM,
66 TOK_DOTATOM, /* atom name starting with '.' */
67 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 68 TOK_QUOTE,
54 TOK_DQUOTE, 69 TOK_DQUOTE,
55 TOK_BQUOTE, 70 TOK_BQUOTE,
56 TOK_COMMA, 71 TOK_COMMA,
57 TOK_ATMARK, 72 TOK_ATMARK,
… …
651#endif 666#endif
652 667
653static int file_push (SCHEME_P_ const char *fname); 668static int file_push (SCHEME_P_ const char *fname);
654static void file_pop (SCHEME_P); 669static void file_pop (SCHEME_P);
655static int file_interactive (SCHEME_P); 670static int file_interactive (SCHEME_P);
656ecb_inline int is_one_of (char *s, int c); 671ecb_inline int is_one_of (const char *s, int c);
657static int alloc_cellseg (SCHEME_P_ int n); 672static int alloc_cellseg (SCHEME_P_ int n);
658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659static void finalize_cell (SCHEME_P_ pointer a); 674static void finalize_cell (SCHEME_P_ pointer a);
660static int count_consecutive_cells (pointer x, int needed); 675static int count_consecutive_cells (pointer x, int needed);
661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
… …
678static void mark (pointer a); 693static void mark (pointer a);
679static void gc (SCHEME_P_ pointer a, pointer b); 694static void gc (SCHEME_P_ pointer a, pointer b);
680static int basic_inchar (port *pt); 695static int basic_inchar (port *pt);
681static int inchar (SCHEME_P); 696static int inchar (SCHEME_P);
682static void backchar (SCHEME_P_ int c); 697static void backchar (SCHEME_P_ int c);
683static char *readstr_upto (SCHEME_P_ char *delim); 698static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684static pointer readstrexp (SCHEME_P); 699static pointer readstrexp (SCHEME_P_ char delim);
685ecb_inline int skipspace (SCHEME_P); 700ecb_inline int skipspace (SCHEME_P);
686static int token (SCHEME_P); 701static int token (SCHEME_P);
687static void printslashstring (SCHEME_P_ char *s, int len); 702static void printslashstring (SCHEME_P_ char *s, int len);
688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 703static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689static void printatom (SCHEME_P_ pointer l, int f); 704static void printatom (SCHEME_P_ pointer l, int f);
… …
1286 SCHEME_V->no_memory = 1; 1301 SCHEME_V->no_memory = 1;
1287 return SCHEME_V->strbuff; 1302 return SCHEME_V->strbuff;
1288 } 1303 }
1289 1304
1290 if (str) 1305 if (str)
1291 { 1306 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1292 int l = strlen (str);
1293
1294 if (l > len_str)
1295 l = len_str;
1296
1297 memcpy (q, str, l);
1298 q[l] = 0;
1299 }
1300 else 1307 else
1301 {
1302 memset (q, fill, len_str); 1308 memset (q, fill, len_str);
1309
1303 q[len_str] = 0; 1310 q[len_str] = 0;
1304 }
1305 1311
1306 return q; 1312 return q;
1307} 1313}
1308 1314
1309INTERFACE pointer 1315INTERFACE pointer
… …
1323 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1329 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1324 1330
1325 set_typeflag (x, T_STRING | T_ATOM); 1331 set_typeflag (x, T_STRING | T_ATOM);
1326 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1332 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1327 strlength (x) = len; 1333 strlength (x) = len;
1334
1328 return x; 1335 return x;
1329} 1336}
1330 1337
1331INTERFACE pointer 1338INTERFACE pointer
1332mk_string (SCHEME_P_ const char *str) 1339mk_string (SCHEME_P_ const char *str)
… …
2105#endif 2112#endif
2106} 2113}
2107 2114
2108/* read characters up to delimiter, but cater to character constants */ 2115/* read characters up to delimiter, but cater to character constants */
2109static char * 2116static char *
2110readstr_upto (SCHEME_P_ char *delim) 2117readstr_upto (SCHEME_P_ int skip, const char *delim)
2111{ 2118{
2112 char *p = SCHEME_V->strbuff; 2119 char *p = SCHEME_V->strbuff + skip;
2113 2120
2114 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2121 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2115 2122
2116 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2123 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2117 *p = 0; 2124 *p = 0;
… …
2124 return SCHEME_V->strbuff; 2131 return SCHEME_V->strbuff;
2125} 2132}
2126 2133
2127/* read string expression "xxx...xxx" */ 2134/* read string expression "xxx...xxx" */
2128static pointer 2135static pointer
2129readstrexp (SCHEME_P) 2136readstrexp (SCHEME_P_ char delim)
2130{ 2137{
2131 char *p = SCHEME_V->strbuff; 2138 char *p = SCHEME_V->strbuff;
2132 int c; 2139 int c;
2133 int c1 = 0; 2140 int c1 = 0;
2134 enum
2135 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2141 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2136 2142
2137 for (;;) 2143 for (;;)
2138 { 2144 {
2139 c = inchar (SCHEME_A); 2145 c = inchar (SCHEME_A);
2140 2146
… …
2142 return S_F; 2148 return S_F;
2143 2149
2144 switch (state) 2150 switch (state)
2145 { 2151 {
2146 case st_ok: 2152 case st_ok:
2147 switch (c) 2153 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); 2154 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2156 2155
2157 default: 2156 if (ecb_expect_false (c == '\\'))
2157 state = st_bsl;
2158 else
2158 *p++ = c; 2159 *p++ = c;
2159 break;
2160 }
2161 2160
2162 break; 2161 break;
2163 2162
2164 case st_bsl: 2163 case st_bsl:
2165 switch (c) 2164 switch (c)
… …
2195 case 'r': 2194 case 'r':
2196 *p++ = '\r'; 2195 *p++ = '\r';
2197 state = st_ok; 2196 state = st_ok;
2198 break; 2197 break;
2199 2198
2200 case '"':
2201 *p++ = '"';
2202 state = st_ok;
2203 break;
2204
2205 default: 2199 default:
2206 *p++ = c; 2200 *p++ = c;
2207 state = st_ok; 2201 state = st_ok;
2208 break; 2202 break;
2209 } 2203 }
2210 2204
2211 break; 2205 break;
2212 2206
2213 case st_x1: 2207 case st_x1:
2214 case st_x2: 2208 case st_x2:
2215 c = toupper (c); 2209 c = tolower (c);
2216 2210
2217 if (c >= '0' && c <= 'F') 2211 if (c >= '0' && c <= '9')
2218 {
2219 if (c <= '9')
2220 c1 = (c1 << 4) + c - '0'; 2212 c1 = (c1 << 4) + c - '0';
2221 else 2213 else if (c >= 'a' && c <= 'f')
2222 c1 = (c1 << 4) + c - 'A' + 10; 2214 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 2215 else
2233 return S_F; 2216 return S_F;
2217
2218 if (state == st_x1)
2219 state = st_x2;
2220 else
2221 {
2222 *p++ = c1;
2223 state = st_ok;
2224 }
2234 2225
2235 break; 2226 break;
2236 2227
2237 case st_oct1: 2228 case st_oct1:
2238 case st_oct2: 2229 case st_oct2:
… …
2242 backchar (SCHEME_A_ c); 2233 backchar (SCHEME_A_ c);
2243 state = st_ok; 2234 state = st_ok;
2244 } 2235 }
2245 else 2236 else
2246 { 2237 {
2247 if (state == st_oct2 && c1 >= 32) 2238 if (state == st_oct2 && c1 >= ' ')
2248 return S_F; 2239 return S_F;
2249 2240
2250 c1 = (c1 << 3) + (c - '0'); 2241 c1 = (c1 << 3) + (c - '0');
2251 2242
2252 if (state == st_oct1) 2243 if (state == st_oct1)
… …
2257 state = st_ok; 2248 state = st_ok;
2258 } 2249 }
2259 } 2250 }
2260 2251
2261 break; 2252 break;
2262
2263 } 2253 }
2264 } 2254 }
2265} 2255}
2266 2256
2267/* check c is in chars */ 2257/* check c is in chars */
2268ecb_inline int 2258ecb_inline int
2269is_one_of (char *s, int c) 2259is_one_of (const char *s, int c)
2270{ 2260{
2271 if (c == EOF) 2261 if (c == EOF)
2272 return 1; 2262 return 1;
2273 2263
2274 return !!strchr (s, c); 2264 return !!strchr (s, c);
… …
2330 2320
2331 if (is_one_of (" \n\t", c)) 2321 if (is_one_of (" \n\t", c))
2332 return TOK_DOT; 2322 return TOK_DOT;
2333 else 2323 else
2334 { 2324 {
2335 //TODO: ungetc twice in a row is not supported in C
2336 backchar (SCHEME_A_ c); 2325 backchar (SCHEME_A_ c);
2337 backchar (SCHEME_A_ '.');
2338 return TOK_ATOM; 2326 return TOK_DOTATOM;
2339 } 2327 }
2328
2329 case '|':
2330 return TOK_STRATOM;
2340 2331
2341 case '\'': 2332 case '\'':
2342 return TOK_QUOTE; 2333 return TOK_QUOTE;
2343 2334
2344 case ';': 2335 case ';':
… …
4951 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 4942 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4952 SCHEME_V->tok = token (SCHEME_A); 4943 SCHEME_V->tok = token (SCHEME_A);
4953 s_goto (OP_RDSEXPR); 4944 s_goto (OP_RDSEXPR);
4954 4945
4955 case TOK_ATOM: 4946 case TOK_ATOM:
4956 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 4947 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
4948
4949 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4957 4952
4958 case TOK_DQUOTE: 4953 case TOK_DQUOTE:
4959 x = readstrexp (SCHEME_A); 4954 x = readstrexp (SCHEME_A_ '"');
4960 4955
4961 if (x == S_F) 4956 if (x == S_F)
4962 Error_0 ("Error reading string"); 4957 Error_0 ("Error reading string");
4963 4958
4964 setimmutable (x); 4959 setimmutable (x);
… …
4976 s_goto (OP_EVAL); 4971 s_goto (OP_EVAL);
4977 } 4972 }
4978 } 4973 }
4979 4974
4980 case TOK_SHARP_CONST: 4975 case TOK_SHARP_CONST:
4981 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 4976 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4982 Error_0 ("undefined sharp expression"); 4977 Error_0 ("undefined sharp expression");
4983 else 4978 else
4984 s_return (x); 4979 s_return (x);
4985 4980
4986 default: 4981 default:

Diff Legend

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