diff options
| -rw-r--r-- | src/parse.y | 47 | ||||
| -rw-r--r-- | test/t/syntax.rb | 6 |
2 files changed, 39 insertions, 14 deletions
diff --git a/src/parse.y b/src/parse.y index aab1aaa40..230d7659e 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3417,15 +3417,15 @@ skip(parser_state *p, char term) } } -static mrb_bool -peek_n(parser_state *p, int c, int n) +static int +peekc_n(parser_state *p, int n) { node *list = 0; int c0; do { c0 = nextc(p); - if (c0 < 0) return FALSE; + if (c0 < 0) return c0; list = push(list, (node*)(intptr_t)c0); } while(n--); if (p->pb) { @@ -3434,8 +3434,13 @@ peek_n(parser_state *p, int c, int n) else { p->pb = list; } - if (c0 == c) return TRUE; - return FALSE; + return c0; +} + +static mrb_bool +peek_n(parser_state *p, int c, int n) +{ + return peekc_n(p, n) == c && c >= 0; } #define peek(p,c) peek_n((p), (c), 0) @@ -3454,7 +3459,7 @@ peeks(parser_state *p, const char *s) } else #endif - if (p->s && p->s + len >= p->send) { + if (p->s && p->s + len <= p->send) { if (memcmp(p->s, s, len) == 0) return TRUE; } return FALSE; @@ -3470,6 +3475,10 @@ skips(parser_state *p, const char *s) for (;;) { c = nextc(p); if (c < 0) return c; + if (c == '\n') { + p->lineno++; + p->column = 0; + } if (c == *s) break; } s++; @@ -3477,7 +3486,10 @@ skips(parser_state *p, const char *s) int len = strlen(s); while (len--) { - nextc(p); + if (nextc(p) == '\n') { + p->lineno++; + p->column = 0; + } } return TRUE; } @@ -4189,14 +4201,23 @@ parser_yylex(parser_state *p) case '=': if (p->column == 1) { - if (peeks(p, "begin ") || peeks(p, "begin\n")) { - if (skips(p, "\n=end ")) { - goto retry; - } - if (skips(p, "\n=end\n")) { + static const char begin[] = "begin"; + static const char end[] = "\n=end"; + if (peeks(p, begin)) { + c = peekc_n(p, sizeof(begin)-1); + if (c < 0 || isspace(c)) { + do { + if (!skips(p, end)) { + yyerror(p, "embedded document meets end of file"); + return 0; + } + c = nextc(p); + } while (!(c < 0 || isspace(c))); + if (c != '\n') skip(p, '\n'); + p->lineno++; + p->column = 0; goto retry; } - goto retry; } } if (p->lstate == EXPR_FNAME || p->lstate == EXPR_DOT) { diff --git a/test/t/syntax.rb b/test/t/syntax.rb index 0bb3fa389..e105cd3d4 100644 --- a/test/t/syntax.rb +++ b/test/t/syntax.rb @@ -307,5 +307,9 @@ this is a comment that has =end with spaces after it =begin this is a comment this is a comment that has extra after =begin and =end with spaces after it =end - true + line = __LINE__ +=begin this is a comment +this is a comment that has extra after =begin and =end with tabs after it +=end xxxxxxxxxxxxxxxxxxxxxxxxxx + assert_equal(line + 4, __LINE__) end |