diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-12 06:59:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-12 06:59:57 +0000 |
commit | c48b4209c267299f52ad51b0e8d639679999465a (patch) | |
tree | 0eccd86184fdd6bebf2bb47fd26dd9e2d4646413 /parse.y | |
parent | 9af743fe0e8c7aa7a25a6805a64d499aab3032af (diff) | |
download | ruby-c48b4209c267299f52ad51b0e8d639679999465a.tar.gz |
parse.y: CR in middle
* parse.y (parser_whole_match_p): treat CR in middle of a line as a
mere whitespace.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -6375,7 +6375,11 @@ parser_whole_match_p(struct parser_params *parser, while (*p && ISSPACE(*p)) p++; } n = lex_pend - (p + len); - if (n < 0 || (n > 0 && p[len] != '\n' && p[len] != '\r')) return FALSE; + if (n < 0) return FALSE; + if (n > 0 && p[len] != '\n') { + if (p[len] != '\r') return FALSE; + if (n <= 1 || p[len+1] != '\n') return FALSE; + } return strncmp(eos, p, len) == 0; } |