| @@ -16,7 +16,6 @@ enum { · 15 unmodified lines |
| 16 | }; | 16 | }; |
| 17 | | 17 | |
| 18 | static Tbl *name2rune; | 18 | static Tbl *name2rune; |
| 19 | static sl_v readtablesym; | | |
| 20 | | 19 | |
| 21 | const char *ascii2name[0x20+1] = { | 20 | const char *ascii2name[0x20+1] = { |
| 22 | "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", | 21 | "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", |
| @@ -248,7 +247,7 @@ again: · 225 unmodified lines |
| 248 | RS->loc0 = IO->loc; | 247 | RS->loc0 = IO->loc; |
| 249 | | 248 | |
| 250 | sl_v best = sl_nil; | 249 | sl_v best = sl_nil; |
| 251 | sl_htable *rt = totable(sym_value(readtablesym)); | 250 | sl_htable *rt = totable(sl.readtable); |
| 252 | Rune c2 = c; | 251 | Rune c2 = c; |
| 253 | // FIXME(sigrid): any length should work | 252 | // FIXME(sigrid): any length should work |
| 254 | for(int i = 0; i < 2; i++){ | 253 | for(int i = 0; i < 2; i++){ |
| @@ -702,13 +701,14 @@ read_list(sl_v label, u32int closer) · 447 unmodified lines |
| 702 | const usize pprevc = pval+3; | 701 | const usize pprevc = pval+3; |
| 703 | ios_loc loc0 = IO->loc; | 702 | ios_loc loc0 = IO->loc; |
| 704 | loc0.colno--; | 703 | loc0.colno--; |
| 705 | u32int t = peek(0); | | |
| 706 | PUSH_SAFE(sl_nil); | 704 | PUSH_SAFE(sl_nil); |
| 707 | PUSH_SAFE(sl_nil); | 705 | PUSH_SAFE(sl_nil); |
| 708 | PUSH_SAFE(sl_noexpr); | 706 | PUSH_SAFE(sl_noexpr); |
| 709 | sl_v c = sl_nil, e, prevc; | 707 | sl_v c = sl_nil, e, prevc; |
| 710 | bool allocnew = true; | 708 | bool allocnew = true; |
| 711 | | 709 | |
| | 710 | u32int t = peek(0); |
| | 711 | |
| 712 | while(t != closer){ | 712 | while(t != closer){ |
| 713 | if(sl_unlikely((IO->flags & IOS_FL_EOF) != 0)){ | 713 | if(sl_unlikely((IO->flags & IOS_FL_EOF) != 0)){ |
| 714 | cthrow( | 714 | cthrow( |
| @@ -940,6 +940,7 @@ sl_read_sexpr(sl_v f, sl_v term, sl_expr_kind kind, bool ws) · 225 unmodified lines |
| 940 | rs.prev = RS; | 940 | rs.prev = RS; |
| 941 | rs.toktype = TOK_NONE; | 941 | rs.toktype = TOK_NONE; |
| 942 | rs.tokval = sl_nil; | 942 | rs.tokval = sl_nil; |
| | 943 | rs.macro = sl_nil; |
| 943 | rs.ws = ws; | 944 | rs.ws = ws; |
| 944 | rs.bq = 0; | 945 | rs.bq = 0; |
| 945 | rs.ags = sl.ags+1; | 946 | rs.ags = sl.ags+1; |
| @@ -1005,12 +1006,10 @@ mk_rune2name_(Rune r, const char *str, int len) · 59 unmodified lines |
| 1005 | void | 1006 | void |
| 1006 | sl_read_init(void) | 1007 | sl_read_init(void) |
| 1007 | { | 1008 | { |
| 1008 | set( | 1009 | sl.readtable = cvalue_nofinalizer(sl_tabletype, sizeof(sl_htable)); |
| 1009 | readtablesym = mk_csym("*read-table*"), | 1010 | sl_htable *h = cvalue_data(sl.readtable); |
| 1010 | cvalue_nofinalizer(sl_tabletype, sizeof(sl_htable)) | | |
| 1011 | ); | | |
| 1012 | sl_htable *h = cvalue_data(sym_value(readtablesym)); | | |
| 1013 | htable_new(h, HT_N_INLINE); | 1011 | htable_new(h, HT_N_INLINE); |
| | 1012 | set(mk_csym("*read-table*"), sl.readtable); |
| 1014 | | 1013 | |
| 1015 | for(Rune r = 0; r < nelem(ascii2name); r++) | 1014 | for(Rune r = 0; r < nelem(ascii2name); r++) |
| 1016 | mk_name2rune(r, ascii2name[r]); | 1015 | mk_name2rune(r, ascii2name[r]); |