admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

get rid of shadowing variables

Browse Source 
Mostly by renaming the shadowing variable.
If a shadowing variable was deleted,
the shadowed one can be used instead.
This commit is contained in:
cremno
2014-09-03 10:00:37 +02:00
parent 1fdf47d71a
commit 26bbc81e12
4 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse.y
+9 -9
View File
@@ -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