From: Masahiro Yamada Date: Tue, 11 Dec 2018 11:00:54 +0000 (+0900) Subject: kconfig: remove redundant if_block rule X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f8cd647552bd33dc081078e3c61fd1bbd6970a39;p=carl9170fw.git 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 Signed-off-by: Christian Lamparter --- diff --git a/config/zconf.y b/config/zconf.y index d91b8dd..b3564a2 100644 --- a/config/zconf.y +++ b/config/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 */