projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kconfig: handle P_SYMBOL in print_symbol()
[carl9170fw.git]
/
config
/
zconf.y
diff --git
a/config/zconf.y
b/config/zconf.y
index 228a14b24faee961505cb3e473fbcac0d4c5c80b..d9a095200e9dd94163401d577309cce435863cf6 100644
(file)
--- a/
config/zconf.y
+++ b/
config/zconf.y
@@
-31,7
+31,7
@@
struct symbol *symbol_hash[SYMBOL_HASHSIZE];
static struct menu *current_menu, *current_entry;
%}
static struct menu *current_menu, *current_entry;
%}
-%expect 3
2
+%expect 3
1
%union
{
%union
{
@@
-41,6
+41,7
@@
static struct menu *current_menu, *current_entry;
struct expr *expr;
struct menu *menu;
const struct kconf_id *id;
struct expr *expr;
struct menu *menu;
const struct kconf_id *id;
+ enum variable_flavor flavor;
}
%token <id>T_MAINMENU
}
%token <id>T_MAINMENU
@@
-77,6
+78,9
@@
static struct menu *current_menu, *current_entry;
%token T_CLOSE_PAREN
%token T_OPEN_PAREN
%token T_EOL
%token T_CLOSE_PAREN
%token T_OPEN_PAREN
%token T_EOL
+%token <string> T_VARIABLE
+%token <flavor> T_ASSIGN
+%token <string> T_ASSIGN_VAL
%left T_OR
%left T_AND
%left T_OR
%left T_AND
@@
-92,7
+96,7
@@
static struct menu *current_menu, *current_entry;
%type <id> end
%type <id> option_name
%type <menu> if_entry menu_entry choice_entry
%type <id> end
%type <id> option_name
%type <menu> if_entry menu_entry choice_entry
-%type <string> symbol_option_arg word_opt
+%type <string> symbol_option_arg word_opt
assign_val
%destructor {
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
%destructor {
fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@
-143,6
+147,7
@@
common_stmt:
| config_stmt
| menuconfig_stmt
| source_stmt
| config_stmt
| menuconfig_stmt
| source_stmt
+ | assignment_stmt
;
option_error:
;
option_error:
@@
-332,7
+337,7
@@
choice_block:
/* if entry */
/* 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);
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
@@
-511,6
+516,15
@@
symbol: nonconst_symbol
word_opt: /* empty */ { $$ = NULL; }
| T_WORD
word_opt: /* empty */ { $$ = NULL; }
| T_WORD
+/* assignment statement */
+
+assignment_stmt: T_VARIABLE T_ASSIGN assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); }
+
+assign_val:
+ /* empty */ { $$ = xstrdup(""); };
+ | T_ASSIGN_VAL
+;
+
%%
void conf_parse(const char *name)
%%
void conf_parse(const char *name)
@@
-526,6
+540,10
@@
void conf_parse(const char *name)
if (getenv("ZCONF_DEBUG"))
yydebug = 1;
yyparse();
if (getenv("ZCONF_DEBUG"))
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)
if (yynerrs)
exit(1);
if (!modules_sym)
@@
-533,7
+551,7
@@
void conf_parse(const char *name)
if (!menu_has_prompt(&rootmenu)) {
current_entry = &rootmenu;
if (!menu_has_prompt(&rootmenu)) {
current_entry = &rootmenu;
- menu_add_prompt(P_MENU, "
Linux Kernel Configuration
", NULL);
+ menu_add_prompt(P_MENU, "
Main menu
", NULL);
}
menu_finalize(&rootmenu);
}
menu_finalize(&rootmenu);
@@
-700,6
+718,10
@@
static void print_symbol(FILE *out, struct menu *menu)
print_quoted_string(out, prop->text);
fputc('\n', out);
break;
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;
default:
fprintf(out, " unknown prop %d!\n", prop->type);
break;