]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
kconfig: require T_EOL to reduce visible statement
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 11 Dec 2018 11:00:46 +0000 (20:00 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Wed, 12 Dec 2018 15:16:22 +0000 (00:16 +0900)
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>
scripts/kconfig/zconf.y

index 22fceb264cf51b6972c7d09357265d416c4157a5..c28f1a8f721d184e50cf813440f2248cdd71b731 100644 (file)
@@ -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);
 };