summaryrefslogtreecommitdiffhomepage
path: root/src/parse.y
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-02-19 09:12:03 -0800
committerYukihiro "Matz" Matsumoto <[email protected]>2013-02-19 09:12:03 -0800
commiteed875ac79db48acfb1b49292bc51e3b44e6a93f (patch)
tree038718022727db89d7542e6c6ab0d9c3bc8fd112 /src/parse.y
parentad84829b6ace1a9dd8a9016a3e38b0cb56fd6507 (diff)
parent2942ad8eeb10291caaa83852d1b426a06ed84d20 (diff)
downloadmruby-eed875ac79db48acfb1b49292bc51e3b44e6a93f.tar.gz
mruby-eed875ac79db48acfb1b49292bc51e3b44e6a93f.zip
Merge pull request #853 from cremno/pluggable-regex-msvc-fix
MSVC: vars must be declared at the start of a block
Diffstat (limited to 'src/parse.y')
-rw-r--r--src/parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parse.y b/src/parse.y
index 9af8682c1..4355c2222 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -3447,8 +3447,9 @@ parse_string(parser_state *p, int term)
if (p->regexp) {
int f = 0;
int c;
- char* s;
- s = strndup(tok(p), toklen(p));
+ char *s = strndup(tok(p), toklen(p));
+ char flag[4] = { '\0' };
+
newtok(p);
while (c = nextc(p), ISALPHA(c)) {
switch (c) {
@@ -3467,7 +3468,6 @@ parse_string(parser_state *p, int term)
toklen(p) > 1 ? "s" : "", tok(p));
yyerror(p, msg);
}
- char flag[4] = {0};
if (f & 1) strcat(flag, "i");
if (f & 2) strcat(flag, "x");
if (f & 4) strcat(flag, "m");