summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 20:00:54 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-15 17:45:21 +0900
commit4891796c6f83bb3be5567b3053428a40329d7e37 (patch)
tree745d90dfc635542c9e74f0a672ea5a9a48f0afae /scripts
parent2f60e46e605a9bcd8dc4fe7745b5576084900850 (diff)
downloadlinux-stable-4891796c6f83bb3be5567b3053428a40329d7e37.tar.gz
linux-stable-4891796c6f83bb3be5567b3053428a40329d7e37.tar.bz2
linux-stable-4891796c6f83bb3be5567b3053428a40329d7e37.zip
kconfig: remove redundant if_block rule
The code block surrounded by "if" ... "endif" is stmt_list. Remove the redundant if_block symbol entirely. Remove "stmt_list: stmt_list end" rule as well since it would obviously cause conflicts. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/zconf.y10
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index a92f167e8267..dcbf6439ace9 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -123,7 +123,6 @@ stmt_list:
| stmt_list common_stmt
| stmt_list choice_stmt
| stmt_list menu_stmt
- | stmt_list end { zconf_error("unexpected end statement"); }
| stmt_list T_WORD error T_EOL { zconf_error("unknown statement \"%s\"", $2); }
| stmt_list error T_EOL { zconf_error("invalid statement"); }
;
@@ -330,14 +329,7 @@ if_end: end
}
};
-if_stmt: if_entry if_block if_end
-;
-
-if_block:
- /* empty */
- | if_block common_stmt
- | if_block menu_stmt
- | if_block choice_stmt
+if_stmt: if_entry stmt_list if_end
;
/* menu entry */