Skip to content

L
linux
Commit d4f8a453 authored by Roman Zippel's avatar Roman Zippel Committed by Ben Collins
Browse files
Options

[PATCH] add new keywords to parser 

Add the following new keywords: def_tristate, def_bool, def_boolean,
select, enable and range.

Add support for def_tristate and def_bool, which combines default and
bool/tristate into a single statement and a allows simpler definition
of derived symbols.
parent 30e61a48
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1889 additions and 1430 deletions
scripts/kconfig/lex.zconf.c_shipped
View file @ d4f8a453
This source diff could not be displayed because it is too large. You can view the blob instead.
scripts/kconfig/zconf.l
View file @ d4f8a453
...@@ -106,11 +106,17 @@ n [A-Za-z0-9_] ...@@ -106,11 +106,17 @@ n [A-Za-z0-9_]
"default" BEGIN(PARAM); return T_DEFAULT; "default" BEGIN(PARAM); return T_DEFAULT;
"prompt" BEGIN(PARAM); return T_PROMPT; "prompt" BEGIN(PARAM); return T_PROMPT;
"tristate" BEGIN(PARAM); return T_TRISTATE; "tristate" BEGIN(PARAM); return T_TRISTATE;
"def_tristate" BEGIN(PARAM); return T_DEF_TRISTATE;
"bool" BEGIN(PARAM); return T_BOOLEAN; "bool" BEGIN(PARAM); return T_BOOLEAN;
"boolean" BEGIN(PARAM); return T_BOOLEAN; "boolean" BEGIN(PARAM); return T_BOOLEAN;
"def_bool" BEGIN(PARAM); return T_DEF_BOOLEAN;
"def_boolean" BEGIN(PARAM); return T_DEF_BOOLEAN;
"int" BEGIN(PARAM); return T_INT; "int" BEGIN(PARAM); return T_INT;
"hex" BEGIN(PARAM); return T_HEX; "hex" BEGIN(PARAM); return T_HEX;
"string" BEGIN(PARAM); return T_STRING; "string" BEGIN(PARAM); return T_STRING;
"select" BEGIN(PARAM); return T_SELECT;
"enable" BEGIN(PARAM); return T_SELECT;
"range" BEGIN(PARAM); return T_RANGE;
{n}+ { {n}+ {
alloc_string(yytext, yyleng); alloc_string(yytext, yyleng);
zconflval.string = text; zconflval.string = text;
...@@ -208,7 +214,6 @@ n [A-Za-z0-9_] ...@@ -208,7 +214,6 @@ n [A-Za-z0-9_]
} }
append_string(" ", ts); append_string(" ", ts);
} }
} }
[ \t]*\n/[^ \t\n] { [ \t]*\n/[^ \t\n] {
current_file->lineno++; current_file->lineno++;
...@@ -250,11 +255,11 @@ void zconf_starthelp(void) ...@@ -250,11 +255,11 @@ void zconf_starthelp(void)
static void zconf_endhelp(void) static void zconf_endhelp(void)
{ {
zconflval.string = text; zconflval.string = text;
BEGIN(INITIAL); BEGIN(INITIAL);
} }
/* /*
* Try to open specified file with following names: * Try to open specified file with following names:
* ./name * ./name
* $(srctree)/name * $(srctree)/name
...@@ -347,7 +352,7 @@ static struct buffer *zconf_endfile(void) ...@@ -347,7 +352,7 @@ static struct buffer *zconf_endfile(void)
int zconf_lineno(void) int zconf_lineno(void)
{ {
if (current_buf) if (current_buf)
return current_file->lineno; return current_file->lineno - 1;
else else
return 0; return 0;
} }
......
scripts/kconfig/zconf.tab.c_shipped
View file @ d4f8a453
This diff is collapsed.
scripts/kconfig/zconf.y
View file @ d4f8a453
...@@ -57,7 +57,9 @@ struct symbol *symbol_hash[257]; ...@@ -57,7 +57,9 @@ struct symbol *symbol_hash[257];
%token T_PROMPT %token T_PROMPT
%token T_DEFAULT %token T_DEFAULT
%token T_TRISTATE %token T_TRISTATE
%token T_DEF_TRISTATE
%token T_BOOLEAN %token T_BOOLEAN
%token T_DEF_BOOLEAN
%token T_STRING %token T_STRING
%token T_INT %token T_INT
%token T_HEX %token T_HEX
...@@ -69,6 +71,8 @@ struct symbol *symbol_hash[257]; ...@@ -69,6 +71,8 @@ struct symbol *symbol_hash[257];
%token T_CLOSE_PAREN %token T_CLOSE_PAREN
%token T_OPEN_PAREN %token T_OPEN_PAREN
%token T_ON %token T_ON
%token T_SELECT
%token T_RANGE
%left T_OR %left T_OR
%left T_AND %left T_AND
...@@ -113,7 +117,7 @@ common_block: ...@@ -113,7 +117,7 @@ common_block:
/* config/menuconfig entry */ /* config/menuconfig entry */
config_entry_start: T_CONFIG T_WORD config_entry_start: T_CONFIG T_WORD T_EOL
{ {
struct symbol *sym = sym_lookup($2, 0); struct symbol *sym = sym_lookup($2, 0);
sym->flags |= SYMBOL_OPTIONAL; sym->flags |= SYMBOL_OPTIONAL;
...@@ -121,13 +125,13 @@ config_entry_start: T_CONFIG T_WORD ...@@ -121,13 +125,13 @@ config_entry_start: T_CONFIG T_WORD
printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2); printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2);
}; };
config_stmt: config_entry_start T_EOL config_option_list config_stmt: config_entry_start config_option_list
{ {
menu_end_entry(); menu_end_entry();
printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
}; };
menuconfig_entry_start: T_MENUCONFIG T_WORD menuconfig_entry_start: T_MENUCONFIG T_WORD T_EOL
{ {
struct symbol *sym = sym_lookup($2, 0); struct symbol *sym = sym_lookup($2, 0);
sym->flags |= SYMBOL_OPTIONAL; sym->flags |= SYMBOL_OPTIONAL;
...@@ -135,7 +139,7 @@ menuconfig_entry_start: T_MENUCONFIG T_WORD ...@@ -135,7 +139,7 @@ menuconfig_entry_start: T_MENUCONFIG T_WORD
printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2); printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2);
}; };
menuconfig_stmt: menuconfig_entry_start T_EOL config_option_list menuconfig_stmt: menuconfig_entry_start config_option_list
{ {
if (current_entry->prompt) if (current_entry->prompt)
current_entry->prompt->type = P_MENU; current_entry->prompt->type = P_MENU;
...@@ -147,57 +151,77 @@ menuconfig_stmt: menuconfig_entry_start T_EOL config_option_list ...@@ -147,57 +151,77 @@ menuconfig_stmt: menuconfig_entry_start T_EOL config_option_list
config_option_list: config_option_list:
/* empty */ /* empty */
| config_option_list config_option T_EOL | config_option_list config_option
| config_option_list depends T_EOL | config_option_list depends
| config_option_list help | config_option_list help
| config_option_list T_EOL | config_option_list T_EOL
{ }; ;
config_option: T_TRISTATE prompt_stmt_opt config_option: T_TRISTATE prompt_stmt_opt T_EOL
{ {
menu_set_type(S_TRISTATE); menu_set_type(S_TRISTATE);
printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_BOOLEAN prompt_stmt_opt config_option: T_DEF_TRISTATE expr if_expr T_EOL
{
printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
};
config_option: T_BOOLEAN prompt_stmt_opt T_EOL
{ {
menu_set_type(S_BOOLEAN); menu_set_type(S_BOOLEAN);
printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_INT prompt_stmt_opt config_option: T_DEF_BOOLEAN expr if_expr T_EOL
{
printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
};
config_option: T_INT prompt_stmt_opt T_EOL
{ {
menu_set_type(S_INT); menu_set_type(S_INT);
printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_HEX prompt_stmt_opt config_option: T_HEX prompt_stmt_opt T_EOL
{ {
menu_set_type(S_HEX); menu_set_type(S_HEX);
printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_STRING prompt_stmt_opt config_option: T_STRING prompt_stmt_opt T_EOL
{ {
menu_set_type(S_STRING); menu_set_type(S_STRING);
printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_PROMPT prompt if_expr config_option: T_PROMPT prompt if_expr T_EOL
{ {
menu_add_prop(P_PROMPT, $2, NULL, $3); menu_add_prop(P_PROMPT, $2, NULL, $3);
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_DEFAULT symbol if_expr config_option: T_DEFAULT symbol if_expr T_EOL
{ {
menu_add_prop(P_DEFAULT, NULL, $2, $3); menu_add_prop(P_DEFAULT, NULL, $2, $3);
printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
}; };
config_option: T_SELECT T_WORD if_expr T_EOL
{
printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
};
config_option: T_RANGE symbol symbol if_expr T_EOL
{
printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
};
/* choice entry */ /* choice entry */
choice: T_CHOICE choice: T_CHOICE T_EOL
{ {
struct symbol *sym = sym_lookup(NULL, 0); struct symbol *sym = sym_lookup(NULL, 0);
sym->flags |= SYMBOL_CHOICE; sym->flags |= SYMBOL_CHOICE;
...@@ -206,7 +230,7 @@ choice: T_CHOICE ...@@ -206,7 +230,7 @@ choice: T_CHOICE
printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
}; };
choice_entry: choice T_EOL choice_option_list choice_entry: choice choice_option_list
{ {
menu_end_entry(); menu_end_entry();
menu_add_menu(); menu_add_menu();
...@@ -221,7 +245,7 @@ choice_end: end ...@@ -221,7 +245,7 @@ choice_end: end
}; };
choice_stmt: choice_stmt:
choice_entry choice_block choice_end T_EOL choice_entry choice_block choice_end
| choice_entry choice_block | choice_entry choice_block
{ {
printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno); printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
...@@ -230,27 +254,39 @@ choice_stmt: ...@@ -230,27 +254,39 @@ choice_stmt:
choice_option_list: choice_option_list:
/* empty */ /* empty */
| choice_option_list choice_option T_EOL | choice_option_list choice_option
| choice_option_list depends T_EOL | choice_option_list depends
| choice_option_list help | choice_option_list help
| choice_option_list T_EOL | choice_option_list T_EOL
; ;
choice_option: T_PROMPT prompt if_expr choice_option: T_PROMPT prompt if_expr T_EOL
{ {
menu_add_prop(P_PROMPT, $2, NULL, $3); menu_add_prop(P_PROMPT, $2, NULL, $3);
printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
}; };
choice_option: T_OPTIONAL choice_option: T_TRISTATE prompt_stmt_opt T_EOL
{
menu_set_type(S_TRISTATE);
printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
};
choice_option: T_BOOLEAN prompt_stmt_opt T_EOL
{
menu_set_type(S_BOOLEAN);
printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
};
choice_option: T_OPTIONAL T_EOL
{ {
current_entry->sym->flags |= SYMBOL_OPTIONAL; current_entry->sym->flags |= SYMBOL_OPTIONAL;
printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());
}; };
choice_option: T_DEFAULT symbol if_expr choice_option: T_DEFAULT T_WORD if_expr T_EOL
{ {
menu_add_prop(P_DEFAULT, NULL, $2, $3); menu_add_prop(P_DEFAULT, NULL, sym_lookup($2, 0), $3);
printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
}; };
...@@ -261,7 +297,7 @@ choice_block: ...@@ -261,7 +297,7 @@ choice_block:
/* if entry */ /* if entry */
if: T_IF expr if: T_IF expr T_EOL
{ {
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL); menu_add_entry(NULL);
...@@ -279,8 +315,8 @@ if_end: end ...@@ -279,8 +315,8 @@ if_end: end
}; };
if_stmt: if_stmt:
if T_EOL if_block if_end T_EOL if if_block if_end
| if T_EOL if_block | if if_block
{ {
printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno); printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
zconfnerrs++; zconfnerrs++;
...@@ -295,14 +331,14 @@ if_block: ...@@ -295,14 +331,14 @@ if_block:
/* menu entry */ /* menu entry */
menu: T_MENU prompt menu: T_MENU prompt T_EOL
{ {
menu_add_entry(NULL); menu_add_entry(NULL);
menu_add_prop(P_MENU, $2, NULL, NULL); menu_add_prop(P_MENU, $2, NULL, NULL);
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
}; };
menu_entry: menu T_EOL depends_list menu_entry: menu depends_list
{ {
menu_end_entry(); menu_end_entry();
menu_add_menu(); menu_add_menu();
...@@ -317,7 +353,7 @@ menu_end: end ...@@ -317,7 +353,7 @@ menu_end: end
}; };
menu_stmt: menu_stmt:
menu_entry menu_block menu_end T_EOL menu_entry menu_block menu_end
| menu_entry menu_block | menu_entry menu_block
{ {
printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno); printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
...@@ -332,27 +368,27 @@ menu_block: ...@@ -332,27 +368,27 @@ menu_block:
| menu_block error T_EOL { zconfprint("invalid menu option"); yyerrok; } | menu_block error T_EOL { zconfprint("invalid menu option"); yyerrok; }
; ;
source: T_SOURCE prompt source: T_SOURCE prompt T_EOL
{ {
$$ = $2; $$ = $2;
printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2); printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
}; };
source_stmt: source T_EOL source_stmt: source
{ {
zconf_nextfile($1); zconf_nextfile($1);
}; };
/* comment entry */ /* comment entry */
comment: T_COMMENT prompt comment: T_COMMENT prompt T_EOL
{ {
menu_add_entry(NULL); menu_add_entry(NULL);
menu_add_prop(P_COMMENT, $2, NULL, NULL); menu_add_prop(P_COMMENT, $2, NULL, NULL);
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
}; };
comment_stmt: comment T_EOL depends_list comment_stmt: comment depends_list
{ {
menu_end_entry(); menu_end_entry();
}; };
...@@ -373,21 +409,21 @@ help: help_start T_HELPTEXT ...@@ -373,21 +409,21 @@ help: help_start T_HELPTEXT
/* depends option */ /* depends option */
depends_list: /* empty */ depends_list: /* empty */
| depends_list depends T_EOL | depends_list depends
| depends_list T_EOL | depends_list T_EOL
{ }; ;
depends: T_DEPENDS T_ON expr depends: T_DEPENDS T_ON expr T_EOL
{ {
menu_add_dep($3); menu_add_dep($3);
printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
} }
| T_DEPENDS expr | T_DEPENDS expr T_EOL
{ {
menu_add_dep($2); menu_add_dep($2);
printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
} }
| T_REQUIRES expr | T_REQUIRES expr T_EOL
{ {
menu_add_dep($2); menu_add_dep($2);
printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno()); printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
...@@ -397,22 +433,18 @@ depends: T_DEPENDS T_ON expr ...@@ -397,22 +433,18 @@ depends: T_DEPENDS T_ON expr
prompt_stmt_opt: prompt_stmt_opt:
/* empty */ /* empty */
| prompt | prompt if_expr
{ {
menu_add_prop(P_PROMPT, $1, NULL, NULL); menu_add_prop(P_PROMPT, $1, NULL, $2);
}
| prompt T_IF expr
{
menu_add_prop(P_PROMPT, $1, NULL, $3);
}; };
prompt: T_WORD prompt: T_WORD
| T_WORD_QUOTE | T_WORD_QUOTE
; ;
end: T_ENDMENU { $$ = T_ENDMENU; } end: T_ENDMENU nl_or_eof { $$ = T_ENDMENU; }
| T_ENDCHOICE { $$ = T_ENDCHOICE; } | T_ENDCHOICE nl_or_eof { $$ = T_ENDCHOICE; }
| T_ENDIF { $$ = T_ENDIF; } | T_ENDIF nl_or_eof { $$ = T_ENDIF; }
; ;
nl_or_eof: nl_or_eof:
...@@ -466,7 +498,7 @@ const char *zconf_tokenname(int token) ...@@ -466,7 +498,7 @@ const char *zconf_tokenname(int token)
case T_ENDIF: return "endif"; case T_ENDIF: return "endif";
} }
return "<token>"; return "<token>";
} }
static bool zconf_endtoken(int token, int starttoken, int endtoken) static bool zconf_endtoken(int token, int starttoken, int endtoken)
{ {
...@@ -488,7 +520,7 @@ static void zconfprint(const char *err, ...) ...@@ -488,7 +520,7 @@ static void zconfprint(const char *err, ...)
{ {
va_list ap; va_list ap;
fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno()); fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno() + 1);
va_start(ap, err); va_start(ap, err);
vfprintf(stderr, err, ap); vfprintf(stderr, err, ap);
va_end(ap); va_end(ap);
...@@ -497,7 +529,7 @@ static void zconfprint(const char *err, ...) ...@@ -497,7 +529,7 @@ static void zconfprint(const char *err, ...)
static void zconferror(const char *err) static void zconferror(const char *err)
{ {
fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno(), err); fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
} }
void print_quoted_string(FILE *out, const char *str) void print_quoted_string(FILE *out, const char *str)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7