aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-11 20:00:46 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-12-13 00:16:22 +0900
commit413cd19d81fd675c6932abf91fe2b54d5ae72c7d (patch)
tree86ca3823c2d53124caff5f7517ec00deede7dcfa /scripts
parentkconfig: fix memory leak when EOF is encountered in quotation (diff)
downloadlinux-dev-413cd19d81fd675c6932abf91fe2b54d5ae72c7d.tar.xz
linux-dev-413cd19d81fd675c6932abf91fe2b54d5ae72c7d.zip
kconfig: require T_EOL to reduce visible statement
All line-oriented statements should be reduced when seeing a T_EOL token. I guess missing T_EOL for the "visible" statement is just a mistake. This commit decreases one shift/reduce conflict. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/zconf.y4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 22fceb264cf5..c28f1a8f721d 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
static struct menu *current_menu, *current_entry;
%}
-%expect 30
+%expect 29
%union
{
@@ -461,7 +461,7 @@ visibility_list:
| visibility_list T_EOL
;
-visible: T_VISIBLE if_expr
+visible: T_VISIBLE if_expr T_EOL
{
menu_add_visibility($2);
};