|
@@ -1,8 +1,8 @@
|
|
|
-%{
|
|
|
+/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
/*
|
|
|
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
|
|
|
- * Released under the terms of the GNU GPL v2.0.
|
|
|
*/
|
|
|
+%{
|
|
|
|
|
|
#include <ctype.h>
|
|
|
#include <stdarg.h>
|
|
@@ -20,63 +20,69 @@
|
|
|
|
|
|
int cdebug = PRINTD;
|
|
|
|
|
|
-extern int zconflex(void);
|
|
|
+static void yyerror(const char *err);
|
|
|
static void zconfprint(const char *err, ...);
|
|
|
static void zconf_error(const char *err, ...);
|
|
|
-static void zconferror(const char *err);
|
|
|
-static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken);
|
|
|
+static bool zconf_endtoken(const char *tokenname,
|
|
|
+ const char *expected_tokenname);
|
|
|
|
|
|
struct symbol *symbol_hash[SYMBOL_HASHSIZE];
|
|
|
|
|
|
static struct menu *current_menu, *current_entry;
|
|
|
|
|
|
%}
|
|
|
-%expect 32
|
|
|
|
|
|
%union
|
|
|
{
|
|
|
char *string;
|
|
|
- struct file *file;
|
|
|
struct symbol *symbol;
|
|
|
struct expr *expr;
|
|
|
struct menu *menu;
|
|
|
- const struct kconf_id *id;
|
|
|
+ enum symbol_type type;
|
|
|
+ enum variable_flavor flavor;
|
|
|
}
|
|
|
|
|
|
-%token <id>T_MAINMENU
|
|
|
-%token <id>T_MENU
|
|
|
-%token <id>T_ENDMENU
|
|
|
-%token <id>T_SOURCE
|
|
|
-%token <id>T_CHOICE
|
|
|
-%token <id>T_ENDCHOICE
|
|
|
-%token <id>T_COMMENT
|
|
|
-%token <id>T_CONFIG
|
|
|
-%token <id>T_MENUCONFIG
|
|
|
-%token <id>T_HELP
|
|
|
%token <string> T_HELPTEXT
|
|
|
-%token <id>T_IF
|
|
|
-%token <id>T_ENDIF
|
|
|
-%token <id>T_DEPENDS
|
|
|
-%token <id>T_OPTIONAL
|
|
|
-%token <id>T_PROMPT
|
|
|
-%token <id>T_TYPE
|
|
|
-%token <id>T_DEFAULT
|
|
|
-%token <id>T_SELECT
|
|
|
-%token <id>T_IMPLY
|
|
|
-%token <id>T_RANGE
|
|
|
-%token <id>T_VISIBLE
|
|
|
-%token <id>T_OPTION
|
|
|
-%token <id>T_ON
|
|
|
%token <string> T_WORD
|
|
|
%token <string> T_WORD_QUOTE
|
|
|
-%token T_UNEQUAL
|
|
|
-%token T_LESS
|
|
|
-%token T_LESS_EQUAL
|
|
|
-%token T_GREATER
|
|
|
-%token T_GREATER_EQUAL
|
|
|
+%token T_ALLNOCONFIG_Y
|
|
|
+%token T_BOOL
|
|
|
+%token T_CHOICE
|
|
|
%token T_CLOSE_PAREN
|
|
|
+%token T_COLON_EQUAL
|
|
|
+%token T_COMMENT
|
|
|
+%token T_CONFIG
|
|
|
+%token T_DEFAULT
|
|
|
+%token T_DEFCONFIG_LIST
|
|
|
+%token T_DEF_BOOL
|
|
|
+%token T_DEF_TRISTATE
|
|
|
+%token T_DEPENDS
|
|
|
+%token T_ENDCHOICE
|
|
|
+%token T_ENDIF
|
|
|
+%token T_ENDMENU
|
|
|
+%token T_HELP
|
|
|
+%token T_HEX
|
|
|
+%token T_IF
|
|
|
+%token T_IMPLY
|
|
|
+%token T_INT
|
|
|
+%token T_MAINMENU
|
|
|
+%token T_MENU
|
|
|
+%token T_MENUCONFIG
|
|
|
+%token T_MODULES
|
|
|
+%token T_ON
|
|
|
%token T_OPEN_PAREN
|
|
|
+%token T_OPTION
|
|
|
+%token T_OPTIONAL
|
|
|
+%token T_PLUS_EQUAL
|
|
|
+%token T_PROMPT
|
|
|
+%token T_RANGE
|
|
|
+%token T_SELECT
|
|
|
+%token T_SOURCE
|
|
|
+%token T_STRING
|
|
|
+%token T_TRISTATE
|
|
|
+%token T_VISIBLE
|
|
|
%token T_EOL
|
|
|
+%token <string> T_ASSIGN_VAL
|
|
|
|
|
|
%left T_OR
|
|
|
%left T_AND
|
|
@@ -85,13 +91,15 @@ static struct menu *current_menu, *current_entry;
|
|
|
%nonassoc T_NOT
|
|
|
|
|
|
%type <string> prompt
|
|
|
+%type <symbol> nonconst_symbol
|
|
|
%type <symbol> symbol
|
|
|
+%type <type> type logic_type default
|
|
|
%type <expr> expr
|
|
|
%type <expr> if_expr
|
|
|
-%type <id> end
|
|
|
-%type <id> option_name
|
|
|
+%type <string> end
|
|
|
%type <menu> if_entry menu_entry choice_entry
|
|
|
-%type <string> symbol_option_arg word_opt
|
|
|
+%type <string> word_opt assign_val
|
|
|
+%type <flavor> assign_op
|
|
|
|
|
|
%destructor {
|
|
|
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
|
|
@@ -100,71 +108,53 @@ static struct menu *current_menu, *current_entry;
|
|
|
menu_end_menu();
|
|
|
} if_entry menu_entry choice_entry
|
|
|
|
|
|
-%{
|
|
|
-/* Include zconf_id.c here so it can see the token constants. */
|
|
|
-#include "kconf_id.c"
|
|
|
-%}
|
|
|
-
|
|
|
%%
|
|
|
-input: nl start | start;
|
|
|
+input: mainmenu_stmt stmt_list | stmt_list;
|
|
|
|
|
|
-start: mainmenu_stmt stmt_list | stmt_list;
|
|
|
+/* mainmenu entry */
|
|
|
+
|
|
|
+mainmenu_stmt: T_MAINMENU prompt T_EOL
|
|
|
+{
|
|
|
+ menu_add_prompt(P_MENU, $2, NULL);
|
|
|
+};
|
|
|
|
|
|
stmt_list:
|
|
|
/* empty */
|
|
|
| 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 option_name error T_EOL
|
|
|
-{
|
|
|
- zconf_error("unexpected option \"%s\"", $2->name);
|
|
|
-}
|
|
|
| stmt_list error T_EOL { zconf_error("invalid statement"); }
|
|
|
;
|
|
|
|
|
|
-option_name:
|
|
|
- T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_IMPLY | T_OPTIONAL | T_RANGE | T_DEFAULT | T_VISIBLE
|
|
|
-;
|
|
|
-
|
|
|
common_stmt:
|
|
|
- T_EOL
|
|
|
- | if_stmt
|
|
|
+ if_stmt
|
|
|
| comment_stmt
|
|
|
| config_stmt
|
|
|
| menuconfig_stmt
|
|
|
| source_stmt
|
|
|
+ | assignment_stmt
|
|
|
;
|
|
|
|
|
|
-option_error:
|
|
|
- T_WORD error T_EOL { zconf_error("unknown option \"%s\"", $1); }
|
|
|
- | error T_EOL { zconf_error("invalid option"); }
|
|
|
-;
|
|
|
-
|
|
|
-
|
|
|
/* config/menuconfig entry */
|
|
|
|
|
|
-config_entry_start: T_CONFIG T_WORD T_EOL
|
|
|
+config_entry_start: T_CONFIG nonconst_symbol T_EOL
|
|
|
{
|
|
|
- struct symbol *sym = sym_lookup($2, 0);
|
|
|
- sym->flags |= SYMBOL_OPTIONAL;
|
|
|
- menu_add_entry(sym);
|
|
|
- printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2);
|
|
|
+ $2->flags |= SYMBOL_OPTIONAL;
|
|
|
+ menu_add_entry($2);
|
|
|
+ printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2->name);
|
|
|
};
|
|
|
|
|
|
config_stmt: config_entry_start config_option_list
|
|
|
{
|
|
|
- menu_end_entry();
|
|
|
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-menuconfig_entry_start: T_MENUCONFIG T_WORD T_EOL
|
|
|
+menuconfig_entry_start: T_MENUCONFIG nonconst_symbol T_EOL
|
|
|
{
|
|
|
- struct symbol *sym = sym_lookup($2, 0);
|
|
|
- sym->flags |= SYMBOL_OPTIONAL;
|
|
|
- menu_add_entry(sym);
|
|
|
- printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2);
|
|
|
+ $2->flags |= SYMBOL_OPTIONAL;
|
|
|
+ menu_add_entry($2);
|
|
|
+ printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2->name);
|
|
|
};
|
|
|
|
|
|
menuconfig_stmt: menuconfig_entry_start config_option_list
|
|
@@ -173,26 +163,22 @@ menuconfig_stmt: menuconfig_entry_start config_option_list
|
|
|
current_entry->prompt->type = P_MENU;
|
|
|
else
|
|
|
zconfprint("warning: menuconfig statement without prompt");
|
|
|
- menu_end_entry();
|
|
|
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
config_option_list:
|
|
|
/* empty */
|
|
|
| config_option_list config_option
|
|
|
- | config_option_list symbol_option
|
|
|
| config_option_list depends
|
|
|
| config_option_list help
|
|
|
- | config_option_list option_error
|
|
|
- | config_option_list T_EOL
|
|
|
;
|
|
|
|
|
|
-config_option: T_TYPE prompt_stmt_opt T_EOL
|
|
|
+config_option: type prompt_stmt_opt T_EOL
|
|
|
{
|
|
|
- menu_set_type($1->stype);
|
|
|
+ menu_set_type($1);
|
|
|
printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
|
|
|
zconf_curname(), zconf_lineno(),
|
|
|
- $1->stype);
|
|
|
+ $1);
|
|
|
};
|
|
|
|
|
|
config_option: T_PROMPT prompt if_expr T_EOL
|
|
@@ -201,25 +187,25 @@ config_option: T_PROMPT prompt if_expr T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-config_option: T_DEFAULT expr if_expr T_EOL
|
|
|
+config_option: default expr if_expr T_EOL
|
|
|
{
|
|
|
menu_add_expr(P_DEFAULT, $2, $3);
|
|
|
- if ($1->stype != S_UNKNOWN)
|
|
|
- menu_set_type($1->stype);
|
|
|
+ if ($1 != S_UNKNOWN)
|
|
|
+ menu_set_type($1);
|
|
|
printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
|
|
|
zconf_curname(), zconf_lineno(),
|
|
|
- $1->stype);
|
|
|
+ $1);
|
|
|
};
|
|
|
|
|
|
-config_option: T_SELECT T_WORD if_expr T_EOL
|
|
|
+config_option: T_SELECT nonconst_symbol if_expr T_EOL
|
|
|
{
|
|
|
- menu_add_symbol(P_SELECT, sym_lookup($2, 0), $3);
|
|
|
+ menu_add_symbol(P_SELECT, $2, $3);
|
|
|
printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-config_option: T_IMPLY T_WORD if_expr T_EOL
|
|
|
+config_option: T_IMPLY nonconst_symbol if_expr T_EOL
|
|
|
{
|
|
|
- menu_add_symbol(P_IMPLY, sym_lookup($2, 0), $3);
|
|
|
+ menu_add_symbol(P_IMPLY, $2, $3);
|
|
|
printd(DEBUG_PARSE, "%s:%d:imply\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
@@ -229,34 +215,30 @@ config_option: T_RANGE symbol symbol if_expr T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-symbol_option: T_OPTION symbol_option_list T_EOL
|
|
|
-;
|
|
|
+config_option: T_OPTION T_MODULES T_EOL
|
|
|
+{
|
|
|
+ menu_add_option_modules();
|
|
|
+};
|
|
|
|
|
|
-symbol_option_list:
|
|
|
- /* empty */
|
|
|
- | symbol_option_list T_WORD symbol_option_arg
|
|
|
+config_option: T_OPTION T_DEFCONFIG_LIST T_EOL
|
|
|
{
|
|
|
- const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
|
|
|
- if (id && id->flags & TF_OPTION)
|
|
|
- menu_add_option(id->token, $3);
|
|
|
- else
|
|
|
- zconfprint("warning: ignoring unknown option %s", $2);
|
|
|
- free($2);
|
|
|
+ menu_add_option_defconfig_list();
|
|
|
};
|
|
|
|
|
|
-symbol_option_arg:
|
|
|
- /* empty */ { $$ = NULL; }
|
|
|
- | T_EQUAL prompt { $$ = $2; }
|
|
|
-;
|
|
|
+config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL
|
|
|
+{
|
|
|
+ menu_add_option_allnoconfig_y();
|
|
|
+};
|
|
|
|
|
|
/* choice entry */
|
|
|
|
|
|
choice: T_CHOICE word_opt T_EOL
|
|
|
{
|
|
|
struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
|
|
|
- sym->flags |= SYMBOL_AUTO;
|
|
|
+ sym->flags |= SYMBOL_NO_WRITE;
|
|
|
menu_add_entry(sym);
|
|
|
menu_add_expr(P_CHOICE, NULL, NULL);
|
|
|
+ free($2);
|
|
|
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
@@ -267,7 +249,7 @@ choice_entry: choice choice_option_list
|
|
|
|
|
|
choice_end: end
|
|
|
{
|
|
|
- if (zconf_endtoken($1, T_CHOICE, T_ENDCHOICE)) {
|
|
|
+ if (zconf_endtoken($1, "choice")) {
|
|
|
menu_end_menu();
|
|
|
printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
|
|
|
}
|
|
@@ -281,8 +263,6 @@ choice_option_list:
|
|
|
| choice_option_list choice_option
|
|
|
| choice_option_list depends
|
|
|
| choice_option_list help
|
|
|
- | choice_option_list T_EOL
|
|
|
- | choice_option_list option_error
|
|
|
;
|
|
|
|
|
|
choice_option: T_PROMPT prompt if_expr T_EOL
|
|
@@ -291,15 +271,11 @@ choice_option: T_PROMPT prompt if_expr T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-choice_option: T_TYPE prompt_stmt_opt T_EOL
|
|
|
+choice_option: logic_type prompt_stmt_opt T_EOL
|
|
|
{
|
|
|
- if ($1->stype == S_BOOLEAN || $1->stype == S_TRISTATE) {
|
|
|
- menu_set_type($1->stype);
|
|
|
- printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
|
|
|
- zconf_curname(), zconf_lineno(),
|
|
|
- $1->stype);
|
|
|
- } else
|
|
|
- YYERROR;
|
|
|
+ menu_set_type($1);
|
|
|
+ printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
|
|
|
+ zconf_curname(), zconf_lineno(), $1);
|
|
|
};
|
|
|
|
|
|
choice_option: T_OPTIONAL T_EOL
|
|
@@ -308,16 +284,28 @@ choice_option: T_OPTIONAL T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-choice_option: T_DEFAULT T_WORD if_expr T_EOL
|
|
|
+choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL
|
|
|
{
|
|
|
- if ($1->stype == S_UNKNOWN) {
|
|
|
- menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
|
|
|
- printd(DEBUG_PARSE, "%s:%d:default\n",
|
|
|
- zconf_curname(), zconf_lineno());
|
|
|
- } else
|
|
|
- YYERROR;
|
|
|
+ menu_add_symbol(P_DEFAULT, $2, $3);
|
|
|
+ printd(DEBUG_PARSE, "%s:%d:default\n",
|
|
|
+ zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
+type:
|
|
|
+ logic_type
|
|
|
+ | T_INT { $$ = S_INT; }
|
|
|
+ | T_HEX { $$ = S_HEX; }
|
|
|
+ | T_STRING { $$ = S_STRING; }
|
|
|
+
|
|
|
+logic_type:
|
|
|
+ T_BOOL { $$ = S_BOOLEAN; }
|
|
|
+ | T_TRISTATE { $$ = S_TRISTATE; }
|
|
|
+
|
|
|
+default:
|
|
|
+ T_DEFAULT { $$ = S_UNKNOWN; }
|
|
|
+ | T_DEF_BOOL { $$ = S_BOOLEAN; }
|
|
|
+ | T_DEF_TRISTATE { $$ = S_TRISTATE; }
|
|
|
+
|
|
|
choice_block:
|
|
|
/* empty */
|
|
|
| choice_block common_stmt
|
|
@@ -325,7 +313,7 @@ choice_block:
|
|
|
|
|
|
/* if entry */
|
|
|
|
|
|
-if_entry: T_IF expr nl
|
|
|
+if_entry: T_IF expr T_EOL
|
|
|
{
|
|
|
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
|
|
|
menu_add_entry(NULL);
|
|
@@ -335,29 +323,15 @@ if_entry: T_IF expr nl
|
|
|
|
|
|
if_end: end
|
|
|
{
|
|
|
- if (zconf_endtoken($1, T_IF, T_ENDIF)) {
|
|
|
+ if (zconf_endtoken($1, "if")) {
|
|
|
menu_end_menu();
|
|
|
printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-if_stmt: if_entry if_block if_end
|
|
|
+if_stmt: if_entry stmt_list if_end
|
|
|
;
|
|
|
|
|
|
-if_block:
|
|
|
- /* empty */
|
|
|
- | if_block common_stmt
|
|
|
- | if_block menu_stmt
|
|
|
- | if_block choice_stmt
|
|
|
-;
|
|
|
-
|
|
|
-/* mainmenu entry */
|
|
|
-
|
|
|
-mainmenu_stmt: T_MAINMENU prompt nl
|
|
|
-{
|
|
|
- menu_add_prompt(P_MENU, $2, NULL);
|
|
|
-};
|
|
|
-
|
|
|
/* menu entry */
|
|
|
|
|
|
menu: T_MENU prompt T_EOL
|
|
@@ -367,33 +341,33 @@ menu: T_MENU prompt T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-menu_entry: menu visibility_list depends_list
|
|
|
+menu_entry: menu menu_option_list
|
|
|
{
|
|
|
$$ = menu_add_menu();
|
|
|
};
|
|
|
|
|
|
menu_end: end
|
|
|
{
|
|
|
- if (zconf_endtoken($1, T_MENU, T_ENDMENU)) {
|
|
|
+ if (zconf_endtoken($1, "menu")) {
|
|
|
menu_end_menu();
|
|
|
printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-menu_stmt: menu_entry menu_block menu_end
|
|
|
+menu_stmt: menu_entry stmt_list menu_end
|
|
|
;
|
|
|
|
|
|
-menu_block:
|
|
|
+menu_option_list:
|
|
|
/* empty */
|
|
|
- | menu_block common_stmt
|
|
|
- | menu_block menu_stmt
|
|
|
- | menu_block choice_stmt
|
|
|
+ | menu_option_list visible
|
|
|
+ | menu_option_list depends
|
|
|
;
|
|
|
|
|
|
source_stmt: T_SOURCE prompt T_EOL
|
|
|
{
|
|
|
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
|
|
|
zconf_nextfile($2);
|
|
|
+ free($2);
|
|
|
};
|
|
|
|
|
|
/* comment entry */
|
|
@@ -405,10 +379,13 @@ comment: T_COMMENT prompt T_EOL
|
|
|
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
|
|
|
};
|
|
|
|
|
|
-comment_stmt: comment depends_list
|
|
|
-{
|
|
|
- menu_end_entry();
|
|
|
-};
|
|
|
+comment_stmt: comment comment_option_list
|
|
|
+;
|
|
|
+
|
|
|
+comment_option_list:
|
|
|
+ /* empty */
|
|
|
+ | comment_option_list depends
|
|
|
+;
|
|
|
|
|
|
/* help option */
|
|
|
|
|
@@ -420,18 +397,22 @@ help_start: T_HELP T_EOL
|
|
|
|
|
|
help: help_start T_HELPTEXT
|
|
|
{
|
|
|
+ if (current_entry->help) {
|
|
|
+ free(current_entry->help);
|
|
|
+ zconfprint("warning: '%s' defined with more than one help text -- only the last one will be used",
|
|
|
+ current_entry->sym->name ?: "<choice>");
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Is the help text empty or all whitespace? */
|
|
|
+ if ($2[strspn($2, " \f\n\r\t\v")] == '\0')
|
|
|
+ zconfprint("warning: '%s' defined with blank help text",
|
|
|
+ current_entry->sym->name ?: "<choice>");
|
|
|
+
|
|
|
current_entry->help = $2;
|
|
|
};
|
|
|
|
|
|
/* depends option */
|
|
|
|
|
|
-depends_list:
|
|
|
- /* empty */
|
|
|
- | depends_list depends
|
|
|
- | depends_list T_EOL
|
|
|
- | depends_list option_error
|
|
|
-;
|
|
|
-
|
|
|
depends: T_DEPENDS T_ON expr T_EOL
|
|
|
{
|
|
|
menu_add_dep($3);
|
|
@@ -439,14 +420,7 @@ depends: T_DEPENDS T_ON expr T_EOL
|
|
|
};
|
|
|
|
|
|
/* visibility option */
|
|
|
-
|
|
|
-visibility_list:
|
|
|
- /* empty */
|
|
|
- | visibility_list visible
|
|
|
- | visibility_list T_EOL
|
|
|
-;
|
|
|
-
|
|
|
-visible: T_VISIBLE if_expr
|
|
|
+visible: T_VISIBLE if_expr T_EOL
|
|
|
{
|
|
|
menu_add_visibility($2);
|
|
|
};
|
|
@@ -464,14 +438,9 @@ prompt: T_WORD
|
|
|
| T_WORD_QUOTE
|
|
|
;
|
|
|
|
|
|
-end: T_ENDMENU T_EOL { $$ = $1; }
|
|
|
- | T_ENDCHOICE T_EOL { $$ = $1; }
|
|
|
- | T_ENDIF T_EOL { $$ = $1; }
|
|
|
-;
|
|
|
-
|
|
|
-nl:
|
|
|
- T_EOL
|
|
|
- | nl T_EOL
|
|
|
+end: T_ENDMENU T_EOL { $$ = "menu"; }
|
|
|
+ | T_ENDCHOICE T_EOL { $$ = "choice"; }
|
|
|
+ | T_ENDIF T_EOL { $$ = "if"; }
|
|
|
;
|
|
|
|
|
|
if_expr: /* empty */ { $$ = NULL; }
|
|
@@ -491,13 +460,31 @@ expr: symbol { $$ = expr_alloc_symbol($1); }
|
|
|
| expr T_AND expr { $$ = expr_alloc_two(E_AND, $1, $3); }
|
|
|
;
|
|
|
|
|
|
-symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); }
|
|
|
+/* For symbol definitions, selects, etc., where quotes are not accepted */
|
|
|
+nonconst_symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); };
|
|
|
+
|
|
|
+symbol: nonconst_symbol
|
|
|
| T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); }
|
|
|
;
|
|
|
|
|
|
word_opt: /* empty */ { $$ = NULL; }
|
|
|
| T_WORD
|
|
|
|
|
|
+/* assignment statement */
|
|
|
+
|
|
|
+assignment_stmt: T_WORD assign_op assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); }
|
|
|
+
|
|
|
+assign_op:
|
|
|
+ T_EQUAL { $$ = VAR_RECURSIVE; }
|
|
|
+ | T_COLON_EQUAL { $$ = VAR_SIMPLE; }
|
|
|
+ | T_PLUS_EQUAL { $$ = VAR_APPEND; }
|
|
|
+;
|
|
|
+
|
|
|
+assign_val:
|
|
|
+ /* empty */ { $$ = xstrdup(""); };
|
|
|
+ | T_ASSIGN_VAL
|
|
|
+;
|
|
|
+
|
|
|
%%
|
|
|
|
|
|
void conf_parse(const char *name)
|
|
@@ -507,61 +494,51 @@ void conf_parse(const char *name)
|
|
|
|
|
|
zconf_initscan(name);
|
|
|
|
|
|
- sym_init();
|
|
|
_menu_init();
|
|
|
- rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
|
|
|
|
|
|
if (getenv("ZCONF_DEBUG"))
|
|
|
- zconfdebug = 1;
|
|
|
- zconfparse();
|
|
|
- if (zconfnerrs)
|
|
|
+ yydebug = 1;
|
|
|
+ yyparse();
|
|
|
+
|
|
|
+ /* Variables are expanded in the parse phase. We can free them here. */
|
|
|
+ variable_all_del();
|
|
|
+
|
|
|
+ if (yynerrs)
|
|
|
exit(1);
|
|
|
if (!modules_sym)
|
|
|
modules_sym = sym_find( "n" );
|
|
|
|
|
|
- rootmenu.prompt->text = _(rootmenu.prompt->text);
|
|
|
- rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
|
|
|
+ if (!menu_has_prompt(&rootmenu)) {
|
|
|
+ current_entry = &rootmenu;
|
|
|
+ menu_add_prompt(P_MENU, "Main menu", NULL);
|
|
|
+ }
|
|
|
|
|
|
menu_finalize(&rootmenu);
|
|
|
for_all_symbols(i, sym) {
|
|
|
if (sym_check_deps(sym))
|
|
|
- zconfnerrs++;
|
|
|
+ yynerrs++;
|
|
|
}
|
|
|
- if (zconfnerrs)
|
|
|
+ if (yynerrs)
|
|
|
exit(1);
|
|
|
sym_set_change_count(1);
|
|
|
}
|
|
|
|
|
|
-static const char *zconf_tokenname(int token)
|
|
|
-{
|
|
|
- switch (token) {
|
|
|
- case T_MENU: return "menu";
|
|
|
- case T_ENDMENU: return "endmenu";
|
|
|
- case T_CHOICE: return "choice";
|
|
|
- case T_ENDCHOICE: return "endchoice";
|
|
|
- case T_IF: return "if";
|
|
|
- case T_ENDIF: return "endif";
|
|
|
- case T_DEPENDS: return "depends";
|
|
|
- case T_VISIBLE: return "visible";
|
|
|
- }
|
|
|
- return "<token>";
|
|
|
-}
|
|
|
-
|
|
|
-static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken)
|
|
|
+static bool zconf_endtoken(const char *tokenname,
|
|
|
+ const char *expected_tokenname)
|
|
|
{
|
|
|
- if (id->token != endtoken) {
|
|
|
+ if (strcmp(tokenname, expected_tokenname)) {
|
|
|
zconf_error("unexpected '%s' within %s block",
|
|
|
- id->name, zconf_tokenname(starttoken));
|
|
|
- zconfnerrs++;
|
|
|
+ tokenname, expected_tokenname);
|
|
|
+ yynerrs++;
|
|
|
return false;
|
|
|
}
|
|
|
if (current_menu->file != current_file) {
|
|
|
zconf_error("'%s' in different file than '%s'",
|
|
|
- id->name, zconf_tokenname(starttoken));
|
|
|
+ tokenname, expected_tokenname);
|
|
|
fprintf(stderr, "%s:%d: location of the '%s'\n",
|
|
|
current_menu->file->name, current_menu->lineno,
|
|
|
- zconf_tokenname(starttoken));
|
|
|
- zconfnerrs++;
|
|
|
+ expected_tokenname);
|
|
|
+ yynerrs++;
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
@@ -582,7 +559,7 @@ static void zconf_error(const char *err, ...)
|
|
|
{
|
|
|
va_list ap;
|
|
|
|
|
|
- zconfnerrs++;
|
|
|
+ yynerrs++;
|
|
|
fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
|
|
|
va_start(ap, err);
|
|
|
vfprintf(stderr, err, ap);
|
|
@@ -590,7 +567,7 @@ static void zconf_error(const char *err, ...)
|
|
|
fprintf(stderr, "\n");
|
|
|
}
|
|
|
|
|
|
-static void zconferror(const char *err)
|
|
|
+static void yyerror(const char *err)
|
|
|
{
|
|
|
fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
|
|
|
}
|
|
@@ -623,7 +600,7 @@ static void print_symbol(FILE *out, struct menu *menu)
|
|
|
fprintf(out, "\nconfig %s\n", sym->name);
|
|
|
switch (sym->type) {
|
|
|
case S_BOOLEAN:
|
|
|
- fputs(" boolean\n", out);
|
|
|
+ fputs(" bool\n", out);
|
|
|
break;
|
|
|
case S_TRISTATE:
|
|
|
fputs(" tristate\n", out);
|
|
@@ -686,6 +663,10 @@ static void print_symbol(FILE *out, struct menu *menu)
|
|
|
print_quoted_string(out, prop->text);
|
|
|
fputc('\n', out);
|
|
|
break;
|
|
|
+ case P_SYMBOL:
|
|
|
+ fputs( " symbol ", out);
|
|
|
+ fprintf(out, "%s\n", prop->sym->name);
|
|
|
+ break;
|
|
|
default:
|
|
|
fprintf(out, " unknown prop %d!\n", prop->type);
|
|
|
break;
|
|
@@ -746,9 +727,5 @@ void zconfdump(FILE *out)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-#include "zconf.lex.c"
|
|
|
#include "util.c"
|
|
|
-#include "confdata.c"
|
|
|
-#include "expr.c"
|
|
|
-#include "symbol.c"
|
|
|
#include "menu.c"
|