diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-09-04 08:31:33 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-09-04 08:31:33 +0900 |
| commit | 27ac09be9dfb20c35c91e5bda112797bdb3d2cfa (patch) | |
| tree | cc2dca1de150a542ae62e4194dd45d80e18c1786 /src/parse.y | |
| parent | 1fdf47d71aff39b780384969c6883a9a04f9ac90 (diff) | |
| parent | 26bbc81e122d7f14616dc799e41ef438398669ee (diff) | |
| download | mruby-27ac09be9dfb20c35c91e5bda112797bdb3d2cfa.tar.gz mruby-27ac09be9dfb20c35c91e5bda112797bdb3d2cfa.zip | |
Merge pull request #2583 from cremno/get-rid-of-shadowing-variables
get rid of shadowing variables
Diffstat (limited to 'src/parse.y')
| -rw-r--r-- | src/parse.y | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/parse.y b/src/parse.y index d73ef8d1e..242d5e60e 100644 --- a/src/parse.y +++ b/src/parse.y @@ -3967,22 +3967,22 @@ parse_string(parser_state *p) if (type & STR_FUNC_REGEXP) { int f = 0; - int c; + int re_opt; char *s = strndup(tok(p), toklen(p)); char flags[3]; char *flag = flags; char *dup; newtok(p); - while (c = nextc(p), c >= 0 && ISALPHA(c)) { - switch (c) { + while (re_opt = nextc(p), re_opt >= 0 && ISALPHA(re_opt)) { + switch (re_opt) { case 'i': f |= 1; break; case 'x': f |= 2; break; case 'm': f |= 4; break; - default: tokadd(p, c); break; + default: tokadd(p, re_opt); break; } } - pushback(p, c); + pushback(p, re_opt); if (toklen(p)) { char msg[128]; tokfix(p); @@ -5668,14 +5668,14 @@ void mrb_parser_dump(mrb_state *mrb, node *tree, int offset) { #ifdef ENABLE_STDIO - int n; + int current_node; if (!tree) return; again: dump_prefix(tree, offset); - n = (int)(intptr_t)tree->car; + current_node = (int)(intptr_t)tree->car; tree = tree->cdr; - switch (n) { + switch (current_node) { case NODE_BEGIN: printf("NODE_BEGIN:\n"); dump_recur(mrb, tree, offset+1); @@ -6402,7 +6402,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset) break; default: - printf("node type: %d (0x%x)\n", n, (unsigned)n); + printf("node type: %d (0x%x)\n", current_node, (unsigned)current_node); break; } #endif |