Skip to content

L
linux
Commit a95cb3cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig updates from Michal Marek:

 - kconfig conditions can use usual less/greater than comparisons

 - kconfig warns about stray characters in Kconfig files

 - bogus expression simplification removed

 - some minor fixes

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: re-generate *.c_shipped files after previous change
  kconfig: allow use of relations other than (in)equality
  kconfig: don't silently ignore unhandled characters
  kconfig: Wrap long "make help" text lines
  scripts/kconfig/Makefile: Cosmetic fixes
  scripts/kconfig/Makefile: Fix spelling of Qt
  Kconfig: Remove bad inference rules expr_eliminate_dups2()
parents 19127af9 4a47f1eb
Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 506 deletions
scripts/kconfig/Makefile
View file @ a95cb3cd
...@@ -86,7 +86,7 @@ $(simple-targets): $(obj)/conf ...@@ -86,7 +86,7 @@ $(simple-targets): $(obj)/conf
PHONY += oldnoconfig savedefconfig defconfig PHONY += oldnoconfig savedefconfig defconfig
# oldnoconfig is an alias of olddefconfig, because people already are dependent # oldnoconfig is an alias of olddefconfig, because people already are dependent
# on its behavior(sets new symbols to their default value but not 'n') with the # on its behavior (sets new symbols to their default value but not 'n') with the
# counter-intuitive name. # counter-intuitive name.
oldnoconfig: olddefconfig oldnoconfig: olddefconfig
...@@ -126,10 +126,11 @@ tinyconfig: ...@@ -126,10 +126,11 @@ tinyconfig:
# Help text used by make help # Help text used by make help
help: help:
@echo ' config - Update current config utilising a line-oriented program' @echo ' config - Update current config utilising a line-oriented program'
@echo ' nconfig - Update current config utilising a ncurses menu based program' @echo ' nconfig - Update current config utilising a ncurses menu based'
@echo ' program'
@echo ' menuconfig - Update current config utilising a menu based program' @echo ' menuconfig - Update current config utilising a menu based program'
@echo ' xconfig - Update current config utilising a QT based front-end' @echo ' xconfig - Update current config utilising a Qt based front-end'
@echo ' gconfig - Update current config utilising a GTK based front-end' @echo ' gconfig - Update current config utilising a GTK+ based front-end'
@echo ' oldconfig - Update current config utilising a provided .config as base' @echo ' oldconfig - Update current config utilising a provided .config as base'
@echo ' localmodconfig - Update current config disabling modules not loaded' @echo ' localmodconfig - Update current config disabling modules not loaded'
@echo ' localyesconfig - Update current config converting local mods to core' @echo ' localyesconfig - Update current config converting local mods to core'
...@@ -142,7 +143,8 @@ help: ...@@ -142,7 +143,8 @@ help:
@echo ' alldefconfig - New config with all symbols set to default' @echo ' alldefconfig - New config with all symbols set to default'
@echo ' randconfig - New config with random answer to all options' @echo ' randconfig - New config with random answer to all options'
@echo ' listnewconfig - List new options' @echo ' listnewconfig - List new options'
@echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value' @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their'
@echo ' default value'
@echo ' kvmconfig - Enable additional options for kvm guest kernel support' @echo ' kvmconfig - Enable additional options for kvm guest kernel support'
@echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support'
@echo ' tinyconfig - Configure the tiniest possible kernel' @echo ' tinyconfig - Configure the tiniest possible kernel'
...@@ -163,9 +165,9 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ ...@@ -163,9 +165,9 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
# mconf: Used for the menuconfig target # mconf: Used for the menuconfig target
# Utilizes the lxdialog package # Utilizes the lxdialog package
# qconf: Used for the xconfig target # qconf: Used for the xconfig target
# Based on QT which needs to be installed to compile it # Based on Qt which needs to be installed to compile it
# gconf: Used for the gconfig target # gconf: Used for the gconfig target
# Based on GTK which needs to be installed to compile it # Based on GTK+ which needs to be installed to compile it
# object files used by all kconfig flavours # object files used by all kconfig flavours
lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
...@@ -222,11 +224,11 @@ ifeq ($(MAKECMDGOALS),xconfig) ...@@ -222,11 +224,11 @@ ifeq ($(MAKECMDGOALS),xconfig)
$(obj)/.tmp_qtcheck: $(src)/Makefile $(obj)/.tmp_qtcheck: $(src)/Makefile
-include $(obj)/.tmp_qtcheck -include $(obj)/.tmp_qtcheck
# QT needs some extra effort... # Qt needs some extra effort...
$(obj)/.tmp_qtcheck: $(obj)/.tmp_qtcheck:
@set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \ @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \
if ! pkg-config --exists QtCore 2> /dev/null; then \ if ! pkg-config --exists QtCore 2> /dev/null; then \
echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \ echo "* Unable to find the Qt4 tool qmake. Trying to use Qt3"; \
pkg-config --exists qt 2> /dev/null && pkg=qt; \ pkg-config --exists qt 2> /dev/null && pkg=qt; \
pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \ pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
if [ -n "$$pkg" ]; then \ if [ -n "$$pkg" ]; then \
...@@ -240,8 +242,8 @@ $(obj)/.tmp_qtcheck: ...@@ -240,8 +242,8 @@ $(obj)/.tmp_qtcheck:
done; \ done; \
if [ -z "$$dir" ]; then \ if [ -z "$$dir" ]; then \
echo >&2 "*"; \ echo >&2 "*"; \
echo >&2 "* Unable to find any QT installation. Please make sure that"; \ echo >&2 "* Unable to find any Qt installation. Please make sure that"; \
echo >&2 "* the QT4 or QT3 development package is correctly installed and"; \ echo >&2 "* the Qt4 or Qt3 development package is correctly installed and"; \
echo >&2 "* either qmake can be found or install pkg-config or set"; \ echo >&2 "* either qmake can be found or install pkg-config or set"; \
echo >&2 "* the QTDIR environment variable to the correct location."; \ echo >&2 "* the QTDIR environment variable to the correct location."; \
echo >&2 "*"; \ echo >&2 "*"; \
...@@ -278,7 +280,7 @@ $(obj)/gconf.o: $(obj)/.tmp_gtkcheck ...@@ -278,7 +280,7 @@ $(obj)/gconf.o: $(obj)/.tmp_gtkcheck
ifeq ($(MAKECMDGOALS),gconfig) ifeq ($(MAKECMDGOALS),gconfig)
-include $(obj)/.tmp_gtkcheck -include $(obj)/.tmp_gtkcheck
# GTK needs some extra effort, too... # GTK+ needs some extra effort, too...
$(obj)/.tmp_gtkcheck: $(obj)/.tmp_gtkcheck:
@if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \ @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \
if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \
...@@ -309,7 +311,7 @@ quiet_cmd_moc = MOC $@ ...@@ -309,7 +311,7 @@ quiet_cmd_moc = MOC $@
$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck $(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
$(call cmd,moc) $(call cmd,moc)
# Extract gconf menu items for I18N support # Extract gconf menu items for i18n support
$(obj)/gconf.glade.h: $(obj)/gconf.glade $(obj)/gconf.glade.h: $(obj)/gconf.glade
$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
$(obj)/gconf.glade $(obj)/gconf.glade
scripts/kconfig/expr.c
View file @ a95cb3cd
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
static int expr_eq(struct expr *e1, struct expr *e2); static int expr_eq(struct expr *e1, struct expr *e2);
static struct expr *expr_eliminate_yn(struct expr *e); static struct expr *expr_eliminate_yn(struct expr *e);
static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2);
static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2);
static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2);
struct expr *expr_alloc_symbol(struct symbol *sym) struct expr *expr_alloc_symbol(struct symbol *sym)
{ {
...@@ -82,6 +79,10 @@ struct expr *expr_copy(const struct expr *org) ...@@ -82,6 +79,10 @@ struct expr *expr_copy(const struct expr *org)
e->left.expr = expr_copy(org->left.expr); e->left.expr = expr_copy(org->left.expr);
break; break;
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
e->left.sym = org->left.sym; e->left.sym = org->left.sym;
e->right.sym = org->right.sym; e->right.sym = org->right.sym;
...@@ -114,6 +115,10 @@ void expr_free(struct expr *e) ...@@ -114,6 +115,10 @@ void expr_free(struct expr *e)
expr_free(e->left.expr); expr_free(e->left.expr);
return; return;
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
break; break;
case E_OR: case E_OR:
...@@ -200,6 +205,10 @@ static int expr_eq(struct expr *e1, struct expr *e2) ...@@ -200,6 +205,10 @@ static int expr_eq(struct expr *e1, struct expr *e2)
return 0; return 0;
switch (e1->type) { switch (e1->type) {
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym; return e1->left.sym == e2->left.sym && e1->right.sym == e2->right.sym;
case E_SYMBOL: case E_SYMBOL:
...@@ -559,62 +568,6 @@ static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct ...@@ -559,62 +568,6 @@ static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1, struct
#undef e2 #undef e2
} }
static void expr_eliminate_dups2(enum expr_type type, struct expr **ep1, struct expr **ep2)
{
#define e1 (*ep1)
#define e2 (*ep2)
struct expr *tmp, *tmp1, *tmp2;
if (e1->type == type) {
expr_eliminate_dups2(type, &e1->left.expr, &e2);
expr_eliminate_dups2(type, &e1->right.expr, &e2);
return;
}
if (e2->type == type) {
expr_eliminate_dups2(type, &e1, &e2->left.expr);
expr_eliminate_dups2(type, &e1, &e2->right.expr);
}
if (e1 == e2)
return;
switch (e1->type) {
case E_OR:
expr_eliminate_dups2(e1->type, &e1, &e1);
// (FOO || BAR) && (!FOO && !BAR) -> n
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_and(&tmp1, &tmp2);
if (expr_is_yes(tmp1)) {
expr_free(e1);
e1 = expr_alloc_symbol(&symbol_no);
trans_count++;
}
expr_free(tmp2);
expr_free(tmp1);
expr_free(tmp);
break;
case E_AND:
expr_eliminate_dups2(e1->type, &e1, &e1);
// (FOO && BAR) || (!FOO || !BAR) -> y
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_or(&tmp1, &tmp2);
if (expr_is_no(tmp1)) {
expr_free(e1);
e1 = expr_alloc_symbol(&symbol_yes);
trans_count++;
}
expr_free(tmp2);
expr_free(tmp1);
expr_free(tmp);
break;
default:
;
}
#undef e1
#undef e2
}
struct expr *expr_eliminate_dups(struct expr *e) struct expr *expr_eliminate_dups(struct expr *e)
{ {
int oldcount; int oldcount;
...@@ -627,7 +580,6 @@ struct expr *expr_eliminate_dups(struct expr *e) ...@@ -627,7 +580,6 @@ struct expr *expr_eliminate_dups(struct expr *e)
switch (e->type) { switch (e->type) {
case E_OR: case E_AND: case E_OR: case E_AND:
expr_eliminate_dups1(e->type, &e, &e); expr_eliminate_dups1(e->type, &e, &e);
expr_eliminate_dups2(e->type, &e, &e);
default: default:
; ;
} }
...@@ -647,6 +599,10 @@ struct expr *expr_transform(struct expr *e) ...@@ -647,6 +599,10 @@ struct expr *expr_transform(struct expr *e)
return NULL; return NULL;
switch (e->type) { switch (e->type) {
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
case E_SYMBOL: case E_SYMBOL:
case E_LIST: case E_LIST:
...@@ -719,6 +675,22 @@ struct expr *expr_transform(struct expr *e) ...@@ -719,6 +675,22 @@ struct expr *expr_transform(struct expr *e)
e = tmp; e = tmp;
e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL; e->type = e->type == E_EQUAL ? E_UNEQUAL : E_EQUAL;
break; break;
case E_LEQ:
case E_GEQ:
// !a<='x' -> a>'x'
tmp = e->left.expr;
free(e);
e = tmp;
e->type = e->type == E_LEQ ? E_GTH : E_LTH;
break;
case E_LTH:
case E_GTH:
// !a<'x' -> a>='x'
tmp = e->left.expr;
free(e);
e = tmp;
e->type = e->type == E_LTH ? E_GEQ : E_LEQ;
break;
case E_OR: case E_OR:
// !(a || b) -> !a && !b // !(a || b) -> !a && !b
tmp = e->left.expr; tmp = e->left.expr;
...@@ -789,6 +761,10 @@ int expr_contains_symbol(struct expr *dep, struct symbol *sym) ...@@ -789,6 +761,10 @@ int expr_contains_symbol(struct expr *dep, struct symbol *sym)
case E_SYMBOL: case E_SYMBOL:
return dep->left.sym == sym; return dep->left.sym == sym;
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
return dep->left.sym == sym || return dep->left.sym == sym ||
dep->right.sym == sym; dep->right.sym == sym;
...@@ -829,57 +805,6 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym) ...@@ -829,57 +805,6 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
return false; return false;
} }
static struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
{
struct expr *tmp = NULL;
expr_extract_eq(E_AND, &tmp, ep1, ep2);
if (tmp) {
*ep1 = expr_eliminate_yn(*ep1);
*ep2 = expr_eliminate_yn(*ep2);
}
return tmp;
}
static struct expr *expr_extract_eq_or(struct expr **ep1, struct expr **ep2)
{
struct expr *tmp = NULL;
expr_extract_eq(E_OR, &tmp, ep1, ep2);
if (tmp) {
*ep1 = expr_eliminate_yn(*ep1);
*ep2 = expr_eliminate_yn(*ep2);
}
return tmp;
}
static void expr_extract_eq(enum expr_type type, struct expr **ep, struct expr **ep1, struct expr **ep2)
{
#define e1 (*ep1)
#define e2 (*ep2)
if (e1->type == type) {
expr_extract_eq(type, ep, &e1->left.expr, &e2);
expr_extract_eq(type, ep, &e1->right.expr, &e2);
return;
}
if (e2->type == type) {
expr_extract_eq(type, ep, ep1, &e2->left.expr);
expr_extract_eq(type, ep, ep1, &e2->right.expr);
return;
}
if (expr_eq(e1, e2)) {
*ep = *ep ? expr_alloc_two(type, *ep, e1) : e1;
expr_free(e2);
if (type == E_AND) {
e1 = expr_alloc_symbol(&symbol_yes);
e2 = expr_alloc_symbol(&symbol_yes);
} else if (type == E_OR) {
e1 = expr_alloc_symbol(&symbol_no);
e2 = expr_alloc_symbol(&symbol_no);
}
}
#undef e1
#undef e2
}
struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym) struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym)
{ {
struct expr *e1, *e2; struct expr *e1, *e2;
...@@ -914,6 +839,10 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb ...@@ -914,6 +839,10 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
case E_NOT: case E_NOT:
return expr_trans_compare(e->left.expr, type == E_EQUAL ? E_UNEQUAL : E_EQUAL, sym); return expr_trans_compare(e->left.expr, type == E_EQUAL ? E_UNEQUAL : E_EQUAL, sym);
case E_UNEQUAL: case E_UNEQUAL:
case E_LTH:
case E_LEQ:
case E_GTH:
case E_GEQ:
case E_EQUAL: case E_EQUAL:
if (type == E_EQUAL) { if (type == E_EQUAL) {
if (sym == &symbol_yes) if (sym == &symbol_yes)
...@@ -941,10 +870,57 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb ...@@ -941,10 +870,57 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
return NULL; return NULL;
} }
enum string_value_kind {
k_string,
k_signed,
k_unsigned,
k_invalid
};
union string_value {
unsigned long long u;
signed long long s;
};
static enum string_value_kind expr_parse_string(const char *str,
enum symbol_type type,
union string_value *val)
{
char *tail;
enum string_value_kind kind;
errno = 0;
switch (type) {
case S_BOOLEAN:
case S_TRISTATE:
return k_string;
case S_INT:
val->s = strtoll(str, &tail, 10);
kind = k_signed;
break;
case S_HEX:
val->u = strtoull(str, &tail, 16);
kind = k_unsigned;
break;
case S_STRING:
case S_UNKNOWN:
val->s = strtoll(str, &tail, 0);
kind = k_signed;
break;
default:
return k_invalid;
}
return !errno && !*tail && tail > str && isxdigit(tail[-1])
? kind : k_string;
}
tristate expr_calc_value(struct expr *e) tristate expr_calc_value(struct expr *e)
{ {
tristate val1, val2; tristate val1, val2;
const char *str1, *str2; const char *str1, *str2;
enum string_value_kind k1 = k_string, k2 = k_string;
union string_value lval = {}, rval = {};
int res;
if (!e) if (!e)
return yes; return yes;
...@@ -965,21 +941,57 @@ tristate expr_calc_value(struct expr *e) ...@@ -965,21 +941,57 @@ tristate expr_calc_value(struct expr *e)
val1 = expr_calc_value(e->left.expr); val1 = expr_calc_value(e->left.expr);
return EXPR_NOT(val1); return EXPR_NOT(val1);
case E_EQUAL: case E_EQUAL:
sym_calc_value(e->left.sym); case E_GEQ:
sym_calc_value(e->right.sym); case E_GTH:
str1 = sym_get_string_value(e->left.sym); case E_LEQ:
str2 = sym_get_string_value(e->right.sym); case E_LTH:
return !strcmp(str1, str2) ? yes : no;
case E_UNEQUAL: case E_UNEQUAL:
sym_calc_value(e->left.sym); break;
sym_calc_value(e->right.sym);
str1 = sym_get_string_value(e->left.sym);
str2 = sym_get_string_value(e->right.sym);
return !strcmp(str1, str2) ? no : yes;
default: default:
printf("expr_calc_value: %d?\n", e->type); printf("expr_calc_value: %d?\n", e->type);
return no; return no;
} }
sym_calc_value(e->left.sym);
sym_calc_value(e->right.sym);
str1 = sym_get_string_value(e->left.sym);
str2 = sym_get_string_value(e->right.sym);
if (e->left.sym->type != S_STRING || e->right.sym->type != S_STRING) {
k1 = expr_parse_string(str1, e->left.sym->type, &lval);
k2 = expr_parse_string(str2, e->right.sym->type, &rval);
}
if (k1 == k_string || k2 == k_string)
res = strcmp(str1, str2);
else if (k1 == k_invalid || k2 == k_invalid) {
if (e->type != E_EQUAL && e->type != E_UNEQUAL) {
printf("Cannot compare \"%s\" and \"%s\"\n", str1, str2);
return no;
}
res = strcmp(str1, str2);
} else if (k1 == k_unsigned || k2 == k_unsigned)
res = (lval.u > rval.u) - (lval.u < rval.u);
else /* if (k1 == k_signed && k2 == k_signed) */
res = (lval.s > rval.s) - (lval.s < rval.s);
switch(e->type) {
case E_EQUAL:
return res ? no : yes;
case E_GEQ:
return res >= 0 ? yes : no;
case E_GTH:
return res > 0 ? yes : no;
case E_LEQ:
return res <= 0 ? yes : no;
case E_LTH:
return res < 0 ? yes : no;
case E_UNEQUAL:
return res ? yes : no;
default:
printf("expr_calc_value: relation %d?\n", e->type);
return no;
}
} }
static int expr_compare_type(enum expr_type t1, enum expr_type t2) static int expr_compare_type(enum expr_type t1, enum expr_type t2)
...@@ -987,6 +999,12 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2) ...@@ -987,6 +999,12 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2)
if (t1 == t2) if (t1 == t2)
return 0; return 0;
switch (t1) { switch (t1) {
case E_LEQ:
case E_LTH:
case E_GEQ:
case E_GTH:
if (t2 == E_EQUAL || t2 == E_UNEQUAL)
return 1;
case E_EQUAL: case E_EQUAL:
case E_UNEQUAL: case E_UNEQUAL:
if (t2 == E_NOT) if (t2 == E_NOT)
...@@ -1080,6 +1098,24 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * ...@@ -1080,6 +1098,24 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
fn(data, NULL, "="); fn(data, NULL, "=");
fn(data, e->right.sym, e->right.sym->name); fn(data, e->right.sym, e->right.sym->name);
break; break;
case E_LEQ:
case E_LTH:
if (e->left.sym->name)
fn(data, e->left.sym, e->left.sym->name);
else
fn(data, NULL, "<choice>");
fn(data, NULL, e->type == E_LEQ ? "<=" : "<");
fn(data, e->right.sym, e->right.sym->name);
break;
case E_GEQ:
case E_GTH:
if (e->left.sym->name)
fn(data, e->left.sym, e->left.sym->name);
else
fn(data, NULL, "<choice>");
fn(data, NULL, e->type == E_LEQ ? ">=" : ">");
fn(data, e->right.sym, e->right.sym->name);
break;
case E_UNEQUAL: case E_UNEQUAL:
if (e->left.sym->name) if (e->left.sym->name)
fn(data, e->left.sym, e->left.sym->name); fn(data, e->left.sym, e->left.sym->name);
......
scripts/kconfig/expr.h
View file @ a95cb3cd
...@@ -29,7 +29,9 @@ typedef enum tristate { ...@@ -29,7 +29,9 @@ typedef enum tristate {
} tristate; } tristate;
enum expr_type { enum expr_type {
E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE E_NONE, E_OR, E_AND, E_NOT,
E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ,
E_LIST, E_SYMBOL, E_RANGE
}; };
union expr_data { union expr_data {
......
scripts/kconfig/symbol.c
View file @ a95cb3cd
...@@ -1166,6 +1166,10 @@ static struct symbol *sym_check_expr_deps(struct expr *e) ...@@ -1166,6 +1166,10 @@ static struct symbol *sym_check_expr_deps(struct expr *e)
case E_NOT: case E_NOT:
return sym_check_expr_deps(e->left.expr); return sym_check_expr_deps(e->left.expr);
case E_EQUAL: case E_EQUAL:
case E_GEQ:
case E_GTH:
case E_LEQ:
case E_LTH:
case E_UNEQUAL: case E_UNEQUAL:
sym = sym_check_deps(e->left.sym); sym = sym_check_deps(e->left.sym);
if (sym) if (sym)
......
scripts/kconfig/zconf.l
View file @ a95cb3cd
...@@ -122,6 +122,10 @@ n [A-Za-z0-9_] ...@@ -122,6 +122,10 @@ n [A-Za-z0-9_]
"!" return T_NOT; "!" return T_NOT;
"=" return T_EQUAL; "=" return T_EQUAL;
"!=" return T_UNEQUAL; "!=" return T_UNEQUAL;
"<=" return T_LESS_EQUAL;
">=" return T_GREATER_EQUAL;
"<" return T_LESS;
">" return T_GREATER;
\"|\' { \"|\' {
str = yytext[0]; str = yytext[0];
new_string(); new_string();
...@@ -141,7 +145,12 @@ n [A-Za-z0-9_] ...@@ -141,7 +145,12 @@ n [A-Za-z0-9_]
} }
#.* /* comment */ #.* /* comment */
\\\n current_file->lineno++; \\\n current_file->lineno++;
. [[:blank:]]+
. {
fprintf(stderr,
"%s:%d:warning: ignoring unsupported character '%c'\n",
zconf_curname(), zconf_lineno(), *yytext);
}
<<EOF>> { <<EOF>> {
BEGIN(INITIAL); BEGIN(INITIAL);
} }
......
scripts/kconfig/zconf.lex.c_shipped
View file @ a95cb3cd
...@@ -365,323 +365,354 @@ int zconflineno = 1; ...@@ -365,323 +365,354 @@ int zconflineno = 1;
extern char *zconftext; extern char *zconftext;
#define yytext_ptr zconftext #define yytext_ptr zconftext
static yyconst flex_int16_t yy_nxt[][17] = static yyconst flex_int16_t yy_nxt[][19] =
{ {
{ {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0
}, },
{ {
11, 12, 13, 14, 12, 12, 15, 12, 12, 12, 11, 12, 13, 14, 12, 12, 15, 12, 12, 12,
12, 12, 12, 12, 12, 12, 12 12, 12, 12, 12, 12, 12, 12, 12, 12
}, },
{ {
11, 12, 13, 14, 12, 12, 15, 12, 12, 12, 11, 12, 13, 14, 12, 12, 15, 12, 12, 12,
12, 12, 12, 12, 12, 12, 12 12, 12, 12, 12, 12, 12, 12, 12, 12
}, },
{ {
11, 16, 16, 17, 16, 16, 16, 16, 16, 16, 11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
16, 16, 16, 18, 16, 16, 16 16, 16, 16, 18, 16, 16, 16, 16, 16
}, },
{ {
11, 16, 16, 17, 16, 16, 16, 16, 16, 16, 11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
16, 16, 16, 18, 16, 16, 16 16, 16, 16, 18, 16, 16, 16, 16, 16
}, },
{ {
11, 19, 20, 21, 19, 19, 19, 19, 19, 19, 11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19 19, 19, 19, 19, 19, 19, 19, 19, 19
}, },
{ {
11, 19, 20, 21, 19, 19, 19, 19, 19, 19, 11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19 19, 19, 19, 19, 19, 19, 19, 19, 19
}, },
{ {
11, 22, 22, 23, 22, 24, 22, 22, 24, 22, 11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
22, 22, 22, 22, 22, 25, 22 22, 22, 22, 22, 22, 22, 22, 25, 22
}, },
{ {
11, 22, 22, 23, 22, 24, 22, 22, 24, 22, 11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
22, 22, 22, 22, 22, 25, 22 22, 22, 22, 22, 22, 22, 22, 25, 22
}, },
{ {
11, 26, 26, 27, 28, 29, 30, 31, 29, 32, 11, 26, 27, 28, 29, 30, 31, 32, 30, 33,
33, 34, 35, 35, 36, 37, 38 34, 35, 36, 36, 37, 38, 39, 40, 41
}, },
{ {
11, 26, 26, 27, 28, 29, 30, 31, 29, 32, 11, 26, 27, 28, 29, 30, 31, 32, 30, 33,
33, 34, 35, 35, 36, 37, 38 34, 35, 36, 36, 37, 38, 39, 40, 41
}, },
{ {
-11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
-11, -11, -11, -11, -11, -11, -11 -11, -11, -11, -11, -11, -11, -11, -11, -11
}, },
{ {
11, -12, -12, -12, -12, -12, -12, -12, -12, -12, 11, -12, -12, -12, -12, -12, -12, -12, -12, -12,
-12, -12, -12, -12, -12, -12, -12 -12, -12, -12, -12, -12, -12, -12, -12, -12
}, },
{ {
11, -13, 39, 40, -13, -13, 41, -13, -13, -13, 11, -13, 42, 43, -13, -13, 44, -13, -13, -13,
-13, -13, -13, -13, -13, -13, -13 -13, -13, -13, -13, -13, -13, -13, -13, -13
}, },
{ {
11, -14, -14, -14, -14, -14, -14, -14, -14, -14, 11, -14, -14, -14, -14, -14, -14, -14, -14, -14,
-14, -14, -14, -14, -14, -14, -14 -14, -14, -14, -14, -14, -14, -14, -14, -14
}, },
{ {
11, 42, 42, 43, 42, 42, 42, 42, 42, 42, 11, 45, 45, 46, 45, 45, 45, 45, 45, 45,
42, 42, 42, 42, 42, 42, 42 45, 45, 45, 45, 45, 45, 45, 45, 45
}, },
{ {
11, -16, -16, -16, -16, -16, -16, -16, -16, -16, 11, -16, -16, -16, -16, -16, -16, -16, -16, -16,
-16, -16, -16, -16, -16, -16, -16 -16, -16, -16, -16, -16, -16, -16, -16, -16
}, },
{ {
11, -17, -17, -17, -17, -17, -17, -17, -17, -17, 11, -17, -17, -17, -17, -17, -17, -17, -17, -17,
-17, -17, -17, -17, -17, -17, -17 -17, -17, -17, -17, -17, -17, -17, -17, -17
}, },
{ {
11, -18, -18, -18, -18, -18, -18, -18, -18, -18, 11, -18, -18, -18, -18, -18, -18, -18, -18, -18,
-18, -18, -18, 44, -18, -18, -18 -18, -18, -18, 47, -18, -18, -18, -18, -18
}, },
{ {
11, 45, 45, -19, 45, 45, 45, 45, 45, 45, 11, 48, 48, -19, 48, 48, 48, 48, 48, 48,
45, 45, 45, 45, 45, 45, 45 48, 48, 48, 48, 48, 48, 48, 48, 48
}, },
{ {
11, -20, 46, 47, -20, -20, -20, -20, -20, -20, 11, -20, 49, 50, -20, -20, -20, -20, -20, -20,
-20, -20, -20, -20, -20, -20, -20 -20, -20, -20, -20, -20, -20, -20, -20, -20
}, },
{ {
11, 48, -21, -21, 48, 48, 48, 48, 48, 48, 11, 51, -21, -21, 51, 51, 51, 51, 51, 51,
48, 48, 48, 48, 48, 48, 48 51, 51, 51, 51, 51, 51, 51, 51, 51
}, },
{ {
11, 49, 49, 50, 49, -22, 49, 49, -22, 49, 11, 52, 52, 53, 52, -22, 52, 52, -22, 52,
49, 49, 49, 49, 49, -22, 49 52, 52, 52, 52, 52, 52, 52, -22, 52
}, },
{ {
11, -23, -23, -23, -23, -23, -23, -23, -23, -23, 11, -23, -23, -23, -23, -23, -23, -23, -23, -23,
-23, -23, -23, -23, -23, -23, -23 -23, -23, -23, -23, -23, -23, -23, -23, -23
}, },
{ {
11, -24, -24, -24, -24, -24, -24, -24, -24, -24, 11, -24, -24, -24, -24, -24, -24, -24, -24, -24,
-24, -24, -24, -24, -24, -24, -24 -24, -24, -24, -24, -24, -24, -24, -24, -24
}, },
{ {
11, 51, 51, 52, 51, 51, 51, 51, 51, 51, 11, 54, 54, 55, 54, 54, 54, 54, 54, 54,
51, 51, 51, 51, 51, 51, 51 54, 54, 54, 54, 54, 54, 54, 54, 54
}, },
{ {
11, -26, -26, -26, -26, -26, -26, -26, -26, -26, 11, -26, -26, -26, -26, -26, -26, -26, -26, -26,
-26, -26, -26, -26, -26, -26, -26 -26, -26, -26, -26, -26, -26, -26, -26, -26
}, },
{ {
11, -27, -27, -27, -27, -27, -27, -27, -27, -27, 11, -27, 56, -27, -27, -27, -27, -27, -27, -27,
-27, -27, -27, -27, -27, -27, -27 -27, -27, -27, -27, -27, -27, -27, -27, -27
}, },
{ {
11, -28, -28, -28, -28, -28, -28, -28, -28, -28, 11, -28, -28, -28, -28, -28, -28, -28, -28, -28,
-28, -28, -28, -28, 53, -28, -28 -28, -28, -28, -28, -28, -28, -28, -28, -28
}, },
{ {
11, -29, -29, -29, -29, -29, -29, -29, -29, -29, 11, -29, -29, -29, -29, -29, -29, -29, -29, -29,
-29, -29, -29, -29, -29, -29, -29 -29, -29, -29, -29, -29, 57, -29, -29, -29
}, },
{ {
11, 54, 54, -30, 54, 54, 54, 54, 54, 54, 11, -30, -30, -30, -30, -30, -30, -30, -30, -30,
54, 54, 54, 54, 54, 54, 54 -30, -30, -30, -30, -30, -30, -30, -30, -30
}, },
{ {
11, -31, -31, -31, -31, -31, -31, 55, -31, -31, 11, 58, 58, -31, 58, 58, 58, 58, 58, 58,
-31, -31, -31, -31, -31, -31, -31 58, 58, 58, 58, 58, 58, 58, 58, 58
}, },
{ {
11, -32, -32, -32, -32, -32, -32, -32, -32, -32, 11, -32, -32, -32, -32, -32, -32, 59, -32, -32,
-32, -32, -32, -32, -32, -32, -32 -32, -32, -32, -32, -32, -32, -32, -32, -32
}, },
{ {
11, -33, -33, -33, -33, -33, -33, -33, -33, -33, 11, -33, -33, -33, -33, -33, -33, -33, -33, -33,
-33, -33, -33, -33, -33, -33, -33 -33, -33, -33, -33, -33, -33, -33, -33, -33
}, },
{ {
11, -34, -34, -34, -34, -34, -34, -34, -34, -34, 11, -34, -34, -34, -34, -34, -34, -34, -34, -34,
-34, 56, 57, 57, -34, -34, -34 -34, -34, -34, -34, -34, -34, -34, -34, -34
}, },
{ {
11, -35, -35, -35, -35, -35, -35, -35, -35, -35, 11, -35, -35, -35, -35, -35, -35, -35, -35, -35,
-35, 57, 57, 57, -35, -35, -35 -35, 60, 61, 61, -35, -35, -35, -35, -35
}, },
{ {
11, -36, -36, -36, -36, -36, -36, -36, -36, -36, 11, -36, -36, -36, -36, -36, -36, -36, -36, -36,
-36, -36, -36, -36, -36, -36, -36 -36, 61, 61, 61, -36, -36, -36, -36, -36
}, },
{ {
11, -37, -37, 58, -37, -37, -37, -37, -37, -37, 11, -37, -37, -37, -37, -37, -37, -37, -37, -37,
-37, -37, -37, -37, -37, -37, -37 -37, -37, -37, -37, -37, 62, -37, -37, -37
}, },
{ {
11, -38, -38, -38, -38, -38, -38, -38, -38, -38, 11, -38, -38, -38, -38, -38, -38, -38, -38, -38,
-38, -38, -38, -38, -38, -38, 59 -38, -38, -38, -38, -38, -38, -38, -38, -38
}, },
{ {
11, -39, 39, 40, -39, -39, 41, -39, -39, -39, 11, -39, -39, -39, -39, -39, -39, -39, -39, -39,
-39, -39, -39, -39, -39, -39, -39 -39, -39, -39, -39, -39, 63, -39, -39, -39
}, },
{ {
11, -40, -40, -40, -40, -40, -40, -40, -40, -40, 11, -40, -40, 64, -40, -40, -40, -40, -40, -40,
-40, -40, -40, -40, -40, -40, -40 -40, -40, -40, -40, -40, -40, -40, -40, -40
}, },
{ {
11, 42, 42, 43, 42, 42, 42, 42, 42, 42, 11, -41, -41, -41, -41, -41, -41, -41, -41, -41,
42, 42, 42, 42, 42, 42, 42 -41, -41, -41, -41, -41, -41, -41, -41, 65
}, },
{ {
11, 42, 42, 43, 42, 42, 42, 42, 42, 42, 11, -42, 42, 43, -42, -42, 44, -42, -42, -42,
42, 42, 42, 42, 42, 42, 42 -42, -42, -42, -42, -42, -42, -42, -42, -42
}, },
{ {
11, -43, -43, -43, -43, -43, -43, -43, -43, -43, 11, -43, -43, -43, -43, -43, -43, -43, -43, -43,
-43, -43, -43, -43, -43, -43, -43 -43, -43, -43, -43, -43, -43, -43, -43, -43
}, },
{ {
11, -44, -44, -44, -44, -44, -44, -44, -44, -44, 11, 45, 45, 46, 45, 45, 45, 45, 45, 45,
-44, -44, -44, 44, -44, -44, -44 45, 45, 45, 45, 45, 45, 45, 45, 45
}, },
{ {
11, 45, 45, -45, 45, 45, 45, 45, 45, 45, 11, 45, 45, 46, 45, 45, 45, 45, 45, 45,
45, 45, 45, 45, 45, 45, 45 45, 45, 45, 45, 45, 45, 45, 45, 45
}, },
{ {
11, -46, 46, 47, -46, -46, -46, -46, -46, -46, 11, -46, -46, -46, -46, -46, -46, -46, -46, -46,
-46, -46, -46, -46, -46, -46, -46 -46, -46, -46, -46, -46, -46, -46, -46, -46
}, },
{ {
11, 48, -47, -47, 48, 48, 48, 48, 48, 48, 11, -47, -47, -47, -47, -47, -47, -47, -47, -47,
48, 48, 48, 48, 48, 48, 48 -47, -47, -47, 47, -47, -47, -47, -47, -47
}, },
{ {
11, -48, -48, -48, -48, -48, -48, -48, -48, -48, 11, 48, 48, -48, 48, 48, 48, 48, 48, 48,
-48, -48, -48, -48, -48, -48, -48 48, 48, 48, 48, 48, 48, 48, 48, 48
}, },
{ {
11, 49, 49, 50, 49, -49, 49, 49, -49, 49, 11, -49, 49, 50, -49, -49, -49, -49, -49, -49,
49, 49, 49, 49, 49, -49, 49 -49, -49, -49, -49, -49, -49, -49, -49, -49
}, },
{ {
11, -50, -50, -50, -50, -50, -50, -50, -50, -50, 11, 51, -50, -50, 51, 51, 51, 51, 51, 51,
-50, -50, -50, -50, -50, -50, -50 51, 51, 51, 51, 51, 51, 51, 51, 51
}, },
{ {
11, -51, -51, 52, -51, -51, -51, -51, -51, -51, 11, -51, -51, -51, -51, -51, -51, -51, -51, -51,
-51, -51, -51, -51, -51, -51, -51 -51, -51, -51, -51, -51, -51, -51, -51, -51
}, },
{ {
11, -52, -52, -52, -52, -52, -52, -52, -52, -52, 11, 52, 52, 53, 52, -52, 52, 52, -52, 52,
-52, -52, -52, -52, -52, -52, -52 52, 52, 52, 52, 52, 52, 52, -52, 52
}, },
{ {
11, -53, -53, -53, -53, -53, -53, -53, -53, -53, 11, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53 -53, -53, -53, -53, -53, -53, -53, -53, -53
}, },
{ {
11, 54, 54, -54, 54, 54, 54, 54, 54, 54, 11, -54, -54, 55, -54, -54, -54, -54, -54, -54,
54, 54, 54, 54, 54, 54, 54 -54, -54, -54, -54, -54, -54, -54, -54, -54
}, },
{ {
11, -55, -55, -55, -55, -55, -55, -55, -55, -55, 11, -55, -55, -55, -55, -55, -55, -55, -55, -55,
-55, -55, -55, -55, -55, -55, -55 -55, -55, -55, -55, -55, -55, -55, -55, -55
}, },
{ {
11, -56, -56, -56, -56, -56, -56, -56, -56, -56, 11, -56, 56, -56, -56, -56, -56, -56, -56, -56,
-56, 60, 57, 57, -56, -56, -56 -56, -56, -56, -56, -56, -56, -56, -56, -56
}, },
{ {
11, -57, -57, -57, -57, -57, -57, -57, -57, -57, 11, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, 57, 57, 57, -57, -57, -57 -57, -57, -57, -57, -57, -57, -57, -57, -57
}, },
{ {
11, -58, -58, -58, -58, -58, -58, -58, -58, -58, 11, 58, 58, -58, 58, 58, 58, 58, 58, 58,
-58, -58, -58, -58, -58, -58, -58 58, 58, 58, 58, 58, 58, 58, 58, 58
}, },
{ {
11, -59, -59, -59, -59, -59, -59, -59, -59, -59, 11, -59, -59, -59, -59, -59, -59, -59, -59, -59,
-59, -59, -59, -59, -59, -59, -59 -59, -59, -59, -59, -59, -59, -59, -59, -59
}, },
{ {
11, -60, -60, -60, -60, -60, -60, -60, -60, -60, 11, -60, -60, -60, -60, -60, -60, -60, -60, -60,
-60, 57, 57, 57, -60, -60, -60 -60, 66, 61, 61, -60, -60, -60, -60, -60
},
{
11, -61, -61, -61, -61, -61, -61, -61, -61, -61,
-61, 61, 61, 61, -61, -61, -61, -61, -61
},
{
11, -62, -62, -62, -62, -62, -62, -62, -62, -62,
-62, -62, -62, -62, -62, -62, -62, -62, -62
},
{
11, -63, -63, -63, -63, -63, -63, -63, -63, -63,
-63, -63, -63, -63, -63, -63, -63, -63, -63
},
{
11, -64, -64, -64, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64
},
{
11, -65, -65, -65, -65, -65, -65, -65, -65, -65,
-65, -65, -65, -65, -65, -65, -65, -65, -65
},
{
11, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, 61, 61, 61, -66, -66, -66, -66, -66
}, },
} ; } ;
...@@ -701,8 +732,8 @@ static void yy_fatal_error (yyconst char msg[] ); ...@@ -701,8 +732,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \ *yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp; (yy_c_buf_p) = yy_cp;
#define YY_NUM_RULES 33 #define YY_NUM_RULES 38
#define YY_END_OF_BUFFER 34 #define YY_END_OF_BUFFER 39
/* This struct is not used in this scanner, /* This struct is not used in this scanner,
but its presence is necessary. */ but its presence is necessary. */
struct yy_trans_info struct yy_trans_info
...@@ -710,14 +741,15 @@ struct yy_trans_info ...@@ -710,14 +741,15 @@ struct yy_trans_info
flex_int32_t yy_verify; flex_int32_t yy_verify;
flex_int32_t yy_nxt; flex_int32_t yy_nxt;
}; };
static yyconst flex_int16_t yy_accept[61] = static yyconst flex_int16_t yy_accept[67] =
{ 0, { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
34, 5, 4, 2, 3, 7, 8, 6, 32, 29, 39, 5, 4, 2, 3, 7, 8, 6, 37, 34,
31, 24, 28, 27, 26, 22, 17, 13, 16, 20, 36, 29, 33, 32, 31, 27, 26, 21, 13, 20,
22, 11, 12, 19, 19, 14, 22, 22, 4, 2, 24, 27, 11, 12, 23, 23, 18, 14, 19, 27,
3, 3, 1, 6, 32, 29, 31, 30, 24, 23, 27, 4, 2, 3, 3, 1, 6, 37, 34, 36,
26, 25, 15, 20, 9, 19, 19, 21, 10, 18 35, 29, 28, 31, 30, 26, 15, 24, 9, 23,
23, 16, 17, 25, 10, 22
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst flex_int32_t yy_ec[256] =
...@@ -727,15 +759,15 @@ static yyconst flex_int32_t yy_ec[256] = ...@@ -727,15 +759,15 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 4, 5, 6, 1, 1, 7, 8, 9, 1, 2, 4, 5, 6, 1, 1, 7, 8, 9,
10, 1, 1, 1, 11, 12, 12, 13, 13, 13, 10, 1, 1, 1, 11, 12, 12, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 1, 1, 1, 13, 13, 13, 13, 13, 13, 13, 1, 1, 14,
14, 1, 1, 1, 13, 13, 13, 13, 13, 13, 15, 16, 1, 1, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
1, 15, 1, 1, 13, 1, 13, 13, 13, 13, 1, 17, 1, 1, 13, 1, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
13, 13, 1, 16, 1, 1, 1, 1, 1, 1, 13, 13, 1, 18, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
...@@ -920,7 +952,7 @@ static int input (void ); ...@@ -920,7 +952,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} } while (0) #define ECHO fwrite( zconftext, zconfleng, 1, zconfout )
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
...@@ -1142,22 +1174,38 @@ return T_UNEQUAL; ...@@ -1142,22 +1174,38 @@ return T_UNEQUAL;
YY_BREAK YY_BREAK
case 16: case 16:
YY_RULE_SETUP YY_RULE_SETUP
return T_LESS_EQUAL;
YY_BREAK
case 17:
YY_RULE_SETUP
return T_GREATER_EQUAL;
YY_BREAK
case 18:
YY_RULE_SETUP
return T_LESS;
YY_BREAK
case 19:
YY_RULE_SETUP
return T_GREATER;
YY_BREAK
case 20:
YY_RULE_SETUP
{ {
str = zconftext[0]; str = zconftext[0];
new_string(); new_string();
BEGIN(STRING); BEGIN(STRING);
} }
YY_BREAK YY_BREAK
case 17: case 21:
/* rule 17 can match eol */ /* rule 21 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
BEGIN(INITIAL); current_file->lineno++; return T_EOL; BEGIN(INITIAL); current_file->lineno++; return T_EOL;
YY_BREAK YY_BREAK
case 18: case 22:
YY_RULE_SETUP YY_RULE_SETUP
/* ignore */ /* ignore */
YY_BREAK YY_BREAK
case 19: case 23:
YY_RULE_SETUP YY_RULE_SETUP
{ {
const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng); const struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
...@@ -1170,18 +1218,26 @@ YY_RULE_SETUP ...@@ -1170,18 +1218,26 @@ YY_RULE_SETUP
return T_WORD; return T_WORD;
} }
YY_BREAK YY_BREAK
case 20: case 24:
YY_RULE_SETUP YY_RULE_SETUP
/* comment */ /* comment */
YY_BREAK YY_BREAK
case 21: case 25:
/* rule 21 can match eol */ /* rule 25 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
current_file->lineno++; current_file->lineno++;
YY_BREAK YY_BREAK
case 22: case 26:
YY_RULE_SETUP YY_RULE_SETUP
YY_BREAK
case 27:
YY_RULE_SETUP
{
fprintf(stderr,
"%s:%d:warning: ignoring unsupported character '%c'\n",
zconf_curname(), zconf_lineno(), *zconftext);
}
YY_BREAK YY_BREAK
case YY_STATE_EOF(PARAM): case YY_STATE_EOF(PARAM):
{ {
...@@ -1189,8 +1245,8 @@ case YY_STATE_EOF(PARAM): ...@@ -1189,8 +1245,8 @@ case YY_STATE_EOF(PARAM):
} }
YY_BREAK YY_BREAK
case 23: case 28:
/* rule 23 can match eol */ /* rule 28 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ *yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1; (yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */ YY_DO_BEFORE_ACTION; /* set up zconftext again */
...@@ -1201,14 +1257,14 @@ YY_RULE_SETUP ...@@ -1201,14 +1257,14 @@ YY_RULE_SETUP
return T_WORD_QUOTE; return T_WORD_QUOTE;
} }
YY_BREAK YY_BREAK
case 24: case 29:
YY_RULE_SETUP YY_RULE_SETUP
{ {
append_string(zconftext, zconfleng); append_string(zconftext, zconfleng);
} }
YY_BREAK YY_BREAK
case 25: case 30:
/* rule 25 can match eol */ /* rule 30 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ *yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1; (yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */ YY_DO_BEFORE_ACTION; /* set up zconftext again */
...@@ -1219,13 +1275,13 @@ YY_RULE_SETUP ...@@ -1219,13 +1275,13 @@ YY_RULE_SETUP
return T_WORD_QUOTE; return T_WORD_QUOTE;
} }
YY_BREAK YY_BREAK
case 26: case 31:
YY_RULE_SETUP YY_RULE_SETUP
{ {
append_string(zconftext + 1, zconfleng - 1); append_string(zconftext + 1, zconfleng - 1);
} }
YY_BREAK YY_BREAK
case 27: case 32:
YY_RULE_SETUP YY_RULE_SETUP
{ {
if (str == zconftext[0]) { if (str == zconftext[0]) {
...@@ -1236,8 +1292,8 @@ YY_RULE_SETUP ...@@ -1236,8 +1292,8 @@ YY_RULE_SETUP
append_string(zconftext, 1); append_string(zconftext, 1);
} }
YY_BREAK YY_BREAK
case 28: case 33:
/* rule 28 can match eol */ /* rule 33 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
{ {
printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno()); printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
...@@ -1252,7 +1308,7 @@ case YY_STATE_EOF(STRING): ...@@ -1252,7 +1308,7 @@ case YY_STATE_EOF(STRING):
} }
YY_BREAK YY_BREAK
case 29: case 34:
YY_RULE_SETUP YY_RULE_SETUP
{ {
ts = 0; ts = 0;
...@@ -1277,8 +1333,8 @@ YY_RULE_SETUP ...@@ -1277,8 +1333,8 @@ YY_RULE_SETUP
} }
} }
YY_BREAK YY_BREAK
case 30: case 35:
/* rule 30 can match eol */ /* rule 35 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */ *yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
(yy_c_buf_p) = yy_cp -= 1; (yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up zconftext again */ YY_DO_BEFORE_ACTION; /* set up zconftext again */
...@@ -1289,15 +1345,15 @@ YY_RULE_SETUP ...@@ -1289,15 +1345,15 @@ YY_RULE_SETUP
return T_HELPTEXT; return T_HELPTEXT;
} }
YY_BREAK YY_BREAK
case 31: case 36:
/* rule 31 can match eol */ /* rule 36 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
{ {
current_file->lineno++; current_file->lineno++;
append_string("\n", 1); append_string("\n", 1);
} }
YY_BREAK YY_BREAK
case 32: case 37:
YY_RULE_SETUP YY_RULE_SETUP
{ {
while (zconfleng) { while (zconfleng) {
...@@ -1328,7 +1384,7 @@ case YY_STATE_EOF(COMMAND): ...@@ -1328,7 +1384,7 @@ case YY_STATE_EOF(COMMAND):
yyterminate(); yyterminate();
} }
YY_BREAK YY_BREAK
case 33: case 38:
YY_RULE_SETUP YY_RULE_SETUP
YY_FATAL_ERROR( "flex scanner jammed" ); YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK YY_BREAK
......
scripts/kconfig/zconf.tab.c_shipped
View file @ a95cb3cd
/* A Bison parser, made by GNU Bison 2.5. */ /* A Bison parser, made by GNU Bison 2.5.1. */
/* Bison implementation for Yacc-like parsers in C /* Bison implementation for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "2.5" #define YYBISON_VERSION "2.5.1"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
...@@ -108,6 +108,14 @@ static struct menu *current_menu, *current_entry; ...@@ -108,6 +108,14 @@ static struct menu *current_menu, *current_entry;
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
# define YY_NULL nullptr
# else
# define YY_NULL 0
# endif
# endif
/* Enabling traces. */ /* Enabling traces. */
#ifndef YYDEBUG #ifndef YYDEBUG
# define YYDEBUG 1 # define YYDEBUG 1
...@@ -159,13 +167,17 @@ static struct menu *current_menu, *current_entry; ...@@ -159,13 +167,17 @@ static struct menu *current_menu, *current_entry;
T_WORD = 281, T_WORD = 281,
T_WORD_QUOTE = 282, T_WORD_QUOTE = 282,
T_UNEQUAL = 283, T_UNEQUAL = 283,
T_CLOSE_PAREN = 284, T_LESS = 284,
T_OPEN_PAREN = 285, T_LESS_EQUAL = 285,
T_EOL = 286, T_GREATER = 286,
T_OR = 287, T_GREATER_EQUAL = 287,
T_AND = 288, T_CLOSE_PAREN = 288,
T_EQUAL = 289, T_OPEN_PAREN = 289,
T_NOT = 290 T_EOL = 290,
T_OR = 291,
T_AND = 292,
T_EQUAL = 293,
T_NOT = 294
}; };
#endif #endif
...@@ -304,6 +316,7 @@ YYID (yyi) ...@@ -304,6 +316,7 @@ YYID (yyi)
# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER) || defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
/* Use EXIT_SUCCESS as a witness for stdlib.h. */
# ifndef EXIT_SUCCESS # ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0 # define EXIT_SUCCESS 0
# endif # endif
...@@ -395,20 +408,20 @@ union yyalloc ...@@ -395,20 +408,20 @@ union yyalloc
#endif #endif
#if defined YYCOPY_NEEDED && YYCOPY_NEEDED #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
/* Copy COUNT objects from FROM to TO. The source and destination do /* Copy COUNT objects from SRC to DST. The source and destination do
not overlap. */ not overlap. */
# ifndef YYCOPY # ifndef YYCOPY
# if defined __GNUC__ && 1 < __GNUC__ # if defined __GNUC__ && 1 < __GNUC__
# define YYCOPY(To, From, Count) \ # define YYCOPY(Dst, Src, Count) \
__builtin_memcpy (To, From, (Count) * sizeof (*(From))) __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
# else # else
# define YYCOPY(To, From, Count) \ # define YYCOPY(Dst, Src, Count) \
do \ do \
{ \ { \
YYSIZE_T yyi; \ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \ for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \ (Dst)[yyi] = (Src)[yyi]; \
} \ } \
while (YYID (0)) while (YYID (0))
# endif # endif
# endif # endif
...@@ -417,20 +430,20 @@ union yyalloc ...@@ -417,20 +430,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */ /* YYFINAL -- State number of the termination state. */
#define YYFINAL 11 #define YYFINAL 11
/* YYLAST -- Last index in YYTABLE. */ /* YYLAST -- Last index in YYTABLE. */
#define YYLAST 290 #define YYLAST 298
/* YYNTOKENS -- Number of terminals. */ /* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 36 #define YYNTOKENS 40
/* YYNNTS -- Number of nonterminals. */ /* YYNNTS -- Number of nonterminals. */
#define YYNNTS 50 #define YYNNTS 50
/* YYNRULES -- Number of rules. */ /* YYNRULES -- Number of rules. */
#define YYNRULES 118 #define YYNRULES 122
/* YYNRULES -- Number of states. */ /* YYNRULES -- Number of states. */
#define YYNSTATES 191 #define YYNSTATES 199
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2 #define YYUNDEFTOK 2
#define YYMAXUTOK 290 #define YYMAXUTOK 294
#define YYTRANSLATE(YYX) \ #define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
...@@ -467,7 +480,7 @@ static const yytype_uint8 yytranslate[] = ...@@ -467,7 +480,7 @@ static const yytype_uint8 yytranslate[] =
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35 35, 36, 37, 38, 39
}; };
#if YYDEBUG #if YYDEBUG
...@@ -486,64 +499,67 @@ static const yytype_uint16 yyprhs[] = ...@@ -486,64 +499,67 @@ static const yytype_uint16 yyprhs[] =
235, 238, 241, 244, 248, 252, 255, 258, 261, 262, 235, 238, 241, 244, 248, 252, 255, 258, 261, 262,
265, 268, 271, 276, 277, 280, 283, 286, 287, 290, 265, 268, 271, 276, 277, 280, 283, 286, 287, 290,
292, 294, 297, 300, 303, 305, 308, 309, 312, 314, 292, 294, 297, 300, 303, 305, 308, 309, 312, 314,
318, 322, 326, 329, 333, 337, 339, 341, 342 318, 322, 326, 330, 334, 338, 342, 345, 349, 353,
355, 357, 358
}; };
/* YYRHS -- A `-1'-separated list of the rules' RHS. */ /* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] = static const yytype_int8 yyrhs[] =
{ {
37, 0, -1, 81, 38, -1, 38, -1, 63, 39, 41, 0, -1, 85, 42, -1, 42, -1, 67, 43,
-1, 39, -1, -1, 39, 41, -1, 39, 55, -1, -1, 43, -1, -1, 43, 45, -1, 43, 59, -1,
39, 67, -1, 39, 80, -1, 39, 26, 1, 31, 43, 71, -1, 43, 84, -1, 43, 26, 1, 35,
-1, 39, 40, 1, 31, -1, 39, 1, 31, -1, -1, 43, 44, 1, 35, -1, 43, 1, 35, -1,
16, -1, 18, -1, 19, -1, 21, -1, 17, -1, 16, -1, 18, -1, 19, -1, 21, -1, 17, -1,
22, -1, 20, -1, 23, -1, 31, -1, 61, -1, 22, -1, 20, -1, 23, -1, 35, -1, 65, -1,
71, -1, 44, -1, 46, -1, 69, -1, 26, 1, 75, -1, 48, -1, 50, -1, 73, -1, 26, 1,
31, -1, 1, 31, -1, 10, 26, 31, -1, 43, 35, -1, 1, 35, -1, 10, 26, 35, -1, 47,
47, -1, 11, 26, 31, -1, 45, 47, -1, -1, 51, -1, 11, 26, 35, -1, 49, 51, -1, -1,
47, 48, -1, 47, 49, -1, 47, 75, -1, 47, 51, 52, -1, 51, 53, -1, 51, 79, -1, 51,
73, -1, 47, 42, -1, 47, 31, -1, 19, 78, 77, -1, 51, 46, -1, 51, 35, -1, 19, 82,
31, -1, 18, 79, 82, 31, -1, 20, 83, 82, 35, -1, 18, 83, 86, 35, -1, 20, 87, 86,
31, -1, 21, 26, 82, 31, -1, 22, 84, 84, 35, -1, 21, 26, 86, 35, -1, 22, 88, 88,
82, 31, -1, 24, 50, 31, -1, -1, 50, 26, 86, 35, -1, 24, 54, 35, -1, -1, 54, 26,
51, -1, -1, 34, 79, -1, 7, 85, 31, -1, 55, -1, -1, 38, 83, -1, 7, 89, 35, -1,
52, 56, -1, 80, -1, 53, 58, 54, -1, -1, 56, 60, -1, 84, -1, 57, 62, 58, -1, -1,
56, 57, -1, 56, 75, -1, 56, 73, -1, 56, 60, 61, -1, 60, 79, -1, 60, 77, -1, 60,
31, -1, 56, 42, -1, 18, 79, 82, 31, -1, 35, -1, 60, 46, -1, 18, 83, 86, 35, -1,
19, 78, 31, -1, 17, 31, -1, 20, 26, 82, 19, 82, 35, -1, 17, 35, -1, 20, 26, 86,
31, -1, -1, 58, 41, -1, 14, 83, 81, -1, 35, -1, -1, 62, 45, -1, 14, 87, 85, -1,
80, -1, 59, 62, 60, -1, -1, 62, 41, -1, 84, -1, 63, 66, 64, -1, -1, 66, 45, -1,
62, 67, -1, 62, 55, -1, 3, 79, 81, -1, 66, 71, -1, 66, 59, -1, 3, 83, 85, -1,
4, 79, 31, -1, 64, 76, 74, -1, 80, -1, 4, 83, 35, -1, 68, 80, 78, -1, 84, -1,
65, 68, 66, -1, -1, 68, 41, -1, 68, 67, 69, 72, 70, -1, -1, 72, 45, -1, 72, 71,
-1, 68, 55, -1, 6, 79, 31, -1, 9, 79, -1, 72, 59, -1, 6, 83, 35, -1, 9, 83,
31, -1, 70, 74, -1, 12, 31, -1, 72, 13, 35, -1, 74, 78, -1, 12, 35, -1, 76, 13,
-1, -1, 74, 75, -1, 74, 31, -1, 74, 42, -1, -1, 78, 79, -1, 78, 35, -1, 78, 46,
-1, 16, 25, 83, 31, -1, -1, 76, 77, -1, -1, 16, 25, 87, 35, -1, -1, 80, 81, -1,
76, 31, -1, 23, 82, -1, -1, 79, 82, -1, 80, 35, -1, 23, 86, -1, -1, 83, 86, -1,
26, -1, 27, -1, 5, 31, -1, 8, 31, -1, 26, -1, 27, -1, 5, 35, -1, 8, 35, -1,
15, 31, -1, 31, -1, 81, 31, -1, -1, 14, 15, 35, -1, 35, -1, 85, 35, -1, -1, 14,
83, -1, 84, -1, 84, 34, 84, -1, 84, 28, 87, -1, 88, -1, 88, 29, 88, -1, 88, 30,
84, -1, 30, 83, 29, -1, 35, 83, -1, 83, 88, -1, 88, 31, 88, -1, 88, 32, 88, -1,
32, 83, -1, 83, 33, 83, -1, 26, -1, 27, 88, 38, 88, -1, 88, 28, 88, -1, 34, 87,
-1, -1, 26, -1 33, -1, 39, 87, -1, 87, 36, 87, -1, 87,
37, 87, -1, 26, -1, 27, -1, -1, 26, -1
}; };
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 103, 103, 103, 105, 105, 107, 109, 110, 111, 0, 108, 108, 108, 110, 110, 112, 114, 115, 116,
112, 113, 114, 118, 122, 122, 122, 122, 122, 122, 117, 118, 119, 123, 127, 127, 127, 127, 127, 127,
122, 122, 126, 127, 128, 129, 130, 131, 135, 136, 127, 127, 131, 132, 133, 134, 135, 136, 140, 141,
142, 150, 156, 164, 174, 176, 177, 178, 179, 180, 147, 155, 161, 169, 179, 181, 182, 183, 184, 185,
181, 184, 192, 198, 208, 214, 220, 223, 225, 236, 186, 189, 197, 203, 213, 219, 225, 228, 230, 241,
237, 242, 251, 256, 264, 267, 269, 270, 271, 272, 242, 247, 256, 261, 269, 272, 274, 275, 276, 277,
273, 276, 282, 293, 299, 309, 311, 316, 324, 332, 278, 281, 287, 298, 304, 314, 316, 321, 329, 337,
335, 337, 338, 339, 344, 351, 358, 363, 371, 374, 340, 342, 343, 344, 349, 356, 363, 368, 376, 379,
376, 377, 378, 381, 389, 396, 403, 409, 416, 418, 381, 382, 383, 386, 394, 401, 408, 414, 421, 423,
419, 420, 423, 431, 433, 434, 437, 444, 446, 451, 424, 425, 428, 436, 438, 439, 442, 449, 451, 456,
452, 455, 456, 457, 461, 462, 465, 466, 469, 470, 457, 460, 461, 462, 466, 467, 470, 471, 474, 475,
471, 472, 473, 474, 475, 478, 479, 482, 483 476, 477, 478, 479, 480, 481, 482, 483, 484, 487,
488, 491, 492
}; };
#endif #endif
...@@ -557,6 +573,7 @@ static const char *const yytname[] = ...@@ -557,6 +573,7 @@ static const char *const yytname[] =
"T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
"T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE", "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
"T_VISIBLE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", "T_VISIBLE", "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL",
"T_LESS", "T_LESS_EQUAL", "T_GREATER", "T_GREATER_EQUAL",
"T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL", "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL",
"T_NOT", "$accept", "input", "start", "stmt_list", "option_name", "T_NOT", "$accept", "input", "start", "stmt_list", "option_name",
"common_stmt", "option_error", "config_entry_start", "config_stmt", "common_stmt", "option_error", "config_entry_start", "config_stmt",
...@@ -568,7 +585,7 @@ static const char *const yytname[] = ...@@ -568,7 +585,7 @@ static const char *const yytname[] =
"menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt", "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt",
"comment", "comment_stmt", "help_start", "help", "depends_list", "comment", "comment_stmt", "help_start", "help", "depends_list",
"depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt", "depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt",
"end", "nl", "if_expr", "expr", "symbol", "word_opt", 0 "end", "nl", "if_expr", "expr", "symbol", "word_opt", YY_NULL
}; };
#endif #endif
...@@ -580,25 +597,26 @@ static const yytype_uint16 yytoknum[] = ...@@ -580,25 +597,26 @@ static const yytype_uint16 yytoknum[] =
0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290 285, 286, 287, 288, 289, 290, 291, 292, 293, 294
}; };
# endif # endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] = static const yytype_uint8 yyr1[] =
{ {
0, 36, 37, 37, 38, 38, 39, 39, 39, 39, 0, 40, 41, 41, 42, 42, 43, 43, 43, 43,
39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 43, 43, 43, 43, 44, 44, 44, 44, 44, 44,
40, 40, 41, 41, 41, 41, 41, 41, 42, 42, 44, 44, 45, 45, 45, 45, 45, 45, 46, 46,
43, 44, 45, 46, 47, 47, 47, 47, 47, 47, 47, 48, 49, 50, 51, 51, 51, 51, 51, 51,
47, 48, 48, 48, 48, 48, 49, 50, 50, 51, 51, 52, 52, 52, 52, 52, 53, 54, 54, 55,
51, 52, 53, 54, 55, 56, 56, 56, 56, 56, 55, 56, 57, 58, 59, 60, 60, 60, 60, 60,
56, 57, 57, 57, 57, 58, 58, 59, 60, 61, 60, 61, 61, 61, 61, 62, 62, 63, 64, 65,
62, 62, 62, 62, 63, 64, 65, 66, 67, 68, 66, 66, 66, 66, 67, 68, 69, 70, 71, 72,
68, 68, 68, 69, 70, 71, 72, 73, 74, 74, 72, 72, 72, 73, 74, 75, 76, 77, 78, 78,
74, 74, 75, 76, 76, 76, 77, 78, 78, 79, 78, 78, 79, 80, 80, 80, 81, 82, 82, 83,
79, 80, 80, 80, 81, 81, 82, 82, 83, 83, 83, 84, 84, 84, 85, 85, 86, 86, 87, 87,
83, 83, 83, 83, 83, 84, 84, 85, 85 87, 87, 87, 87, 87, 87, 87, 87, 87, 88,
88, 89, 89
}; };
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
...@@ -615,7 +633,8 @@ static const yytype_uint8 yyr2[] = ...@@ -615,7 +633,8 @@ static const yytype_uint8 yyr2[] =
2, 2, 2, 3, 3, 2, 2, 2, 0, 2, 2, 2, 2, 3, 3, 2, 2, 2, 0, 2,
2, 2, 4, 0, 2, 2, 2, 0, 2, 1, 2, 2, 4, 0, 2, 2, 2, 0, 2, 1,
1, 2, 2, 2, 1, 2, 0, 2, 1, 3, 1, 2, 2, 2, 1, 2, 0, 2, 1, 3,
3, 3, 2, 3, 3, 1, 1, 0, 1 3, 3, 3, 3, 3, 3, 2, 3, 3, 1,
1, 0, 1
}; };
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
...@@ -624,72 +643,72 @@ static const yytype_uint8 yyr2[] = ...@@ -624,72 +643,72 @@ static const yytype_uint8 yyr2[] =
static const yytype_uint8 yydefact[] = static const yytype_uint8 yydefact[] =
{ {
6, 0, 104, 0, 3, 0, 6, 6, 99, 100, 6, 0, 104, 0, 3, 0, 6, 6, 99, 100,
0, 1, 0, 0, 0, 0, 117, 0, 0, 0, 0, 1, 0, 0, 0, 0, 121, 0, 0, 0,
0, 0, 0, 14, 18, 15, 16, 20, 17, 19, 0, 0, 0, 14, 18, 15, 16, 20, 17, 19,
21, 0, 22, 0, 7, 34, 25, 34, 26, 55, 21, 0, 22, 0, 7, 34, 25, 34, 26, 55,
65, 8, 70, 23, 93, 79, 9, 27, 88, 24, 65, 8, 70, 23, 93, 79, 9, 27, 88, 24,
10, 0, 105, 2, 74, 13, 0, 101, 0, 118, 10, 0, 105, 2, 74, 13, 0, 101, 0, 122,
0, 102, 0, 0, 0, 115, 116, 0, 0, 0, 0, 102, 0, 0, 0, 119, 120, 0, 0, 0,
108, 103, 0, 0, 0, 0, 0, 0, 0, 88, 108, 103, 0, 0, 0, 0, 0, 0, 0, 88,
0, 0, 75, 83, 51, 84, 30, 32, 0, 112, 0, 0, 75, 83, 51, 84, 30, 32, 0, 116,
0, 0, 67, 0, 0, 11, 12, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 11,
0, 97, 0, 0, 0, 47, 0, 40, 39, 35, 12, 0, 0, 0, 0, 97, 0, 0, 0, 47,
36, 0, 38, 37, 0, 0, 97, 0, 59, 60, 0, 40, 39, 35, 36, 0, 38, 37, 0, 0,
56, 58, 57, 66, 54, 53, 71, 73, 69, 72, 97, 0, 59, 60, 56, 58, 57, 66, 54, 53,
68, 106, 95, 0, 94, 80, 82, 78, 81, 77, 71, 73, 69, 72, 68, 106, 95, 0, 94, 80,
90, 91, 89, 111, 113, 114, 110, 109, 29, 86, 82, 78, 81, 77, 90, 91, 89, 115, 117, 118,
0, 106, 0, 106, 106, 106, 0, 0, 0, 87, 114, 109, 110, 111, 112, 113, 29, 86, 0, 106,
63, 106, 0, 106, 0, 96, 0, 0, 41, 98, 0, 106, 106, 106, 0, 0, 0, 87, 63, 106,
0, 0, 106, 49, 46, 28, 0, 62, 0, 107, 0, 106, 0, 96, 0, 0, 41, 98, 0, 0,
92, 42, 43, 44, 0, 0, 48, 61, 64, 45, 106, 49, 46, 28, 0, 62, 0, 107, 92, 42,
50 43, 44, 0, 0, 48, 61, 64, 45, 50
}; };
/* YYDEFGOTO[NTERM-NUM]. */ /* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] = static const yytype_int16 yydefgoto[] =
{ {
-1, 3, 4, 5, 33, 34, 108, 35, 36, 37, -1, 3, 4, 5, 33, 34, 112, 35, 36, 37,
38, 74, 109, 110, 157, 186, 39, 40, 124, 41, 38, 74, 113, 114, 165, 194, 39, 40, 128, 41,
76, 120, 77, 42, 128, 43, 78, 6, 44, 45, 76, 124, 77, 42, 132, 43, 78, 6, 44, 45,
137, 46, 80, 47, 48, 49, 111, 112, 81, 113, 141, 46, 80, 47, 48, 49, 115, 116, 81, 117,
79, 134, 152, 153, 50, 7, 165, 69, 70, 60 79, 138, 160, 161, 50, 7, 173, 69, 70, 60
}; };
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */ STATE-NUM. */
#define YYPACT_NINF -90 #define YYPACT_NINF -91
static const yytype_int16 yypact[] = static const yytype_int16 yypact[] =
{ {
4, 42, -90, 96, -90, 111, -90, 15, -90, -90, 19, 37, -91, 13, -91, 79, -91, 20, -91, -91,
75, -90, 82, 42, 104, 42, 110, 107, 42, 115, -16, -91, 21, 37, 25, 37, 41, 36, 37, 78,
125, -4, 121, -90, -90, -90, -90, -90, -90, -90, 83, 31, 56, -91, -91, -91, -91, -91, -91, -91,
-90, 162, -90, 163, -90, -90, -90, -90, -90, -90, -91, 116, -91, 127, -91, -91, -91, -91, -91, -91,
-90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-90, 139, -90, -90, 138, -90, 142, -90, 143, -90, -91, 147, -91, -91, 105, -91, 109, -91, 111, -91,
152, -90, 164, 167, 168, -90, -90, -4, -4, 77, 114, -91, 136, 137, 142, -91, -91, 31, 31, 76,
-18, -90, 177, 185, 33, 71, 195, 247, 236, -2, 254, -91, 143, 146, 27, 115, 207, 258, 243, -14,
236, 171, -90, -90, -90, -90, -90, -90, 41, -90, 243, 179, -91, -91, -91, -91, -91, -91, -7, -91,
-4, -4, 138, 97, 97, -90, -90, 186, 187, 194, 31, 31, 105, 51, 51, 51, 51, 51, 51, -91,
42, 42, -4, 196, 97, -90, 219, -90, -90, -90, -91, 156, 168, 181, 37, 37, 31, 178, 51, -91,
-90, 210, -90, -90, 204, 42, 42, 199, -90, -90, 206, -91, -91, -91, -91, 196, -91, -91, 175, 37,
-90, -90, -90, -90, -90, -90, -90, -90, -90, -90, 37, 185, -91, -91, -91, -91, -91, -91, -91, -91,
-90, 222, -90, 223, -90, -90, -90, -90, -90, -90, -91, -91, -91, -91, -91, 214, -91, 230, -91, -91,
-90, -90, -90, -90, 215, -90, -90, -90, -90, -90, -91, -91, -91, -91, -91, -91, -91, -91, 183, -91,
-4, 222, 228, 222, -5, 222, 97, 35, 229, -90, -91, -91, -91, -91, -91, -91, -91, -91, 31, 214,
-90, 222, 232, 222, -4, -90, 135, 233, -90, -90, 194, 214, 45, 214, 51, 26, 195, -91, -91, 214,
234, 235, 222, 240, -90, -90, 237, -90, 239, -13, 197, 214, 31, -91, 139, 208, -91, -91, 220, 224,
-90, -90, -90, -90, 244, 42, -90, -90, -90, -90, 214, 222, -91, -91, 226, -91, 227, 123, -91, -91,
-90 -91, -91, 235, 37, -91, -91, -91, -91, -91
}; };
/* YYPGOTO[NTERM-NUM]. */ /* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] = static const yytype_int16 yypgoto[] =
{ {
-90, -90, 269, 271, -90, 23, -70, -90, -90, -90, -91, -91, 264, 268, -91, 30, -65, -91, -91, -91,
-90, 243, -90, -90, -90, -90, -90, -90, -90, -48, -91, 238, -91, -91, -91, -91, -91, -91, -91, -12,
-90, -90, -90, -90, -90, -90, -90, -90, -90, -90, -91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
-90, -20, -90, -90, -90, -90, -90, 206, 205, -68, -91, -5, -91, -91, -91, -91, -91, 200, 209, -61,
-90, -90, 169, -1, 27, -7, 118, -66, -89, -90 -91, -91, 170, -1, 65, 0, 118, -66, -90, -91
}; };
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
...@@ -698,102 +717,102 @@ static const yytype_int16 yypgoto[] = ...@@ -698,102 +717,102 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -86 #define YYTABLE_NINF -86
static const yytype_int16 yytable[] = static const yytype_int16 yytable[] =
{ {
10, 88, 89, 54, 146, 147, 119, 1, 122, 164, 10, 88, 89, 150, 151, 152, 153, 154, 155, 135,
93, 141, 56, 142, 58, 156, 94, 62, 1, 90, 54, 123, 56, 11, 58, 126, 145, 62, 164, 2,
91, 131, 65, 66, 144, 145, 67, 90, 91, 132, 146, 136, 1, 1, 148, 149, 147, -31, 101, 90,
127, 68, 136, -31, 97, 2, 154, -31, -31, -31, 91, -31, -31, -31, -31, -31, -31, -31, -31, 102,
-31, -31, -31, -31, -31, 98, 52, -31, -31, 99, 162, -31, -31, 103, -31, 104, 105, 106, 107, 108,
-31, 100, 101, 102, 103, 104, -31, 105, 129, 106, -31, 109, 181, 110, 2, 52, 55, 65, 66, 172,
138, 173, 92, 141, 107, 142, 174, 172, 8, 9, 57, 182, 111, 8, 9, 67, 131, 59, 140, 92,
143, -33, 97, 90, 91, -33, -33, -33, -33, -33, 68, 61, 145, 133, 180, 142, 146, 65, 66, -5,
-33, -33, -33, 98, 166, -33, -33, 99, -33, 100, 12, 90, 91, 13, 14, 15, 16, 17, 18, 19,
101, 102, 103, 104, -33, 105, 11, 106, 179, 151, 20, 71, 174, 21, 22, 23, 24, 25, 26, 27,
123, 126, 107, 135, 125, 130, 2, 139, 2, 90, 28, 29, 30, 159, 63, 31, 187, 127, 130, 64,
91, -5, 12, 55, 161, 13, 14, 15, 16, 17, 139, 2, 90, 91, 32, -33, 101, 72, 169, -33,
18, 19, 20, 65, 66, 21, 22, 23, 24, 25, -33, -33, -33, -33, -33, -33, -33, 102, 73, -33,
26, 27, 28, 29, 30, 57, 59, 31, 61, -4, -33, 103, -33, 104, 105, 106, 107, 108, -33, 109,
12, 63, 32, 13, 14, 15, 16, 17, 18, 19, 52, 110, 129, 134, 82, 143, 83, -4, 12, 84,
20, 64, 71, 21, 22, 23, 24, 25, 26, 27, 111, 13, 14, 15, 16, 17, 18, 19, 20, 90,
28, 29, 30, 72, 73, 31, 180, 90, 91, 52, 91, 21, 22, 23, 24, 25, 26, 27, 28, 29,
32, -85, 97, 82, 83, -85, -85, -85, -85, -85, 30, 85, 86, 31, 188, 90, 91, 87, 99, -85,
-85, -85, -85, 84, 190, -85, -85, 99, -85, -85, 101, 100, 32, -85, -85, -85, -85, -85, -85, -85,
-85, -85, -85, -85, -85, 85, 97, 106, 86, 87, -85, 156, 198, -85, -85, 103, -85, -85, -85, -85,
-52, -52, 140, -52, -52, -52, -52, 98, 95, -52, -85, -85, -85, 157, 163, 110, 158, 166, 101, 167,
-52, 99, 114, 115, 116, 117, 96, 148, 149, 150, 168, 171, -52, -52, 144, -52, -52, -52, -52, 102,
158, 106, 155, 159, 97, 163, 118, -76, -76, -76, 91, -52, -52, 103, 118, 119, 120, 121, 172, 176,
-76, -76, -76, -76, -76, 160, 164, -76, -76, 99, 183, 101, 185, 110, -76, -76, -76, -76, -76, -76,
13, 14, 15, 16, 17, 18, 19, 20, 91, 106, -76, -76, 122, 189, -76, -76, 103, 13, 14, 15,
21, 22, 14, 15, 140, 17, 18, 19, 20, 168, 16, 17, 18, 19, 20, 190, 110, 21, 22, 191,
175, 21, 22, 177, 181, 182, 183, 32, 187, 167, 193, 195, 196, 14, 15, 144, 17, 18, 19, 20,
188, 169, 170, 171, 185, 189, 53, 51, 32, 176, 197, 53, 21, 22, 51, 75, 125, 175, 32, 177,
75, 178, 121, 0, 133, 162, 0, 0, 0, 0, 178, 179, 93, 94, 95, 96, 97, 184, 137, 186,
184 170, 0, 98, 32, 0, 0, 0, 0, 192
}; };
#define yypact_value_is_default(yystate) \ #define yypact_value_is_default(yystate) \
((yystate) == (-90)) ((yystate) == (-91))
#define yytable_value_is_error(yytable_value) \ #define yytable_value_is_error(yytable_value) \
YYID (0) YYID (0)
static const yytype_int16 yycheck[] = static const yytype_int16 yycheck[] =
{ {
1, 67, 68, 10, 93, 94, 76, 3, 76, 14, 1, 67, 68, 93, 94, 95, 96, 97, 98, 23,
28, 81, 13, 81, 15, 104, 34, 18, 3, 32, 10, 76, 13, 0, 15, 76, 81, 18, 108, 35,
33, 23, 26, 27, 90, 91, 30, 32, 33, 31, 81, 35, 3, 3, 90, 91, 33, 0, 1, 36,
78, 35, 80, 0, 1, 31, 102, 4, 5, 6, 37, 4, 5, 6, 7, 8, 9, 10, 11, 12,
7, 8, 9, 10, 11, 12, 31, 14, 15, 16, 106, 14, 15, 16, 17, 18, 19, 20, 21, 22,
17, 18, 19, 20, 21, 22, 23, 24, 78, 26, 23, 24, 26, 26, 35, 35, 35, 26, 27, 14,
80, 26, 69, 133, 31, 133, 31, 156, 26, 27, 35, 35, 35, 26, 27, 34, 78, 26, 80, 69,
29, 0, 1, 32, 33, 4, 5, 6, 7, 8, 39, 35, 137, 78, 164, 80, 137, 26, 27, 0,
9, 10, 11, 12, 150, 14, 15, 16, 17, 18, 1, 36, 37, 4, 5, 6, 7, 8, 9, 10,
19, 20, 21, 22, 23, 24, 0, 26, 164, 100, 11, 35, 158, 14, 15, 16, 17, 18, 19, 20,
77, 78, 31, 80, 77, 78, 31, 80, 31, 32, 21, 22, 23, 104, 26, 26, 172, 77, 78, 26,
33, 0, 1, 31, 115, 4, 5, 6, 7, 8, 80, 35, 36, 37, 35, 0, 1, 1, 119, 4,
9, 10, 11, 26, 27, 14, 15, 16, 17, 18, 5, 6, 7, 8, 9, 10, 11, 12, 1, 14,
19, 20, 21, 22, 23, 31, 26, 26, 31, 0, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
1, 26, 31, 4, 5, 6, 7, 8, 9, 10, 35, 26, 77, 78, 35, 80, 35, 0, 1, 35,
11, 26, 31, 14, 15, 16, 17, 18, 19, 20, 35, 4, 5, 6, 7, 8, 9, 10, 11, 36,
21, 22, 23, 1, 1, 26, 31, 32, 33, 31, 37, 14, 15, 16, 17, 18, 19, 20, 21, 22,
31, 0, 1, 31, 31, 4, 5, 6, 7, 8, 23, 35, 35, 26, 35, 36, 37, 35, 35, 0,
9, 10, 11, 31, 185, 14, 15, 16, 17, 18, 1, 35, 35, 4, 5, 6, 7, 8, 9, 10,
19, 20, 21, 22, 23, 31, 1, 26, 31, 31, 11, 35, 193, 14, 15, 16, 17, 18, 19, 20,
5, 6, 31, 8, 9, 10, 11, 12, 31, 14, 21, 22, 23, 35, 26, 26, 25, 1, 1, 13,
15, 16, 17, 18, 19, 20, 31, 31, 31, 25, 35, 26, 5, 6, 35, 8, 9, 10, 11, 12,
1, 26, 26, 13, 1, 26, 31, 4, 5, 6, 37, 14, 15, 16, 17, 18, 19, 20, 14, 35,
7, 8, 9, 10, 11, 31, 14, 14, 15, 16, 35, 1, 35, 26, 4, 5, 6, 7, 8, 9,
4, 5, 6, 7, 8, 9, 10, 11, 33, 26, 10, 11, 35, 35, 14, 15, 16, 4, 5, 6,
14, 15, 5, 6, 31, 8, 9, 10, 11, 31, 7, 8, 9, 10, 11, 35, 26, 14, 15, 35,
31, 14, 15, 31, 31, 31, 31, 31, 31, 151, 38, 35, 35, 5, 6, 35, 8, 9, 10, 11,
31, 153, 154, 155, 34, 31, 7, 6, 31, 161, 35, 7, 14, 15, 6, 37, 76, 159, 35, 161,
37, 163, 76, -1, 79, 116, -1, -1, -1, -1, 162, 163, 28, 29, 30, 31, 32, 169, 79, 171,
172 120, -1, 38, 35, -1, -1, -1, -1, 180
}; };
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */ symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] = static const yytype_uint8 yystos[] =
{ {
0, 3, 31, 37, 38, 39, 63, 81, 26, 27, 0, 3, 35, 41, 42, 43, 67, 85, 26, 27,
79, 0, 1, 4, 5, 6, 7, 8, 9, 10, 83, 0, 1, 4, 5, 6, 7, 8, 9, 10,
11, 14, 15, 16, 17, 18, 19, 20, 21, 22, 11, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 26, 31, 40, 41, 43, 44, 45, 46, 52, 23, 26, 35, 44, 45, 47, 48, 49, 50, 56,
53, 55, 59, 61, 64, 65, 67, 69, 70, 71, 57, 59, 63, 65, 68, 69, 71, 73, 74, 75,
80, 39, 31, 38, 81, 31, 79, 31, 79, 26, 84, 43, 35, 42, 85, 35, 83, 35, 83, 26,
85, 31, 79, 26, 26, 26, 27, 30, 35, 83, 89, 35, 83, 26, 26, 26, 27, 34, 39, 87,
84, 31, 1, 1, 47, 47, 56, 58, 62, 76, 88, 35, 1, 1, 51, 51, 60, 62, 66, 80,
68, 74, 31, 31, 31, 31, 31, 31, 83, 83, 72, 78, 35, 35, 35, 35, 35, 35, 87, 87,
32, 33, 81, 28, 34, 31, 31, 1, 12, 16, 36, 37, 85, 28, 29, 30, 31, 32, 38, 35,
18, 19, 20, 21, 22, 24, 26, 31, 42, 48, 35, 1, 12, 16, 18, 19, 20, 21, 22, 24,
49, 72, 73, 75, 17, 18, 19, 20, 31, 42, 26, 35, 46, 52, 53, 76, 77, 79, 17, 18,
57, 73, 75, 41, 54, 80, 41, 55, 60, 67, 19, 20, 35, 46, 61, 77, 79, 45, 58, 84,
80, 23, 31, 74, 77, 41, 55, 66, 67, 80, 45, 59, 64, 71, 84, 23, 35, 78, 81, 45,
31, 42, 75, 29, 83, 83, 84, 84, 31, 31, 59, 70, 71, 84, 35, 46, 79, 33, 87, 87,
25, 79, 78, 79, 83, 26, 84, 50, 1, 13, 88, 88, 88, 88, 88, 88, 35, 35, 25, 83,
31, 79, 78, 26, 14, 82, 83, 82, 31, 82, 82, 83, 87, 26, 88, 54, 1, 13, 35, 83,
82, 82, 84, 26, 31, 31, 82, 31, 82, 83, 82, 26, 14, 86, 87, 86, 35, 86, 86, 86,
31, 31, 31, 31, 82, 34, 51, 31, 31, 31, 88, 26, 35, 35, 86, 35, 86, 87, 35, 35,
79 35, 35, 86, 38, 55, 35, 35, 35, 83
}; };
#define yyerrok (yyerrstatus = 0) #define yyerrok (yyerrstatus = 0)
...@@ -823,17 +842,18 @@ static const yytype_uint8 yystos[] = ...@@ -823,17 +842,18 @@ static const yytype_uint8 yystos[] =
#define YYRECOVERING() (!!yyerrstatus) #define YYRECOVERING() (!!yyerrstatus)
#define YYBACKUP(Token, Value) \ #define YYBACKUP(Token, Value) \
do \ do \
if (yychar == YYEMPTY && yylen == 1) \ if (yychar == YYEMPTY) \
{ \ { \
yychar = (Token); \ yychar = (Token); \
yylval = (Value); \ yylval = (Value); \
YYPOPSTACK (1); \ YYPOPSTACK (yylen); \
goto yybackup; \ yystate = *yyssp; \
} \ goto yybackup; \
else \ } \
{ \ else \
{ \
yyerror (YY_("syntax error: cannot back up")); \ yyerror (YY_("syntax error: cannot back up")); \
YYERROR; \ YYERROR; \
} \ } \
...@@ -928,6 +948,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) ...@@ -928,6 +948,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
YYSTYPE const * const yyvaluep; YYSTYPE const * const yyvaluep;
#endif #endif
{ {
FILE *yyo = yyoutput;
YYUSE (yyo);
if (!yyvaluep) if (!yyvaluep)
return; return;
# ifdef YYPRINT # ifdef YYPRINT
...@@ -1179,12 +1201,12 @@ static int ...@@ -1179,12 +1201,12 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken) yytype_int16 *yyssp, int yytoken)
{ {
YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
YYSIZE_T yysize = yysize0; YYSIZE_T yysize = yysize0;
YYSIZE_T yysize1; YYSIZE_T yysize1;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */ /* Internationalized format string. */
const char *yyformat = 0; const char *yyformat = YY_NULL;
/* Arguments of yyformat. */ /* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per /* Number of reported tokens (one for the "unexpected", one per
...@@ -1244,7 +1266,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, ...@@ -1244,7 +1266,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
break; break;
} }
yyarg[yycount++] = yytname[yyx]; yyarg[yycount++] = yytname[yyx];
yysize1 = yysize + yytnamerr (0, yytname[yyx]); yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
if (! (yysize <= yysize1 if (! (yysize <= yysize1
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM)) && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
return 2; return 2;
...@@ -1329,7 +1351,7 @@ yydestruct (yymsg, yytype, yyvaluep) ...@@ -1329,7 +1351,7 @@ yydestruct (yymsg, yytype, yyvaluep)
switch (yytype) switch (yytype)
{ {
case 53: /* "choice_entry" */ case 57: /* "choice_entry" */
{ {
fprintf(stderr, "%s:%d: missing end statement for this entry\n", fprintf(stderr, "%s:%d: missing end statement for this entry\n",
...@@ -1339,7 +1361,7 @@ yydestruct (yymsg, yytype, yyvaluep) ...@@ -1339,7 +1361,7 @@ yydestruct (yymsg, yytype, yyvaluep)
}; };
break; break;
case 59: /* "if_entry" */ case 63: /* "if_entry" */
{ {
fprintf(stderr, "%s:%d: missing end statement for this entry\n", fprintf(stderr, "%s:%d: missing end statement for this entry\n",
...@@ -1349,7 +1371,7 @@ yydestruct (yymsg, yytype, yyvaluep) ...@@ -1349,7 +1371,7 @@ yydestruct (yymsg, yytype, yyvaluep)
}; };
break; break;
case 65: /* "menu_entry" */ case 69: /* "menu_entry" */
{ {
fprintf(stderr, "%s:%d: missing end statement for this entry\n", fprintf(stderr, "%s:%d: missing end statement for this entry\n",
...@@ -1426,7 +1448,7 @@ yyparse () ...@@ -1426,7 +1448,7 @@ yyparse ()
`yyss': related to states. `yyss': related to states.
`yyvs': related to semantic values. `yyvs': related to semantic values.
Refer to the stacks thru separate pointers, to allow yyoverflow Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */ to reallocate them elsewhere. */
/* The state stack. */ /* The state stack. */
...@@ -2012,46 +2034,66 @@ yyreduce: ...@@ -2012,46 +2034,66 @@ yyreduce:
case 109: case 109:
{ (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); } { (yyval.expr) = expr_alloc_comp(E_LTH, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 110: case 110:
{ (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); } { (yyval.expr) = expr_alloc_comp(E_LEQ, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 111: case 111:
{ (yyval.expr) = (yyvsp[(2) - (3)].expr); } { (yyval.expr) = expr_alloc_comp(E_GTH, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 112: case 112:
{ (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); } { (yyval.expr) = expr_alloc_comp(E_GEQ, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 113: case 113:
{ (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 114: case 114:
{ (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); }
break; break;
case 115: case 115:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); } { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
break; break;
case 116: case 116:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); } { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); }
break; break;
case 117: case 117:
{ (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
break;
case 118:
{ (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); }
break;
case 119:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); }
break;
case 120:
{ (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); }
break;
case 121:
{ (yyval.string) = NULL; } { (yyval.string) = NULL; }
break; break;
...@@ -2243,7 +2285,7 @@ yyabortlab: ...@@ -2243,7 +2285,7 @@ yyabortlab:
yyresult = 1; yyresult = 1;
goto yyreturn; goto yyreturn;
#if !defined(yyoverflow) || YYERROR_VERBOSE #if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------. /*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. | | yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/ `-------------------------------------------------*/
......
scripts/kconfig/zconf.y
View file @ a95cb3cd
...@@ -69,6 +69,10 @@ static struct menu *current_menu, *current_entry; ...@@ -69,6 +69,10 @@ static struct menu *current_menu, *current_entry;
%token <string> T_WORD %token <string> T_WORD
%token <string> T_WORD_QUOTE %token <string> T_WORD_QUOTE
%token T_UNEQUAL %token T_UNEQUAL
%token T_LESS
%token T_LESS_EQUAL
%token T_GREATER
%token T_GREATER_EQUAL
%token T_CLOSE_PAREN %token T_CLOSE_PAREN
%token T_OPEN_PAREN %token T_OPEN_PAREN
%token T_EOL %token T_EOL
...@@ -76,6 +80,7 @@ static struct menu *current_menu, *current_entry; ...@@ -76,6 +80,7 @@ static struct menu *current_menu, *current_entry;
%left T_OR %left T_OR
%left T_AND %left T_AND
%left T_EQUAL T_UNEQUAL %left T_EQUAL T_UNEQUAL
%left T_LESS T_LESS_EQUAL T_GREATER T_GREATER_EQUAL
%nonassoc T_NOT %nonassoc T_NOT
%type <string> prompt %type <string> prompt
...@@ -467,6 +472,10 @@ if_expr: /* empty */ { $$ = NULL; } ...@@ -467,6 +472,10 @@ if_expr: /* empty */ { $$ = NULL; }
; ;
expr: symbol { $$ = expr_alloc_symbol($1); } expr: symbol { $$ = expr_alloc_symbol($1); }
| symbol T_LESS symbol { $$ = expr_alloc_comp(E_LTH, $1, $3); }
| symbol T_LESS_EQUAL symbol { $$ = expr_alloc_comp(E_LEQ, $1, $3); }
| symbol T_GREATER symbol { $$ = expr_alloc_comp(E_GTH, $1, $3); }
| symbol T_GREATER_EQUAL symbol { $$ = expr_alloc_comp(E_GEQ, $1, $3); }
| symbol T_EQUAL symbol { $$ = expr_alloc_comp(E_EQUAL, $1, $3); } | symbol T_EQUAL symbol { $$ = expr_alloc_comp(E_EQUAL, $1, $3); }
| symbol T_UNEQUAL symbol { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); } | symbol T_UNEQUAL symbol { $$ = expr_alloc_comp(E_UNEQUAL, $1, $3); }
| T_OPEN_PAREN expr T_CLOSE_PAREN { $$ = $2; } | T_OPEN_PAREN expr T_CLOSE_PAREN { $$ = $2; }
......
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