archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* parse.y (parser_tokadd_string): escape simple regexp meta

Browse source 
character termninators.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-06 07:24:07 +00:00
parent 8a4de7abf8
commit bc6dde9420
3 changed files with 53 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
parse.y
View file

@ -6440,6 +6440,18 @@ parser_tokadd_mbchar(struct parser_params *parser, int c)
#define tokadd_mbchar(c) parser_tokadd_mbchar(parser, (c))
static inline int
simple_re_meta(int c)
{
switch (c) {
case '$': case '*': case '+': case '.':
case '?': case '^': case '|':
return TRUE;
default:
return FALSE;
}
}
static int
parser_tokadd_string(struct parser_params *parser,
int func, int term, int paren, long *nest,
@ -6520,7 +6532,7 @@ parser_tokadd_string(struct parser_params *parser,
goto non_ascii;
}
if (func & STR_FUNC_REGEXP) {
if (c == term) {
if (c == term && !simple_re_meta(c)) {
tokadd(c);
continue;
}