| Message ID | 1533797226-6547-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 56869d45e364244a721de34ce9c5dc9ed022779e |
| Headers | show |
| Series | kconfig: fix the rule of mainmenu_stmt symbol | expand |
2018-08-09 15:47 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > The rule of mainmenu_stmt does not have debug print of zconf_lineno(), > but if it had, it would print a wrong line number for the same reason > as commit b2d00d7c61c8 ("kconfig: fix line numbers for if-entries in > menu tree"). > > The mainmenu_stmt does not need to eat following empty lines because > they are reduced to common_stmt. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-kbuild/kconfig. > scripts/kconfig/zconf.y | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y > index 4b68272..95a4fd3 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 31 > +%expect 30 > > %union > { > @@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list; > > /* mainmenu entry */ > > -mainmenu_stmt: T_MAINMENU prompt nl > +mainmenu_stmt: T_MAINMENU prompt T_EOL > { > menu_add_prompt(P_MENU, $2, NULL); > }; > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best Regards Masahiro Yamada
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 4b68272..95a4fd3 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 31 +%expect 30 %union { @@ -117,7 +117,7 @@ start: mainmenu_stmt stmt_list | stmt_list; /* mainmenu entry */ -mainmenu_stmt: T_MAINMENU prompt nl +mainmenu_stmt: T_MAINMENU prompt T_EOL { menu_add_prompt(P_MENU, $2, NULL); };
The rule of mainmenu_stmt does not have debug print of zconf_lineno(), but if it had, it would print a wrong line number for the same reason as commit b2d00d7c61c8 ("kconfig: fix line numbers for if-entries in menu tree"). The mainmenu_stmt does not need to eat following empty lines because they are reduced to common_stmt. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/zconf.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4