diff options
| -rw-r--r-- | parse.y | 20 | ||||
| -rw-r--r-- | test/ruby/test_parse.rb | 10 |
2 files changed, 20 insertions, 10 deletions
@@ -8200,19 +8200,19 @@ parser_dedent_string(VALUE self, VALUE input, VALUE width) static int whole_match_p(struct parser_params *p, const char *eos, long len, int indent) { - const char *ptr = p->lex.pbeg; - long n; + const char *beg = p->lex.pbeg; + const char *ptr = p->lex.pend; - if (indent) { - while (*ptr && ISSPACE(*ptr)) ptr++; + if (ptr - beg < len) return FALSE; + if (ptr > beg && ptr[-1] == '\n') { + if (--ptr > beg && ptr[-1] == '\r') --ptr; + if (ptr - beg < len) return FALSE; } - n = p->lex.pend - (ptr + len); - if (n < 0) return FALSE; - if (n > 0 && ptr[len] != '\n') { - if (ptr[len] != '\r') return FALSE; - if (n <= 1 || ptr[len+1] != '\n') return FALSE; + if (strncmp(eos, ptr -= len, len)) return FALSE; + if (indent) { + while (beg < ptr && ISSPACE(*beg)) beg++; } - return strncmp(eos, ptr, len) == 0; + return beg == ptr; } static int diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index 2f2c062ceb..49b25fcaf0 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -681,6 +681,16 @@ FOO eval "x = <<""FOO\r\n1\r\nFOO" end assert_equal("1\n", x) + + assert_nothing_raised do + x = eval "<<' FOO'\n""[Bug #19539]\n"" FOO\n" + end + assert_equal("[Bug #19539]\n", x) + + assert_nothing_raised do + x = eval "<<-' FOO'\n""[Bug #19539]\n"" FOO\n" + end + assert_equal("[Bug #19539]\n", x) end def test_magic_comment |