diff options
Diffstat (limited to 'src/lj_lex.c')
| -rw-r--r-- | src/lj_lex.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lj_lex.c b/src/lj_lex.c index 44ff306c..f954b428 100644 --- a/src/lj_lex.c +++ b/src/lj_lex.c | |||
| @@ -105,7 +105,7 @@ static void lex_number(LexState *ls, TValue *tv) | |||
| 105 | lex_savenext(ls); | 105 | lex_savenext(ls); |
| 106 | } | 106 | } |
| 107 | lex_save(ls, '\0'); | 107 | lex_save(ls, '\0'); |
| 108 | fmt = lj_strscan_scan((const uint8_t *)sbufB(&ls->sb), sbuflen(&ls->sb)-1, tv, | 108 | fmt = lj_strscan_scan((const uint8_t *)ls->sb.b, sbuflen(&ls->sb)-1, tv, |
| 109 | (LJ_DUALNUM ? STRSCAN_OPT_TOINT : STRSCAN_OPT_TONUM) | | 109 | (LJ_DUALNUM ? STRSCAN_OPT_TOINT : STRSCAN_OPT_TONUM) | |
| 110 | (LJ_HASFFI ? (STRSCAN_OPT_LL|STRSCAN_OPT_IMAG) : 0)); | 110 | (LJ_HASFFI ? (STRSCAN_OPT_LL|STRSCAN_OPT_IMAG) : 0)); |
| 111 | if (LJ_DUALNUM && fmt == STRSCAN_INT) { | 111 | if (LJ_DUALNUM && fmt == STRSCAN_INT) { |
| @@ -180,7 +180,7 @@ static void lex_longstring(LexState *ls, TValue *tv, int sep) | |||
| 180 | } | 180 | } |
| 181 | } endloop: | 181 | } endloop: |
| 182 | if (tv) { | 182 | if (tv) { |
| 183 | GCstr *str = lj_parse_keepstr(ls, sbufB(&ls->sb) + (2 + (MSize)sep), | 183 | GCstr *str = lj_parse_keepstr(ls, ls->sb.b + (2 + (MSize)sep), |
| 184 | sbuflen(&ls->sb) - 2*(2 + (MSize)sep)); | 184 | sbuflen(&ls->sb) - 2*(2 + (MSize)sep)); |
| 185 | setstrV(ls->L, tv, str); | 185 | setstrV(ls->L, tv, str); |
| 186 | } | 186 | } |
| @@ -286,7 +286,7 @@ static void lex_string(LexState *ls, TValue *tv) | |||
| 286 | } | 286 | } |
| 287 | lex_savenext(ls); /* Skip trailing delimiter. */ | 287 | lex_savenext(ls); /* Skip trailing delimiter. */ |
| 288 | setstrV(ls->L, tv, | 288 | setstrV(ls->L, tv, |
| 289 | lj_parse_keepstr(ls, sbufB(&ls->sb)+1, sbuflen(&ls->sb)-2)); | 289 | lj_parse_keepstr(ls, ls->sb.b+1, sbuflen(&ls->sb)-2)); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | /* -- Main lexical scanner ------------------------------------------------ */ | 292 | /* -- Main lexical scanner ------------------------------------------------ */ |
| @@ -306,7 +306,7 @@ static LexToken lex_scan(LexState *ls, TValue *tv) | |||
| 306 | do { | 306 | do { |
| 307 | lex_savenext(ls); | 307 | lex_savenext(ls); |
| 308 | } while (lj_char_isident(ls->c)); | 308 | } while (lj_char_isident(ls->c)); |
| 309 | s = lj_parse_keepstr(ls, sbufB(&ls->sb), sbuflen(&ls->sb)); | 309 | s = lj_parse_keepstr(ls, ls->sb.b, sbuflen(&ls->sb)); |
| 310 | setstrV(ls->L, tv, s); | 310 | setstrV(ls->L, tv, s); |
| 311 | if (s->reserved > 0) /* Reserved word? */ | 311 | if (s->reserved > 0) /* Reserved word? */ |
| 312 | return TK_OFS + s->reserved; | 312 | return TK_OFS + s->reserved; |
| @@ -496,7 +496,7 @@ void lj_lex_error(LexState *ls, LexToken tok, ErrMsg em, ...) | |||
| 496 | tokstr = NULL; | 496 | tokstr = NULL; |
| 497 | } else if (tok == TK_name || tok == TK_string || tok == TK_number) { | 497 | } else if (tok == TK_name || tok == TK_string || tok == TK_number) { |
| 498 | lex_save(ls, '\0'); | 498 | lex_save(ls, '\0'); |
| 499 | tokstr = sbufB(&ls->sb); | 499 | tokstr = ls->sb.b; |
| 500 | } else { | 500 | } else { |
| 501 | tokstr = lj_lex_token2str(ls, tok); | 501 | tokstr = lj_lex_token2str(ls, tok); |
| 502 | } | 502 | } |