|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH] build: sync Kconfig with Linux v4.17
Hi Doug,
(I am the guy talked with you about kconfig in Nanjing's summit)
I don't completely go through your patch and of course don't know all
the background, so here is just some comments FYI.
1. silentoldconfig(will be renamed to syncconfig) is for kbuild internal
use, which take .config as input, then output many other files. And you
will see it fails when "make silentoldconfig" in clean src. So, is it
good to expose silentoldconfig/syncconfig to user in xen/Makefile?
2. During my test, I see the host program is compiled every time I "make
-C xen/ menuconfig".
3. savedefconfig don't work? it can produce the xen/defconfig, but how
can use it? In linux kernel, we would do:
cp defconfig arch/$(ARCH)/my_cool_defconfig
and use it with:
make my_cool_defconfig
--
Sincerely,
Cao jin
On 06/21/2018 10:10 AM, dougtrav@xxxxxxxxxx wrote:
> From: Doug Goldstein <cardoe@xxxxxxxxxx>
>
> From: Doug Goldstein <cardoe@xxxxxxxxxx>
>
> Import the following files and directories from the Linux v4.17 tag
> (commit id 29dcea88779c856c7dc92040a0c01233263101d4):
> - scripts/kconfig/ -> xen/tools/kconfig/
> - scripts/Makefile.host -> xen/tools/kconfig/Makefile.host
> - Documentation/kbuild/kconfig{,-language}.txt ->
> docs/misc/kconfig{-language}.txt
> - include/linux/kconfig.h -> xen/include/xen/kconfig.h
>
> Pulled in parts of scripts/Makefile.lib into
> xen/tools/kconfig/Makefile.kconfig
>
> Side effect of this change is that flex and bison are required to build
> Kconfig. Linux has switched from shipping the pre-generated files to
> always generating them with flex and bison.
>
> Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
> ---
> So this makes flex & bison required to build Kconfig which means to
> build the hypervisor now these are required. These are already
> documented in the README as required but that was previously just for
> the toolstack. Since these are GNU utilities I would ask that non-Linux
> folks (e.g. Roger)
>
> CC: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> CC: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
> CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> CC: Jan Beulich <jbeulich@xxxxxxxx>
> CC: Julien Grall <julien.grall@xxxxxxx>
> CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Tim Deegan <tim@xxxxxxx>
> CC: Wei Liu <wei.liu2@xxxxxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> ---
> .gitignore | 2 +
> docs/misc/kconfig-language.txt | 295 ++-
> docs/misc/kconfig.txt | 2 +-
> xen/Makefile | 4 +-
> xen/include/xen/kconfig.h | 64 +-
> xen/tools/kconfig/.gitignore | 5 -
> xen/tools/kconfig/Makefile | 111 +-
> xen/tools/kconfig/Makefile.host | 62 +-
> xen/tools/kconfig/Makefile.kconfig | 28 +
> xen/tools/kconfig/check.sh | 1 +
> xen/tools/kconfig/conf.c | 117 +-
> xen/tools/kconfig/confdata.c | 26 +-
> xen/tools/kconfig/expr.c | 195 +-
> xen/tools/kconfig/expr.h | 95 +-
> xen/tools/kconfig/gconf.c | 2 +-
> xen/tools/kconfig/kconf_id.c | 53 +
> xen/tools/kconfig/kxgettext.c | 2 +-
> xen/tools/kconfig/list.h | 1 +
> xen/tools/kconfig/lkc.h | 6 +-
> xen/tools/kconfig/lkc_proto.h | 3 +-
> xen/tools/kconfig/lxdialog/check-lxdialog.sh | 4 +-
> xen/tools/kconfig/mconf.c | 2 +-
> xen/tools/kconfig/menu.c | 244 ++-
> xen/tools/kconfig/merge_config.sh | 18 +-
> xen/tools/kconfig/nconf.c | 14 +-
> xen/tools/kconfig/nconf.gui.c | 22 +-
> xen/tools/kconfig/nconf.h | 4 +-
> xen/tools/kconfig/qconf.cc | 705 +++----
> xen/tools/kconfig/qconf.h | 150 +-
> xen/tools/kconfig/streamline_config.pl | 47 +-
> xen/tools/kconfig/symbol.c | 118 +-
> xen/tools/kconfig/util.c | 26 +-
> xen/tools/kconfig/zconf.gperf | 49 -
> xen/tools/kconfig/zconf.hash.c_shipped | 293 ---
> xen/tools/kconfig/zconf.l | 78 +-
> xen/tools/kconfig/zconf.lex.c_shipped | 2473 ------------------------
> xen/tools/kconfig/zconf.tab.c_shipped | 2580
> --------------------------
> xen/tools/kconfig/zconf.y | 138 +-
> 38 files changed, 1832 insertions(+), 6207 deletions(-)
> create mode 100644 xen/tools/kconfig/kconf_id.c
> delete mode 100644 xen/tools/kconfig/zconf.gperf
> delete mode 100644 xen/tools/kconfig/zconf.hash.c_shipped
> delete mode 100644 xen/tools/kconfig/zconf.lex.c_shipped
> delete mode 100644 xen/tools/kconfig/zconf.tab.c_shipped
>
> diff --git a/.gitignore b/.gitignore
> index 7004349d5a..739f63b9de 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -325,6 +325,8 @@ xen/test/livepatch/xen_nop.livepatch
> xen/test/livepatch/xen_replace_world.livepatch
> xen/tools/kconfig/.tmp_gtkcheck
> xen/tools/kconfig/.tmp_qtcheck
> +xen/tools/kconfig/zconf.lex.c
> +xen/tools/kconfig/zconf.tab.c
> xen/tools/symbols
> xen/xsm/flask/include/av_perm_to_string.h
> xen/xsm/flask/include/av_permissions.h
> diff --git a/docs/misc/kconfig-language.txt b/docs/misc/kconfig-language.txt
> index 350f733bf2..f5b9493f04 100644
> --- a/docs/misc/kconfig-language.txt
> +++ b/docs/misc/kconfig-language.txt
> @@ -77,6 +77,27 @@ applicable everywhere (see syntax).
> Optionally, dependencies only for this default value can be added with
> "if".
>
> + The default value deliberately defaults to 'n' in order to avoid bloating
> the
> + build. With few exceptions, new config options should not change this. The
> + intent is for "make oldconfig" to add as little as possible to the config
> from
> + release to release.
> +
> + Note:
> + Things that merit "default y/m" include:
> +
> + a) A new Kconfig option for something that used to always be built
> + should be "default y".
> +
> + b) A new gatekeeping Kconfig option that hides/shows other Kconfig
> + options (but does not generate any code of its own), should be
> + "default y" so people will see those other options.
> +
> + c) Sub-driver behavior or similar options for a driver that is
> + "default n". This allows you to provide sane defaults.
> +
> + d) Hardware or infrastructure that everybody expects, such as CONFIG_NET
> + or CONFIG_BLOCK. These are rare exceptions.
> +
> - type definition + default value:
> "def_bool"/"def_tristate" <expr> ["if" <expr>]
> This is a shorthand notation for a type definition plus a value.
> @@ -113,6 +134,34 @@ applicable everywhere (see syntax).
> That will limit the usefulness but on the other hand avoid
> the illegal configurations all over.
>
> +- weak reverse dependencies: "imply" <symbol> ["if" <expr>]
> + This is similar to "select" as it enforces a lower limit on another
> + symbol except that the "implied" symbol's value may still be set to n
> + from a direct dependency or with a visible prompt.
> +
> + Given the following example:
> +
> + config FOO
> + tristate
> + imply BAZ
> +
> + config BAZ
> + tristate
> + depends on BAR
> +
> + The following values are possible:
> +
> + FOO BAR BAZ's default choice for BAZ
> + --- --- ------------- --------------
> + n y n N/m/y
> + m y m M/y/n
> + y y y Y/n
> + y n * N
> +
> + This is useful e.g. with multiple drivers that want to indicate their
> + ability to hook into a secondary subsystem while allowing the user to
> + configure that subsystem out without also having to unset these drivers.
> +
> - limiting menu display: "visible if" <expr>
> This attribute is only applicable to menu blocks, if the condition is
> false, the menu block is not displayed to the user (the symbols
> @@ -172,10 +221,14 @@ module state. Dependency expressions have the following
> syntax:
> <expr> ::= <symbol> (1)
> <symbol> '=' <symbol> (2)
> <symbol> '!=' <symbol> (3)
> - '(' <expr> ')' (4)
> - '!' <expr> (5)
> - <expr> '&&' <expr> (6)
> - <expr> '||' <expr> (7)
> + <symbol1> '<' <symbol2> (4)
> + <symbol1> '>' <symbol2> (4)
> + <symbol1> '<=' <symbol2> (4)
> + <symbol1> '>=' <symbol2> (4)
> + '(' <expr> ')' (5)
> + '!' <expr> (6)
> + <expr> '&&' <expr> (7)
> + <expr> '||' <expr> (8)
>
> Expressions are listed in decreasing order of precedence.
>
> @@ -186,10 +239,13 @@ Expressions are listed in decreasing order of
> precedence.
> otherwise 'n'.
> (3) If the values of both symbols are equal, it returns 'n',
> otherwise 'y'.
> -(4) Returns the value of the expression. Used to override precedence.
> -(5) Returns the result of (2-/expr/).
> -(6) Returns the result of min(/expr/, /expr/).
> -(7) Returns the result of max(/expr/, /expr/).
> +(4) If value of <symbol1> is respectively lower, greater, lower-or-equal,
> + or greater-or-equal than value of <symbol2>, it returns 'y',
> + otherwise 'n'.
> +(5) Returns the value of the expression. Used to override precedence.
> +(6) Returns the result of (2-/expr/).
> +(7) Returns the result of min(/expr/, /expr/).
> +(8) Returns the result of max(/expr/, /expr/).
>
> An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
> respectively for calculations). A menu entry becomes visible when its
> @@ -241,9 +297,8 @@ comment "module support disabled"
> depends on !MODULES
>
> MODVERSIONS directly depends on MODULES, this means it's only visible if
> -MODULES is different from 'n'. The comment on the other hand is always
> -visible when MODULES is visible (the (empty) dependency of MODULES is
> -also part of the comment dependencies).
> +MODULES is different from 'n'. The comment on the other hand is only
> +visible when MODULES is set to 'n'.
>
>
> Kconfig syntax
> @@ -275,7 +330,44 @@ menuconfig:
>
> This is similar to the simple config entry above, but it also gives a
> hint to front ends, that all suboptions should be displayed as a
> -separate list of options.
> +separate list of options. To make sure all the suboptions will really
> +show up under the menuconfig entry and not outside of it, every item
> +from the <config options> list must depend on the menuconfig symbol.
> +In practice, this is achieved by using one of the next two constructs:
> +
> +(1):
> +menuconfig M
> +if M
> + config C1
> + config C2
> +endif
> +
> +(2):
> +menuconfig M
> +config C1
> + depends on M
> +config C2
> + depends on M
> +
> +In the following examples (3) and (4), C1 and C2 still have the M
> +dependency, but will not appear under menuconfig M anymore, because
> +of C0, which doesn't depend on M:
> +
> +(3):
> +menuconfig M
> + config C0
> +if M
> + config C1
> + config C2
> +endif
> +
> +(4):
> +menuconfig M
> +config C0
> +config C1
> + depends on M
> +config C2
> + depends on M
>
> choices:
>
> @@ -285,12 +377,17 @@ choices:
> "endchoice"
>
> This defines a choice group and accepts any of the above attributes as
> -options. A choice can only be of type bool or tristate, while a boolean
> -choice only allows a single config entry to be selected, a tristate
> -choice also allows any number of config entries to be set to 'm'. This
> -can be used if multiple drivers for a single hardware exists and only a
> -single driver can be compiled/loaded into the kernel, but all drivers
> -can be compiled as modules.
> +options. A choice can only be of type bool or tristate. If no type is
> +specified for a choice, it's type will be determined by the type of
> +the first choice element in the group or remain unknown if none of the
> +choice elements have a type specified, as well.
> +
> +While a boolean choice only allows a single config entry to be
> +selected, a tristate choice also allows any number of config entries
> +to be set to 'm'. This can be used if multiple drivers for a single
> +hardware exists and only a single driver can be compiled/loaded into
> +the kernel, but all drivers can be compiled as modules.
> +
> A choice accepts another option "optional", which allows to set the
> choice to 'n' and no entry needs to be selected.
> If no [symbol] is associated with a choice, then you can not have multiple
> @@ -393,3 +490,165 @@ config FOO
> depends on BAR && m
>
> limits FOO to module (=m) or disabled (=n).
> +
> +Kconfig recursive dependency limitations
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +If you've hit the Kconfig error: "recursive dependency detected" you've run
> +into a recursive dependency issue with Kconfig, a recursive dependency can be
> +summarized as a circular dependency. The kconfig tools need to ensure that
> +Kconfig files comply with specified configuration requirements. In order to
> do
> +that kconfig must determine the values that are possible for all Kconfig
> +symbols, this is currently not possible if there is a circular relation
> +between two or more Kconfig symbols. For more details refer to the "Simple
> +Kconfig recursive issue" subsection below. Kconfig does not do recursive
> +dependency resolution; this has a few implications for Kconfig file writers.
> +We'll first explain why this issues exists and then provide an example
> +technical limitation which this brings upon Kconfig developers. Eager
> +developers wishing to try to address this limitation should read the next
> +subsections.
> +
> +Simple Kconfig recursive issue
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Read: Documentation/kbuild/Kconfig.recursion-issue-01
> +
> +Test with:
> +
> +make KBUILD_KCONFIG=Documentation/kbuild/Kconfig.recursion-issue-01
> allnoconfig
> +
> +Cumulative Kconfig recursive issue
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Read: Documentation/kbuild/Kconfig.recursion-issue-02
> +
> +Test with:
> +
> +make KBUILD_KCONFIG=Documentation/kbuild/Kconfig.recursion-issue-02
> allnoconfig
> +
> +Practical solutions to kconfig recursive issue
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Developers who run into the recursive Kconfig issue have three options
> +at their disposal. We document them below and also provide a list of
> +historical issues resolved through these different solutions.
> +
> + a) Remove any superfluous "select FOO" or "depends on FOO"
> + b) Match dependency semantics:
> + b1) Swap all "select FOO" to "depends on FOO" or,
> + b2) Swap all "depends on FOO" to "select FOO"
> + c) Consider the use of "imply" instead of "select"
> +
> +The resolution to a) can be tested with the sample Kconfig file
> +Documentation/kbuild/Kconfig.recursion-issue-01 through the removal
> +of the "select CORE" from CORE_BELL_A_ADVANCED as that is implicit already
> +since CORE_BELL_A depends on CORE. At times it may not be possible to remove
> +some dependency criteria, for such cases you can work with solution b).
> +
> +The two different resolutions for b) can be tested in the sample Kconfig file
> +Documentation/kbuild/Kconfig.recursion-issue-02.
> +
> +Below is a list of examples of prior fixes for these types of recursive
> issues;
> +all errors appear to involve one or more select's and one or more "depends
> on".
> +
> +commit fix
> +====== ===
> +06b718c01208 select A -> depends on A
> +c22eacfe82f9 depends on A -> depends on B
> +6a91e854442c select A -> depends on A
> +118c565a8f2e select A -> select B
> +f004e5594705 select A -> depends on A
> +c7861f37b4c6 depends on A -> (null)
> +80c69915e5fb select A -> (null) (1)
> +c2218e26c0d0 select A -> depends on A (1)
> +d6ae99d04e1c select A -> depends on A
> +95ca19cf8cbf select A -> depends on A
> +8f057d7bca54 depends on A -> (null)
> +8f057d7bca54 depends on A -> select A
> +a0701f04846e select A -> depends on A
> +0c8b92f7f259 depends on A -> (null)
> +e4e9e0540928 select A -> depends on A (2)
> +7453ea886e87 depends on A > (null) (1)
> +7b1fff7e4fdf select A -> depends on A
> +86c747d2a4f0 select A -> depends on A
> +d9f9ab51e55e select A -> depends on A
> +0c51a4d8abd6 depends on A -> select A (3)
> +e98062ed6dc4 select A -> depends on A (3)
> +91e5d284a7f1 select A -> (null)
> +
> +(1) Partial (or no) quote of error.
> +(2) That seems to be the gist of that fix.
> +(3) Same error.
> +
> +Future kconfig work
> +~~~~~~~~~~~~~~~~~~~
> +
> +Work on kconfig is welcomed on both areas of clarifying semantics and on
> +evaluating the use of a full SAT solver for it. A full SAT solver can be
> +desirable to enable more complex dependency mappings and / or queries,
> +for instance on possible use case for a SAT solver could be that of handling
> +the current known recursive dependency issues. It is not known if this would
> +address such issues but such evaluation is desirable. If support for a full
> SAT
> +solver proves too complex or that it cannot address recursive dependency
> issues
> +Kconfig should have at least clear and well defined semantics which also
> +addresses and documents limitations or requirements such as the ones dealing
> +with recursive dependencies.
> +
> +Further work on both of these areas is welcomed on Kconfig. We elaborate
> +on both of these in the next two subsections.
> +
> +Semantics of Kconfig
> +~~~~~~~~~~~~~~~~~~~~
> +
> +The use of Kconfig is broad, Linux is now only one of Kconfig's users:
> +one study has completed a broad analysis of Kconfig use in 12 projects [0].
> +Despite its widespread use, and although this document does a reasonable job
> +in documenting basic Kconfig syntax a more precise definition of Kconfig
> +semantics is welcomed. One project deduced Kconfig semantics through
> +the use of the xconfig configurator [1]. Work should be done to confirm if
> +the deduced semantics matches our intended Kconfig design goals.
> +
> +Having well defined semantics can be useful for tools for practical
> +evaluation of depenencies, for instance one such use known case was work to
> +express in boolean abstraction of the inferred semantics of Kconfig to
> +translate Kconfig logic into boolean formulas and run a SAT solver on this to
> +find dead code / features (always inactive), 114 dead features were found in
> +Linux using this methodology [1] (Section 8: Threats to validity).
> +
> +Confirming this could prove useful as Kconfig stands as one of the the
> leading
> +industrial variability modeling languages [1] [2]. Its study would help
> +evaluate practical uses of such languages, their use was only theoretical
> +and real world requirements were not well understood. As it stands though
> +only reverse engineering techniques have been used to deduce semantics from
> +variability modeling languages such as Kconfig [3].
> +
> +[0] http://www.eng.uwaterloo.ca/~shshe/kconfig_semantics.pdf
> +[1] http://gsd.uwaterloo.ca/sites/default/files/vm-2013-berger.pdf
> +[2] http://gsd.uwaterloo.ca/sites/default/files/ase241-berger_0.pdf
> +[3] http://gsd.uwaterloo.ca/sites/default/files/icse2011.pdf
> +
> +Full SAT solver for Kconfig
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Although SAT solvers [0] haven't yet been used by Kconfig directly, as noted
> in
> +the previous subsection, work has been done however to express in boolean
> +abstraction the inferred semantics of Kconfig to translate Kconfig logic into
> +boolean formulas and run a SAT solver on it [1]. Another known related
> project
> +is CADOS [2] (former VAMOS [3]) and the tools, mainly undertaker [4], which
> has
> +been introduced first with [5]. The basic concept of undertaker is to exract
> +variability models from Kconfig, and put them together with a propositional
> +formula extracted from CPP #ifdefs and build-rules into a SAT solver in order
> +to find dead code, dead files, and dead symbols. If using a SAT solver is
> +desirable on Kconfig one approach would be to evaluate repurposing such
> efforts
> +somehow on Kconfig. There is enough interest from mentors of existing
> projects
> +to not only help advise how to integrate this work upstream but also help
> +maintain it long term. Interested developers should visit:
> +
> +http://kernelnewbies.org/KernelProjects/kconfig-sat
> +
> +[0] http://www.cs.cornell.edu/~sabhar/chapters/SATSolvers-KR-Handbook.pdf
> +[1] http://gsd.uwaterloo.ca/sites/default/files/vm-2013-berger.pdf
> +[2] https://cados.cs.fau.de
> +[3] https://vamos.cs.fau.de
> +[4] https://undertaker.cs.fau.de
> +[5] https://www4.cs.fau.de/Publications/2011/tartler_11_eurosys.pdf
> diff --git a/docs/misc/kconfig.txt b/docs/misc/kconfig.txt
> index bbc99c0c10..7233118f3a 100644
> --- a/docs/misc/kconfig.txt
> +++ b/docs/misc/kconfig.txt
> @@ -119,7 +119,7 @@ Examples:
> 15% of tristates will be set to 'y', 15% to 'm', 70% to 'n'
>
> ______________________________________________________________________
> -Environment variables for 'silentoldconfig'
> +Environment variables for 'syncconfig'
>
> KCONFIG_NOSILENTUPDATE
> --------------------------------------------------
> diff --git a/xen/Makefile b/xen/Makefile
> index 60867e31a4..49ca8505f7 100644
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -251,13 +251,13 @@ FORCE:
>
> kconfig := silentoldconfig oldconfig config menuconfig defconfig \
> nconfig xconfig gconfig savedefconfig listnewconfig olddefconfig \
> - randconfig
> + randconfig syncconfig
> .PHONY: $(kconfig)
> $(kconfig):
> $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH)
> SRCARCH=$(SRCARCH) HOSTCC="$(HOSTCC)" HOSTCXX="$(HOSTCXX)" $@
>
> include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG)
> - $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH)
> SRCARCH=$(SRCARCH) HOSTCC="$(HOSTCC)" HOSTCXX="$(HOSTCXX)" silentoldconfig
> + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH)
> SRCARCH=$(SRCARCH) HOSTCC="$(HOSTCC)" HOSTCXX="$(HOSTCXX)" syncconfig
>
> # Allow people to just run `make` as before and not force them to configure
> $(KCONFIG_CONFIG):
> diff --git a/xen/include/xen/kconfig.h b/xen/include/xen/kconfig.h
> index 4d58c5bb3c..cc8fa109cf 100644
> --- a/xen/include/xen/kconfig.h
> +++ b/xen/include/xen/kconfig.h
> @@ -1,11 +1,33 @@
> -#ifndef __XEN_KCONFIG_H
> -#define __XEN_KCONFIG_H
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef __LINUX_KCONFIG_H
> +#define __LINUX_KCONFIG_H
>
> #include <generated/autoconf.h>
>
> +#ifdef CONFIG_CPU_BIG_ENDIAN
> +#define __BIG_ENDIAN 4321
> +#else
> +#define __LITTLE_ENDIAN 1234
> +#endif
> +
> +#define __ARG_PLACEHOLDER_1 0,
> +#define __take_second_arg(__ignored, val, ...) val
> +
> +/*
> + * The use of "&&" / "||" is limited in certain expressions.
> + * The following enable to calculate "and" / "or" with macro expansion only.
> + */
> +#define __and(x, y) ___and(x, y)
> +#define ___and(x, y) ____and(__ARG_PLACEHOLDER_##x, y)
> +#define ____and(arg1_or_junk, y) __take_second_arg(arg1_or_junk y, 0)
> +
> +#define __or(x, y) ___or(x, y)
> +#define ___or(x, y) ____or(__ARG_PLACEHOLDER_##x, y)
> +#define ____or(arg1_or_junk, y) __take_second_arg(arg1_or_junk
> 1, y)
> +
> /*
> * Helper macros to use CONFIG_ options in C/CPP expressions. Note that
> - * these only work with boolean option.
> + * these only work with boolean and tristate options.
> */
>
> /*
> @@ -16,16 +38,36 @@
> * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
> * the last step cherry picks the 2nd arg, we get a zero.
> */
> -#define __ARG_PLACEHOLDER_1 0,
> -#define config_enabled(cfg) _config_enabled(cfg)
> -#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value)
> -#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
> -#define ___config_enabled(__ignored, val, ...) val
> +#define __is_defined(x) ___is_defined(x)
> +#define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val)
> +#define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0)
>
> /*
> - * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
> + * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
> + * otherwise. For boolean options, this is equivalent to
> + * IS_ENABLED(CONFIG_FOO).
> + */
> +#define IS_BUILTIN(option) __is_defined(option)
> +
> +/*
> + * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0
> * otherwise.
> */
> -#define IS_ENABLED(option) config_enabled(option)
> +#define IS_MODULE(option) __is_defined(option##_MODULE)
> +
> +/*
> + * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
> + * code can call a function defined in code compiled based on CONFIG_FOO.
> + * This is similar to IS_ENABLED(), but returns false when invoked from
> + * built-in code when CONFIG_FOO is set to 'm'.
> + */
> +#define IS_REACHABLE(option) __or(IS_BUILTIN(option), \
> + __and(IS_MODULE(option), __is_defined(MODULE)))
> +
> +/*
> + * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
> + * 0 otherwise.
> + */
> +#define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option))
>
> -#endif /* __XEN_KCONFIG_H */
> +#endif /* __LINUX_KCONFIG_H */
> diff --git a/xen/tools/kconfig/.gitignore b/xen/tools/kconfig/.gitignore
> index be603c4fef..2da579edcb 100644
> --- a/xen/tools/kconfig/.gitignore
> +++ b/xen/tools/kconfig/.gitignore
> @@ -1,11 +1,6 @@
> #
> # Generated files
> #
> -config*
> -*.lex.c
> -*.tab.c
> -*.tab.h
> -zconf.hash.c
> *.moc
> gconf.glade.h
> *.pot
> diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile
> index aceaaed098..5def8779d7 100644
> --- a/xen/tools/kconfig/Makefile
> +++ b/xen/tools/kconfig/Makefile
> @@ -1,8 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0
> # ===========================================================================
> # Kernel configuration targets
> # These targets are used from top-level makefile
>
> -PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \
> +PHONY += xconfig gconfig menuconfig config syncconfig update-po-config \
> localmodconfig localyesconfig
>
> ifdef KBUILD_KCONFIG
> @@ -33,22 +34,24 @@ config: $(obj)/conf
> nconfig: $(obj)/nconf
> $< $(silent) $(Kconfig)
>
> -silentoldconfig: $(obj)/conf
> +# This has become an internal implementation detail and is now deprecated
> +# for external use.
> +syncconfig: $(obj)/conf
> $(Q)mkdir -p include/config include/generated
> $< $(silent) --$@ $(Kconfig)
>
> -localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
> +localyesconfig localmodconfig: $(obj)/conf
> $(Q)mkdir -p include/config include/generated
> - $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
> + $(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree)
> $(Kconfig) > .tmp.config
> $(Q)if [ -f .config ]; then \
> cmp -s .tmp.config .config || \
> (mv -f .config .config.old.1; \
> mv -f .tmp.config .config; \
> - $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
> + $< $(silent) --oldconfig $(Kconfig); \
> mv -f .config.old.1 .config.old) \
> else \
> mv -f .tmp.config .config; \
> - $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
> + $< $(silent) --oldconfig $(Kconfig); \
> fi
> $(Q)rm -f .tmp.config
>
> @@ -83,12 +86,21 @@ PHONY += $(simple-targets)
> $(simple-targets): $(obj)/conf
> $< $(silent) --$@ $(Kconfig)
>
> -PHONY += oldnoconfig savedefconfig defconfig
> +PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
>
> # 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
> # counter-intuitive name.
> oldnoconfig: olddefconfig
> + @echo " WARNING: \"oldnoconfig\" target will be removed after Linux
> 4.19"
> + @echo " Please use \"olddefconfig\" instead, which is an
> alias."
> +
> +# We do not expect manual invokcation of "silentoldcofig" (or "syncconfig").
> +silentoldconfig: syncconfig
> + @echo " WARNING: \"silentoldconfig\" has been renamed to
> \"syncconfig\""
> + @echo " and is now an internal implementation detail."
> + @echo " What you want is probably \"oldconfig\"."
> + @echo " \"silentoldconfig\" will be removed after Linux 4.19"
>
> savedefconfig: $(obj)/conf
> $< $(silent) --$@=defconfig $(Kconfig)
> @@ -97,8 +109,13 @@ defconfig: $(obj)/conf
> ifeq ($(KBUILD_DEFCONFIG),)
> $< $(silent) --defconfig $(Kconfig)
> else
> +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)
> @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
> $(Q)$< $(silent)
> --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
> +else
> + @$(kecho) "*** Default configuration is based on target
> '$(KBUILD_DEFCONFIG)'"
> + $(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)
> +endif
> endif
>
> %_defconfig: $(obj)/conf
> @@ -123,6 +140,14 @@ PHONY += tinyconfig
> tinyconfig:
> $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
>
> +# CHECK: -o cache_dir=<path> working?
> +PHONY += testconfig
> +testconfig: $(obj)/conf
> + $(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \
> + -o cache_dir=$(abspath $(obj)/tests/.cache) \
> + $(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=no)
> +clean-dirs += tests/.cache
> +
> # Help text used by make help
> help:
> @echo ' config - Update current config utilising a
> line-oriented program'
> @@ -134,7 +159,6 @@ help:
> @echo ' oldconfig - Update current config utilising a provided
> .config as base'
> @echo ' localmodconfig - Update current config disabling modules not
> loaded'
> @echo ' localyesconfig - Update current config converting local mods
> to core'
> - @echo ' silentoldconfig - Same as oldconfig, but quietly,
> additionally update deps'
> @echo ' defconfig - New config with default from ARCH supplied
> defconfig'
> @echo ' savedefconfig - Save current config as ./defconfig (minimal
> config)'
> @echo ' allnoconfig - New config where all options are answered
> with no'
> @@ -143,8 +167,8 @@ help:
> @echo ' alldefconfig - New config with all symbols set to default'
> @echo ' randconfig - New config with random answer to all
> options'
> @echo ' listnewconfig - List new options'
> - @echo ' olddefconfig - Same as silentoldconfig but sets new
> symbols to their'
> - @echo ' default value'
> + @echo ' olddefconfig - Same as oldconfig but sets new symbols to
> their'
> + @echo ' default value without prompting'
> @echo ' kvmconfig - Enable additional options for kvm guest
> kernel support'
> @echo ' xenconfig - Enable additional options for xen dom0 and
> guest kernel support'
> @echo ' tinyconfig - Configure the tiniest possible kernel'
> @@ -183,13 +207,14 @@ gconf-objs := gconf.o zconf.tab.o
>
> hostprogs-y := conf nconf mconf kxgettext qconf gconf
>
> +targets += zconf.lex.c
> clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
> -clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
> +clean-files += gconf.glade.h
> clean-files += config.pot linux.pot
>
> # Check that we have the required ncurses stuff installed for lxdialog
> (menuconfig)
> PHONY += $(obj)/dochecklxdialog
> -$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
> +$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/dochecklxdialog
> $(obj)/dochecklxdialog:
> $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC)
> $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
>
> @@ -197,14 +222,12 @@ always := dochecklxdialog
>
> # Add environment specific flags
> HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh
> $(HOSTCC) $(HOSTCFLAGS))
> +HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh
> $(HOSTCXX) $(HOSTCXXFLAGS))
>
> # generated files seem to need this to find local include files
> HOSTCFLAGS_zconf.lex.o := -I$(src)
> HOSTCFLAGS_zconf.tab.o := -I$(src)
>
> -LEX_PREFIX_zconf := zconf
> -YACC_PREFIX_zconf := zconf
> -
> HOSTLOADLIBES_qconf = $(KC_QT_LIBS)
> HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS)
>
> @@ -226,49 +249,21 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
>
> # Qt needs some extra effort...
> $(obj)/.tmp_qtcheck:
> - @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \
> - if ! pkg-config --exists QtCore 2> /dev/null; then \
> - 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-mt 2> /dev/null && pkg=qt-mt; \
> - if [ -n "$$pkg" ]; then \
> - cflags="\$$(shell pkg-config $$pkg --cflags)"; \
> - libs="\$$(shell pkg-config $$pkg --libs)"; \
> - moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
> - dir="$$(pkg-config $$pkg --variable=prefix)"; \
> - else \
> - for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
> - if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
> - done; \
> - if [ -z "$$dir" ]; then \
> - echo >&2 "*"; \
> - 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 "* either qmake can be found or install pkg-config or
> set"; \
> - echo >&2 "* the QTDIR environment variable to the correct
> location."; \
> - echo >&2 "*"; \
> - false; \
> - fi; \
> - libpath=$$dir/lib; lib=qt; osdir=""; \
> - $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
> - osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
> - test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
> - test -f $$libpath/libqt-mt.so && lib=qt-mt; \
> - cflags="-I$$dir/include"; \
> - libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
> - moc="$$dir/bin/moc"; \
> - fi; \
> - if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
> - echo "*"; \
> - echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc
> instead."; \
> - echo "*"; \
> - moc="/usr/bin/moc"; \
> - fi; \
> + @set -e; $(kecho) " CHECK qt"; \
> + if pkg-config --exists Qt5Core; then \
> + cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui
> Qt5Widgets`"; \
> + libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \
> + moc=`pkg-config --variable=host_bins Qt5Core`/moc; \
> + elif pkg-config --exists QtCore; then \
> + cflags=`pkg-config --cflags QtCore QtGui`; \
> + libs=`pkg-config --libs QtCore QtGui`; \
> + moc=`pkg-config --variable=moc_location QtCore`; \
> else \
> - cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
> - libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
> - moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \
> - [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore
> --variable=prefix)/bin/moc"; \
> + echo >&2 "*"; \
> + echo >&2 "* Could not find Qt via pkg-config."; \
> + echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's
> in PKG_CONFIG_PATH"; \
> + echo >&2 "*"; \
> + exit 1; \
> fi; \
> echo "KC_QT_CFLAGS=$$cflags" > $@; \
> echo "KC_QT_LIBS=$$libs" >> $@; \
> @@ -301,7 +296,7 @@ $(obj)/.tmp_gtkcheck:
> fi
> endif
>
> -$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
> +$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
>
> $(obj)/qconf.o: $(obj)/qconf.moc
>
> diff --git a/xen/tools/kconfig/Makefile.host b/xen/tools/kconfig/Makefile.host
> index 133edfae5b..aa971cc3f3 100644
> --- a/xen/tools/kconfig/Makefile.host
> +++ b/xen/tools/kconfig/Makefile.host
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> # ==========================================================================
> # Building binaries on the host system
> # Binaries are used during the compilation of the kernel, for example
> @@ -21,6 +22,8 @@
> # They are linked as C++ code to the executable qconf
>
> __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
> +host-cshlib := $(sort $(hostlibs-y) $(hostlibs-m))
> +host-cxxshlib := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
>
> # C code
> # Executables compiled from a single .c file
> @@ -42,23 +45,19 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if
> $($(m)-cxxobjs),$(m)))
> # C++ Object (.o) files compiled from .cc files
> host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
>
> -# output directory for programs/.o files
> -# hostprogs-y := tools/build may have been specified.
> -# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
> -host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
> +# Object (.o) files used by the shared libaries
> +host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
> +host-cxxshobjs := $(sort $(foreach
> m,$(host-cxxshlib),$($(m:.so=-objs))))
>
> -host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
> -
> -
> -__hostprogs := $(addprefix $(obj)/,$(__hostprogs))
> host-csingle := $(addprefix $(obj)/,$(host-csingle))
> host-cmulti := $(addprefix $(obj)/,$(host-cmulti))
> host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
> host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
> host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
> -host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
> -
> -obj-dirs += $(host-objdirs)
> +host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
> +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
> +host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
> +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
>
> #####
> # Handle options to gcc. Support building with separate output directory
> @@ -85,7 +84,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags)
> # Create executable from a single .c file
> # host-csingle -> Executable
> quiet_cmd_host-csingle = HOSTCC $@
> - cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \
> + cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(HOSTLDFLAGS) -o $@
> $< \
> $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
> $(host-csingle): $(obj)/%: $(src)/%.c FORCE
> $(call if_changed_dep,host-csingle)
> @@ -124,5 +123,42 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@
> $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
> $(call if_changed_dep,host-cxxobjs)
>
> +# Compile .c file, create position independent .o file
> +# host-cshobjs -> .o
> +quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
> + cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
> +$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
> + $(call if_changed_dep,host-cshobjs)
> +
> +# Compile .c file, create position independent .o file
> +# Note that plugin capable gcc versions can be either C or C++ based
> +# therefore plugin source files have to be compilable in both C and C++ mode.
> +# This is why a C++ compiler is invoked on a .c file.
> +# host-cxxshobjs -> .o
> +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
> + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
> +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
> + $(call if_changed_dep,host-cxxshobjs)
> +
> +# Link a shared library, based on position independent .o files
> +# *.o -> .so shared library (host-cshlib)
> +quiet_cmd_host-cshlib = HOSTLLD -shared $@
> + cmd_host-cshlib = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
> + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
> + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
> +$(host-cshlib): FORCE
> + $(call if_changed,host-cshlib)
> +$(call multi_depend, $(host-cshlib), .so, -objs)
> +
> +# Link a shared library, based on position independent .o files
> +# *.o -> .so shared library (host-cxxshlib)
> +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
> + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
> + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
> + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
> +$(host-cxxshlib): FORCE
> + $(call if_changed,host-cxxshlib)
> +$(call multi_depend, $(host-cxxshlib), .so, -objs)
> +
> targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
> - $(host-cxxmulti) $(host-cxxobjs)
> + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
> $(host-cxxshlib) $(host-cxxshobjs)
> diff --git a/xen/tools/kconfig/Makefile.kconfig
> b/xen/tools/kconfig/Makefile.kconfig
> index dbd8912015..85b4bbba7e 100644
> --- a/xen/tools/kconfig/Makefile.kconfig
> +++ b/xen/tools/kconfig/Makefile.kconfig
> @@ -39,6 +39,10 @@ CONFIG_SHELL := $(SHELL)
> HOSTCC ?= gcc
> HOSTCXX ?= g++
>
> +# default lex and yacc provider
> +LEX ?= flex
> +YACC ?= bison
> +
> # force target
> PHONY += FORCE
>
> @@ -60,3 +64,27 @@ clean:
>
> $(obj)/zconf%: $(src)/zconf%_shipped
> @cp -f $< $@
> +
> +# from scripts/Makefile.lib
> +
> +# LEX
> +# ---------------------------------------------------------------------------
> +quiet_cmd_flex = LEX $@
> + cmd_flex = $(LEX) -o$@ -L $<
> +
> +$(obj)/%.lex.c: $(src)/%.l FORCE
> + $(call if_changed,flex)
> +
> +# YACC
> +# ---------------------------------------------------------------------------
> +quiet_cmd_bison = YACC $@
> + cmd_bison = $(YACC) -o$@ -t -l $<
> +
> +$(obj)/%.tab.c: $(src)/%.y FORCE
> + $(call if_changed,bison)
> +
> +quiet_cmd_bison_h = YACC $@
> + cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $<
> +
> +$(obj)/%.tab.h: $(src)/%.y FORCE
> + $(call if_changed,bison_h)
> diff --git a/xen/tools/kconfig/check.sh b/xen/tools/kconfig/check.sh
> index 55b79ba1ba..97f0fee7d1 100755
> --- a/xen/tools/kconfig/check.sh
> +++ b/xen/tools/kconfig/check.sh
> @@ -1,4 +1,5 @@
> #!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> # Needed for systems without gettext
> $* -x c -o /dev/null - > /dev/null 2>&1 << EOF
> #include <libintl.h>
> diff --git a/xen/tools/kconfig/conf.c b/xen/tools/kconfig/conf.c
> index 6c204318bc..283eeedaa4 100644
> --- a/xen/tools/kconfig/conf.c
> +++ b/xen/tools/kconfig/conf.c
> @@ -5,6 +5,7 @@
>
> #include <locale.h>
> #include <ctype.h>
> +#include <limits.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> @@ -19,11 +20,10 @@
>
> static void conf(struct menu *menu);
> static void check_conf(struct menu *menu);
> -static void xfgets(char *str, int size, FILE *in);
>
> enum input_mode {
> oldaskconfig,
> - silentoldconfig,
> + syncconfig,
> oldconfig,
> allnoconfig,
> allyesconfig,
> @@ -34,14 +34,14 @@ enum input_mode {
> savedefconfig,
> listnewconfig,
> olddefconfig,
> -} input_mode = oldaskconfig;
> +};
> +static enum input_mode input_mode = oldaskconfig;
>
> static int indent = 1;
> static int tty_stdio;
> -static int valid_stdin = 1;
> static int sync_kconfig;
> static int conf_cnt;
> -static char line[128];
> +static char line[PATH_MAX];
> static struct menu *rootEntry;
>
> static void print_help(struct menu *menu)
> @@ -71,14 +71,14 @@ static void strip(char *str)
> *p-- = 0;
> }
>
> -static void check_stdin(void)
> +/* Helper function to facilitate fgets() by Jean Sacren. */
> +static void xfgets(char *str, int size, FILE *in)
> {
> - if (!valid_stdin) {
> - printf(_("aborted!\n\n"));
> - printf(_("Console input/output is redirected. "));
> - printf(_("Run 'make oldconfig' to update configuration.\n\n"));
> - exit(1);
> - }
> + if (!fgets(str, size, in))
> + fprintf(stderr, "\nError in reading or end of file.\n");
> +
> + if (!tty_stdio)
> + printf("%s", str);
> }
>
> static int conf_askvalue(struct symbol *sym, const char *def)
> @@ -100,18 +100,15 @@ static int conf_askvalue(struct symbol *sym, const char
> *def)
>
> switch (input_mode) {
> case oldconfig:
> - case silentoldconfig:
> + case syncconfig:
> if (sym_has_value(sym)) {
> printf("%s\n", def);
> return 0;
> }
> - check_stdin();
> /* fall through */
> case oldaskconfig:
> fflush(stdout);
> - xfgets(line, 128, stdin);
> - if (!tty_stdio)
> - printf("\n");
> + xfgets(line, sizeof(line), stdin);
> return 1;
> default:
> break;
> @@ -191,9 +188,7 @@ static int conf_sym(struct menu *menu)
> printf("/m");
> if (oldval != yes && sym_tristate_within_range(sym, yes))
> printf("/y");
> - if (menu_has_help(menu))
> - printf("/?");
> - printf("] ");
> + printf("/?] ");
> if (!conf_askvalue(sym, sym_get_string_value(sym)))
> return 0;
> strip(line);
> @@ -295,23 +290,19 @@ static int conf_choice(struct menu *menu)
> printf("[1]: 1\n");
> goto conf_childs;
> }
> - printf("[1-%d", cnt);
> - if (menu_has_help(menu))
> - printf("?");
> - printf("]: ");
> + printf("[1-%d?]: ", cnt);
> switch (input_mode) {
> case oldconfig:
> - case silentoldconfig:
> + case syncconfig:
> if (!is_new) {
> cnt = def;
> printf("%d\n", cnt);
> break;
> }
> - check_stdin();
> /* fall through */
> case oldaskconfig:
> fflush(stdout);
> - xfgets(line, 128, stdin);
> + xfgets(line, sizeof(line), stdin);
> strip(line);
> if (line[0] == '?') {
> print_help(menu);
> @@ -367,10 +358,11 @@ static void conf(struct menu *menu)
>
> switch (prop->type) {
> case P_MENU:
> - if ((input_mode == silentoldconfig ||
> - input_mode == listnewconfig ||
> - input_mode == olddefconfig) &&
> - rootEntry != menu) {
> + /*
> + * Except in oldaskconfig mode, we show only menus that
> + * contain new symbols.
> + */
> + if (input_mode != oldaskconfig && rootEntry != menu) {
> check_conf(menu);
> return;
> }
> @@ -430,10 +422,20 @@ static void check_conf(struct menu *menu)
> if (sym_is_changable(sym) ||
> (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes))
> {
> if (input_mode == listnewconfig) {
> - if (sym->name && !sym_is_choice_value(sym)) {
> - printf("%s%s\n", CONFIG_, sym->name);
> + if (sym->name) {
> + const char *str;
> +
> + if (sym->type == S_STRING) {
> + str = sym_get_string_value(sym);
> + str =
> sym_escape_string_value(str);
> + printf("%s%s=%s\n", CONFIG_,
> sym->name, str);
> + free((void *)str);
> + } else {
> + str = sym_get_string_value(sym);
> + printf("%s%s=%s\n", CONFIG_,
> sym->name, str);
> + }
> }
> - } else if (input_mode != olddefconfig) {
> + } else {
> if (!conf_cnt++)
> printf(_("*\n* Restart
> config...\n*\n"));
> rootEntry = menu_get_parent_menu(menu);
> @@ -449,7 +451,7 @@ static void check_conf(struct menu *menu)
> static struct option long_opts[] = {
> {"oldaskconfig", no_argument, NULL, oldaskconfig},
> {"oldconfig", no_argument, NULL, oldconfig},
> - {"silentoldconfig", no_argument, NULL, silentoldconfig},
> + {"syncconfig", no_argument, NULL, syncconfig},
> {"defconfig", optional_argument, NULL, defconfig},
> {"savedefconfig", required_argument, NULL, savedefconfig},
> {"allnoconfig", no_argument, NULL, allnoconfig},
> @@ -476,8 +478,9 @@ static void conf_usage(const char *progname)
> printf(" --listnewconfig List new options\n");
> printf(" --oldaskconfig Start a new configuration using a
> line-oriented program\n");
> printf(" --oldconfig Update a configuration using a
> provided .config as base\n");
> - printf(" --silentoldconfig Same as oldconfig, but quietly,
> additionally update deps\n");
> - printf(" --olddefconfig Same as silentoldconfig but sets new
> symbols to their default value\n");
> + printf(" --syncconfig Similar to oldconfig but generates
> configuration in\n"
> + " include/{generated/,config/}\n");
> + printf(" --olddefconfig Same as oldconfig but sets new
> symbols to their default value\n");
> printf(" --oldnoconfig An alias of olddefconfig\n");
> printf(" --defconfig <file> New config with default defined in
> <file>\n");
> printf(" --savedefconfig <file> Save the minimal current
> configuration to <file>\n");
> @@ -499,7 +502,7 @@ int main(int ac, char **av)
> bindtextdomain(PACKAGE, LOCALEDIR);
> textdomain(PACKAGE);
>
> - tty_stdio = isatty(0) && isatty(1) && isatty(2);
> + tty_stdio = isatty(0) && isatty(1);
>
> while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
> if (opt == 's') {
> @@ -508,7 +511,7 @@ int main(int ac, char **av)
> }
> input_mode = (enum input_mode)opt;
> switch (opt) {
> - case silentoldconfig:
> + case syncconfig:
> sync_kconfig = 1;
> break;
> case defconfig:
> @@ -556,7 +559,7 @@ int main(int ac, char **av)
> }
> }
> if (ac == optind) {
> - printf(_("%s: Kconfig file missing\n"), av[0]);
> + fprintf(stderr, _("%s: Kconfig file missing\n"), av[0]);
> conf_usage(progname);
> exit(1);
> }
> @@ -581,14 +584,16 @@ int main(int ac, char **av)
> if (!defconfig_file)
> defconfig_file = conf_get_default_confname();
> if (conf_read(defconfig_file)) {
> - printf(_("***\n"
> - "*** Can't find default configuration \"%s\"!\n"
> - "***\n"), defconfig_file);
> + fprintf(stderr,
> + _("***\n"
> + "*** Can't find default configuration
> \"%s\"!\n"
> + "***\n"),
> + defconfig_file);
> exit(1);
> }
> break;
> case savedefconfig:
> - case silentoldconfig:
> + case syncconfig:
> case oldaskconfig:
> case oldconfig:
> case listnewconfig:
> @@ -641,7 +646,6 @@ int main(int ac, char **av)
> return 1;
> }
> }
> - valid_stdin = tty_stdio;
> }
>
> switch (input_mode) {
> @@ -669,24 +673,24 @@ int main(int ac, char **av)
> case oldaskconfig:
> rootEntry = &rootmenu;
> conf(&rootmenu);
> - input_mode = silentoldconfig;
> + input_mode = oldconfig;
> /* fall through */
> case oldconfig:
> case listnewconfig:
> - case olddefconfig:
> - case silentoldconfig:
> + case syncconfig:
> /* Update until a loop caused no more changes */
> do {
> conf_cnt = 0;
> check_conf(&rootmenu);
> - } while (conf_cnt &&
> - (input_mode != listnewconfig &&
> - input_mode != olddefconfig));
> + } while (conf_cnt);
> + break;
> + case olddefconfig:
> + default:
> break;
> }
>
> if (sync_kconfig) {
> - /* silentoldconfig is used during the build so we shall update
> autoconf.
> + /* syncconfig is used during the build so we shall update
> autoconf.
> * All other commands are only used to generate a config.
> */
> if (conf_get_changed() && conf_write(NULL)) {
> @@ -711,12 +715,3 @@ int main(int ac, char **av)
> }
> return 0;
> }
> -
> -/*
> - * Helper function to facilitate fgets() by Jean Sacren.
> - */
> -void xfgets(char *str, int size, FILE *in)
> -{
> - if (fgets(str, size, in) == NULL)
> - fprintf(stderr, "\nError in reading or end of file.\n");
> -}
> diff --git a/xen/tools/kconfig/confdata.c b/xen/tools/kconfig/confdata.c
> index 0b7dc2fd7b..df26c7b0fe 100644
> --- a/xen/tools/kconfig/confdata.c
> +++ b/xen/tools/kconfig/confdata.c
> @@ -28,7 +28,7 @@ static void conf_message(const char *fmt, ...)
> __attribute__ ((format (printf, 1, 2)));
>
> static const char *conf_filename;
> -static int conf_lineno, conf_warnings, conf_unsaved;
> +static int conf_lineno, conf_warnings;
>
> const char conf_defname[] = "arch/$ARCH/defconfig";
>
> @@ -178,7 +178,7 @@ static int conf_set_sym_val(struct symbol *sym, int def,
> int def_flags, char *p)
> case S_HEX:
> done:
> if (sym_string_valid(sym, p)) {
> - sym->def[def].val = strdup(p);
> + sym->def[def].val = xstrdup(p);
> sym->flags |= def_flags;
> } else {
> if (def != S_DEF_AUTO)
> @@ -201,7 +201,7 @@ static int add_byte(int c, char **lineptr, size_t slen,
> size_t *n)
> if (new_size > *n) {
> new_size += LINE_GROWTH - 1;
> new_size *= 2;
> - nline = realloc(*lineptr, new_size);
> + nline = xrealloc(*lineptr, new_size);
> if (!nline)
> return -1;
>
> @@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def)
> if (in)
> goto load;
> sym_add_change_count(1);
> - if (!sym_defconfig_list) {
> - sym_calc_value(modules_sym);
> + if (!sym_defconfig_list)
> return 1;
> - }
>
> for_all_defaults(sym_defconfig_list, prop) {
> if (expr_calc_value(prop->visible.expr) == no ||
> @@ -292,7 +290,6 @@ load:
> conf_filename = name;
> conf_lineno = 0;
> conf_warnings = 0;
> - conf_unsaved = 0;
>
> def_flags = SYMBOL_DEF << def;
> for_all_symbols(i, sym) {
> @@ -377,7 +374,9 @@ load:
> continue;
> } else {
> if (line[0] != '\r' && line[0] != '\n')
> - conf_warning("unexpected data");
> + conf_warning("unexpected data: %.*s",
> + (int)strcspn(line, "\r\n"), line);
> +
> continue;
> }
> setsym:
> @@ -403,19 +402,23 @@ setsym:
> }
> free(line);
> fclose(in);
> - sym_calc_value(modules_sym);
> return 0;
> }
>
> int conf_read(const char *name)
> {
> struct symbol *sym;
> + int conf_unsaved = 0;
> int i;
>
> sym_set_change_count(0);
>
> - if (conf_read_simple(name, S_DEF_USER))
> + if (conf_read_simple(name, S_DEF_USER)) {
> + sym_calc_value(modules_sym);
> return 1;
> + }
> +
> + sym_calc_value(modules_sym);
>
> for_all_symbols(i, sym) {
> sym_calc_value(sym);
> @@ -846,6 +849,7 @@ static int conf_split_config(void)
>
> name = conf_get_autoconfig_name();
> conf_read_simple(name, S_DEF_AUTO);
> + sym_calc_value(modules_sym);
>
> if (chdir("include/config"))
> return 1;
> @@ -1119,7 +1123,7 @@ void set_all_choice_values(struct symbol *csym)
> bool conf_set_all_new_symbols(enum conf_def_mode mode)
> {
> struct symbol *sym, *csym;
> - int i, cnt, pby, pty, ptm; /* pby: probability of boolean = y
> + int i, cnt, pby, pty, ptm; /* pby: probability of bool = y
> * pty: probability of tristate = y
> * ptm: probability of tristate = m
> */
> diff --git a/xen/tools/kconfig/expr.c b/xen/tools/kconfig/expr.c
> index 667d1aa237..e1a39e9084 100644
> --- a/xen/tools/kconfig/expr.c
> +++ b/xen/tools/kconfig/expr.c
> @@ -94,7 +94,7 @@ struct expr *expr_copy(const struct expr *org)
> e->right.expr = expr_copy(org->right.expr);
> break;
> default:
> - printf("can't copy type %d\n", e->type);
> + fprintf(stderr, "can't copy type %d\n", e->type);
> free(e);
> e = NULL;
> break;
> @@ -113,7 +113,7 @@ void expr_free(struct expr *e)
> break;
> case E_NOT:
> expr_free(e->left.expr);
> - return;
> + break;
> case E_EQUAL:
> case E_GEQ:
> case E_GTH:
> @@ -127,7 +127,7 @@ void expr_free(struct expr *e)
> expr_free(e->right.expr);
> break;
> default:
> - printf("how to free type %d?\n", e->type);
> + fprintf(stderr, "how to free type %d?\n", e->type);
> break;
> }
> free(e);
> @@ -138,8 +138,18 @@ static int trans_count;
> #define e1 (*ep1)
> #define e2 (*ep2)
>
> +/*
> + * expr_eliminate_eq() helper.
> + *
> + * Walks the two expression trees given in 'ep1' and 'ep2'. Any node that
> does
> + * not have type 'type' (E_OR/E_AND) is considered a leaf, and is compared
> + * against all other leaves. Two equal leaves are both replaced with either
> 'y'
> + * or 'n' as appropriate for 'type', to be eliminated later.
> + */
> static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1,
> struct expr **ep2)
> {
> + /* Recurse down to leaves */
> +
> if (e1->type == type) {
> __expr_eliminate_eq(type, &e1->left.expr, &e2);
> __expr_eliminate_eq(type, &e1->right.expr, &e2);
> @@ -150,12 +160,18 @@ static void __expr_eliminate_eq(enum expr_type type,
> struct expr **ep1, struct e
> __expr_eliminate_eq(type, &e1, &e2->right.expr);
> return;
> }
> +
> + /* e1 and e2 are leaves. Compare them. */
> +
> if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&
> e1->left.sym == e2->left.sym &&
> (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no))
> return;
> if (!expr_eq(e1, e2))
> return;
> +
> + /* e1 and e2 are equal leaves. Prepare them for elimination. */
> +
> trans_count++;
> expr_free(e1); expr_free(e2);
> switch (type) {
> @@ -172,6 +188,35 @@ static void __expr_eliminate_eq(enum expr_type type,
> struct expr **ep1, struct e
> }
> }
>
> +/*
> + * Rewrites the expressions 'ep1' and 'ep2' to remove operands common to
> both.
> + * Example reductions:
> + *
> + * ep1: A && B -> ep1: y
> + * ep2: A && B && C -> ep2: C
> + *
> + * ep1: A || B -> ep1: n
> + * ep2: A || B || C -> ep2: C
> + *
> + * ep1: A && (B && FOO) -> ep1: FOO
> + * ep2: (BAR && B) && A -> ep2: BAR
> + *
> + * ep1: A && (B || C) -> ep1: y
> + * ep2: (C || B) && A -> ep2: y
> + *
> + * Comparisons are done between all operands at the same "level" of && or ||.
> + * For example, in the expression 'e1 && (e2 || e3) && (e4 || e5)', the
> + * following operands will be compared:
> + *
> + * - 'e1', 'e2 || e3', and 'e4 || e5', against each other
> + * - e2 against e3
> + * - e4 against e5
> + *
> + * Parentheses are irrelevant within a single level. 'e1 && (e2 && e3)' and
> + * '(e1 && e2) && e3' are both a single level.
> + *
> + * See __expr_eliminate_eq() as well.
> + */
> void expr_eliminate_eq(struct expr **ep1, struct expr **ep2)
> {
> if (!e1 || !e2)
> @@ -197,6 +242,12 @@ void expr_eliminate_eq(struct expr **ep1, struct expr
> **ep2)
> #undef e1
> #undef e2
>
> +/*
> + * Returns true if 'e1' and 'e2' are equal, after minor simplification. Two
> + * &&/|| expressions are considered equal if every operand in one expression
> + * equals some operand in the other (operands do not need to appear in the
> same
> + * order), recursively.
> + */
> static int expr_eq(struct expr *e1, struct expr *e2)
> {
> int res, old_count;
> @@ -243,6 +294,17 @@ static int expr_eq(struct expr *e1, struct expr *e2)
> return 0;
> }
>
> +/*
> + * Recursively performs the following simplifications in-place (as well as
> the
> + * corresponding simplifications with swapped operands):
> + *
> + * expr && n -> n
> + * expr && y -> expr
> + * expr || n -> expr
> + * expr || y -> y
> + *
> + * Returns the optimized expression.
> + */
> static struct expr *expr_eliminate_yn(struct expr *e)
> {
> struct expr *tmp;
> @@ -516,12 +578,21 @@ static struct expr *expr_join_and(struct expr *e1,
> struct expr *e2)
> return NULL;
> }
>
> +/*
> + * expr_eliminate_dups() helper.
> + *
> + * Walks the two expression trees given in 'ep1' and 'ep2'. Any node that
> does
> + * not have type 'type' (E_OR/E_AND) is considered a leaf, and is compared
> + * against all other leaves to look for simplifications.
> + */
> static void expr_eliminate_dups1(enum expr_type type, struct expr **ep1,
> struct expr **ep2)
> {
> #define e1 (*ep1)
> #define e2 (*ep2)
> struct expr *tmp;
>
> + /* Recurse down to leaves */
> +
> if (e1->type == type) {
> expr_eliminate_dups1(type, &e1->left.expr, &e2);
> expr_eliminate_dups1(type, &e1->right.expr, &e2);
> @@ -532,6 +603,9 @@ static void expr_eliminate_dups1(enum expr_type type,
> struct expr **ep1, struct
> expr_eliminate_dups1(type, &e1, &e2->right.expr);
> return;
> }
> +
> + /* e1 and e2 are leaves. Compare and process them. */
> +
> if (e1 == e2)
> return;
>
> @@ -568,6 +642,17 @@ static void expr_eliminate_dups1(enum expr_type type,
> struct expr **ep1, struct
> #undef e2
> }
>
> +/*
> + * Rewrites 'e' in-place to remove ("join") duplicate and other redundant
> + * operands.
> + *
> + * Example simplifications:
> + *
> + * A || B || A -> A || B
> + * A && B && A=y -> A=y && B
> + *
> + * Returns the deduplicated expression.
> + */
> struct expr *expr_eliminate_dups(struct expr *e)
> {
> int oldcount;
> @@ -584,6 +669,7 @@ struct expr *expr_eliminate_dups(struct expr *e)
> ;
> }
> if (!trans_count)
> + /* No simplifications done in this pass. We're done */
> break;
> e = expr_eliminate_yn(e);
> }
> @@ -591,6 +677,12 @@ struct expr *expr_eliminate_dups(struct expr *e)
> return e;
> }
>
> +/*
> + * Performs various simplifications involving logical operators and
> + * comparisons.
> + *
> + * Allocates and returns a new expression.
> + */
> struct expr *expr_transform(struct expr *e)
> {
> struct expr *tmp;
> @@ -805,6 +897,20 @@ bool expr_depends_symbol(struct expr *dep, struct symbol
> *sym)
> return false;
> }
>
> +/*
> + * Inserts explicit comparisons of type 'type' to symbol 'sym' into the
> + * expression 'e'.
> + *
> + * Examples transformations for type == E_UNEQUAL, sym == &symbol_no:
> + *
> + * A -> A!=n
> + * !A -> A=n
> + * A && B -> !(A=n || B=n)
> + * A || B -> !(A=n && B=n)
> + * A && (B || C) -> !(A=n || (B=n && C=n))
> + *
> + * Allocates and returns a new expression.
> + */
> struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct
> symbol *sym)
> {
> struct expr *e1, *e2;
> @@ -893,7 +999,10 @@ static enum string_value_kind expr_parse_string(const
> char *str,
> switch (type) {
> case S_BOOLEAN:
> case S_TRISTATE:
> - return k_string;
> + val->s = !strcmp(str, "n") ? 0 :
> + !strcmp(str, "m") ? 1 :
> + !strcmp(str, "y") ? 2 : -1;
> + return k_signed;
> case S_INT:
> val->s = strtoll(str, &tail, 10);
> kind = k_signed;
> @@ -1028,49 +1137,9 @@ static int expr_compare_type(enum expr_type t1, enum
> expr_type t2)
> return 0;
> }
>
> -static inline struct expr *
> -expr_get_leftmost_symbol(const struct expr *e)
> -{
> -
> - if (e == NULL)
> - return NULL;
> -
> - while (e->type != E_SYMBOL)
> - e = e->left.expr;
> -
> - return expr_copy(e);
> -}
> -
> -/*
> - * Given expression `e1' and `e2', returns the leaf of the longest
> - * sub-expression of `e1' not containing 'e2.
> - */
> -struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2)
> -{
> - struct expr *ret;
> -
> - switch (e1->type) {
> - case E_OR:
> - return expr_alloc_and(
> - expr_simplify_unmet_dep(e1->left.expr, e2),
> - expr_simplify_unmet_dep(e1->right.expr, e2));
> - case E_AND: {
> - struct expr *e;
> - e = expr_alloc_and(expr_copy(e1), expr_copy(e2));
> - e = expr_eliminate_dups(e);
> - ret = (!expr_eq(e, e1)) ? e1 : NULL;
> - expr_free(e);
> - break;
> - }
> - default:
> - ret = e1;
> - break;
> - }
> -
> - return expr_get_leftmost_symbol(ret);
> -}
> -
> -void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const
> char *), void *data, int prevtoken)
> +void expr_print(struct expr *e,
> + void (*fn)(void *, struct symbol *, const char *),
> + void *data, int prevtoken)
> {
> if (!e) {
> fn(data, NULL, "y");
> @@ -1113,7 +1182,7 @@ void expr_print(struct expr *e, void (*fn)(void *,
> struct symbol *, const char *
> fn(data, e->left.sym, e->left.sym->name);
> else
> fn(data, NULL, "<choice>");
> - fn(data, NULL, e->type == E_LEQ ? ">=" : ">");
> + fn(data, NULL, e->type == E_GEQ ? ">=" : ">");
> fn(data, e->right.sym, e->right.sym->name);
> break;
> case E_UNEQUAL:
> @@ -1204,3 +1273,33 @@ void expr_gstr_print(struct expr *e, struct gstr *gs)
> {
> expr_print(e, expr_print_gstr_helper, gs, E_NONE);
> }
> +
> +/*
> + * Transform the top level "||" tokens into newlines and prepend each
> + * line with a minus. This makes expressions much easier to read.
> + * Suitable for reverse dependency expressions.
> + */
> +static void expr_print_revdep(struct expr *e,
> + void (*fn)(void *, struct symbol *, const char *),
> + void *data, tristate pr_type, const char **title)
> +{
> + if (e->type == E_OR) {
> + expr_print_revdep(e->left.expr, fn, data, pr_type, title);
> + expr_print_revdep(e->right.expr, fn, data, pr_type, title);
> + } else if (expr_calc_value(e) == pr_type) {
> + if (*title) {
> + fn(data, NULL, *title);
> + *title = NULL;
> + }
> +
> + fn(data, NULL, " - ");
> + expr_print(e, fn, data, E_NONE);
> + fn(data, NULL, "\n");
> + }
> +}
> +
> +void expr_gstr_print_revdep(struct expr *e, struct gstr *gs,
> + tristate pr_type, const char *title)
> +{
> + expr_print_revdep(e, expr_print_gstr_helper, gs, pr_type, &title);
> +}
> diff --git a/xen/tools/kconfig/expr.h b/xen/tools/kconfig/expr.h
> index 973b6f7333..94a383b21d 100644
> --- a/xen/tools/kconfig/expr.h
> +++ b/xen/tools/kconfig/expr.h
> @@ -74,17 +74,61 @@ enum {
> S_DEF_COUNT
> };
>
> +/*
> + * Represents a configuration symbol.
> + *
> + * Choices are represented as a special kind of symbol and have the
> + * SYMBOL_CHOICE bit set in 'flags'.
> + */
> struct symbol {
> + /* The next symbol in the same bucket in the symbol hash table */
> struct symbol *next;
> +
> + /* The name of the symbol, e.g. "FOO" for 'config FOO' */
> char *name;
> +
> + /* S_BOOLEAN, S_TRISTATE, ... */
> enum symbol_type type;
> +
> + /*
> + * The calculated value of the symbol. The SYMBOL_VALID bit is set in
> + * 'flags' when this is up to date. Note that this value might differ
> + * from the user value set in e.g. a .config file, due to visibility.
> + */
> struct symbol_value curr;
> +
> + /*
> + * Values for the symbol provided from outside. def[S_DEF_USER] holds
> + * the .config value.
> + */
> struct symbol_value def[S_DEF_COUNT];
> +
> + /*
> + * An upper bound on the tristate value the user can set for the symbol
> + * if it is a boolean or tristate. Calculated from prompt dependencies,
> + * which also inherit dependencies from enclosing menus, choices, and
> + * ifs. If 'n', the user value will be ignored.
> + *
> + * Symbols lacking prompts always have visibility 'n'.
> + */
> tristate visible;
> +
> + /* SYMBOL_* flags */
> int flags;
> +
> + /* List of properties. See prop_type. */
> struct property *prop;
> +
> + /* Dependencies from enclosing menus, choices, and ifs */
> struct expr_value dir_dep;
> +
> + /* Reverse dependencies through being selected by other symbols */
> struct expr_value rev_dep;
> +
> + /*
> + * "Weak" reverse dependencies through being implied by other symbols
> + */
> + struct expr_value implied;
> };
>
> #define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for
> (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
> @@ -132,10 +176,11 @@ enum prop_type {
> P_UNKNOWN,
> P_PROMPT, /* prompt "foo prompt" or "BAZ Value" */
> P_COMMENT, /* text associated with a comment */
> - P_MENU, /* prompt associated with a menuconfig option */
> + P_MENU, /* prompt associated with a menu or menuconfig symbol */
> P_DEFAULT, /* default y */
> P_CHOICE, /* choice value */
> P_SELECT, /* select BAR */
> + P_IMPLY, /* imply BAR */
> P_RANGE, /* range 7..100 (for a symbol) */
> P_ENV, /* value from environment variable */
> P_SYMBOL, /* where a symbol is defined */
> @@ -164,22 +209,67 @@ struct property {
> for (st = sym->prop; st; st = st->next) \
> if (st->text)
>
> +/*
> + * Represents a node in the menu tree, as seen in e.g. menuconfig (though
> used
> + * for all front ends). Each symbol, menu, etc. defined in the Kconfig files
> + * gets a node. A symbol defined in multiple locations gets one node at each
> + * location.
> + */
> struct menu {
> + /* The next menu node at the same level */
> struct menu *next;
> +
> + /* The parent menu node, corresponding to e.g. a menu or choice */
> struct menu *parent;
> +
> + /* The first child menu node, for e.g. menus and choices */
> struct menu *list;
> +
> + /*
> + * The symbol associated with the menu node. Choices are implemented as
> + * a special kind of symbol. NULL for menus, comments, and ifs.
> + */
> struct symbol *sym;
> +
> + /*
> + * The prompt associated with the node. This holds the prompt for a
> + * symbol as well as the text for a menu or comment, along with the
> + * type (P_PROMPT, P_MENU, etc.)
> + */
> struct property *prompt;
> +
> + /*
> + * 'visible if' dependencies. If more than one is given, they will be
> + * ANDed together.
> + */
> struct expr *visibility;
> +
> + /*
> + * Ordinary dependencies from e.g. 'depends on' and 'if', ANDed
> + * together
> + */
> struct expr *dep;
> +
> + /* MENU_* flags */
> unsigned int flags;
> +
> + /* Any help text associated with the node */
> char *help;
> +
> + /* The location where the menu node appears in the Kconfig files */
> struct file *file;
> int lineno;
> +
> + /* For use by front ends that need to store auxiliary data */
> void *data;
> };
>
> +/*
> + * Set on a menu node when the corresponding symbol changes state in some
> way.
> + * Can be checked by front ends.
> + */
> #define MENU_CHANGED 0x0001
> +
> #define MENU_ROOT 0x0002
>
> struct jump_key {
> @@ -215,11 +305,12 @@ struct expr *expr_transform(struct expr *e);
> int expr_contains_symbol(struct expr *dep, struct symbol *sym);
> bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
> struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct
> symbol *sym);
> -struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);
>
> void expr_fprint(struct expr *e, FILE *out);
> struct gstr; /* forward */
> void expr_gstr_print(struct expr *e, struct gstr *gs);
> +void expr_gstr_print_revdep(struct expr *e, struct gstr *gs,
> + tristate pr_type, const char *title);
>
> static inline int expr_is_yes(struct expr *e)
> {
> diff --git a/xen/tools/kconfig/gconf.c b/xen/tools/kconfig/gconf.c
> index 26d208b435..cfddddb9c9 100644
> --- a/xen/tools/kconfig/gconf.c
> +++ b/xen/tools/kconfig/gconf.c
> @@ -914,7 +914,7 @@ on_treeview2_button_press_event(GtkWidget * widget,
> current = menu;
> display_tree_part();
> gtk_widget_set_sensitive(back_btn, TRUE);
> - } else if ((col == COL_OPTION)) {
> + } else if (col == COL_OPTION) {
> toggle_sym_value(menu);
> gtk_tree_view_expand_row(view, path, TRUE);
> }
> diff --git a/xen/tools/kconfig/kconf_id.c b/xen/tools/kconfig/kconf_id.c
> new file mode 100644
> index 0000000000..3ea9c5f9f7
> --- /dev/null
> +++ b/xen/tools/kconfig/kconf_id.c
> @@ -0,0 +1,53 @@
> +
> +static struct kconf_id kconf_id_array[] = {
> + { "mainmenu", T_MAINMENU, TF_COMMAND },
> + { "menu", T_MENU, TF_COMMAND },
> + { "endmenu", T_ENDMENU, TF_COMMAND },
> + { "source", T_SOURCE, TF_COMMAND },
> + { "choice", T_CHOICE, TF_COMMAND },
> + { "endchoice", T_ENDCHOICE, TF_COMMAND },
> + { "comment", T_COMMENT, TF_COMMAND },
> + { "config", T_CONFIG, TF_COMMAND },
> + { "menuconfig", T_MENUCONFIG, TF_COMMAND },
> + { "help", T_HELP, TF_COMMAND },
> + { "---help---", T_HELP, TF_COMMAND },
> + { "if", T_IF, TF_COMMAND|TF_PARAM },
> + { "endif", T_ENDIF, TF_COMMAND },
> + { "depends", T_DEPENDS, TF_COMMAND },
> + { "optional", T_OPTIONAL, TF_COMMAND },
> + { "default", T_DEFAULT, TF_COMMAND, S_UNKNOWN },
> + { "prompt", T_PROMPT, TF_COMMAND },
> + { "tristate", T_TYPE, TF_COMMAND, S_TRISTATE
> },
> + { "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE
> },
> + { "bool", T_TYPE, TF_COMMAND, S_BOOLEAN },
> + { "def_bool", T_DEFAULT, TF_COMMAND, S_BOOLEAN },
> + { "int", T_TYPE, TF_COMMAND, S_INT },
> + { "hex", T_TYPE, TF_COMMAND, S_HEX },
> + { "string", T_TYPE, TF_COMMAND, S_STRING },
> + { "select", T_SELECT, TF_COMMAND },
> + { "imply", T_IMPLY, TF_COMMAND },
> + { "range", T_RANGE, TF_COMMAND },
> + { "visible", T_VISIBLE, TF_COMMAND },
> + { "option", T_OPTION, TF_COMMAND },
> + { "on", T_ON, TF_PARAM },
> + { "modules", T_OPT_MODULES, TF_OPTION },
> + { "defconfig_list", T_OPT_DEFCONFIG_LIST, TF_OPTION },
> + { "env", T_OPT_ENV, TF_OPTION },
> + { "allnoconfig_y", T_OPT_ALLNOCONFIG_Y, TF_OPTION },
> +};
> +
> +#define KCONF_ID_ARRAY_SIZE (sizeof(kconf_id_array)/sizeof(struct kconf_id))
> +
> +static const struct kconf_id *kconf_id_lookup(register const char *str,
> register unsigned int len)
> +{
> + int i;
> +
> + for (i = 0; i < KCONF_ID_ARRAY_SIZE; i++) {
> + struct kconf_id *id = kconf_id_array+i;
> + int l = strlen(id->name);
> +
> + if (len == l && !memcmp(str, id->name, len))
> + return id;
> + }
> + return NULL;
> +}
> diff --git a/xen/tools/kconfig/kxgettext.c b/xen/tools/kconfig/kxgettext.c
> index 2858738b22..240880a891 100644
> --- a/xen/tools/kconfig/kxgettext.c
> +++ b/xen/tools/kconfig/kxgettext.c
> @@ -101,7 +101,7 @@ static struct message *message__new(const char *msg, char
> *option,
> if (self->files == NULL)
> goto out_fail;
>
> - self->msg = strdup(msg);
> + self->msg = xstrdup(msg);
> if (self->msg == NULL)
> goto out_fail_msg;
>
> diff --git a/xen/tools/kconfig/list.h b/xen/tools/kconfig/list.h
> index 2cf23f002d..45cb237ab7 100644
> --- a/xen/tools/kconfig/list.h
> +++ b/xen/tools/kconfig/list.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> #ifndef LIST_H
> #define LIST_H
>
> diff --git a/xen/tools/kconfig/lkc.h b/xen/tools/kconfig/lkc.h
> index 91ca126ea0..f4394af6e4 100644
> --- a/xen/tools/kconfig/lkc.h
> +++ b/xen/tools/kconfig/lkc.h
> @@ -62,12 +62,13 @@ enum conf_def_mode {
> #define T_OPT_ALLNOCONFIG_Y 4
>
> struct kconf_id {
> - int name;
> + const char *name;
> int token;
> unsigned int flags;
> enum symbol_type stype;
> };
>
> +extern int yylineno;
> void zconfdump(FILE *out);
> void zconf_starthelp(void);
> FILE *zconf_fopen(const char *name);
> @@ -100,7 +101,6 @@ void menu_warn(struct menu *menu, const char *fmt, ...);
> struct menu *menu_add_menu(void);
> void menu_end_menu(void);
> void menu_add_entry(struct symbol *sym);
> -void menu_end_entry(void);
> void menu_add_dep(struct expr *dep);
> void menu_add_visibility(struct expr *dep);
> struct property *menu_add_prompt(enum prop_type type, char *prompt, struct
> expr *dep);
> @@ -115,6 +115,8 @@ struct file *file_lookup(const char *name);
> int file_write_dep(const char *name);
> void *xmalloc(size_t size);
> void *xcalloc(size_t nmemb, size_t size);
> +void *xrealloc(void *p, size_t size);
> +char *xstrdup(const char *s);
>
> struct gstr {
> size_t len;
> diff --git a/xen/tools/kconfig/lkc_proto.h b/xen/tools/kconfig/lkc_proto.h
> index d5398718ec..9dc8abfb1d 100644
> --- a/xen/tools/kconfig/lkc_proto.h
> +++ b/xen/tools/kconfig/lkc_proto.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> #include <stdarg.h>
>
> /* confdata.c */
> @@ -30,7 +31,7 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
>
> struct symbol * sym_lookup(const char *name, int flags);
> struct symbol * sym_find(const char *name);
> -const char * sym_expand_string_value(const char *in);
> +char *sym_expand_string_value(const char *in);
> const char * sym_escape_string_value(const char *in);
> struct symbol ** sym_re_search(const char *pattern);
> const char * sym_type_name(enum symbol_type type);
> diff --git a/xen/tools/kconfig/lxdialog/check-lxdialog.sh
> b/xen/tools/kconfig/lxdialog/check-lxdialog.sh
> index 5075ebf2d3..6c0bcd9c47 100755
> --- a/xen/tools/kconfig/lxdialog/check-lxdialog.sh
> +++ b/xen/tools/kconfig/lxdialog/check-lxdialog.sh
> @@ -1,4 +1,5 @@
> #!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> # Check ncurses compatibility
>
> # What library to link
> @@ -54,7 +55,8 @@ EOF
> echo " *** required header files." 1>&2
> echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
> echo " *** " 1>&2
> - echo " *** Install ncurses (ncurses-devel) and try again." 1>&2
> + echo " *** Install ncurses (ncurses-devel or libncurses-dev " 1>&2
> + echo " *** depending on your distribution) and try again." 1>&2
> echo " *** " 1>&2
> exit 1
> fi
> diff --git a/xen/tools/kconfig/mconf.c b/xen/tools/kconfig/mconf.c
> index 315ce2c7cb..c829be8bb1 100644
> --- a/xen/tools/kconfig/mconf.c
> +++ b/xen/tools/kconfig/mconf.c
> @@ -246,7 +246,7 @@ search_help[] = N_(
> " Selected by: BAR [=n]\n"
> "-----------------------------------------------------------------\n"
> "o The line 'Type:' shows the type of the configuration option for\n"
> - " this symbol (boolean, tristate, string, ...)\n"
> + " this symbol (bool, tristate, string, ...)\n"
> "o The line 'Prompt:' shows the text used in the menu structure for\n"
> " this symbol\n"
> "o The 'Defined at' line tells at what file / line number the symbol\n"
> diff --git a/xen/tools/kconfig/menu.c b/xen/tools/kconfig/menu.c
> index b05cc3d4a9..5c5c1374b1 100644
> --- a/xen/tools/kconfig/menu.c
> +++ b/xen/tools/kconfig/menu.c
> @@ -62,13 +62,8 @@ void menu_add_entry(struct symbol *sym)
> menu_add_symbol(P_SYMBOL, sym, NULL);
> }
>
> -void menu_end_entry(void)
> -{
> -}
> -
> struct menu *menu_add_menu(void)
> {
> - menu_end_entry();
> last_entry_ptr = ¤t_entry->list;
> return current_menu = current_entry;
> }
> @@ -79,19 +74,23 @@ void menu_end_menu(void)
> current_menu = current_menu->parent;
> }
>
> -static struct expr *menu_check_dep(struct expr *e)
> +/*
> + * Rewrites 'm' to 'm' && MODULES, so that it evaluates to 'n' when running
> + * without modules
> + */
> +static struct expr *rewrite_m(struct expr *e)
> {
> if (!e)
> return e;
>
> switch (e->type) {
> case E_NOT:
> - e->left.expr = menu_check_dep(e->left.expr);
> + e->left.expr = rewrite_m(e->left.expr);
> break;
> case E_OR:
> case E_AND:
> - e->left.expr = menu_check_dep(e->left.expr);
> - e->right.expr = menu_check_dep(e->right.expr);
> + e->left.expr = rewrite_m(e->left.expr);
> + e->right.expr = rewrite_m(e->right.expr);
> break;
> case E_SYMBOL:
> /* change 'm' into 'm' && MODULES */
> @@ -106,7 +105,7 @@ static struct expr *menu_check_dep(struct expr *e)
>
> void menu_add_dep(struct expr *dep)
> {
> - current_entry->dep = expr_alloc_and(current_entry->dep,
> menu_check_dep(dep));
> + current_entry->dep = expr_alloc_and(current_entry->dep, dep);
> }
>
> void menu_set_type(int type)
> @@ -131,7 +130,7 @@ static struct property *menu_add_prop(enum prop_type
> type, char *prompt, struct
>
> prop->menu = current_entry;
> prop->expr = expr;
> - prop->visible.expr = menu_check_dep(dep);
> + prop->visible.expr = dep;
>
> if (prompt) {
> if (isspace(*prompt)) {
> @@ -213,6 +212,7 @@ void menu_add_option(int token, char *arg)
> sym_defconfig_list = current_entry->sym;
> else if (sym_defconfig_list != current_entry->sym)
> zconf_error("trying to redefine defconfig symbol");
> + sym_defconfig_list->flags |= SYMBOL_AUTO;
> break;
> case T_OPT_ENV:
> prop_add_env(arg);
> @@ -233,6 +233,8 @@ static void sym_check_prop(struct symbol *sym)
> {
> struct property *prop;
> struct symbol *sym2;
> + char *use;
> +
> for (prop = sym->prop; prop; prop = prop->next) {
> switch (prop->type) {
> case P_DEFAULT:
> @@ -250,20 +252,32 @@ static void sym_check_prop(struct symbol *sym)
> "'%s': number is invalid",
> sym->name);
> }
> + if (sym_is_choice(sym)) {
> + struct property *choice_prop =
> + sym_get_choice_prop(sym2);
> +
> + if (!choice_prop ||
> + prop_get_symbol(choice_prop) != sym)
> + prop_warn(prop,
> + "choice default symbol '%s'
> is not contained in the choice",
> + sym2->name);
> + }
> break;
> case P_SELECT:
> + case P_IMPLY:
> + use = prop->type == P_SELECT ? "select" : "imply";
> sym2 = prop_get_symbol(prop);
> if (sym->type != S_BOOLEAN && sym->type != S_TRISTATE)
> prop_warn(prop,
> - "config symbol '%s' uses select, but is "
> - "not boolean or tristate", sym->name);
> + "config symbol '%s' uses %s, but is "
> + "not bool or tristate", sym->name, use);
> else if (sym2->type != S_UNKNOWN &&
> sym2->type != S_BOOLEAN &&
> sym2->type != S_TRISTATE)
> prop_warn(prop,
> - "'%s' has wrong type. 'select' only "
> - "accept arguments of boolean and "
> - "tristate type", sym2->name);
> + "'%s' has wrong type. '%s' only "
> + "accept arguments of bool and "
> + "tristate type", sym2->name, use);
> break;
> case P_RANGE:
> if (sym->type != S_INT && sym->type != S_HEX)
> @@ -288,6 +302,11 @@ void menu_finalize(struct menu *parent)
>
> sym = parent->sym;
> if (parent->list) {
> + /*
> + * This menu node has children. We (recursively) process them
> + * and propagate parent dependencies before moving on.
> + */
> +
> if (sym && sym_is_choice(sym)) {
> if (sym->type == S_UNKNOWN) {
> /* find the first choice value to find out
> choice type */
> @@ -305,65 +324,169 @@ void menu_finalize(struct menu *parent)
> if (menu->sym && menu->sym->type == S_UNKNOWN)
> menu_set_type(sym->type);
> }
> +
> + /*
> + * Use the choice itself as the parent dependency of
> + * the contained items. This turns the mode of the
> + * choice into an upper bound on the visibility of the
> + * choice value symbols.
> + */
> parentdep = expr_alloc_symbol(sym);
> } else if (parent->prompt)
> + /* Menu node for 'menu' */
> parentdep = parent->prompt->visible.expr;
> else
> + /* Menu node for 'if' */
> parentdep = parent->dep;
>
> + /* For each child menu node... */
> for (menu = parent->list; menu; menu = menu->next) {
> - basedep = expr_transform(menu->dep);
> + /*
> + * Propagate parent dependencies to the child menu
> + * node, also rewriting and simplifying expressions
> + */
> + basedep = rewrite_m(menu->dep);
> + basedep = expr_transform(basedep);
> basedep = expr_alloc_and(expr_copy(parentdep), basedep);
> basedep = expr_eliminate_dups(basedep);
> menu->dep = basedep;
> +
> if (menu->sym)
> + /*
> + * Note: For symbols, all prompts are included
> + * too in the symbol's own property list
> + */
> prop = menu->sym->prop;
> else
> + /*
> + * For non-symbol menu nodes, we just need to
> + * handle the prompt
> + */
> prop = menu->prompt;
> +
> + /* For each property... */
> for (; prop; prop = prop->next) {
> if (prop->menu != menu)
> + /*
> + * Two possibilities:
> + *
> + * 1. The property lacks dependencies
> + * and so isn't location-specific,
> + * e.g. an 'option'
> + *
> + * 2. The property belongs to a symbol
> + * defined in multiple locations and
> + * is from some other location. It
> + * will be handled there in that
> + * case.
> + *
> + * Skip the property.
> + */
> continue;
> - dep = expr_transform(prop->visible.expr);
> +
> + /*
> + * Propagate parent dependencies to the
> + * property's condition, rewriting and
> + * simplifying expressions at the same time
> + */
> + dep = rewrite_m(prop->visible.expr);
> + dep = expr_transform(dep);
> dep = expr_alloc_and(expr_copy(basedep), dep);
> dep = expr_eliminate_dups(dep);
> if (menu->sym && menu->sym->type != S_TRISTATE)
> dep = expr_trans_bool(dep);
> prop->visible.expr = dep;
> +
> + /*
> + * Handle selects and implies, which modify the
> + * dependencies of the selected/implied symbol
> + */
> if (prop->type == P_SELECT) {
> struct symbol *es =
> prop_get_symbol(prop);
> es->rev_dep.expr =
> expr_alloc_or(es->rev_dep.expr,
>
> expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep)));
> + } else if (prop->type == P_IMPLY) {
> + struct symbol *es =
> prop_get_symbol(prop);
> + es->implied.expr =
> expr_alloc_or(es->implied.expr,
> +
> expr_alloc_and(expr_alloc_symbol(menu->sym), expr_copy(dep)));
> }
> }
> }
> +
> + if (sym && sym_is_choice(sym))
> + expr_free(parentdep);
> +
> + /*
> + * Recursively process children in the same fashion before
> + * moving on
> + */
> for (menu = parent->list; menu; menu = menu->next)
> menu_finalize(menu);
> } else if (sym) {
> + /*
> + * Automatic submenu creation. If sym is a symbol and A, B, C,
> + * ... are consecutive items (symbols, menus, ifs, etc.) that
> + * all depend on sym, then the following menu structure is
> + * created:
> + *
> + * sym
> + * +-A
> + * +-B
> + * +-C
> + * ...
> + *
> + * This also works recursively, giving the following structure
> + * if A is a symbol and B depends on A:
> + *
> + * sym
> + * +-A
> + * | +-B
> + * +-C
> + * ...
> + */
> +
> basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
> basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
> basedep = expr_eliminate_dups(expr_transform(basedep));
> +
> + /* Examine consecutive elements after sym */
> last_menu = NULL;
> for (menu = parent->next; menu; menu = menu->next) {
> dep = menu->prompt ? menu->prompt->visible.expr :
> menu->dep;
> if (!expr_contains_symbol(dep, sym))
> + /* No dependency, quit */
> break;
> if (expr_depends_symbol(dep, sym))
> + /* Absolute dependency, put in submenu */
> goto next;
> +
> + /*
> + * Also consider it a dependency on sym if our
> + * dependencies contain sym and are a "superset" of
> + * sym's dependencies, e.g. '(sym || Q) && R' when sym
> + * depends on R.
> + *
> + * Note that 'R' might be from an enclosing menu or if,
> + * making this a more common case than it might seem.
> + */
> dep = expr_trans_compare(dep, E_UNEQUAL, &symbol_no);
> dep = expr_eliminate_dups(expr_transform(dep));
> dep2 = expr_copy(basedep);
> expr_eliminate_eq(&dep, &dep2);
> expr_free(dep);
> if (!expr_is_yes(dep2)) {
> + /* Not superset, quit */
> expr_free(dep2);
> break;
> }
> + /* Superset, put in submenu */
> expr_free(dep2);
> next:
> menu_finalize(menu);
> menu->parent = parent;
> last_menu = menu;
> }
> + expr_free(basedep);
> if (last_menu) {
> parent->list = parent->next;
> parent->next = last_menu->next;
> @@ -412,6 +535,35 @@ void menu_finalize(struct menu *parent)
> *ep = expr_alloc_one(E_LIST, NULL);
> (*ep)->right.sym = menu->sym;
> }
> +
> + /*
> + * This code serves two purposes:
> + *
> + * (1) Flattening 'if' blocks, which do not specify a submenu
> + * and only add dependencies.
> + *
> + * (Automatic submenu creation might still create a submenu
> + * from an 'if' before this code runs.)
> + *
> + * (2) "Undoing" any automatic submenus created earlier below
> + * promptless symbols.
> + *
> + * Before:
> + *
> + * A
> + * if ... (or promptless symbol)
> + * +-B
> + * +-C
> + * D
> + *
> + * After:
> + *
> + * A
> + * if ... (or promptless symbol)
> + * B
> + * C
> + * D
> + */
> if (menu->list && (!menu->prompt || !menu->prompt->text)) {
> for (last_menu = menu->list; ; last_menu =
> last_menu->next) {
> last_menu->parent = parent;
> @@ -436,6 +588,15 @@ void menu_finalize(struct menu *parent)
> sym->flags |= SYMBOL_WARNED;
> }
>
> + /*
> + * For non-optional choices, add a reverse dependency (corresponding to
> + * a select) of '<visibility> && m'. This prevents the user from
> + * setting the choice mode to 'n' when the choice is visible.
> + *
> + * This would also work for non-choice symbols, but only non-optional
> + * choices clear SYMBOL_OPTIONAL as of writing. Choices are implemented
> + * as a type of symbol.
> + */
> if (sym && !sym_is_optional(sym) && parent->prompt) {
> sym->rev_dep.expr = expr_alloc_or(sym->rev_dep.expr,
> expr_alloc_and(parent->prompt->visible.expr,
> @@ -477,7 +638,7 @@ bool menu_is_visible(struct menu *menu)
>
> if (menu->visibility) {
> if (expr_calc_value(menu->visibility) == no)
> - return no;
> + return false;
> }
>
> sym = menu->sym;
> @@ -612,13 +773,30 @@ static struct property *get_symbol_prop(struct symbol
> *sym)
> return prop;
> }
>
> +static void get_symbol_props_str(struct gstr *r, struct symbol *sym,
> + enum prop_type tok, const char *prefix)
> +{
> + bool hit = false;
> + struct property *prop;
> +
> + for_all_properties(sym, prop, tok) {
> + if (!hit) {
> + str_append(r, prefix);
> + hit = true;
> + } else
> + str_printf(r, " && ");
> + expr_gstr_print(prop->expr, r);
> + }
> + if (hit)
> + str_append(r, "\n");
> +}
> +
> /*
> * head is optional and may be NULL
> */
> static void get_symbol_str(struct gstr *r, struct symbol *sym,
> struct list_head *head)
> {
> - bool hit;
> struct property *prop;
>
> if (sym && sym->name) {
> @@ -648,22 +826,20 @@ static void get_symbol_str(struct gstr *r, struct
> symbol *sym,
> }
> }
>
> - hit = false;
> - for_all_properties(sym, prop, P_SELECT) {
> - if (!hit) {
> - str_append(r, " Selects: ");
> - hit = true;
> - } else
> - str_printf(r, " && ");
> - expr_gstr_print(prop->expr, r);
> - }
> - if (hit)
> - str_append(r, "\n");
> + get_symbol_props_str(r, sym, P_SELECT, _(" Selects: "));
> if (sym->rev_dep.expr) {
> - str_append(r, _(" Selected by: "));
> - expr_gstr_print(sym->rev_dep.expr, r);
> - str_append(r, "\n");
> + expr_gstr_print_revdep(sym->rev_dep.expr, r, yes, " Selected
> by [y]:\n");
> + expr_gstr_print_revdep(sym->rev_dep.expr, r, mod, " Selected
> by [m]:\n");
> + expr_gstr_print_revdep(sym->rev_dep.expr, r, no, " Selected by
> [n]:\n");
> }
> +
> + get_symbol_props_str(r, sym, P_IMPLY, _(" Implies: "));
> + if (sym->implied.expr) {
> + expr_gstr_print_revdep(sym->implied.expr, r, yes, " Implied by
> [y]:\n");
> + expr_gstr_print_revdep(sym->implied.expr, r, mod, " Implied by
> [m]:\n");
> + expr_gstr_print_revdep(sym->implied.expr, r, no, " Implied by
> [n]:\n");
> + }
> +
> str_append(r, "\n\n");
> }
>
> diff --git a/xen/tools/kconfig/merge_config.sh
> b/xen/tools/kconfig/merge_config.sh
> index 0d883b3788..67d1314476 100755
> --- a/xen/tools/kconfig/merge_config.sh
> +++ b/xen/tools/kconfig/merge_config.sh
> @@ -32,7 +32,7 @@ usage() {
> echo " -m only merge the fragments, do not execute the make command"
> echo " -n use allnoconfig instead of alldefconfig"
> echo " -r list redundant entries when merging fragments"
> - echo " -O dir to put generated output files"
> + echo " -O dir to put generated output files. Consider setting
> \$KCONFIG_CONFIG instead."
> }
>
> RUNMAKE=true
> @@ -77,11 +77,19 @@ while true; do
> esac
> done
>
> -if [ "$#" -lt 2 ] ; then
> +if [ "$#" -lt 1 ] ; then
> usage
> exit
> fi
>
> +if [ -z "$KCONFIG_CONFIG" ]; then
> + if [ "$OUTPUT" != . ]; then
> + KCONFIG_CONFIG=$(readlink -m -- "$OUTPUT/.config")
> + else
> + KCONFIG_CONFIG=.config
> + fi
> +fi
> +
> INITFILE=$1
> shift;
>
> @@ -124,9 +132,9 @@ for MERGE_FILE in $MERGE_LIST ; do
> done
>
> if [ "$RUNMAKE" = "false" ]; then
> - cp $TMP_FILE $OUTPUT/.config
> + cp -T -- "$TMP_FILE" "$KCONFIG_CONFIG"
> echo "#"
> - echo "# merged configuration written to $OUTPUT/.config (needs make)"
> + echo "# merged configuration written to $KCONFIG_CONFIG (needs make)"
> echo "#"
> clean_up
> exit
> @@ -150,7 +158,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
> for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
>
> REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
> - ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config)
> + ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
> if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then
> echo "Value requested for $CFG not in final .config"
> echo "Requested value: $REQUESTED_VAL"
> diff --git a/xen/tools/kconfig/nconf.c b/xen/tools/kconfig/nconf.c
> index d42d534a66..0031147798 100644
> --- a/xen/tools/kconfig/nconf.c
> +++ b/xen/tools/kconfig/nconf.c
> @@ -5,7 +5,9 @@
> * Derived from menuconfig.
> *
> */
> +#ifndef _GNU_SOURCE
> #define _GNU_SOURCE
> +#endif
> #include <string.h>
> #include <stdlib.h>
>
> @@ -269,7 +271,7 @@ static struct mitem k_menu_items[MAX_MENU_ITEMS];
> static int items_num;
> static int global_exit;
> /* the currently selected button */
> -const char *current_instructions = menu_instructions;
> +static const char *current_instructions = menu_instructions;
>
> static char *dialog_input_result;
> static int dialog_input_result_len;
> @@ -303,7 +305,7 @@ struct function_keys {
> };
>
> static const int function_keys_num = 9;
> -struct function_keys function_keys[] = {
> +static struct function_keys function_keys[] = {
> {
> .key_str = "F1",
> .func = "Help",
> @@ -506,7 +508,7 @@ static int get_mext_match(const char *match_str, match_f
> flag)
> index = (index + items_num) % items_num;
> while (true) {
> char *str = k_menu_items[index].str;
> - if (strcasestr(str, match_str) != 0)
> + if (strcasestr(str, match_str) != NULL)
> return index;
> if (flag == FIND_NEXT_MATCH_UP ||
> flag == MATCH_TINKER_PATTERN_UP)
> @@ -1065,7 +1067,7 @@ static int do_match(int key, struct match_state *state,
> int *ans)
>
> static void conf(struct menu *menu)
> {
> - struct menu *submenu = 0;
> + struct menu *submenu = NULL;
> const char *prompt = menu_get_prompt(menu);
> struct symbol *sym;
> int res;
> @@ -1232,7 +1234,7 @@ static void show_help(struct menu *menu)
> static void conf_choice(struct menu *menu)
> {
> const char *prompt = _(menu_get_prompt(menu));
> - struct menu *child = 0;
> + struct menu *child = NULL;
> struct symbol *active;
> int selected_index = 0;
> int last_top_row = 0;
> @@ -1454,7 +1456,7 @@ static void conf_save(void)
> }
> }
>
> -void setup_windows(void)
> +static void setup_windows(void)
> {
> int lines, columns;
>
> diff --git a/xen/tools/kconfig/nconf.gui.c b/xen/tools/kconfig/nconf.gui.c
> index 8275f0e551..88874acfda 100644
> --- a/xen/tools/kconfig/nconf.gui.c
> +++ b/xen/tools/kconfig/nconf.gui.c
> @@ -6,6 +6,7 @@
> *
> */
> #include "nconf.h"
> +#include "lkc.h"
>
> /* a list of all the different widgets we use */
> attributes_t attributes[ATTR_MAX+1] = {0};
> @@ -129,7 +130,7 @@ static void no_colors_theme(void)
> mkattrn(FUNCTION_TEXT, A_REVERSE);
> }
>
> -void set_colors()
> +void set_colors(void)
> {
> start_color();
> use_default_colors();
> @@ -192,7 +193,7 @@ const char *get_line(const char *text, int line_no)
> int lines = 0;
>
> if (!text)
> - return 0;
> + return NULL;
>
> for (i = 0; text[i] != '\0' && lines < line_no; i++)
> if (text[i] == '\n')
> @@ -364,15 +365,17 @@ int dialog_inputbox(WINDOW *main_window,
> WINDOW *prompt_win;
> WINDOW *form_win;
> PANEL *panel;
> - int i, x, y;
> + int i, x, y, lines, columns, win_lines, win_cols;
> int res = -1;
> int cursor_position = strlen(init);
> int cursor_form_win;
> char *result = *resultp;
>
> + getmaxyx(stdscr, lines, columns);
> +
> if (strlen(init)+1 > *result_len) {
> *result_len = strlen(init)+1;
> - *resultp = result = realloc(result, *result_len);
> + *resultp = result = xrealloc(result, *result_len);
> }
>
> /* find the widest line of msg: */
> @@ -386,14 +389,19 @@ int dialog_inputbox(WINDOW *main_window,
> if (title)
> prompt_width = max(prompt_width, strlen(title));
>
> + win_lines = min(prompt_lines+6, lines-2);
> + win_cols = min(prompt_width+7, columns-2);
> + prompt_lines = max(win_lines-6, 0);
> + prompt_width = max(win_cols-7, 0);
> +
> /* place dialog in middle of screen */
> - y = (getmaxy(stdscr)-(prompt_lines+4))/2;
> - x = (getmaxx(stdscr)-(prompt_width+4))/2;
> + y = (lines-win_lines)/2;
> + x = (columns-win_cols)/2;
>
> strncpy(result, init, *result_len);
>
> /* create the windows */
> - win = newwin(prompt_lines+6, prompt_width+7, y, x);
> + win = newwin(win_lines, win_cols, y, x);
> prompt_win = derwin(win, prompt_lines+1, prompt_width, 2, 2);
> form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2);
> keypad(form_win, TRUE);
> diff --git a/xen/tools/kconfig/nconf.h b/xen/tools/kconfig/nconf.h
> index 0d5261705e..9f6f21d3b0 100644
> --- a/xen/tools/kconfig/nconf.h
> +++ b/xen/tools/kconfig/nconf.h
> @@ -15,7 +15,7 @@
> #include <string.h>
> #include <unistd.h>
> #include <locale.h>
> -#include <curses.h>
> +#include <ncurses.h>
> #include <menu.h>
> #include <panel.h>
> #include <form.h>
> @@ -24,8 +24,6 @@
> #include <time.h>
> #include <sys/time.h>
>
> -#include "ncurses.h"
> -
> #define max(a, b) ({\
> typeof(a) _a = a;\
> typeof(b) _b = b;\
> diff --git a/xen/tools/kconfig/qconf.cc b/xen/tools/kconfig/qconf.cc
> index c3bb7fe8df..ae6c725464 100644
> --- a/xen/tools/kconfig/qconf.cc
> +++ b/xen/tools/kconfig/qconf.cc
> @@ -1,32 +1,17 @@
> /*
> * Copyright (C) 2002 Roman Zippel <zippel@xxxxxxxxxxxxxx>
> + * Copyright (C) 2015 Boris Barbulovski <bbarbulovski@xxxxxxxxx>
> * Released under the terms of the GNU GPL v2.0.
> */
>
> #include <qglobal.h>
>
> -#if QT_VERSION < 0x040000
> -#include <stddef.h>
> -#include <qmainwindow.h>
> -#include <qvbox.h>
> -#include <qvaluelist.h>
> +#include <QMainWindow>
> +#include <QList>
> #include <qtextbrowser.h>
> -#include <qaction.h>
> -#include <qheader.h>
> -#include <qfiledialog.h>
> -#include <qdragobject.h>
> -#include <qpopupmenu.h>
> -#else
> -#include <q3mainwindow.h>
> -#include <q3vbox.h>
> -#include <q3valuelist.h>
> -#include <q3textbrowser.h>
> -#include <q3action.h>
> -#include <q3header.h>
> -#include <q3filedialog.h>
> -#include <q3dragobject.h>
> -#include <q3popupmenu.h>
> -#endif
> +#include <QAction>
> +#include <QFileDialog>
> +#include <QMenu>
>
> #include <qapplication.h>
> #include <qdesktopwidget.h>
> @@ -57,7 +42,7 @@
> static QApplication *configApp;
> static ConfigSettings *configSettings;
>
> -Q3Action *ConfigMainWindow::saveAction;
> +QAction *ConfigMainWindow::saveAction;
>
> static inline QString qgettext(const char* str)
> {
> @@ -66,7 +51,7 @@ static inline QString qgettext(const char* str)
>
> static inline QString qgettext(const QString& str)
> {
> - return QString::fromLocal8Bit(gettext(str.latin1()));
> + return QString::fromLocal8Bit(gettext(str.toLatin1()));
> }
>
> ConfigSettings::ConfigSettings()
> @@ -77,14 +62,22 @@ ConfigSettings::ConfigSettings()
> /**
> * Reads a list of integer values from the application settings.
> */
> -Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
> +QList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
> {
> - Q3ValueList<int> result;
> - QStringList entryList = readListEntry(key, ok);
> - QStringList::Iterator it;
> + QList<int> result;
> +
> + if (contains(key))
> + {
> + QStringList entryList = value(key).toStringList();
> + QStringList::Iterator it;
>
> - for (it = entryList.begin(); it != entryList.end(); ++it)
> - result.push_back((*it).toInt());
> + for (it = entryList.begin(); it != entryList.end(); ++it)
> + result.push_back((*it).toInt());
> +
> + *ok = true;
> + }
> + else
> + *ok = false;
>
> return result;
> }
> @@ -92,14 +85,16 @@ Q3ValueList<int> ConfigSettings::readSizes(const QString&
> key, bool *ok)
> /**
> * Writes a list of integer values to the application settings.
> */
> -bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>&
> value)
> +bool ConfigSettings::writeSizes(const QString& key, const QList<int>& value)
> {
> QStringList stringList;
> - Q3ValueList<int>::ConstIterator it;
> + QList<int>::ConstIterator it;
>
> for (it = value.begin(); it != value.end(); ++it)
> stringList.push_back(QString::number(*it));
> - return writeEntry(key, stringList);
> + setValue(key, stringList);
> +
> + return true;
> }
>
>
> @@ -109,9 +104,6 @@ bool ConfigSettings::writeSizes(const QString& key, const
> Q3ValueList<int>& valu
> */
> void ConfigItem::okRename(int col)
> {
> - Parent::okRename(col);
> - sym_set_string_value(menu->sym, text(dataColIdx).latin1());
> - listView()->updateList(this);
> }
>
> /*
> @@ -149,11 +141,11 @@ void ConfigItem::updateMenu(void)
> } else {
> if (sym)
> break;
> - setPixmap(promptColIdx, 0);
> + setPixmap(promptColIdx, QIcon());
> }
> goto set_prompt;
> case P_COMMENT:
> - setPixmap(promptColIdx, 0);
> + setPixmap(promptColIdx, QIcon());
> goto set_prompt;
> default:
> ;
> @@ -170,7 +162,7 @@ void ConfigItem::updateMenu(void)
> char ch;
>
> if (!sym_is_changable(sym) && list->optMode == normalOpt) {
> - setPixmap(promptColIdx, 0);
> + setPixmap(promptColIdx, QIcon());
> setText(noColIdx, QString::null);
> setText(modColIdx, QString::null);
> setText(yesColIdx, QString::null);
> @@ -216,9 +208,6 @@ void ConfigItem::updateMenu(void)
>
> data = sym_get_string_value(sym);
>
> - int i = list->mapIdx(dataColIdx);
> - if (i >= 0)
> - setRenameEnabled(i, TRUE);
> setText(dataColIdx, data);
> if (type == S_STRING)
> prompt = QString("%1: %2").arg(prompt).arg(data);
> @@ -250,18 +239,6 @@ void ConfigItem::testUpdateMenu(bool v)
> updateMenu();
> }
>
> -void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column,
> int width, int align)
> -{
> - ConfigList* list = listView();
> -
> - if (visible) {
> - if (isSelected() && !list->hasFocus() && list->mode == menuMode)
> - Parent::paintCell(p, list->inactivedColorGroup, column,
> width, align);
> - else
> - Parent::paintCell(p, cg, column, width, align);
> - } else
> - Parent::paintCell(p, list->disabledColorGroup, column, width,
> align);
> -}
>
> /*
> * construct a menu entry
> @@ -274,7 +251,7 @@ void ConfigItem::init(void)
> menu->data = this;
>
> if (list->mode != fullMode)
> - setOpen(TRUE);
> + setExpanded(true);
> sym_calc_value(menu->sym);
> }
> updateMenu();
> @@ -299,7 +276,7 @@ ConfigItem::~ConfigItem(void)
> ConfigLineEdit::ConfigLineEdit(ConfigView* parent)
> : Parent(parent)
> {
> - connect(this, SIGNAL(lostFocus()), SLOT(hide()));
> + connect(this, SIGNAL(editingFinished()), SLOT(hide()));
> }
>
> void ConfigLineEdit::show(ConfigItem* i)
> @@ -320,7 +297,7 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
> break;
> case Qt::Key_Return:
> case Qt::Key_Enter:
> - sym_set_string_value(item->menu->sym, text().latin1());
> + sym_set_string_value(item->menu->sym, text().toLatin1());
> parent()->updateList(item);
> break;
> default:
> @@ -333,39 +310,39 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
> }
>
> ConfigList::ConfigList(ConfigView* p, const char *name)
> - : Parent(p, name),
> + : Parent(p),
> updateAll(false),
> symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod),
> symbolNoPix(xpm_symbol_no),
> choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no),
> menuPix(xpm_menu), menuInvPix(xpm_menu_inv),
> menuBackPix(xpm_menuback), voidPix(xpm_void),
> - showName(false), showRange(false), showData(false),
> optMode(normalOpt),
> + showName(false), showRange(false), showData(false), mode(singleMode),
> optMode(normalOpt),
> rootEntry(0), headerPopup(0)
> {
> int i;
>
> - setSorting(-1);
> - setRootIsDecorated(TRUE);
> - disabledColorGroup = palette().active();
> - disabledColorGroup.setColor(QColorGroup::Text,
> palette().disabled().text());
> - inactivedColorGroup = palette().active();
> - inactivedColorGroup.setColor(QColorGroup::Highlight,
> palette().disabled().highlight());
> + setObjectName(name);
> + setSortingEnabled(false);
> + setRootIsDecorated(true);
> +
> + setVerticalScrollMode(ScrollPerPixel);
> + setHorizontalScrollMode(ScrollPerPixel);
>
> - connect(this, SIGNAL(selectionChanged(void)),
> + setHeaderLabels(QStringList() << _("Option") << _("Name") << "N" << "M"
> << "Y" << _("Value"));
> +
> + connect(this, SIGNAL(itemSelectionChanged(void)),
> SLOT(updateSelection(void)));
>
> if (name) {
> configSettings->beginGroup(name);
> - showName = configSettings->readBoolEntry("/showName", false);
> - showRange = configSettings->readBoolEntry("/showRange", false);
> - showData = configSettings->readBoolEntry("/showData", false);
> - optMode = (enum
> optionMode)configSettings->readNumEntry("/optionMode", false);
> + showName = configSettings->value("/showName", false).toBool();
> + showRange = configSettings->value("/showRange", false).toBool();
> + showData = configSettings->value("/showData", false).toBool();
> + optMode = (enum optionMode)configSettings->value("/optionMode",
> 0).toInt();
> configSettings->endGroup();
> connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
> }
>
> - for (i = 0; i < colNr; i++)
> - colMap[i] = colRevMap[i] = -1;
> - addColumn(promptColIdx, _("Option"));
> + addColumn(promptColIdx);
>
> reinit();
> }
> @@ -390,26 +367,26 @@ void ConfigList::reinit(void)
> removeColumn(nameColIdx);
>
> if (showName)
> - addColumn(nameColIdx, _("Name"));
> + addColumn(nameColIdx);
> if (showRange) {
> - addColumn(noColIdx, "N");
> - addColumn(modColIdx, "M");
> - addColumn(yesColIdx, "Y");
> + addColumn(noColIdx);
> + addColumn(modColIdx);
> + addColumn(yesColIdx);
> }
> if (showData)
> - addColumn(dataColIdx, _("Value"));
> + addColumn(dataColIdx);
>
> updateListAll();
> }
>
> void ConfigList::saveSettings(void)
> {
> - if (name()) {
> - configSettings->beginGroup(name());
> - configSettings->writeEntry("/showName", showName);
> - configSettings->writeEntry("/showRange", showRange);
> - configSettings->writeEntry("/showData", showData);
> - configSettings->writeEntry("/optionMode", (int)optMode);
> + if (!objectName().isEmpty()) {
> + configSettings->beginGroup(objectName());
> + configSettings->setValue("/showName", showName);
> + configSettings->setValue("/showRange", showRange);
> + configSettings->setValue("/showData", showData);
> + configSettings->setValue("/optionMode", (int)optMode);
> configSettings->endGroup();
> }
> }
> @@ -431,7 +408,10 @@ void ConfigList::updateSelection(void)
> struct menu *menu;
> enum prop_type type;
>
> - ConfigItem* item = (ConfigItem*)selectedItem();
> + if (selectedItems().count() == 0)
> + return;
> +
> + ConfigItem* item = (ConfigItem*)selectedItems().first();
> if (!item)
> return;
>
> @@ -451,21 +431,23 @@ void ConfigList::updateList(ConfigItem* item)
> if (!rootEntry) {
> if (mode != listMode)
> goto update;
> - Q3ListViewItemIterator it(this);
> + QTreeWidgetItemIterator it(this);
> ConfigItem* item;
>
> - for (; it.current(); ++it) {
> - item = (ConfigItem*)it.current();
> + while (*it) {
> + item = (ConfigItem*)(*it);
> if (!item->menu)
> continue;
> item->testUpdateMenu(menu_is_visible(item->menu));
> +
> + ++it;
> }
> return;
> }
>
> if (rootEntry != &rootmenu && (mode == singleMode ||
> (mode == symbolMode && rootEntry->parent != &rootmenu))) {
> - item = firstChild();
> + item = (ConfigItem *)topLevelItem(0);
> if (!item)
> item = new ConfigItem(this, 0, true);
> last = item;
> @@ -479,12 +461,14 @@ void ConfigList::updateList(ConfigItem* item)
> item->testUpdateMenu(true);
>
> updateMenuList(item, rootEntry);
> - triggerUpdate();
> + update();
> + resizeColumnToContents(0);
> return;
> }
> update:
> updateMenuList(this, rootEntry);
> - triggerUpdate();
> + update();
> + resizeColumnToContents(0);
> }
>
> void ConfigList::setValue(ConfigItem* item, tristate val)
> @@ -506,7 +490,7 @@ void ConfigList::setValue(ConfigItem* item, tristate val)
> if (!sym_set_tristate_value(sym, val))
> return;
> if (oldval == no && item->menu->list)
> - item->setOpen(TRUE);
> + item->setExpanded(true);
> parent()->updateList(item);
> break;
> }
> @@ -524,7 +508,7 @@ void ConfigList::changeValue(ConfigItem* item)
> sym = menu->sym;
> if (!sym) {
> if (item->menu->list)
> - item->setOpen(!item->isOpen());
> + item->setExpanded(!item->isExpanded());
> return;
> }
>
> @@ -536,9 +520,9 @@ void ConfigList::changeValue(ConfigItem* item)
> newexpr = sym_toggle_tristate_value(sym);
> if (item->menu->list) {
> if (oldexpr == newexpr)
> - item->setOpen(!item->isOpen());
> + item->setExpanded(!item->isExpanded());
> else if (oldexpr == no)
> - item->setOpen(TRUE);
> + item->setExpanded(true);
> }
> if (oldexpr != newexpr)
> parent()->updateList(item);
> @@ -546,10 +530,7 @@ void ConfigList::changeValue(ConfigItem* item)
> case S_INT:
> case S_HEX:
> case S_STRING:
> - if (colMap[dataColIdx] >= 0)
> - item->startRename(colMap[dataColIdx]);
> - else
> - parent()->lineEdit->show(item);
> + parent()->lineEdit->show(item);
> break;
> }
> }
> @@ -566,8 +547,10 @@ void ConfigList::setRootMenu(struct menu *menu)
> updateMenuList(this, 0);
> rootEntry = menu;
> updateListAll();
> - setSelected(currentItem(), hasFocus());
> - ensureItemVisible(currentItem());
> + if (currentItem()) {
> + currentItem()->setSelected(hasFocus());
> + scrollToItem(currentItem());
> + }
> }
>
> void ConfigList::setParentMenu(void)
> @@ -580,13 +563,16 @@ void ConfigList::setParentMenu(void)
> return;
> setRootMenu(menu_get_parent_menu(rootEntry->parent));
>
> - Q3ListViewItemIterator it(this);
> - for (; (item = (ConfigItem*)it.current()); it++) {
> + QTreeWidgetItemIterator it(this);
> + while (*it) {
> + item = (ConfigItem *)(*it);
> if (item->menu == oldroot) {
> setCurrentItem(item);
> - ensureItemVisible(item);
> + scrollToItem(item);
> break;
> }
> +
> + ++it;
> }
> }
>
> @@ -597,8 +583,7 @@ void ConfigList::setParentMenu(void)
> * parent: either the menu list widget or a menu entry widget
> * menu: entry to be updated
> */
> -template <class P>
> -void ConfigList::updateMenuList(P* parent, struct menu* menu)
> +void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu)
> {
> struct menu* child;
> ConfigItem* item;
> @@ -607,8 +592,11 @@ void ConfigList::updateMenuList(P* parent, struct menu*
> menu)
> enum prop_type type;
>
> if (!menu) {
> - while ((item = parent->firstChild()))
> - delete item;
> + while (parent->childCount() > 0)
> + {
> + delete parent->takeChild(0);
> + }
> +
> return;
> }
>
> @@ -660,9 +648,74 @@ void ConfigList::updateMenuList(P* parent, struct menu*
> menu)
> }
> }
>
> +void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
> +{
> + struct menu* child;
> + ConfigItem* item;
> + ConfigItem* last;
> + bool visible;
> + enum prop_type type;
> +
> + if (!menu) {
> + while (parent->topLevelItemCount() > 0)
> + {
> + delete parent->takeTopLevelItem(0);
> + }
> +
> + return;
> + }
> +
> + last = (ConfigItem*)parent->topLevelItem(0);
> + if (last && !last->goParent)
> + last = 0;
> + for (child = menu->list; child; child = child->next) {
> + item = last ? last->nextSibling() :
> (ConfigItem*)parent->topLevelItem(0);
> + type = child->prompt ? child->prompt->type : P_UNKNOWN;
> +
> + switch (mode) {
> + case menuMode:
> + if (!(child->flags & MENU_ROOT))
> + goto hide;
> + break;
> + case symbolMode:
> + if (child->flags & MENU_ROOT)
> + goto hide;
> + break;
> + default:
> + break;
> + }
> +
> + visible = menu_is_visible(child);
> + if (!menuSkip(child)) {
> + if (!child->sym && !child->list && !child->prompt)
> + continue;
> + if (!item || item->menu != child)
> + item = new ConfigItem(parent, last, child,
> visible);
> + else
> + item->testUpdateMenu(visible);
> +
> + if (mode == fullMode || mode == menuMode || type !=
> P_MENU)
> + updateMenuList(item, child);
> + else
> + updateMenuList(item, 0);
> + last = item;
> + continue;
> + }
> + hide:
> + if (item && item->menu == child) {
> + last = (ConfigItem*)parent->topLevelItem(0);
> + if (last == item)
> + last = 0;
> + else while (last->nextSibling() != item)
> + last = last->nextSibling();
> + delete item;
> + }
> + }
> +}
> +
> void ConfigList::keyPressEvent(QKeyEvent* ev)
> {
> - Q3ListViewItem* i = currentItem();
> + QTreeWidgetItem* i = currentItem();
> ConfigItem* item;
> struct menu *menu;
> enum prop_type type;
> @@ -714,20 +767,20 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
> ev->accept();
> }
>
> -void ConfigList::contentsMousePressEvent(QMouseEvent* e)
> +void ConfigList::mousePressEvent(QMouseEvent* e)
> {
> //QPoint p(contentsToViewport(e->pos()));
> //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y());
> - Parent::contentsMousePressEvent(e);
> + Parent::mousePressEvent(e);
> }
>
> -void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
> +void ConfigList::mouseReleaseEvent(QMouseEvent* e)
> {
> - QPoint p(contentsToViewport(e->pos()));
> + QPoint p = e->pos();
> ConfigItem* item = (ConfigItem*)itemAt(p);
> struct menu *menu;
> enum prop_type ptype;
> - const QPixmap* pm;
> + QIcon icon;
> int idx, x;
>
> if (!item)
> @@ -735,14 +788,13 @@ void ConfigList::contentsMouseReleaseEvent(QMouseEvent*
> e)
>
> menu = item->menu;
> x = header()->offset() + p.x();
> - idx = colRevMap[header()->sectionAt(x)];
> + idx = header()->logicalIndexAt(x);
> switch (idx) {
> case promptColIdx:
> - pm = item->pixmap(promptColIdx);
> - if (pm) {
> - int off = header()->sectionPos(0) + itemMargin() +
> - treeStepSize() * (item->depth() +
> (rootIsDecorated() ? 1 : 0));
> - if (x >= off && x < off + pm->width()) {
> + icon = item->pixmap(promptColIdx);
> + if (!icon.isNull()) {
> + int off = header()->sectionPosition(0) +
> visualRect(indexAt(p)).x() + 4; // 4 is Hardcoded image offset. There might
> be a way to do it properly.
> + if (x >= off && x < off +
> icon.availableSizes().first().width()) {
> if (item->goParent) {
> emit parentSelected();
> break;
> @@ -773,19 +825,19 @@ void ConfigList::contentsMouseReleaseEvent(QMouseEvent*
> e)
>
> skip:
> //printf("contentsMouseReleaseEvent: %d,%d\n", p.x(), p.y());
> - Parent::contentsMouseReleaseEvent(e);
> + Parent::mouseReleaseEvent(e);
> }
>
> -void ConfigList::contentsMouseMoveEvent(QMouseEvent* e)
> +void ConfigList::mouseMoveEvent(QMouseEvent* e)
> {
> //QPoint p(contentsToViewport(e->pos()));
> //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y());
> - Parent::contentsMouseMoveEvent(e);
> + Parent::mouseMoveEvent(e);
> }
>
> -void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
> +void ConfigList::mouseDoubleClickEvent(QMouseEvent* e)
> {
> - QPoint p(contentsToViewport(e->pos()));
> + QPoint p = e->pos(); // TODO: Check if this works(was
> contentsToViewport).
> ConfigItem* item = (ConfigItem*)itemAt(p);
> struct menu *menu;
> enum prop_type ptype;
> @@ -807,7 +859,7 @@ void
> ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
>
> skip:
> //printf("contentsMouseDoubleClickEvent: %d,%d\n", p.x(), p.y());
> - Parent::contentsMouseDoubleClickEvent(e);
> + Parent::mouseDoubleClickEvent(e);
> }
>
> void ConfigList::focusInEvent(QFocusEvent *e)
> @@ -818,7 +870,7 @@ void ConfigList::focusInEvent(QFocusEvent *e)
>
> ConfigItem* item = (ConfigItem *)currentItem();
> if (item) {
> - setSelected(item, TRUE);
> + item->setSelected(true);
> menu = item->menu;
> }
> emit gotFocus(menu);
> @@ -828,33 +880,33 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
> {
> if (e->y() <= header()->geometry().bottom()) {
> if (!headerPopup) {
> - Q3Action *action;
> + QAction *action;
>
> - headerPopup = new Q3PopupMenu(this);
> - action = new Q3Action(NULL, _("Show Name"), 0, this);
> - action->setToggleAction(TRUE);
> + headerPopup = new QMenu(this);
> + action = new QAction(_("Show Name"), this);
> + action->setCheckable(true);
> connect(action, SIGNAL(toggled(bool)),
> parent(), SLOT(setShowName(bool)));
> connect(parent(), SIGNAL(showNameChanged(bool)),
> action, SLOT(setOn(bool)));
> - action->setOn(showName);
> - action->addTo(headerPopup);
> - action = new Q3Action(NULL, _("Show Range"), 0, this);
> - action->setToggleAction(TRUE);
> + action->setChecked(showName);
> + headerPopup->addAction(action);
> + action = new QAction(_("Show Range"), this);
> + action->setCheckable(true);
> connect(action, SIGNAL(toggled(bool)),
> parent(), SLOT(setShowRange(bool)));
> connect(parent(), SIGNAL(showRangeChanged(bool)),
> action, SLOT(setOn(bool)));
> - action->setOn(showRange);
> - action->addTo(headerPopup);
> - action = new Q3Action(NULL, _("Show Data"), 0, this);
> - action->setToggleAction(TRUE);
> + action->setChecked(showRange);
> + headerPopup->addAction(action);
> + action = new QAction(_("Show Data"), this);
> + action->setCheckable(true);
> connect(action, SIGNAL(toggled(bool)),
> parent(), SLOT(setShowData(bool)));
> connect(parent(), SIGNAL(showDataChanged(bool)),
> action, SLOT(setOn(bool)));
> - action->setOn(showData);
> - action->addTo(headerPopup);
> + action->setChecked(showData);
> + headerPopup->addAction(action);
> }
> headerPopup->exec(e->globalPos());
> e->accept();
> @@ -868,11 +920,17 @@ QAction *ConfigView::showAllAction;
> QAction *ConfigView::showPromptAction;
>
> ConfigView::ConfigView(QWidget* parent, const char *name)
> - : Parent(parent, name)
> + : Parent(parent)
> {
> - list = new ConfigList(this, name);
> + setObjectName(name);
> + QVBoxLayout *verticalLayout = new QVBoxLayout(this);
> + verticalLayout->setContentsMargins(0, 0, 0, 0);
> +
> + list = new ConfigList(this);
> + verticalLayout->addWidget(list);
> lineEdit = new ConfigLineEdit(this);
> lineEdit->hide();
> + verticalLayout->addWidget(lineEdit);
>
> this->nextView = viewList;
> viewList = this;
> @@ -931,10 +989,13 @@ void ConfigView::setShowData(bool b)
>
> void ConfigList::setAllOpen(bool open)
> {
> - Q3ListViewItemIterator it(this);
> + QTreeWidgetItemIterator it(this);
> +
> + while (*it) {
> + (*it)->setExpanded(open);
>
> - for (; it.current(); it++)
> - it.current()->setOpen(open);
> + ++it;
> + }
> }
>
> void ConfigView::updateList(ConfigItem* item)
> @@ -954,11 +1015,14 @@ void ConfigView::updateListAll(void)
> }
>
> ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
> - : Parent(parent, name), sym(0), _menu(0)
> + : Parent(parent), sym(0), _menu(0)
> {
> - if (name) {
> - configSettings->beginGroup(name);
> - _showDebug = configSettings->readBoolEntry("/showDebug", false);
> + setObjectName(name);
> +
> +
> + if (!objectName().isEmpty()) {
> + configSettings->beginGroup(objectName());
> + setShowDebug(configSettings->value("/showDebug",
> false).toBool());
> configSettings->endGroup();
> connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
> }
> @@ -966,9 +1030,9 @@ ConfigInfoView::ConfigInfoView(QWidget* parent, const
> char *name)
>
> void ConfigInfoView::saveSettings(void)
> {
> - if (name()) {
> - configSettings->beginGroup(name());
> - configSettings->writeEntry("/showDebug", showDebug());
> + if (!objectName().isEmpty()) {
> + configSettings->beginGroup(objectName());
> + configSettings->setValue("/showDebug", showDebug());
> configSettings->endGroup();
> }
> }
> @@ -1127,8 +1191,8 @@ QString ConfigInfoView::print_filter(const QString &str)
> {
> QRegExp re("[<>&\"\\n]");
> QString res = str;
> - for (int i = 0; (i = res.find(re, i)) >= 0;) {
> - switch (res[i].latin1()) {
> + for (int i = 0; (i = res.indexOf(re, i)) >= 0;) {
> + switch (res[i].toLatin1()) {
> case '<':
> res.replace(i, 1, "<");
> i += 4;
> @@ -1167,37 +1231,42 @@ void ConfigInfoView::expr_print_help(void *data,
> struct symbol *sym, const char
> *text += str2;
> }
>
> -Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
> +QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos)
> {
> - Q3PopupMenu* popup = Parent::createPopupMenu(pos);
> - Q3Action* action = new Q3Action(NULL, _("Show Debug Info"), 0, popup);
> - action->setToggleAction(TRUE);
> + QMenu* popup = Parent::createStandardContextMenu(pos);
> + QAction* action = new QAction(_("Show Debug Info"), popup);
> + action->setCheckable(true);
> connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
> connect(this, SIGNAL(showDebugChanged(bool)), action,
> SLOT(setOn(bool)));
> - action->setOn(showDebug());
> - popup->insertSeparator();
> - action->addTo(popup);
> + action->setChecked(showDebug());
> + popup->addSeparator();
> + popup->addAction(action);
> return popup;
> }
>
> -void ConfigInfoView::contentsContextMenuEvent(QContextMenuEvent *e)
> +void ConfigInfoView::contextMenuEvent(QContextMenuEvent *e)
> {
> - Parent::contentsContextMenuEvent(e);
> + Parent::contextMenuEvent(e);
> }
>
> ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char
> *name)
> - : Parent(parent, name), result(NULL)
> + : Parent(parent), result(NULL)
> {
> - setCaption("Search Config");
> + setObjectName(name);
> + setWindowTitle("Search Config");
>
> - QVBoxLayout* layout1 = new QVBoxLayout(this, 11, 6);
> - QHBoxLayout* layout2 = new QHBoxLayout(0, 0, 6);
> + QVBoxLayout* layout1 = new QVBoxLayout(this);
> + layout1->setContentsMargins(11, 11, 11, 11);
> + layout1->setSpacing(6);
> + QHBoxLayout* layout2 = new QHBoxLayout(0);
> + layout2->setContentsMargins(0, 0, 0, 0);
> + layout2->setSpacing(6);
> layout2->addWidget(new QLabel(_("Find:"), this));
> editField = new QLineEdit(this);
> connect(editField, SIGNAL(returnPressed()), SLOT(search()));
> layout2->addWidget(editField);
> searchButton = new QPushButton(_("Search"), this);
> - searchButton->setAutoDefault(FALSE);
> + searchButton->setAutoDefault(false);
> connect(searchButton, SIGNAL(clicked()), SLOT(search()));
> layout2->addWidget(searchButton);
> layout1->addLayout(layout2);
> @@ -1215,19 +1284,19 @@
> ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char
> *nam
> layout1->addWidget(split);
>
> if (name) {
> - int x, y, width, height;
> + QVariant x, y;
> + int width, height;
> bool ok;
>
> configSettings->beginGroup(name);
> - width = configSettings->readNumEntry("/window width",
> parent->width() / 2);
> - height = configSettings->readNumEntry("/window height",
> parent->height() / 2);
> + width = configSettings->value("/window width", parent->width()
> / 2).toInt();
> + height = configSettings->value("/window height",
> parent->height() / 2).toInt();
> resize(width, height);
> - x = configSettings->readNumEntry("/window x", 0, &ok);
> - if (ok)
> - y = configSettings->readNumEntry("/window y", 0, &ok);
> - if (ok)
> - move(x, y);
> - Q3ValueList<int> sizes = configSettings->readSizes("/split",
> &ok);
> + x = configSettings->value("/window x");
> + y = configSettings->value("/window y");
> + if ((x.isValid())&&(y.isValid()))
> + move(x.toInt(), y.toInt());
> + QList<int> sizes = configSettings->readSizes("/split", &ok);
> if (ok)
> split->setSizes(sizes);
> configSettings->endGroup();
> @@ -1237,12 +1306,12 @@
> ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char
> *nam
>
> void ConfigSearchWindow::saveSettings(void)
> {
> - if (name()) {
> - configSettings->beginGroup(name());
> - configSettings->writeEntry("/window x", pos().x());
> - configSettings->writeEntry("/window y", pos().y());
> - configSettings->writeEntry("/window width", size().width());
> - configSettings->writeEntry("/window height", size().height());
> + if (!objectName().isEmpty()) {
> + configSettings->beginGroup(objectName());
> + configSettings->setValue("/window x", pos().x());
> + configSettings->setValue("/window y", pos().y());
> + configSettings->setValue("/window width", size().width());
> + configSettings->setValue("/window height", size().height());
> configSettings->writeSizes("/split", split->sizes());
> configSettings->endGroup();
> }
> @@ -1258,7 +1327,7 @@ void ConfigSearchWindow::search(void)
> list->list->clear();
> info->clear();
>
> - result = sym_re_search(editField->text().latin1());
> + result = sym_re_search(editField->text().toLatin1());
> if (!result)
> return;
> for (p = result; *p; p++) {
> @@ -1275,29 +1344,25 @@ ConfigMainWindow::ConfigMainWindow(void)
> : searchWindow(0)
> {
> QMenuBar* menu;
> - bool ok;
> - int x, y, width, height;
> + bool ok = true;
> + QVariant x, y;
> + int width, height;
> char title[256];
>
> QDesktopWidget *d = configApp->desktop();
> snprintf(title, sizeof(title), "%s%s",
> rootmenu.prompt->text,
> -#if QT_VERSION < 0x040000
> - " (Qt3)"
> -#else
> ""
> -#endif
> );
> - setCaption(title);
> + setWindowTitle(title);
>
> - width = configSettings->readNumEntry("/window width", d->width() - 64);
> - height = configSettings->readNumEntry("/window height", d->height() -
> 64);
> + width = configSettings->value("/window width", d->width() - 64).toInt();
> + height = configSettings->value("/window height", d->height() -
> 64).toInt();
> resize(width, height);
> - x = configSettings->readNumEntry("/window x", 0, &ok);
> - if (ok)
> - y = configSettings->readNumEntry("/window y", 0, &ok);
> - if (ok)
> - move(x, y);
> + x = configSettings->value("/window x");
> + y = configSettings->value("/window y");
> + if ((x.isValid())&&(y.isValid()))
> + move(x.toInt(), y.toInt());
>
> split1 = new QSplitter(this);
> split1->setOrientation(Qt::Horizontal);
> @@ -1314,127 +1379,116 @@ ConfigMainWindow::ConfigMainWindow(void)
> configList = configView->list;
>
> helpText = new ConfigInfoView(split2, "help");
> - helpText->setTextFormat(Qt::RichText);
>
> setTabOrder(configList, helpText);
> configList->setFocus();
>
> menu = menuBar();
> - toolBar = new Q3ToolBar("Tools", this);
> -
> - backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0,
> this);
> - connect(backAction, SIGNAL(activated()), SLOT(goBack()));
> - backAction->setEnabled(FALSE);
> - Q3Action *quitAction = new Q3Action("Quit", _("&Quit"), Qt::CTRL +
> Qt::Key_Q, this);
> - connect(quitAction, SIGNAL(activated()), SLOT(close()));
> - Q3Action *loadAction = new Q3Action("Load", QPixmap(xpm_load),
> _("&Load"), Qt::CTRL + Qt::Key_L, this);
> - connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
> - saveAction = new Q3Action("Save", QPixmap(xpm_save), _("&Save"),
> Qt::CTRL + Qt::Key_S, this);
> - connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
> + toolBar = new QToolBar("Tools", this);
> + addToolBar(toolBar);
> +
> + backAction = new QAction(QPixmap(xpm_back), _("Back"), this);
> + connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack()));
> + backAction->setEnabled(false);
> + QAction *quitAction = new QAction(_("&Quit"), this);
> + quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
> + connect(quitAction, SIGNAL(triggered(bool)), SLOT(close()));
> + QAction *loadAction = new QAction(QPixmap(xpm_load), _("&Load"), this);
> + loadAction->setShortcut(Qt::CTRL + Qt::Key_L);
> + connect(loadAction, SIGNAL(triggered(bool)), SLOT(loadConfig()));
> + saveAction = new QAction(QPixmap(xpm_save), _("&Save"), this);
> + saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
> + connect(saveAction, SIGNAL(triggered(bool)), SLOT(saveConfig()));
> conf_set_changed_callback(conf_changed);
> // Set saveAction's initial state
> conf_changed();
> - Q3Action *saveAsAction = new Q3Action("Save As...", _("Save &As..."),
> 0, this);
> - connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
> - Q3Action *searchAction = new Q3Action("Find", _("&Find"), Qt::CTRL +
> Qt::Key_F, this);
> - connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
> - Q3Action *singleViewAction = new Q3Action("Single View",
> QPixmap(xpm_single_view), _("Single View"), 0, this);
> - connect(singleViewAction, SIGNAL(activated()),
> SLOT(showSingleView()));
> - Q3Action *splitViewAction = new Q3Action("Split View",
> QPixmap(xpm_split_view), _("Split View"), 0, this);
> - connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()));
> - Q3Action *fullViewAction = new Q3Action("Full View",
> QPixmap(xpm_tree_view), _("Full View"), 0, this);
> - connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView()));
> -
> - Q3Action *showNameAction = new Q3Action(NULL, _("Show Name"), 0, this);
> - showNameAction->setToggleAction(TRUE);
> + QAction *saveAsAction = new QAction(_("Save &As..."), this);
> + connect(saveAsAction, SIGNAL(triggered(bool)), SLOT(saveConfigAs()));
> + QAction *searchAction = new QAction(_("&Find"), this);
> + searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
> + connect(searchAction, SIGNAL(triggered(bool)), SLOT(searchConfig()));
> + singleViewAction = new QAction(QPixmap(xpm_single_view), _("Single
> View"), this);
> + singleViewAction->setCheckable(true);
> + connect(singleViewAction, SIGNAL(triggered(bool)),
> SLOT(showSingleView()));
> + splitViewAction = new QAction(QPixmap(xpm_split_view), _("Split View"),
> this);
> + splitViewAction->setCheckable(true);
> + connect(splitViewAction, SIGNAL(triggered(bool)),
> SLOT(showSplitView()));
> + fullViewAction = new QAction(QPixmap(xpm_tree_view), _("Full View"),
> this);
> + fullViewAction->setCheckable(true);
> + connect(fullViewAction, SIGNAL(triggered(bool)),
> SLOT(showFullView()));
> +
> + QAction *showNameAction = new QAction(_("Show Name"), this);
> + showNameAction->setCheckable(true);
> connect(showNameAction, SIGNAL(toggled(bool)), configView,
> SLOT(setShowName(bool)));
> - connect(configView, SIGNAL(showNameChanged(bool)), showNameAction,
> SLOT(setOn(bool)));
> - showNameAction->setOn(configView->showName());
> - Q3Action *showRangeAction = new Q3Action(NULL, _("Show Range"), 0,
> this);
> - showRangeAction->setToggleAction(TRUE);
> + showNameAction->setChecked(configView->showName());
> + QAction *showRangeAction = new QAction(_("Show Range"), this);
> + showRangeAction->setCheckable(true);
> connect(showRangeAction, SIGNAL(toggled(bool)), configView,
> SLOT(setShowRange(bool)));
> - connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction,
> SLOT(setOn(bool)));
> - showRangeAction->setOn(configList->showRange);
> - Q3Action *showDataAction = new Q3Action(NULL, _("Show Data"), 0, this);
> - showDataAction->setToggleAction(TRUE);
> + QAction *showDataAction = new QAction(_("Show Data"), this);
> + showDataAction->setCheckable(true);
> connect(showDataAction, SIGNAL(toggled(bool)), configView,
> SLOT(setShowData(bool)));
> - connect(configView, SIGNAL(showDataChanged(bool)), showDataAction,
> SLOT(setOn(bool)));
> - showDataAction->setOn(configList->showData);
>
> QActionGroup *optGroup = new QActionGroup(this);
> - optGroup->setExclusive(TRUE);
> - connect(optGroup, SIGNAL(selected(QAction *)), configView,
> + optGroup->setExclusive(true);
> + connect(optGroup, SIGNAL(triggered(QAction*)), configView,
> SLOT(setOptionMode(QAction *)));
> - connect(optGroup, SIGNAL(selected(QAction *)), menuView,
> + connect(optGroup, SIGNAL(triggered(QAction *)), menuView,
> SLOT(setOptionMode(QAction *)));
>
> -#if QT_VERSION >= 0x040000
> configView->showNormalAction = new QAction(_("Show Normal Options"),
> optGroup);
> configView->showAllAction = new QAction(_("Show All Options"),
> optGroup);
> configView->showPromptAction = new QAction(_("Show Prompt Options"),
> optGroup);
> -#else
> - configView->showNormalAction = new QAction(_("Show Normal Options"), 0,
> optGroup);
> - configView->showAllAction = new QAction(_("Show All Options"), 0,
> optGroup);
> - configView->showPromptAction = new QAction(_("Show Prompt Options"), 0,
> optGroup);
> -#endif
> - configView->showNormalAction->setToggleAction(TRUE);
> - configView->showNormalAction->setOn(configList->optMode == normalOpt);
> - configView->showAllAction->setToggleAction(TRUE);
> - configView->showAllAction->setOn(configList->optMode == allOpt);
> - configView->showPromptAction->setToggleAction(TRUE);
> - configView->showPromptAction->setOn(configList->optMode == promptOpt);
> -
> - Q3Action *showDebugAction = new Q3Action(NULL, _("Show Debug Info"), 0,
> this);
> - showDebugAction->setToggleAction(TRUE);
> + configView->showNormalAction->setCheckable(true);
> + configView->showAllAction->setCheckable(true);
> + configView->showPromptAction->setCheckable(true);
> +
> + QAction *showDebugAction = new QAction( _("Show Debug Info"), this);
> + showDebugAction->setCheckable(true);
> connect(showDebugAction, SIGNAL(toggled(bool)), helpText,
> SLOT(setShowDebug(bool)));
> - connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction,
> SLOT(setOn(bool)));
> - showDebugAction->setOn(helpText->showDebug());
> + showDebugAction->setChecked(helpText->showDebug());
>
> - Q3Action *showIntroAction = new Q3Action(NULL, _("Introduction"), 0,
> this);
> - connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro()));
> - Q3Action *showAboutAction = new Q3Action(NULL, _("About"), 0, this);
> - connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout()));
> + QAction *showIntroAction = new QAction( _("Introduction"), this);
> + connect(showIntroAction, SIGNAL(triggered(bool)), SLOT(showIntro()));
> + QAction *showAboutAction = new QAction( _("About"), this);
> + connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout()));
>
> // init tool bar
> - backAction->addTo(toolBar);
> + toolBar->addAction(backAction);
> toolBar->addSeparator();
> - loadAction->addTo(toolBar);
> - saveAction->addTo(toolBar);
> + toolBar->addAction(loadAction);
> + toolBar->addAction(saveAction);
> toolBar->addSeparator();
> - singleViewAction->addTo(toolBar);
> - splitViewAction->addTo(toolBar);
> - fullViewAction->addTo(toolBar);
> + toolBar->addAction(singleViewAction);
> + toolBar->addAction(splitViewAction);
> + toolBar->addAction(fullViewAction);
>
> // create config menu
> - Q3PopupMenu* config = new Q3PopupMenu(this);
> - menu->insertItem(_("&File"), config);
> - loadAction->addTo(config);
> - saveAction->addTo(config);
> - saveAsAction->addTo(config);
> - config->insertSeparator();
> - quitAction->addTo(config);
> + QMenu* config = menu->addMenu(_("&File"));
> + config->addAction(loadAction);
> + config->addAction(saveAction);
> + config->addAction(saveAsAction);
> + config->addSeparator();
> + config->addAction(quitAction);
>
> // create edit menu
> - Q3PopupMenu* editMenu = new Q3PopupMenu(this);
> - menu->insertItem(_("&Edit"), editMenu);
> - searchAction->addTo(editMenu);
> + QMenu* editMenu = menu->addMenu(_("&Edit"));
> + editMenu->addAction(searchAction);
>
> // create options menu
> - Q3PopupMenu* optionMenu = new Q3PopupMenu(this);
> - menu->insertItem(_("&Option"), optionMenu);
> - showNameAction->addTo(optionMenu);
> - showRangeAction->addTo(optionMenu);
> - showDataAction->addTo(optionMenu);
> - optionMenu->insertSeparator();
> - optGroup->addTo(optionMenu);
> - optionMenu->insertSeparator();
> + QMenu* optionMenu = menu->addMenu(_("&Option"));
> + optionMenu->addAction(showNameAction);
> + optionMenu->addAction(showRangeAction);
> + optionMenu->addAction(showDataAction);
> + optionMenu->addSeparator();
> + optionMenu->addActions(optGroup->actions());
> + optionMenu->addSeparator();
> + optionMenu->addAction(showDebugAction);
>
> // create help menu
> - Q3PopupMenu* helpMenu = new Q3PopupMenu(this);
> - menu->insertSeparator();
> - menu->insertItem(_("&Help"), helpMenu);
> - showIntroAction->addTo(helpMenu);
> - showAboutAction->addTo(helpMenu);
> + menu->addSeparator();
> + QMenu* helpMenu = menu->addMenu(_("&Help"));
> + helpMenu->addAction(showIntroAction);
> + helpMenu->addAction(showAboutAction);
>
> connect(configList, SIGNAL(menuChanged(struct menu *)),
> helpText, SLOT(setInfo(struct menu *)));
> @@ -1456,7 +1510,7 @@ ConfigMainWindow::ConfigMainWindow(void)
> connect(helpText, SIGNAL(menuSelected(struct menu *)),
> SLOT(setMenuLink(struct menu *)));
>
> - QString listMode = configSettings->readEntry("/listMode", "symbol");
> + QString listMode = configSettings->value("/listMode",
> "symbol").toString();
> if (listMode == "single")
> showSingleView();
> else if (listMode == "full")
> @@ -1465,7 +1519,7 @@ ConfigMainWindow::ConfigMainWindow(void)
> showSplitView();
>
> // UI setup done, restore splitter positions
> - Q3ValueList<int> sizes = configSettings->readSizes("/split1", &ok);
> + QList<int> sizes = configSettings->readSizes("/split1", &ok);
> if (ok)
> split1->setSizes(sizes);
>
> @@ -1476,7 +1530,7 @@ ConfigMainWindow::ConfigMainWindow(void)
>
> void ConfigMainWindow::loadConfig(void)
> {
> - QString s = Q3FileDialog::getOpenFileName(conf_get_configname(), NULL,
> this);
> + QString s = QFileDialog::getOpenFileName(this, "",
> conf_get_configname());
> if (s.isNull())
> return;
> if (conf_read(QFile::encodeName(s)))
> @@ -1495,7 +1549,7 @@ bool ConfigMainWindow::saveConfig(void)
>
> void ConfigMainWindow::saveConfigAs(void)
> {
> - QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL,
> this);
> + QString s = QFileDialog::getSaveFileName(this, "",
> conf_get_configname());
> if (s.isNull())
> return;
> saveConfig();
> @@ -1512,9 +1566,9 @@ void ConfigMainWindow::changeMenu(struct menu *menu)
> {
> configList->setRootMenu(menu);
> if (configList->rootEntry->parent == &rootmenu)
> - backAction->setEnabled(FALSE);
> + backAction->setEnabled(false);
> else
> - backAction->setEnabled(TRUE);
> + backAction->setEnabled(true);
> }
>
> void ConfigMainWindow::setMenuLink(struct menu *menu)
> @@ -1546,8 +1600,8 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
> return;
> item = menuList->findConfigItem(parent);
> if (item) {
> - menuList->setSelected(item, TRUE);
> - menuList->ensureItemVisible(item);
> + item->setSelected(true);
> + menuList->scrollToItem(item);
> }
> list->setRootMenu(parent);
> }
> @@ -1562,8 +1616,8 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
> if (list) {
> item = list->findConfigItem(menu);
> if (item) {
> - list->setSelected(item, TRUE);
> - list->ensureItemVisible(item);
> + item->setSelected(true);
> + list->scrollToItem(item);
> list->setFocus();
> }
> }
> @@ -1577,15 +1631,21 @@ void ConfigMainWindow::listFocusChanged(void)
>
> void ConfigMainWindow::goBack(void)
> {
> - ConfigItem* item;
> + ConfigItem* item, *oldSelection;
>
> configList->setParentMenu();
> if (configList->rootEntry == &rootmenu)
> - backAction->setEnabled(FALSE);
> - item = (ConfigItem*)menuList->selectedItem();
> + backAction->setEnabled(false);
> +
> + if (menuList->selectedItems().count() == 0)
> + return;
> +
> + item = (ConfigItem*)menuList->selectedItems().first();
> + oldSelection = item;
> while (item) {
> if (item->menu == configList->rootEntry) {
> - menuList->setSelected(item, TRUE);
> + oldSelection->setSelected(false);
> + item->setSelected(true);
> break;
> }
> item = (ConfigItem*)item->parent();
> @@ -1594,6 +1654,13 @@ void ConfigMainWindow::goBack(void)
>
> void ConfigMainWindow::showSingleView(void)
> {
> + singleViewAction->setEnabled(false);
> + singleViewAction->setChecked(true);
> + splitViewAction->setEnabled(true);
> + splitViewAction->setChecked(false);
> + fullViewAction->setEnabled(true);
> + fullViewAction->setChecked(false);
> +
> menuView->hide();
> menuList->setRootMenu(0);
> configList->mode = singleMode;
> @@ -1601,28 +1668,41 @@ void ConfigMainWindow::showSingleView(void)
> configList->updateListAll();
> else
> configList->setRootMenu(&rootmenu);
> - configList->setAllOpen(TRUE);
> configList->setFocus();
> }
>
> void ConfigMainWindow::showSplitView(void)
> {
> + singleViewAction->setEnabled(true);
> + singleViewAction->setChecked(false);
> + splitViewAction->setEnabled(false);
> + splitViewAction->setChecked(true);
> + fullViewAction->setEnabled(true);
> + fullViewAction->setChecked(false);
> +
> configList->mode = symbolMode;
> if (configList->rootEntry == &rootmenu)
> configList->updateListAll();
> else
> configList->setRootMenu(&rootmenu);
> - configList->setAllOpen(TRUE);
> + configList->setAllOpen(true);
> configApp->processEvents();
> menuList->mode = menuMode;
> menuList->setRootMenu(&rootmenu);
> - menuList->setAllOpen(TRUE);
> + menuList->setAllOpen(true);
> menuView->show();
> menuList->setFocus();
> }
>
> void ConfigMainWindow::showFullView(void)
> {
> + singleViewAction->setEnabled(true);
> + singleViewAction->setChecked(false);
> + splitViewAction->setEnabled(true);
> + splitViewAction->setChecked(false);
> + fullViewAction->setEnabled(false);
> + fullViewAction->setChecked(true);
> +
> menuView->hide();
> menuList->setRootMenu(0);
> configList->mode = fullMode;
> @@ -1630,7 +1710,6 @@ void ConfigMainWindow::showFullView(void)
> configList->updateListAll();
> else
> configList->setRootMenu(&rootmenu);
> - configList->setAllOpen(FALSE);
> configList->setFocus();
> }
>
> @@ -1684,7 +1763,8 @@ void ConfigMainWindow::showIntro(void)
>
> void ConfigMainWindow::showAbout(void)
> {
> - static const QString str = _("qconf is Copyright (C) 2002 Roman Zippel
> <zippel@xxxxxxxxxxxxxx>.\n\n"
> + static const QString str = _("qconf is Copyright (C) 2002 Roman Zippel
> <zippel@xxxxxxxxxxxxxx>.\n"
> + "Copyright (C) 2015 Boris Barbulovski
> <bbarbulovski@xxxxxxxxx>.\n\n"
> "Bug reports and feature request can also be entered at
> http://bugzilla.kernel.org/\n";);
>
> QMessageBox::information(this, "qconf", str);
> @@ -1692,10 +1772,10 @@ void ConfigMainWindow::showAbout(void)
>
> void ConfigMainWindow::saveSettings(void)
> {
> - configSettings->writeEntry("/window x", pos().x());
> - configSettings->writeEntry("/window y", pos().y());
> - configSettings->writeEntry("/window width", size().width());
> - configSettings->writeEntry("/window height", size().height());
> + configSettings->setValue("/window x", pos().x());
> + configSettings->setValue("/window y", pos().y());
> + configSettings->setValue("/window width", size().width());
> + configSettings->setValue("/window height", size().height());
>
> QString entry;
> switch(configList->mode) {
> @@ -1714,7 +1794,7 @@ void ConfigMainWindow::saveSettings(void)
> default:
> break;
> }
> - configSettings->writeEntry("/listMode", entry);
> + configSettings->setValue("/listMode", entry);
>
> configSettings->writeSizes("/split1", split1->sizes());
> configSettings->writeSizes("/split2", split2->sizes());
> @@ -1746,7 +1826,7 @@ static const char *progname;
>
> static void usage(void)
> {
> - printf(_("%s [-s] <config>\n"), progname);
> + printf(_("%s [-s] <config>\n").toLatin1().constData(), progname);
> exit(0);
> }
>
> @@ -1785,7 +1865,6 @@ int main(int ac, char** av)
> v = new ConfigMainWindow();
>
> //zconfdump(stdout);
> - configApp->setMainWidget(v);
> configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
> configApp->connect(configApp, SIGNAL(aboutToQuit()), v,
> SLOT(saveSettings()));
> v->show();
> @@ -1793,6 +1872,8 @@ int main(int ac, char** av)
>
> configSettings->endGroup();
> delete configSettings;
> + delete v;
> + delete configApp;
>
> return 0;
> }
> diff --git a/xen/tools/kconfig/qconf.h b/xen/tools/kconfig/qconf.h
> index bde0c6b6f9..a40036d1b0 100644
> --- a/xen/tools/kconfig/qconf.h
> +++ b/xen/tools/kconfig/qconf.h
> @@ -3,26 +3,18 @@
> * Released under the terms of the GNU GPL v2.0.
> */
>
> -#if QT_VERSION < 0x040000
> -#include <qlistview.h>
> -#else
> -#include <q3listview.h>
> -#endif
> +#include <QTextBrowser>
> +#include <QTreeWidget>
> +#include <QMainWindow>
> +#include <QHeaderView>
> #include <qsettings.h>
> -
> -#if QT_VERSION < 0x040000
> -#define Q3ValueList QValueList
> -#define Q3PopupMenu QPopupMenu
> -#define Q3ListView QListView
> -#define Q3ListViewItem QListViewItem
> -#define Q3VBox QVBox
> -#define Q3TextBrowser QTextBrowser
> -#define Q3MainWindow QMainWindow
> -#define Q3Action QAction
> -#define Q3ToolBar QToolBar
> -#define Q3ListViewItemIterator QListViewItemIterator
> -#define Q3FileDialog QFileDialog
> -#endif
> +#include <QPushButton>
> +#include <QSettings>
> +#include <QLineEdit>
> +#include <QSplitter>
> +#include <QCheckBox>
> +#include <QDialog>
> +#include "expr.h"
>
> class ConfigView;
> class ConfigList;
> @@ -33,8 +25,8 @@ class ConfigMainWindow;
> class ConfigSettings : public QSettings {
> public:
> ConfigSettings();
> - Q3ValueList<int> readSizes(const QString& key, bool *ok);
> - bool writeSizes(const QString& key, const Q3ValueList<int>& value);
> + QList<int> readSizes(const QString& key, bool *ok);
> + bool writeSizes(const QString& key, const QList<int>& value);
> };
>
> enum colIdx {
> @@ -47,9 +39,9 @@ enum optionMode {
> normalOpt = 0, allOpt, promptOpt
> };
>
> -class ConfigList : public Q3ListView {
> +class ConfigList : public QTreeWidget {
> Q_OBJECT
> - typedef class Q3ListView Parent;
> + typedef class QTreeWidget Parent;
> public:
> ConfigList(ConfigView* p, const char *name = 0);
> void reinit(void);
> @@ -61,10 +53,10 @@ public:
>
> protected:
> void keyPressEvent(QKeyEvent *e);
> - void contentsMousePressEvent(QMouseEvent *e);
> - void contentsMouseReleaseEvent(QMouseEvent *e);
> - void contentsMouseMoveEvent(QMouseEvent *e);
> - void contentsMouseDoubleClickEvent(QMouseEvent *e);
> + void mousePressEvent(QMouseEvent *e);
> + void mouseReleaseEvent(QMouseEvent *e);
> + void mouseMoveEvent(QMouseEvent *e);
> + void mouseDoubleClickEvent(QMouseEvent *e);
> void focusInEvent(QFocusEvent *e);
> void contextMenuEvent(QContextMenuEvent *e);
>
> @@ -95,32 +87,23 @@ public:
> }
> ConfigItem* firstChild() const
> {
> - return (ConfigItem *)Parent::firstChild();
> - }
> - int mapIdx(colIdx idx)
> - {
> - return colMap[idx];
> + return (ConfigItem *)children().first();
> }
> - void addColumn(colIdx idx, const QString& label)
> + void addColumn(colIdx idx)
> {
> - colMap[idx] = Parent::addColumn(label);
> - colRevMap[colMap[idx]] = idx;
> + showColumn(idx);
> }
> void removeColumn(colIdx idx)
> {
> - int col = colMap[idx];
> - if (col >= 0) {
> - Parent::removeColumn(col);
> - colRevMap[col] = colMap[idx] = -1;
> - }
> + hideColumn(idx);
> }
> void setAllOpen(bool open);
> void setParentMenu(void);
>
> bool menuSkip(struct menu *);
>
> - template <class P>
> - void updateMenuList(P*, struct menu*);
> + void updateMenuList(ConfigItem *parent, struct menu*);
> + void updateMenuList(ConfigList *parent, struct menu*);
>
> bool updateAll;
>
> @@ -132,30 +115,26 @@ public:
> enum listMode mode;
> enum optionMode optMode;
> struct menu *rootEntry;
> - QColorGroup disabledColorGroup;
> - QColorGroup inactivedColorGroup;
> - Q3PopupMenu* headerPopup;
> -
> -private:
> - int colMap[colNr];
> - int colRevMap[colNr];
> + QPalette disabledColorGroup;
> + QPalette inactivedColorGroup;
> + QMenu* headerPopup;
> };
>
> -class ConfigItem : public Q3ListViewItem {
> - typedef class Q3ListViewItem Parent;
> +class ConfigItem : public QTreeWidgetItem {
> + typedef class QTreeWidgetItem Parent;
> public:
> - ConfigItem(Q3ListView *parent, ConfigItem *after, struct menu *m, bool
> v)
> - : Parent(parent, after), menu(m), visible(v), goParent(false)
> + ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m, bool
> v)
> + : Parent(parent, after), nextItem(0), menu(m), visible(v),
> goParent(false)
> {
> init();
> }
> ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool
> v)
> - : Parent(parent, after), menu(m), visible(v), goParent(false)
> + : Parent(parent, after), nextItem(0), menu(m), visible(v),
> goParent(false)
> {
> init();
> }
> - ConfigItem(Q3ListView *parent, ConfigItem *after, bool v)
> - : Parent(parent, after), menu(0), visible(v), goParent(true)
> + ConfigItem(ConfigList *parent, ConfigItem *after, bool v)
> + : Parent(parent, after), nextItem(0), menu(0), visible(v),
> goParent(true)
> {
> init();
> }
> @@ -166,33 +145,43 @@ public:
> void testUpdateMenu(bool v);
> ConfigList* listView() const
> {
> - return (ConfigList*)Parent::listView();
> + return (ConfigList*)Parent::treeWidget();
> }
> ConfigItem* firstChild() const
> {
> - return (ConfigItem *)Parent::firstChild();
> + return (ConfigItem *)Parent::child(0);
> }
> - ConfigItem* nextSibling() const
> + ConfigItem* nextSibling()
> {
> - return (ConfigItem *)Parent::nextSibling();
> + ConfigItem *ret = NULL;
> + ConfigItem *_parent = (ConfigItem *)parent();
> +
> + if(_parent) {
> + ret = (ConfigItem
> *)_parent->child(_parent->indexOfChild(this)+1);
> + } else {
> + QTreeWidget *_treeWidget = treeWidget();
> + ret = (ConfigItem
> *)_treeWidget->topLevelItem(_treeWidget->indexOfTopLevelItem(this)+1);
> + }
> +
> + return ret;
> }
> void setText(colIdx idx, const QString& text)
> {
> - Parent::setText(listView()->mapIdx(idx), text);
> + Parent::setText(idx, text);
> }
> QString text(colIdx idx) const
> {
> - return Parent::text(listView()->mapIdx(idx));
> + return Parent::text(idx);
> }
> - void setPixmap(colIdx idx, const QPixmap& pm)
> + void setPixmap(colIdx idx, const QIcon &icon)
> {
> - Parent::setPixmap(listView()->mapIdx(idx), pm);
> + Parent::setIcon(idx, icon);
> }
> - const QPixmap* pixmap(colIdx idx) const
> + const QIcon pixmap(colIdx idx) const
> {
> - return Parent::pixmap(listView()->mapIdx(idx));
> + return icon(idx);
> }
> - void paintCell(QPainter* p, const QColorGroup& cg, int column, int
> width, int align);
> + // TODO: Implement paintCell
>
> ConfigItem* nextItem;
> struct menu *menu;
> @@ -216,9 +205,9 @@ public:
> ConfigItem *item;
> };
>
> -class ConfigView : public Q3VBox {
> +class ConfigView : public QWidget {
> Q_OBJECT
> - typedef class Q3VBox Parent;
> + typedef class QWidget Parent;
> public:
> ConfigView(QWidget* parent, const char *name = 0);
> ~ConfigView(void);
> @@ -249,9 +238,9 @@ public:
> static QAction *showPromptAction;
> };
>
> -class ConfigInfoView : public Q3TextBrowser {
> +class ConfigInfoView : public QTextBrowser {
> Q_OBJECT
> - typedef class Q3TextBrowser Parent;
> + typedef class QTextBrowser Parent;
> public:
> ConfigInfoView(QWidget* parent, const char *name = 0);
> bool showDebug(void) const { return _showDebug; }
> @@ -271,8 +260,8 @@ protected:
> QString debug_info(struct symbol *sym);
> static QString print_filter(const QString &str);
> static void expr_print_help(void *data, struct symbol *sym, const char
> *str);
> - Q3PopupMenu* createPopupMenu(const QPoint& pos);
> - void contentsContextMenuEvent(QContextMenuEvent *e);
> + QMenu *createStandardContextMenu(const QPoint & pos);
> + void contextMenuEvent(QContextMenuEvent *e);
>
> struct symbol *sym;
> struct menu *_menu;
> @@ -299,10 +288,10 @@ protected:
> struct symbol **result;
> };
>
> -class ConfigMainWindow : public Q3MainWindow {
> +class ConfigMainWindow : public QMainWindow {
> Q_OBJECT
>
> - static Q3Action *saveAction;
> + static QAction *saveAction;
> static void conf_changed(void);
> public:
> ConfigMainWindow(void);
> @@ -331,8 +320,11 @@ protected:
> ConfigView *configView;
> ConfigList *configList;
> ConfigInfoView *helpText;
> - Q3ToolBar *toolBar;
> - Q3Action *backAction;
> - QSplitter* split1;
> - QSplitter* split2;
> + QToolBar *toolBar;
> + QAction *backAction;
> + QAction *singleViewAction;
> + QAction *splitViewAction;
> + QAction *fullViewAction;
> + QSplitter *split1;
> + QSplitter *split2;
> };
> diff --git a/xen/tools/kconfig/streamline_config.pl
> b/xen/tools/kconfig/streamline_config.pl
> index f3d3fb42b8..a2e83ab17d 100755
> --- a/xen/tools/kconfig/streamline_config.pl
> +++ b/xen/tools/kconfig/streamline_config.pl
> @@ -1,4 +1,4 @@
> -#!/usr/bin/perl -w
> +#!/usr/bin/env perl
> #
> # Copyright 2005-2009 - Steven Rostedt
> # Licensed under the terms of the GNU GPL License version 2
> @@ -42,6 +42,7 @@
> # mv config_strip .config
> # make oldconfig
> #
> +use warnings;
> use strict;
> use Getopt::Long;
>
> @@ -188,7 +189,7 @@ sub read_kconfig {
> $cont = 0;
>
> # collect any Kconfig sources
> - if (/^source\s*"(.*)"/) {
> + if (/^source\s+"?([^"]+)/) {
> my $kconfig = $1;
> # prevent reading twice.
> if (!defined($read_kconfigs{$kconfig})) {
> @@ -237,7 +238,7 @@ sub read_kconfig {
> }
>
> # configs without prompts must be selected
> - } elsif ($state ne "NONE" && /^\s*tristate\s\S/) {
> + } elsif ($state ne "NONE" && /^\s*(tristate\s+\S|prompt\b)/) {
> # note if the config has a prompt
> $prompts{$config} = 1;
>
> @@ -256,8 +257,8 @@ sub read_kconfig {
>
> $iflevel-- if ($iflevel);
>
> - # stop on "help"
> - } elsif (/^\s*help\s*$/) {
> + # stop on "help" and keywords that end a menu entry
> + } elsif (/^\s*(---)?help(---)?\s*$/ || /^(comment|choice|menu)\b/) {
> $state = "NONE";
> }
> }
> @@ -454,7 +455,7 @@ sub parse_config_depends
> $p =~ s/^[^$valid]*[$valid]+//;
>
> # We only need to process if the depend config is a module
> - if (!defined($orig_configs{$conf}) || !$orig_configs{conf} eq "m") {
> + if (!defined($orig_configs{$conf}) || $orig_configs{$conf} eq "y") {
> next;
> }
>
> @@ -610,6 +611,40 @@ foreach my $line (@config_file) {
> next;
> }
>
> + if (/CONFIG_MODULE_SIG_KEY="(.+)"/) {
> + my $orig_cert = $1;
> + my $default_cert = "certs/signing_key.pem";
> +
> + # Check that the logic in this script still matches the one in
> Kconfig
> + if (!defined($depends{"MODULE_SIG_KEY"}) ||
> + $depends{"MODULE_SIG_KEY"} !~ /"\Q$default_cert\E"/) {
> + print STDERR "WARNING: MODULE_SIG_KEY assertion failure, ",
> + "update needed to ", __FILE__, " line ", __LINE__, "\n";
> + print;
> + } elsif ($orig_cert ne $default_cert && ! -f $orig_cert) {
> + print STDERR "Module signature verification enabled but ",
> + "module signing key \"$orig_cert\" not found. Resetting ",
> + "signing key to default value.\n";
> + print "CONFIG_MODULE_SIG_KEY=\"$default_cert\"\n";
> + } else {
> + print;
> + }
> + next;
> + }
> +
> + if (/CONFIG_SYSTEM_TRUSTED_KEYS="(.+)"/) {
> + my $orig_keys = $1;
> +
> + if (! -f $orig_keys) {
> + print STDERR "System keyring enabled but keys \"$orig_keys\" ",
> + "not found. Resetting keys to default value.\n";
> + print "CONFIG_SYSTEM_TRUSTED_KEYS=\"\"\n";
> + } else {
> + print;
> + }
> + next;
> + }
> +
> if (/^(CONFIG.*)=(m|y)/) {
> if (defined($configs{$1})) {
> if ($localyesconfig) {
> diff --git a/xen/tools/kconfig/symbol.c b/xen/tools/kconfig/symbol.c
> index 50878dc025..f0b2e3b310 100644
> --- a/xen/tools/kconfig/symbol.c
> +++ b/xen/tools/kconfig/symbol.c
> @@ -77,7 +77,7 @@ const char *sym_type_name(enum symbol_type type)
> {
> switch (type) {
> case S_BOOLEAN:
> - return "boolean";
> + return "bool";
> case S_TRISTATE:
> return "tristate";
> case S_INT:
> @@ -183,7 +183,7 @@ static void sym_validate_range(struct symbol *sym)
> sprintf(str, "%lld", val2);
> else
> sprintf(str, "0x%llx", val2);
> - sym->curr.val = strdup(str);
> + sym->curr.val = xstrdup(str);
> }
>
> static void sym_set_changed(struct symbol *sym)
> @@ -209,12 +209,26 @@ static void sym_set_all_changed(void)
> static void sym_calc_visibility(struct symbol *sym)
> {
> struct property *prop;
> + struct symbol *choice_sym = NULL;
> tristate tri;
>
> /* any prompt visible? */
> tri = no;
> +
> + if (sym_is_choice_value(sym))
> + choice_sym = prop_get_symbol(sym_get_choice_prop(sym));
> +
> for_all_prompts(sym, prop) {
> prop->visible.tri = expr_calc_value(prop->visible.expr);
> + /*
> + * Tristate choice_values with visibility 'mod' are
> + * not visible if the corresponding choice's value is
> + * 'yes'.
> + */
> + if (choice_sym && sym->type == S_TRISTATE &&
> + prop->visible.tri == mod && choice_sym->curr.tri == yes)
> + prop->visible.tri = no;
> +
> tri = EXPR_OR(tri, prop->visible.tri);
> }
> if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
> @@ -229,7 +243,7 @@ static void sym_calc_visibility(struct symbol *sym)
> tri = yes;
> if (sym->dir_dep.expr)
> tri = expr_calc_value(sym->dir_dep.expr);
> - if (tri == mod)
> + if (tri == mod && sym_get_type(sym) == S_BOOLEAN)
> tri = yes;
> if (sym->dir_dep.tri != tri) {
> sym->dir_dep.tri = tri;
> @@ -244,6 +258,15 @@ static void sym_calc_visibility(struct symbol *sym)
> sym->rev_dep.tri = tri;
> sym_set_changed(sym);
> }
> + tri = no;
> + if (sym->implied.expr && sym->dir_dep.tri != no)
> + tri = expr_calc_value(sym->implied.expr);
> + if (tri == mod && sym_get_type(sym) == S_BOOLEAN)
> + tri = yes;
> + if (sym->implied.tri != tri) {
> + sym->implied.tri = tri;
> + sym_set_changed(sym);
> + }
> }
>
> /*
> @@ -310,6 +333,27 @@ static struct symbol *sym_calc_choice(struct symbol *sym)
> return def_sym;
> }
>
> +static void sym_warn_unmet_dep(struct symbol *sym)
> +{
> + struct gstr gs = str_new();
> +
> + str_printf(&gs,
> + "\nWARNING: unmet direct dependencies detected for %s\n",
> + sym->name);
> + str_printf(&gs,
> + " Depends on [%c]: ",
> + sym->dir_dep.tri == mod ? 'm' : 'n');
> + expr_gstr_print(sym->dir_dep.expr, &gs);
> + str_printf(&gs, "\n");
> +
> + expr_gstr_print_revdep(sym->rev_dep.expr, &gs, yes,
> + " Selected by [y]:\n");
> + expr_gstr_print_revdep(sym->rev_dep.expr, &gs, mod,
> + " Selected by [m]:\n");
> +
> + fputs(str_get(&gs), stderr);
> +}
> +
> void sym_calc_value(struct symbol *sym)
> {
> struct symbol_value newval, oldval;
> @@ -348,11 +392,13 @@ void sym_calc_value(struct symbol *sym)
> sym->curr.tri = no;
> return;
> }
> - if (!sym_is_choice_value(sym))
> - sym->flags &= ~SYMBOL_WRITE;
> + sym->flags &= ~SYMBOL_WRITE;
>
> sym_calc_visibility(sym);
>
> + if (sym->visible != no)
> + sym->flags |= SYMBOL_WRITE;
> +
> /* set default if recursively called */
> sym->curr = newval;
>
> @@ -367,7 +413,6 @@ void sym_calc_value(struct symbol *sym)
> /* if the symbol is visible use the user value
> * if available, otherwise try the default value
> */
> - sym->flags |= SYMBOL_WRITE;
> if (sym_has_value(sym)) {
> newval.tri =
> EXPR_AND(sym->def[S_DEF_USER].tri,
> sym->visible);
> @@ -379,38 +424,31 @@ void sym_calc_value(struct symbol *sym)
> if (!sym_is_choice(sym)) {
> prop = sym_get_default_prop(sym);
> if (prop) {
> - sym->flags |= SYMBOL_WRITE;
> newval.tri =
> EXPR_AND(expr_calc_value(prop->expr),
>
> prop->visible.tri);
> + if (newval.tri != no)
> + sym->flags |= SYMBOL_WRITE;
> + }
> + if (sym->implied.tri != no) {
> + sym->flags |= SYMBOL_WRITE;
> + newval.tri = EXPR_OR(newval.tri,
> sym->implied.tri);
> }
> }
> calc_newval:
> - if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
> - struct expr *e;
> - e = expr_simplify_unmet_dep(sym->rev_dep.expr,
> - sym->dir_dep.expr);
> - fprintf(stderr, "warning: (");
> - expr_fprint(e, stderr);
> - fprintf(stderr, ") selects %s which has unmet
> direct dependencies (",
> - sym->name);
> - expr_fprint(sym->dir_dep.expr, stderr);
> - fprintf(stderr, ")\n");
> - expr_free(e);
> - }
> + if (sym->dir_dep.tri < sym->rev_dep.tri)
> + sym_warn_unmet_dep(sym);
> newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
> }
> - if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
> + if (newval.tri == mod &&
> + (sym_get_type(sym) == S_BOOLEAN || sym->implied.tri == yes))
> newval.tri = yes;
> break;
> case S_STRING:
> case S_HEX:
> case S_INT:
> - if (sym->visible != no) {
> - sym->flags |= SYMBOL_WRITE;
> - if (sym_has_value(sym)) {
> - newval.val = sym->def[S_DEF_USER].val;
> - break;
> - }
> + if (sym->visible != no && sym_has_value(sym)) {
> + newval.val = sym->def[S_DEF_USER].val;
> + break;
> }
> prop = sym_get_default_prop(sym);
> if (prop) {
> @@ -484,6 +522,8 @@ bool sym_tristate_within_range(struct symbol *sym,
> tristate val)
> return false;
> if (sym->visible <= sym->rev_dep.tri)
> return false;
> + if (sym->implied.tri == yes && val == mod)
> + return false;
> if (sym_is_choice_value(sym) && sym->visible == yes)
> return val == yes;
> return val >= sym->rev_dep.tri && val <= sym->visible;
> @@ -736,6 +776,10 @@ const char *sym_get_string_default(struct symbol *sym)
> if (sym->type == S_BOOLEAN && val == mod)
> val = yes;
>
> + /* adjust the default value if this symbol is implied by another */
> + if (val < sym->implied.tri)
> + val = sym->implied.tri;
> +
> switch (sym->type) {
> case S_BOOLEAN:
> case S_TRISTATE:
> @@ -817,7 +861,7 @@ struct symbol *sym_lookup(const char *name, int flags)
> : !(symbol->flags &
> (SYMBOL_CONST|SYMBOL_CHOICE))))
> return symbol;
> }
> - new_name = strdup(name);
> + new_name = xstrdup(name);
> } else {
> new_name = NULL;
> hash = 0;
> @@ -867,12 +911,16 @@ struct symbol *sym_find(const char *name)
> * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to
> * the empty string.
> */
> -const char *sym_expand_string_value(const char *in)
> +char *sym_expand_string_value(const char *in)
> {
> const char *src;
> char *res;
> size_t reslen;
>
> + /*
> + * Note: 'in' might come from a token that's about to be
> + * freed, so make sure to always allocate a new string
> + */
> reslen = strlen(in) + 1;
> res = xmalloc(reslen);
> res[0] = '\0';
> @@ -900,7 +948,7 @@ const char *sym_expand_string_value(const char *in)
> newlen = strlen(res) + strlen(symval) + strlen(src) + 1;
> if (newlen > reslen) {
> reslen = newlen;
> - res = realloc(res, reslen);
> + res = xrealloc(res, reslen);
> }
>
> strcat(res, symval);
> @@ -1027,7 +1075,7 @@ struct symbol **sym_re_search(const char *pattern)
> }
> if (sym_match_arr) {
> qsort(sym_match_arr, cnt, sizeof(struct sym_match),
> sym_rel_comp);
> - sym_arr = malloc((cnt+1) * sizeof(struct symbol));
> + sym_arr = malloc((cnt+1) * sizeof(struct symbol *));
> if (!sym_arr)
> goto sym_re_search_free;
> for (i = 0; i < cnt; i++)
> @@ -1116,6 +1164,7 @@ static void sym_check_print_recursive(struct symbol
> *last_sym)
> if (stack->sym == last_sym)
> fprintf(stderr, "%s:%d:error: recursive dependency
> detected!\n",
> prop->file->name, prop->lineno);
> +
> if (stack->expr) {
> fprintf(stderr, "%s:%d:\tsymbol %s %s value contains
> %s\n",
> prop->file->name, prop->lineno,
> @@ -1145,6 +1194,11 @@ static void sym_check_print_recursive(struct symbol
> *last_sym)
> }
> }
>
> + fprintf(stderr,
> + "For a resolution refer to
> Documentation/kbuild/kconfig-language.txt\n"
> + "subsection \"Kconfig recursive dependency limitations\"\n"
> + "\n");
> +
> if (check_top == &cv_stack)
> dep_stack_remove();
> }
> @@ -1179,7 +1233,7 @@ static struct symbol *sym_check_expr_deps(struct expr
> *e)
> default:
> break;
> }
> - printf("Oops! How to check %d?\n", e->type);
> + fprintf(stderr, "Oops! How to check %d?\n", e->type);
> return NULL;
> }
>
> @@ -1336,6 +1390,8 @@ const char *prop_get_type_name(enum prop_type type)
> return "choice";
> case P_SELECT:
> return "select";
> + case P_IMPLY:
> + return "imply";
> case P_RANGE:
> return "range";
> case P_SYMBOL:
> diff --git a/xen/tools/kconfig/util.c b/xen/tools/kconfig/util.c
> index 0e76042473..c6f6e21b80 100644
> --- a/xen/tools/kconfig/util.c
> +++ b/xen/tools/kconfig/util.c
> @@ -14,11 +14,11 @@
> struct file *file_lookup(const char *name)
> {
> struct file *file;
> - const char *file_name = sym_expand_string_value(name);
> + char *file_name = sym_expand_string_value(name);
>
> for (file = file_list; file; file = file->next) {
> if (!strcmp(name, file->name)) {
> - free((void *)file_name);
> + free(file_name);
> return file;
> }
> }
> @@ -104,7 +104,7 @@ void str_append(struct gstr *gs, const char *s)
> if (s) {
> l = strlen(gs->s) + strlen(s) + 1;
> if (l > gs->len) {
> - gs->s = realloc(gs->s, l);
> + gs->s = xrealloc(gs->s, l);
> gs->len = l;
> }
> strcat(gs->s, s);
> @@ -145,3 +145,23 @@ void *xcalloc(size_t nmemb, size_t size)
> fprintf(stderr, "Out of memory.\n");
> exit(1);
> }
> +
> +void *xrealloc(void *p, size_t size)
> +{
> + p = realloc(p, size);
> + if (p)
> + return p;
> + fprintf(stderr, "Out of memory.\n");
> + exit(1);
> +}
> +
> +char *xstrdup(const char *s)
> +{
> + char *p;
> +
> + p = strdup(s);
> + if (p)
> + return p;
> + fprintf(stderr, "Out of memory.\n");
> + exit(1);
> +}
> diff --git a/xen/tools/kconfig/zconf.gperf b/xen/tools/kconfig/zconf.gperf
> deleted file mode 100644
> index ac498f01b4..0000000000
> --- a/xen/tools/kconfig/zconf.gperf
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -%language=ANSI-C
> -%define hash-function-name kconf_id_hash
> -%define lookup-function-name kconf_id_lookup
> -%define string-pool-name kconf_id_strings
> -%compare-strncmp
> -%enum
> -%pic
> -%struct-type
> -
> -struct kconf_id;
> -
> -static const struct kconf_id *kconf_id_lookup(register const char *str,
> register unsigned int len);
> -
> -%%
> -mainmenu, T_MAINMENU, TF_COMMAND
> -menu, T_MENU, TF_COMMAND
> -endmenu, T_ENDMENU, TF_COMMAND
> -source, T_SOURCE, TF_COMMAND
> -choice, T_CHOICE, TF_COMMAND
> -endchoice, T_ENDCHOICE, TF_COMMAND
> -comment, T_COMMENT, TF_COMMAND
> -config, T_CONFIG, TF_COMMAND
> -menuconfig, T_MENUCONFIG, TF_COMMAND
> -help, T_HELP, TF_COMMAND
> ----help---, T_HELP, TF_COMMAND
> -if, T_IF, TF_COMMAND|TF_PARAM
> -endif, T_ENDIF, TF_COMMAND
> -depends, T_DEPENDS, TF_COMMAND
> -optional, T_OPTIONAL, TF_COMMAND
> -default, T_DEFAULT, TF_COMMAND, S_UNKNOWN
> -prompt, T_PROMPT, TF_COMMAND
> -tristate, T_TYPE, TF_COMMAND, S_TRISTATE
> -def_tristate, T_DEFAULT, TF_COMMAND, S_TRISTATE
> -bool, T_TYPE, TF_COMMAND, S_BOOLEAN
> -boolean, T_TYPE, TF_COMMAND, S_BOOLEAN
> -def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN
> -int, T_TYPE, TF_COMMAND, S_INT
> -hex, T_TYPE, TF_COMMAND, S_HEX
> -string, T_TYPE, TF_COMMAND, S_STRING
> -select, T_SELECT, TF_COMMAND
> -range, T_RANGE, TF_COMMAND
> -visible, T_VISIBLE, TF_COMMAND
> -option, T_OPTION, TF_COMMAND
> -on, T_ON, TF_PARAM
> -modules, T_OPT_MODULES, TF_OPTION
> -defconfig_list, T_OPT_DEFCONFIG_LIST,TF_OPTION
> -env, T_OPT_ENV, TF_OPTION
> -allnoconfig_y, T_OPT_ALLNOCONFIG_Y,TF_OPTION
> -%%
> diff --git a/xen/tools/kconfig/zconf.hash.c_shipped
> b/xen/tools/kconfig/zconf.hash.c_shipped
> deleted file mode 100644
> index 360a62df2b..0000000000
> --- a/xen/tools/kconfig/zconf.hash.c_shipped
> +++ /dev/null
> @@ -1,293 +0,0 @@
> -/* ANSI-C code produced by gperf version 3.0.4 */
> -/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped
> -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */
> -
> -#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
> - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
> - && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
> - && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
> - && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
> - && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
> - && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
> - && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
> - && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
> - && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
> - && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
> - && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
> - && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
> - && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
> - && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
> - && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
> - && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
> - && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
> - && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
> - && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
> - && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
> - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
> - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
> -/* The character set is not based on ISO-646. */
> -#error "gperf generated tables don't work with this execution character set.
> Please report a bug to <bug-gnu-gperf@xxxxxxx>."
> -#endif
> -
> -#line 10 "scripts/kconfig/zconf.gperf"
> -struct kconf_id;
> -
> -static const struct kconf_id *kconf_id_lookup(register const char *str,
> register unsigned int len);
> -/* maximum key range = 71, duplicates = 0 */
> -
> -#ifdef __GNUC__
> -__inline
> -#else
> -#ifdef __cplusplus
> -inline
> -#endif
> -#endif
> -static unsigned int
> -kconf_id_hash (register const char *str, register unsigned int len)
> -{
> - static const unsigned char asso_values[] =
> - {
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 0, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 5, 25, 25,
> - 0, 0, 0, 5, 0, 0, 73, 73, 5, 0,
> - 10, 5, 45, 73, 20, 20, 0, 15, 15, 73,
> - 20, 5, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73,
> - 73, 73, 73, 73, 73, 73
> - };
> - register int hval = len;
> -
> - switch (hval)
> - {
> - default:
> - hval += asso_values[(unsigned char)str[2]];
> - /*FALLTHROUGH*/
> - case 2:
> - case 1:
> - hval += asso_values[(unsigned char)str[0]];
> - break;
> - }
> - return hval + asso_values[(unsigned char)str[len - 1]];
> -}
> -
> -struct kconf_id_strings_t
> - {
> - char kconf_id_strings_str2[sizeof("if")];
> - char kconf_id_strings_str3[sizeof("int")];
> - char kconf_id_strings_str5[sizeof("endif")];
> - char kconf_id_strings_str7[sizeof("default")];
> - char kconf_id_strings_str8[sizeof("tristate")];
> - char kconf_id_strings_str9[sizeof("endchoice")];
> - char kconf_id_strings_str10[sizeof("---help---")];
> - char kconf_id_strings_str12[sizeof("def_tristate")];
> - char kconf_id_strings_str13[sizeof("def_bool")];
> - char kconf_id_strings_str14[sizeof("defconfig_list")];
> - char kconf_id_strings_str17[sizeof("on")];
> - char kconf_id_strings_str18[sizeof("optional")];
> - char kconf_id_strings_str21[sizeof("option")];
> - char kconf_id_strings_str22[sizeof("endmenu")];
> - char kconf_id_strings_str23[sizeof("mainmenu")];
> - char kconf_id_strings_str25[sizeof("menuconfig")];
> - char kconf_id_strings_str27[sizeof("modules")];
> - char kconf_id_strings_str28[sizeof("allnoconfig_y")];
> - char kconf_id_strings_str29[sizeof("menu")];
> - char kconf_id_strings_str31[sizeof("select")];
> - char kconf_id_strings_str32[sizeof("comment")];
> - char kconf_id_strings_str33[sizeof("env")];
> - char kconf_id_strings_str35[sizeof("range")];
> - char kconf_id_strings_str36[sizeof("choice")];
> - char kconf_id_strings_str39[sizeof("bool")];
> - char kconf_id_strings_str41[sizeof("source")];
> - char kconf_id_strings_str42[sizeof("visible")];
> - char kconf_id_strings_str43[sizeof("hex")];
> - char kconf_id_strings_str46[sizeof("config")];
> - char kconf_id_strings_str47[sizeof("boolean")];
> - char kconf_id_strings_str51[sizeof("string")];
> - char kconf_id_strings_str54[sizeof("help")];
> - char kconf_id_strings_str56[sizeof("prompt")];
> - char kconf_id_strings_str72[sizeof("depends")];
> - };
> -static const struct kconf_id_strings_t kconf_id_strings_contents =
> - {
> - "if",
> - "int",
> - "endif",
> - "default",
> - "tristate",
> - "endchoice",
> - "---help---",
> - "def_tristate",
> - "def_bool",
> - "defconfig_list",
> - "on",
> - "optional",
> - "option",
> - "endmenu",
> - "mainmenu",
> - "menuconfig",
> - "modules",
> - "allnoconfig_y",
> - "menu",
> - "select",
> - "comment",
> - "env",
> - "range",
> - "choice",
> - "bool",
> - "source",
> - "visible",
> - "hex",
> - "config",
> - "boolean",
> - "string",
> - "help",
> - "prompt",
> - "depends"
> - };
> -#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
> -#ifdef __GNUC__
> -__inline
> -#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
> -__attribute__ ((__gnu_inline__))
> -#endif
> -#endif
> -const struct kconf_id *
> -kconf_id_lookup (register const char *str, register unsigned int len)
> -{
> - enum
> - {
> - TOTAL_KEYWORDS = 34,
> - MIN_WORD_LENGTH = 2,
> - MAX_WORD_LENGTH = 14,
> - MIN_HASH_VALUE = 2,
> - MAX_HASH_VALUE = 72
> - };
> -
> - static const struct kconf_id wordlist[] =
> - {
> - {-1}, {-1},
> -#line 26 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,
> T_IF, TF_COMMAND|TF_PARAM},
> -#line 37 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,
> T_TYPE, TF_COMMAND, S_INT},
> - {-1},
> -#line 27 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,
> T_ENDIF, TF_COMMAND},
> - {-1},
> -#line 30 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,
> T_DEFAULT, TF_COMMAND, S_UNKNOWN},
> -#line 32 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,
> T_TYPE, TF_COMMAND, S_TRISTATE},
> -#line 20 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,
> T_ENDCHOICE, TF_COMMAND},
> -#line 25 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,
> T_HELP, TF_COMMAND},
> - {-1},
> -#line 33 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,
> T_DEFAULT, TF_COMMAND, S_TRISTATE},
> -#line 36 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,
> T_DEFAULT, TF_COMMAND, S_BOOLEAN},
> -#line 46 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,
> T_OPT_DEFCONFIG_LIST,TF_OPTION},
> - {-1}, {-1},
> -#line 44 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,
> T_ON, TF_PARAM},
> -#line 29 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,
> T_OPTIONAL, TF_COMMAND},
> - {-1}, {-1},
> -#line 43 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,
> T_OPTION, TF_COMMAND},
> -#line 17 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,
> T_ENDMENU, TF_COMMAND},
> -#line 15 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,
> T_MAINMENU, TF_COMMAND},
> - {-1},
> -#line 23 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25,
> T_MENUCONFIG, TF_COMMAND},
> - {-1},
> -#line 45 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,
> T_OPT_MODULES, TF_OPTION},
> -#line 48 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,
> T_OPT_ALLNOCONFIG_Y,TF_OPTION},
> -#line 16 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,
> T_MENU, TF_COMMAND},
> - {-1},
> -#line 40 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,
> T_SELECT, TF_COMMAND},
> -#line 21 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,
> T_COMMENT, TF_COMMAND},
> -#line 47 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,
> T_OPT_ENV, TF_OPTION},
> - {-1},
> -#line 41 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,
> T_RANGE, TF_COMMAND},
> -#line 19 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,
> T_CHOICE, TF_COMMAND},
> - {-1}, {-1},
> -#line 34 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39,
> T_TYPE, TF_COMMAND, S_BOOLEAN},
> - {-1},
> -#line 18 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,
> T_SOURCE, TF_COMMAND},
> -#line 42 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,
> T_VISIBLE, TF_COMMAND},
> -#line 38 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43,
> T_TYPE, TF_COMMAND, S_HEX},
> - {-1}, {-1},
> -#line 22 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,
> T_CONFIG, TF_COMMAND},
> -#line 35 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,
> T_TYPE, TF_COMMAND, S_BOOLEAN},
> - {-1}, {-1}, {-1},
> -#line 39 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51,
> T_TYPE, TF_COMMAND, S_STRING},
> - {-1}, {-1},
> -#line 24 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54,
> T_HELP, TF_COMMAND},
> - {-1},
> -#line 31 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56,
> T_PROMPT, TF_COMMAND},
> - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
> - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
> -#line 28 "scripts/kconfig/zconf.gperf"
> - {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72,
> T_DEPENDS, TF_COMMAND}
> - };
> -
> - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
> - {
> - register int key = kconf_id_hash (str, len);
> -
> - if (key <= MAX_HASH_VALUE && key >= 0)
> - {
> - register int o = wordlist[key].name;
> - if (o >= 0)
> - {
> - register const char *s = o + kconf_id_strings;
> -
> - if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len]
> == '\0')
> - return &wordlist[key];
> - }
> - }
> - }
> - return 0;
> -}
> -#line 49 "scripts/kconfig/zconf.gperf"
> -
> diff --git a/xen/tools/kconfig/zconf.l b/xen/tools/kconfig/zconf.l
> index c410d257da..045093d827 100644
> --- a/xen/tools/kconfig/zconf.l
> +++ b/xen/tools/kconfig/zconf.l
> @@ -1,5 +1,5 @@
> %option nostdinit noyywrap never-interactive full ecs
> -%option 8bit nodefault perf-report perf-report
> +%option 8bit nodefault yylineno
> %option noinput
> %x COMMAND HELP STRING PARAM
> %{
> @@ -52,7 +52,7 @@ static void append_string(const char *str, int size)
> if (new_size > text_asize) {
> new_size += START_STRSIZE - 1;
> new_size &= -START_STRSIZE;
> - text = realloc(text, new_size);
> + text = xrealloc(text, new_size);
> text_asize = new_size;
> }
> memcpy(text + text_size, str, size);
> @@ -83,7 +83,6 @@ n [A-Za-z0-9_-]
>
> [ \t]*#.*\n |
> [ \t]*\n {
> - current_file->lineno++;
> return T_EOL;
> }
> [ \t]*#.*
> @@ -104,19 +103,18 @@ n [A-Za-z0-9_-]
> const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
> BEGIN(PARAM);
> current_pos.file = current_file;
> - current_pos.lineno = current_file->lineno;
> + current_pos.lineno = yylineno;
> if (id && id->flags & TF_COMMAND) {
> - zconflval.id = id;
> + yylval.id = id;
> return id->token;
> }
> alloc_string(yytext, yyleng);
> - zconflval.string = text;
> + yylval.string = text;
> return T_WORD;
> }
> . warn_ignored_character(*yytext);
> \n {
> BEGIN(INITIAL);
> - current_file->lineno++;
> return T_EOL;
> }
> }
> @@ -138,19 +136,19 @@ n [A-Za-z0-9_-]
> new_string();
> BEGIN(STRING);
> }
> - \n BEGIN(INITIAL); current_file->lineno++; return T_EOL;
> + \n BEGIN(INITIAL); return T_EOL;
> ({n}|[/.])+ {
> const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
> if (id && id->flags & TF_PARAM) {
> - zconflval.id = id;
> + yylval.id = id;
> return id->token;
> }
> alloc_string(yytext, yyleng);
> - zconflval.string = text;
> + yylval.string = text;
> return T_WORD;
> }
> #.* /* comment */
> - \\\n current_file->lineno++;
> + \\\n ;
> [[:blank:]]+
> . warn_ignored_character(*yytext);
> <<EOF>> {
> @@ -161,7 +159,7 @@ n [A-Za-z0-9_-]
> <STRING>{
> [^'"\\\n]+/\n {
> append_string(yytext, yyleng);
> - zconflval.string = text;
> + yylval.string = text;
> return T_WORD_QUOTE;
> }
> [^'"\\\n]+ {
> @@ -169,7 +167,7 @@ n [A-Za-z0-9_-]
> }
> \\.?/\n {
> append_string(yytext + 1, yyleng - 1);
> - zconflval.string = text;
> + yylval.string = text;
> return T_WORD_QUOTE;
> }
> \\.? {
> @@ -178,14 +176,15 @@ n [A-Za-z0-9_-]
> \'|\" {
> if (str == yytext[0]) {
> BEGIN(PARAM);
> - zconflval.string = text;
> + yylval.string = text;
> return T_WORD_QUOTE;
> } else
> append_string(yytext, 1);
> }
> \n {
> - printf("%s:%d:warning: multi-line strings not supported\n",
> zconf_curname(), zconf_lineno());
> - current_file->lineno++;
> + fprintf(stderr,
> + "%s:%d:warning: multi-line strings not supported\n",
> + zconf_curname(), zconf_lineno());
> BEGIN(INITIAL);
> return T_EOL;
> }
> @@ -218,12 +217,10 @@ n [A-Za-z0-9_-]
> }
> }
> [ \t]*\n/[^ \t\n] {
> - current_file->lineno++;
> zconf_endhelp();
> return T_HELPTEXT;
> }
> [ \t]*\n {
> - current_file->lineno++;
> append_string("\n", 1);
> }
> [^ \t\n].* {
> @@ -261,7 +258,7 @@ void zconf_starthelp(void)
>
> static void zconf_endhelp(void)
> {
> - zconflval.string = text;
> + yylval.string = text;
> BEGIN(INITIAL);
> }
>
> @@ -294,7 +291,7 @@ void zconf_initscan(const char *name)
> {
> yyin = zconf_fopen(name);
> if (!yyin) {
> - printf("can't find file %s\n", name);
> + fprintf(stderr, "can't find file %s\n", name);
> exit(1);
> }
>
> @@ -302,7 +299,7 @@ void zconf_initscan(const char *name)
> memset(current_buf, 0, sizeof(*current_buf));
>
> current_file = file_lookup(name);
> - current_file->lineno = 1;
> + yylineno = 1;
> }
>
> void zconf_nextfile(const char *name)
> @@ -315,35 +312,34 @@ void zconf_nextfile(const char *name)
> current_buf->state = YY_CURRENT_BUFFER;
> yyin = zconf_fopen(file->name);
> if (!yyin) {
> - printf("%s:%d: can't open file \"%s\"\n",
> - zconf_curname(), zconf_lineno(), file->name);
> + fprintf(stderr, "%s:%d: can't open file \"%s\"\n",
> + zconf_curname(), zconf_lineno(), file->name);
> exit(1);
> }
> yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
> buf->parent = current_buf;
> current_buf = buf;
>
> - for (iter = current_file->parent; iter; iter = iter->parent ) {
> - if (!strcmp(current_file->name,iter->name) ) {
> - printf("%s:%d: recursive inclusion detected. "
> - "Inclusion path:\n current file : '%s'\n",
> - zconf_curname(), zconf_lineno(),
> - zconf_curname());
> - iter = current_file->parent;
> - while (iter && \
> - strcmp(iter->name,current_file->name)) {
> - printf(" included from: '%s:%d'\n",
> - iter->name, iter->lineno-1);
> + current_file->lineno = yylineno;
> + file->parent = current_file;
> +
> + for (iter = current_file; iter; iter = iter->parent) {
> + if (!strcmp(iter->name, file->name)) {
> + fprintf(stderr,
> + "Recursive inclusion detected.\n"
> + "Inclusion path:\n"
> + " current file : %s\n", file->name);
> + iter = file;
> + do {
> iter = iter->parent;
> - }
> - if (iter)
> - printf(" included from: '%s:%d'\n",
> - iter->name, iter->lineno+1);
> + fprintf(stderr, " included from: %s:%d\n",
> + iter->name, iter->lineno - 1);
> + } while (strcmp(iter->name, file->name));
> exit(1);
> }
> }
> - file->lineno = 1;
> - file->parent = current_file;
> +
> + yylineno = 1;
> current_file = file;
> }
>
> @@ -352,6 +348,8 @@ static void zconf_endfile(void)
> struct buffer *parent;
>
> current_file = current_file->parent;
> + if (current_file)
> + yylineno = current_file->lineno;
>
> parent = current_buf->parent;
> if (parent) {
> diff --git a/xen/tools/kconfig/zconf.lex.c_shipped
> b/xen/tools/kconfig/zconf.lex.c_shipped
> deleted file mode 100644
> index 37fdf61235..0000000000
> --- a/xen/tools/kconfig/zconf.lex.c_shipped
> +++ /dev/null
> @@ -1,2473 +0,0 @@
> -
> -#line 3 "scripts/kconfig/zconf.lex.c_shipped"
> -
> -#define YY_INT_ALIGNED short int
> -
> -/* A lexical scanner generated by flex */
> -
> -#define yy_create_buffer zconf_create_buffer
> -#define yy_delete_buffer zconf_delete_buffer
> -#define yy_flex_debug zconf_flex_debug
> -#define yy_init_buffer zconf_init_buffer
> -#define yy_flush_buffer zconf_flush_buffer
> -#define yy_load_buffer_state zconf_load_buffer_state
> -#define yy_switch_to_buffer zconf_switch_to_buffer
> -#define yyin zconfin
> -#define yyleng zconfleng
> -#define yylex zconflex
> -#define yylineno zconflineno
> -#define yyout zconfout
> -#define yyrestart zconfrestart
> -#define yytext zconftext
> -#define yywrap zconfwrap
> -#define yyalloc zconfalloc
> -#define yyrealloc zconfrealloc
> -#define yyfree zconffree
> -
> -#define FLEX_SCANNER
> -#define YY_FLEX_MAJOR_VERSION 2
> -#define YY_FLEX_MINOR_VERSION 5
> -#define YY_FLEX_SUBMINOR_VERSION 35
> -#if YY_FLEX_SUBMINOR_VERSION > 0
> -#define FLEX_BETA
> -#endif
> -
> -/* First, we deal with platform-specific or compiler-specific issues. */
> -
> -/* begin standard C headers. */
> -#include <stdio.h>
> -#include <string.h>
> -#include <errno.h>
> -#include <stdlib.h>
> -
> -/* end standard C headers. */
> -
> -/* flex integer type definitions */
> -
> -#ifndef FLEXINT_H
> -#define FLEXINT_H
> -
> -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
> -
> -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
> -
> -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
> - * if you want the limit (max/min) macros for int types.
> - */
> -#ifndef __STDC_LIMIT_MACROS
> -#define __STDC_LIMIT_MACROS 1
> -#endif
> -
> -#include <inttypes.h>
> -typedef int8_t flex_int8_t;
> -typedef uint8_t flex_uint8_t;
> -typedef int16_t flex_int16_t;
> -typedef uint16_t flex_uint16_t;
> -typedef int32_t flex_int32_t;
> -typedef uint32_t flex_uint32_t;
> -#else
> -typedef signed char flex_int8_t;
> -typedef short int flex_int16_t;
> -typedef int flex_int32_t;
> -typedef unsigned char flex_uint8_t;
> -typedef unsigned short int flex_uint16_t;
> -typedef unsigned int flex_uint32_t;
> -
> -/* Limits of integral types. */
> -#ifndef INT8_MIN
> -#define INT8_MIN (-128)
> -#endif
> -#ifndef INT16_MIN
> -#define INT16_MIN (-32767-1)
> -#endif
> -#ifndef INT32_MIN
> -#define INT32_MIN (-2147483647-1)
> -#endif
> -#ifndef INT8_MAX
> -#define INT8_MAX (127)
> -#endif
> -#ifndef INT16_MAX
> -#define INT16_MAX (32767)
> -#endif
> -#ifndef INT32_MAX
> -#define INT32_MAX (2147483647)
> -#endif
> -#ifndef UINT8_MAX
> -#define UINT8_MAX (255U)
> -#endif
> -#ifndef UINT16_MAX
> -#define UINT16_MAX (65535U)
> -#endif
> -#ifndef UINT32_MAX
> -#define UINT32_MAX (4294967295U)
> -#endif
> -
> -#endif /* ! C99 */
> -
> -#endif /* ! FLEXINT_H */
> -
> -#ifdef __cplusplus
> -
> -/* The "const" storage-class-modifier is valid. */
> -#define YY_USE_CONST
> -
> -#else /* ! __cplusplus */
> -
> -/* C99 requires __STDC__ to be defined as 1. */
> -#if defined (__STDC__)
> -
> -#define YY_USE_CONST
> -
> -#endif /* defined (__STDC__) */
> -#endif /* ! __cplusplus */
> -
> -#ifdef YY_USE_CONST
> -#define yyconst const
> -#else
> -#define yyconst
> -#endif
> -
> -/* Returned upon end-of-file. */
> -#define YY_NULL 0
> -
> -/* Promotes a possibly negative, possibly signed char to an unsigned
> - * integer for use as an array index. If the signed char is negative,
> - * we want to instead treat it as an 8-bit unsigned char, hence the
> - * double cast.
> - */
> -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
> -
> -/* Enter a start condition. This macro really ought to take a parameter,
> - * but we do it the disgusting crufty way forced on us by the ()-less
> - * definition of BEGIN.
> - */
> -#define BEGIN (yy_start) = 1 + 2 *
> -
> -/* Translate the current start state into a value that can be later handed
> - * to BEGIN to return to the state. The YYSTATE alias is for lex
> - * compatibility.
> - */
> -#define YY_START (((yy_start) - 1) / 2)
> -#define YYSTATE YY_START
> -
> -/* Action number for EOF rule of a given start state. */
> -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
> -
> -/* Special action meaning "start processing a new file". */
> -#define YY_NEW_FILE zconfrestart(zconfin )
> -
> -#define YY_END_OF_BUFFER_CHAR 0
> -
> -/* Size of default input buffer. */
> -#ifndef YY_BUF_SIZE
> -#ifdef __ia64__
> -/* On IA-64, the buffer size is 16k, not 8k.
> - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
> - * Ditto for the __ia64__ case accordingly.
> - */
> -#define YY_BUF_SIZE 32768
> -#else
> -#define YY_BUF_SIZE 16384
> -#endif /* __ia64__ */
> -#endif
> -
> -/* The state buf must be large enough to hold one state per character in the
> main buffer.
> - */
> -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
> -
> -#ifndef YY_TYPEDEF_YY_BUFFER_STATE
> -#define YY_TYPEDEF_YY_BUFFER_STATE
> -typedef struct yy_buffer_state *YY_BUFFER_STATE;
> -#endif
> -
> -extern int zconfleng;
> -
> -extern FILE *zconfin, *zconfout;
> -
> -#define EOB_ACT_CONTINUE_SCAN 0
> -#define EOB_ACT_END_OF_FILE 1
> -#define EOB_ACT_LAST_MATCH 2
> -
> - #define YY_LESS_LINENO(n)
> -
> -/* Return all but the first "n" matched characters back to the input stream.
> */
> -#define yyless(n) \
> - do \
> - { \
> - /* Undo effects of setting up zconftext. */ \
> - int yyless_macro_arg = (n); \
> - YY_LESS_LINENO(yyless_macro_arg);\
> - *yy_cp = (yy_hold_char); \
> - YY_RESTORE_YY_MORE_OFFSET \
> - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
> - YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
> - } \
> - while ( 0 )
> -
> -#define unput(c) yyunput( c, (yytext_ptr) )
> -
> -#ifndef YY_TYPEDEF_YY_SIZE_T
> -#define YY_TYPEDEF_YY_SIZE_T
> -typedef size_t yy_size_t;
> -#endif
> -
> -#ifndef YY_STRUCT_YY_BUFFER_STATE
> -#define YY_STRUCT_YY_BUFFER_STATE
> -struct yy_buffer_state
> - {
> - FILE *yy_input_file;
> -
> - char *yy_ch_buf; /* input buffer */
> - char *yy_buf_pos; /* current position in input buffer */
> -
> - /* Size of input buffer in bytes, not including room for EOB
> - * characters.
> - */
> - yy_size_t yy_buf_size;
> -
> - /* Number of characters read into yy_ch_buf, not including EOB
> - * characters.
> - */
> - int yy_n_chars;
> -
> - /* Whether we "own" the buffer - i.e., we know we created it,
> - * and can realloc() it to grow it, and should free() it to
> - * delete it.
> - */
> - int yy_is_our_buffer;
> -
> - /* Whether this is an "interactive" input source; if so, and
> - * if we're using stdio for input, then we want to use getc()
> - * instead of fread(), to make sure we stop fetching input after
> - * each newline.
> - */
> - int yy_is_interactive;
> -
> - /* Whether we're considered to be at the beginning of a line.
> - * If so, '^' rules will be active on the next match, otherwise
> - * not.
> - */
> - int yy_at_bol;
> -
> - int yy_bs_lineno; /**< The line count. */
> - int yy_bs_column; /**< The column count. */
> -
> - /* Whether to try to fill the input buffer when we reach the
> - * end of it.
> - */
> - int yy_fill_buffer;
> -
> - int yy_buffer_status;
> -
> -#define YY_BUFFER_NEW 0
> -#define YY_BUFFER_NORMAL 1
> - /* When an EOF's been seen but there's still some text to process
> - * then we mark the buffer as YY_EOF_PENDING, to indicate that we
> - * shouldn't try reading from the input source any more. We might
> - * still have a bunch of tokens to match, though, because of
> - * possible backing-up.
> - *
> - * When we actually see the EOF, we change the status to "new"
> - * (via zconfrestart()), so that the user can continue scanning by
> - * just pointing zconfin at a new input file.
> - */
> -#define YY_BUFFER_EOF_PENDING 2
> -
> - };
> -#endif /* !YY_STRUCT_YY_BUFFER_STATE */
> -
> -/* Stack of input buffers. */
> -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
> -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
> -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
> -
> -/* We provide macros for accessing buffer states in case in the
> - * future we want to put the buffer states in a more general
> - * "scanner state".
> - *
> - * Returns the top of the stack, or NULL.
> - */
> -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
> - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
> - : NULL)
> -
> -/* Same as previous macro, but useful when we know that the buffer stack is
> not
> - * NULL or when we need an lvalue. For internal use only.
> - */
> -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
> -
> -/* yy_hold_char holds the character lost when zconftext is formed. */
> -static char yy_hold_char;
> -static int yy_n_chars; /* number of characters read into
> yy_ch_buf */
> -int zconfleng;
> -
> -/* Points to current character in buffer. */
> -static char *yy_c_buf_p = (char *) 0;
> -static int yy_init = 0; /* whether we need to initialize */
> -static int yy_start = 0; /* start state number */
> -
> -/* Flag which is used to allow zconfwrap()'s to do buffer switches
> - * instead of setting up a fresh zconfin. A bit of a hack ...
> - */
> -static int yy_did_buffer_switch_on_eof;
> -
> -void zconfrestart (FILE *input_file );
> -void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer );
> -YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size );
> -void zconf_delete_buffer (YY_BUFFER_STATE b );
> -void zconf_flush_buffer (YY_BUFFER_STATE b );
> -void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer );
> -void zconfpop_buffer_state (void );
> -
> -static void zconfensure_buffer_stack (void );
> -static void zconf_load_buffer_state (void );
> -static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file );
> -
> -#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
> -
> -YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size );
> -YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str );
> -YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len );
> -
> -void *zconfalloc (yy_size_t );
> -void *zconfrealloc (void *,yy_size_t );
> -void zconffree (void * );
> -
> -#define yy_new_buffer zconf_create_buffer
> -
> -#define yy_set_interactive(is_interactive) \
> - { \
> - if ( ! YY_CURRENT_BUFFER ){ \
> - zconfensure_buffer_stack (); \
> - YY_CURRENT_BUFFER_LVALUE = \
> - zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
> - } \
> - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
> - }
> -
> -#define yy_set_bol(at_bol) \
> - { \
> - if ( ! YY_CURRENT_BUFFER ){\
> - zconfensure_buffer_stack (); \
> - YY_CURRENT_BUFFER_LVALUE = \
> - zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
> - } \
> - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
> - }
> -
> -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
> -
> -/* Begin user sect3 */
> -
> -#define zconfwrap(n) 1
> -#define YY_SKIP_YYWRAP
> -
> -typedef unsigned char YY_CHAR;
> -
> -FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
> -
> -typedef int yy_state_type;
> -
> -extern int zconflineno;
> -
> -int zconflineno = 1;
> -
> -extern char *zconftext;
> -#define yytext_ptr zconftext
> -static yyconst flex_int16_t yy_nxt[][18] =
> - {
> - {
> - 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,
> - 12, 12, 12, 12, 12, 12, 12, 12
> - },
> -
> - {
> - 11, 12, 13, 14, 12, 12, 15, 12, 12, 12,
> - 12, 12, 12, 12, 12, 12, 12, 12
> - },
> -
> - {
> - 11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
> - 16, 18, 16, 16, 16, 16, 16, 16
> - },
> -
> - {
> - 11, 16, 16, 17, 16, 16, 16, 16, 16, 16,
> - 16, 18, 16, 16, 16, 16, 16, 16
> -
> - },
> -
> - {
> - 11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
> - 19, 19, 19, 19, 19, 19, 19, 19
> - },
> -
> - {
> - 11, 19, 20, 21, 19, 19, 19, 19, 19, 19,
> - 19, 19, 19, 19, 19, 19, 19, 19
> - },
> -
> - {
> - 11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
> - 22, 22, 22, 22, 22, 22, 25, 22
> - },
> -
> - {
> - 11, 22, 22, 23, 22, 24, 22, 22, 24, 22,
> - 22, 22, 22, 22, 22, 22, 25, 22
> - },
> -
> - {
> - 11, 26, 27, 28, 29, 30, 31, 32, 30, 33,
> - 34, 35, 35, 36, 37, 38, 39, 40
> -
> - },
> -
> - {
> - 11, 26, 27, 28, 29, 30, 31, 32, 30, 33,
> - 34, 35, 35, 36, 37, 38, 39, 40
> - },
> -
> - {
> - -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,
> - -12, -12, -12, -12, -12, -12, -12, -12
> - },
> -
> - {
> - 11, -13, 41, 42, -13, -13, 43, -13, -13, -13,
> - -13, -13, -13, -13, -13, -13, -13, -13
> - },
> -
> - {
> - 11, -14, -14, -14, -14, -14, -14, -14, -14, -14,
> - -14, -14, -14, -14, -14, -14, -14, -14
> -
> - },
> -
> - {
> - 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
> - 44, 44, 44, 44, 44, 44, 44, 44
> - },
> -
> - {
> - 11, -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,
> - -17, -17, -17, -17, -17, -17, -17, -17
> - },
> -
> - {
> - 11, -18, -18, -18, -18, -18, -18, -18, -18, -18,
> - -18, 46, -18, -18, -18, -18, -18, -18
> - },
> -
> - {
> - 11, 47, 47, -19, 47, 47, 47, 47, 47, 47,
> - 47, 47, 47, 47, 47, 47, 47, 47
> -
> - },
> -
> - {
> - 11, -20, 48, 49, -20, -20, -20, -20, -20, -20,
> - -20, -20, -20, -20, -20, -20, -20, -20
> - },
> -
> - {
> - 11, 50, -21, -21, 50, 50, 50, 50, 50, 50,
> - 50, 50, 50, 50, 50, 50, 50, 50
> - },
> -
> - {
> - 11, 51, 51, 52, 51, -22, 51, 51, -22, 51,
> - 51, 51, 51, 51, 51, 51, -22, 51
> - },
> -
> - {
> - 11, -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,
> - -24, -24, -24, -24, -24, -24, -24, -24
> -
> - },
> -
> - {
> - 11, 53, 53, 54, 53, 53, 53, 53, 53, 53,
> - 53, 53, 53, 53, 53, 53, 53, 53
> - },
> -
> - {
> - 11, -26, -26, -26, -26, -26, -26, -26, -26, -26,
> - -26, -26, -26, -26, -26, -26, -26, -26
> - },
> -
> - {
> - 11, -27, 55, -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,
> - -28, -28, -28, -28, -28, -28, -28, -28
> - },
> -
> - {
> - 11, -29, -29, -29, -29, -29, -29, -29, -29, -29,
> - -29, -29, -29, -29, 56, -29, -29, -29
> -
> - },
> -
> - {
> - 11, -30, -30, -30, -30, -30, -30, -30, -30, -30,
> - -30, -30, -30, -30, -30, -30, -30, -30
> - },
> -
> - {
> - 11, 57, 57, -31, 57, 57, 57, 57, 57, 57,
> - 57, 57, 57, 57, 57, 57, 57, 57
> - },
> -
> - {
> - 11, -32, -32, -32, -32, -32, -32, 58, -32, -32,
> - -32, -32, -32, -32, -32, -32, -32, -32
> - },
> -
> - {
> - 11, -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,
> - -34, -34, -34, -34, -34, -34, -34, -34
> -
> - },
> -
> - {
> - 11, -35, -35, -35, -35, -35, -35, -35, -35, -35,
> - -35, 59, 59, -35, -35, -35, -35, -35
> - },
> -
> - {
> - 11, -36, -36, -36, -36, -36, -36, -36, -36, -36,
> - -36, -36, -36, -36, 60, -36, -36, -36
> - },
> -
> - {
> - 11, -37, -37, -37, -37, -37, -37, -37, -37, -37,
> - -37, -37, -37, -37, -37, -37, -37, -37
> - },
> -
> - {
> - 11, -38, -38, -38, -38, -38, -38, -38, -38, -38,
> - -38, -38, -38, -38, 61, -38, -38, -38
> - },
> -
> - {
> - 11, -39, -39, 62, -39, -39, -39, -39, -39, -39,
> - -39, -39, -39, -39, -39, -39, -39, -39
> -
> - },
> -
> - {
> - 11, -40, -40, -40, -40, -40, -40, -40, -40, -40,
> - -40, -40, -40, -40, -40, -40, -40, 63
> - },
> -
> - {
> - 11, -41, 41, 42, -41, -41, 43, -41, -41, -41,
> - -41, -41, -41, -41, -41, -41, -41, -41
> - },
> -
> - {
> - 11, -42, -42, -42, -42, -42, -42, -42, -42, -42,
> - -42, -42, -42, -42, -42, -42, -42, -42
> - },
> -
> - {
> - 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
> - 44, 44, 44, 44, 44, 44, 44, 44
> - },
> -
> - {
> - 11, 44, 44, 45, 44, 44, 44, 44, 44, 44,
> - 44, 44, 44, 44, 44, 44, 44, 44
> -
> - },
> -
> - {
> - 11, -45, -45, -45, -45, -45, -45, -45, -45, -45,
> - -45, -45, -45, -45, -45, -45, -45, -45
> - },
> -
> - {
> - 11, -46, -46, -46, -46, -46, -46, -46, -46, -46,
> - -46, 46, -46, -46, -46, -46, -46, -46
> - },
> -
> - {
> - 11, 47, 47, -47, 47, 47, 47, 47, 47, 47,
> - 47, 47, 47, 47, 47, 47, 47, 47
> - },
> -
> - {
> - 11, -48, 48, 49, -48, -48, -48, -48, -48, -48,
> - -48, -48, -48, -48, -48, -48, -48, -48
> - },
> -
> - {
> - 11, 50, -49, -49, 50, 50, 50, 50, 50, 50,
> - 50, 50, 50, 50, 50, 50, 50, 50
> -
> - },
> -
> - {
> - 11, -50, -50, -50, -50, -50, -50, -50, -50, -50,
> - -50, -50, -50, -50, -50, -50, -50, -50
> - },
> -
> - {
> - 11, 51, 51, 52, 51, -51, 51, 51, -51, 51,
> - 51, 51, 51, 51, 51, 51, -51, 51
> - },
> -
> - {
> - 11, -52, -52, -52, -52, -52, -52, -52, -52, -52,
> - -52, -52, -52, -52, -52, -52, -52, -52
> - },
> -
> - {
> - 11, -53, -53, 54, -53, -53, -53, -53, -53, -53,
> - -53, -53, -53, -53, -53, -53, -53, -53
> - },
> -
> - {
> - 11, -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,
> - -55, -55, -55, -55, -55, -55, -55, -55
> - },
> -
> - {
> - 11, -56, -56, -56, -56, -56, -56, -56, -56, -56,
> - -56, -56, -56, -56, -56, -56, -56, -56
> - },
> -
> - {
> - 11, 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,
> - -58, -58, -58, -58, -58, -58, -58, -58
> - },
> -
> - {
> - 11, -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,
> - -60, -60, -60, -60, -60, -60, -60, -60
> - },
> -
> - {
> - 11, -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
> - },
> -
> - {
> - 11, -63, -63, -63, -63, -63, -63, -63, -63, -63,
> - -63, -63, -63, -63, -63, -63, -63, -63
> - },
> -
> - } ;
> -
> -static yy_state_type yy_get_previous_state (void );
> -static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
> -static int yy_get_next_buffer (void );
> -static void yy_fatal_error (yyconst char msg[] );
> -
> -/* Done after the current pattern has been matched and before the
> - * corresponding action - sets up zconftext.
> - */
> -#define YY_DO_BEFORE_ACTION \
> - (yytext_ptr) = yy_bp; \
> - zconfleng = (size_t) (yy_cp - yy_bp); \
> - (yy_hold_char) = *yy_cp; \
> - *yy_cp = '\0'; \
> - (yy_c_buf_p) = yy_cp;
> -
> -#define YY_NUM_RULES 37
> -#define YY_END_OF_BUFFER 38
> -/* This struct is not used in this scanner,
> - but its presence is necessary. */
> -struct yy_trans_info
> - {
> - flex_int32_t yy_verify;
> - flex_int32_t yy_nxt;
> - };
> -static yyconst flex_int16_t yy_accept[64] =
> - { 0,
> - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
> - 38, 5, 4, 2, 3, 7, 8, 6, 36, 33,
> - 35, 28, 32, 31, 30, 26, 25, 21, 13, 20,
> - 23, 26, 11, 12, 22, 18, 14, 19, 26, 26,
> - 4, 2, 3, 3, 1, 6, 36, 33, 35, 34,
> - 28, 27, 30, 29, 25, 15, 23, 9, 22, 16,
> - 17, 24, 10
> - } ;
> -
> -static yyconst flex_int32_t yy_ec[256] =
> - { 0,
> - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
> - 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,
> - 10, 1, 1, 1, 11, 12, 12, 11, 11, 11,
> - 11, 11, 11, 11, 11, 11, 11, 1, 1, 13,
> - 14, 15, 1, 1, 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,
> - 1, 16, 1, 1, 11, 1, 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, 1, 17, 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,
> - 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
> - } ;
> -
> -extern int zconf_flex_debug;
> -int zconf_flex_debug = 0;
> -
> -/* The intent behind this definition is that it'll catch
> - * any uses of REJECT which flex missed.
> - */
> -#define REJECT reject_used_but_not_detected
> -#define yymore() yymore_used_but_not_detected
> -#define YY_MORE_ADJ 0
> -#define YY_RESTORE_YY_MORE_OFFSET
> -char *zconftext;
> -#define YY_NO_INPUT 1
> -
> -/*
> - * Copyright (C) 2002 Roman Zippel <zippel@xxxxxxxxxxxxxx>
> - * Released under the terms of the GNU GPL v2.0.
> - */
> -
> -#include <limits.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <unistd.h>
> -
> -#include "lkc.h"
> -
> -#define START_STRSIZE 16
> -
> -static struct {
> - struct file *file;
> - int lineno;
> -} current_pos;
> -
> -static char *text;
> -static int text_size, text_asize;
> -
> -struct buffer {
> - struct buffer *parent;
> - YY_BUFFER_STATE state;
> -};
> -
> -struct buffer *current_buf;
> -
> -static int last_ts, first_ts;
> -
> -static void zconf_endhelp(void);
> -static void zconf_endfile(void);
> -
> -static void new_string(void)
> -{
> - text = xmalloc(START_STRSIZE);
> - text_asize = START_STRSIZE;
> - text_size = 0;
> - *text = 0;
> -}
> -
> -static void append_string(const char *str, int size)
> -{
> - int new_size = text_size + size + 1;
> - if (new_size > text_asize) {
> - new_size += START_STRSIZE - 1;
> - new_size &= -START_STRSIZE;
> - text = realloc(text, new_size);
> - text_asize = new_size;
> - }
> - memcpy(text + text_size, str, size);
> - text_size += size;
> - text[text_size] = 0;
> -}
> -
> -static void alloc_string(const char *str, int size)
> -{
> - text = xmalloc(size + 1);
> - memcpy(text, str, size);
> - text[size] = 0;
> -}
> -
> -static void warn_ignored_character(char chr)
> -{
> - fprintf(stderr,
> - "%s:%d:warning: ignoring unsupported character '%c'\n",
> - zconf_curname(), zconf_lineno(), chr);
> -}
> -
> -#define INITIAL 0
> -#define COMMAND 1
> -#define HELP 2
> -#define STRING 3
> -#define PARAM 4
> -
> -#ifndef YY_NO_UNISTD_H
> -/* Special case for "unistd.h", since it is non-ANSI. We include it way
> - * down here because we want the user's section 1 to have been scanned first.
> - * The user has a chance to override it with an option.
> - */
> -#include <unistd.h>
> -#endif
> -
> -#ifndef YY_EXTRA_TYPE
> -#define YY_EXTRA_TYPE void *
> -#endif
> -
> -static int yy_init_globals (void );
> -
> -/* Accessor methods to globals.
> - These are made visible to non-reentrant scanners for convenience. */
> -
> -int zconflex_destroy (void );
> -
> -int zconfget_debug (void );
> -
> -void zconfset_debug (int debug_flag );
> -
> -YY_EXTRA_TYPE zconfget_extra (void );
> -
> -void zconfset_extra (YY_EXTRA_TYPE user_defined );
> -
> -FILE *zconfget_in (void );
> -
> -void zconfset_in (FILE * in_str );
> -
> -FILE *zconfget_out (void );
> -
> -void zconfset_out (FILE * out_str );
> -
> -int zconfget_leng (void );
> -
> -char *zconfget_text (void );
> -
> -int zconfget_lineno (void );
> -
> -void zconfset_lineno (int line_number );
> -
> -/* Macros after this point can all be overridden by user definitions in
> - * section 1.
> - */
> -
> -#ifndef YY_SKIP_YYWRAP
> -#ifdef __cplusplus
> -extern "C" int zconfwrap (void );
> -#else
> -extern int zconfwrap (void );
> -#endif
> -#endif
> -
> - static void yyunput (int c,char *buf_ptr );
> -
> -#ifndef yytext_ptr
> -static void yy_flex_strncpy (char *,yyconst char *,int );
> -#endif
> -
> -#ifdef YY_NEED_STRLEN
> -static int yy_flex_strlen (yyconst char * );
> -#endif
> -
> -#ifndef YY_NO_INPUT
> -
> -#ifdef __cplusplus
> -static int yyinput (void );
> -#else
> -static int input (void );
> -#endif
> -
> -#endif
> -
> -/* Amount of stuff to slurp up with each read. */
> -#ifndef YY_READ_BUF_SIZE
> -#ifdef __ia64__
> -/* On IA-64, the buffer size is 16k, not 8k */
> -#define YY_READ_BUF_SIZE 16384
> -#else
> -#define YY_READ_BUF_SIZE 8192
> -#endif /* __ia64__ */
> -#endif
> -
> -/* Copy whatever the last rule matched to the standard output. */
> -#ifndef ECHO
> -/* This used to be an fputs(), but since the string might contain NUL's,
> - * we now use fwrite().
> - */
> -#define ECHO do { if (fwrite( zconftext, zconfleng, 1, zconfout )) {} }
> while (0)
> -#endif
> -
> -/* Gets input and stuffs it into "buf". number of characters read, or
> YY_NULL,
> - * is returned in "result".
> - */
> -#ifndef YY_INPUT
> -#define YY_INPUT(buf,result,max_size) \
> - errno=0; \
> - while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0
> ) \
> - { \
> - if( errno != EINTR) \
> - { \
> - YY_FATAL_ERROR( "input in flex scanner failed" ); \
> - break; \
> - } \
> - errno=0; \
> - clearerr(zconfin); \
> - }\
> -\
> -
> -#endif
> -
> -/* No semi-colon after return; correct usage is to write "yyterminate();" -
> - * we don't want an extra ';' after the "return" because that will cause
> - * some compilers to complain about unreachable statements.
> - */
> -#ifndef yyterminate
> -#define yyterminate() return YY_NULL
> -#endif
> -
> -/* Number of entries by which start-condition stack grows. */
> -#ifndef YY_START_STACK_INCR
> -#define YY_START_STACK_INCR 25
> -#endif
> -
> -/* Report a fatal error. */
> -#ifndef YY_FATAL_ERROR
> -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
> -#endif
> -
> -/* end tables serialization structures and prototypes */
> -
> -/* Default declaration of generated scanner - a define so the user can
> - * easily add parameters.
> - */
> -#ifndef YY_DECL
> -#define YY_DECL_IS_OURS 1
> -
> -extern int zconflex (void);
> -
> -#define YY_DECL int zconflex (void)
> -#endif /* !YY_DECL */
> -
> -/* Code executed at the beginning of each rule, after zconftext and zconfleng
> - * have been set up.
> - */
> -#ifndef YY_USER_ACTION
> -#define YY_USER_ACTION
> -#endif
> -
> -/* Code executed at the end of each rule. */
> -#ifndef YY_BREAK
> -#define YY_BREAK break;
> -#endif
> -
> -#define YY_RULE_SETUP \
> - YY_USER_ACTION
> -
> -/** The main scanner function which does all the work.
> - */
> -YY_DECL
> -{
> - register yy_state_type yy_current_state;
> - register char *yy_cp, *yy_bp;
> - register int yy_act;
> -
> - int str = 0;
> - int ts, i;
> -
> - if ( !(yy_init) )
> - {
> - (yy_init) = 1;
> -
> -#ifdef YY_USER_INIT
> - YY_USER_INIT;
> -#endif
> -
> - if ( ! (yy_start) )
> - (yy_start) = 1; /* first start state */
> -
> - if ( ! zconfin )
> - zconfin = stdin;
> -
> - if ( ! zconfout )
> - zconfout = stdout;
> -
> - if ( ! YY_CURRENT_BUFFER ) {
> - zconfensure_buffer_stack ();
> - YY_CURRENT_BUFFER_LVALUE =
> - zconf_create_buffer(zconfin,YY_BUF_SIZE );
> - }
> -
> - zconf_load_buffer_state( );
> - }
> -
> - while ( 1 ) /* loops until end-of-file is reached */
> - {
> - yy_cp = (yy_c_buf_p);
> -
> - /* Support of zconftext. */
> - *yy_cp = (yy_hold_char);
> -
> - /* yy_bp points to the position in yy_ch_buf of the start of
> - * the current run.
> - */
> - yy_bp = yy_cp;
> -
> - yy_current_state = (yy_start);
> -yy_match:
> - while ( (yy_current_state = yy_nxt[yy_current_state][
> yy_ec[YY_SC_TO_UI(*yy_cp)] ]) > 0 )
> - ++yy_cp;
> -
> - yy_current_state = -yy_current_state;
> -
> -yy_find_action:
> - yy_act = yy_accept[yy_current_state];
> -
> - YY_DO_BEFORE_ACTION;
> -
> -do_action: /* This label is used only to access EOF actions. */
> -
> - switch ( yy_act )
> - { /* beginning of action switch */
> -case 1:
> -/* rule 1 can match eol */
> -case 2:
> -/* rule 2 can match eol */
> -YY_RULE_SETUP
> -{
> - current_file->lineno++;
> - return T_EOL;
> -}
> - YY_BREAK
> -case 3:
> -YY_RULE_SETUP
> -
> - YY_BREAK
> -case 4:
> -YY_RULE_SETUP
> -{
> - BEGIN(COMMAND);
> -}
> - YY_BREAK
> -case 5:
> -YY_RULE_SETUP
> -{
> - unput(zconftext[0]);
> - BEGIN(COMMAND);
> -}
> - YY_BREAK
> -
> -case 6:
> -YY_RULE_SETUP
> -{
> - const struct kconf_id *id = kconf_id_lookup(zconftext,
> zconfleng);
> - BEGIN(PARAM);
> - current_pos.file = current_file;
> - current_pos.lineno = current_file->lineno;
> - if (id && id->flags & TF_COMMAND) {
> - zconflval.id = id;
> - return id->token;
> - }
> - alloc_string(zconftext, zconfleng);
> - zconflval.string = text;
> - return T_WORD;
> - }
> - YY_BREAK
> -case 7:
> -YY_RULE_SETUP
> -warn_ignored_character(*zconftext);
> - YY_BREAK
> -case 8:
> -/* rule 8 can match eol */
> -YY_RULE_SETUP
> -{
> - BEGIN(INITIAL);
> - current_file->lineno++;
> - return T_EOL;
> - }
> - YY_BREAK
> -
> -case 9:
> -YY_RULE_SETUP
> -return T_AND;
> - YY_BREAK
> -case 10:
> -YY_RULE_SETUP
> -return T_OR;
> - YY_BREAK
> -case 11:
> -YY_RULE_SETUP
> -return T_OPEN_PAREN;
> - YY_BREAK
> -case 12:
> -YY_RULE_SETUP
> -return T_CLOSE_PAREN;
> - YY_BREAK
> -case 13:
> -YY_RULE_SETUP
> -return T_NOT;
> - YY_BREAK
> -case 14:
> -YY_RULE_SETUP
> -return T_EQUAL;
> - YY_BREAK
> -case 15:
> -YY_RULE_SETUP
> -return T_UNEQUAL;
> - YY_BREAK
> -case 16:
> -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];
> - new_string();
> - BEGIN(STRING);
> - }
> - YY_BREAK
> -case 21:
> -/* rule 21 can match eol */
> -YY_RULE_SETUP
> -BEGIN(INITIAL); current_file->lineno++; return T_EOL;
> - YY_BREAK
> -case 22:
> -YY_RULE_SETUP
> -{
> - const struct kconf_id *id = kconf_id_lookup(zconftext,
> zconfleng);
> - if (id && id->flags & TF_PARAM) {
> - zconflval.id = id;
> - return id->token;
> - }
> - alloc_string(zconftext, zconfleng);
> - zconflval.string = text;
> - return T_WORD;
> - }
> - YY_BREAK
> -case 23:
> -YY_RULE_SETUP
> -/* comment */
> - YY_BREAK
> -case 24:
> -/* rule 24 can match eol */
> -YY_RULE_SETUP
> -current_file->lineno++;
> - YY_BREAK
> -case 25:
> -YY_RULE_SETUP
> -
> - YY_BREAK
> -case 26:
> -YY_RULE_SETUP
> -warn_ignored_character(*zconftext);
> - YY_BREAK
> -case YY_STATE_EOF(PARAM):
> -{
> - BEGIN(INITIAL);
> - }
> - YY_BREAK
> -
> -case 27:
> -/* rule 27 can match eol */
> -*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
> -(yy_c_buf_p) = yy_cp -= 1;
> -YY_DO_BEFORE_ACTION; /* set up zconftext again */
> -YY_RULE_SETUP
> -{
> - append_string(zconftext, zconfleng);
> - zconflval.string = text;
> - return T_WORD_QUOTE;
> - }
> - YY_BREAK
> -case 28:
> -YY_RULE_SETUP
> -{
> - append_string(zconftext, zconfleng);
> - }
> - YY_BREAK
> -case 29:
> -/* rule 29 can match eol */
> -*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
> -(yy_c_buf_p) = yy_cp -= 1;
> -YY_DO_BEFORE_ACTION; /* set up zconftext again */
> -YY_RULE_SETUP
> -{
> - append_string(zconftext + 1, zconfleng - 1);
> - zconflval.string = text;
> - return T_WORD_QUOTE;
> - }
> - YY_BREAK
> -case 30:
> -YY_RULE_SETUP
> -{
> - append_string(zconftext + 1, zconfleng - 1);
> - }
> - YY_BREAK
> -case 31:
> -YY_RULE_SETUP
> -{
> - if (str == zconftext[0]) {
> - BEGIN(PARAM);
> - zconflval.string = text;
> - return T_WORD_QUOTE;
> - } else
> - append_string(zconftext, 1);
> - }
> - YY_BREAK
> -case 32:
> -/* rule 32 can match eol */
> -YY_RULE_SETUP
> -{
> - printf("%s:%d:warning: multi-line strings not supported\n",
> zconf_curname(), zconf_lineno());
> - current_file->lineno++;
> - BEGIN(INITIAL);
> - return T_EOL;
> - }
> - YY_BREAK
> -case YY_STATE_EOF(STRING):
> -{
> - BEGIN(INITIAL);
> - }
> - YY_BREAK
> -
> -case 33:
> -YY_RULE_SETUP
> -{
> - ts = 0;
> - for (i = 0; i < zconfleng; i++) {
> - if (zconftext[i] == '\t')
> - ts = (ts & ~7) + 8;
> - else
> - ts++;
> - }
> - last_ts = ts;
> - if (first_ts) {
> - if (ts < first_ts) {
> - zconf_endhelp();
> - return T_HELPTEXT;
> - }
> - ts -= first_ts;
> - while (ts > 8) {
> - append_string(" ", 8);
> - ts -= 8;
> - }
> - append_string(" ", ts);
> - }
> - }
> - YY_BREAK
> -case 34:
> -/* rule 34 can match eol */
> -*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
> -(yy_c_buf_p) = yy_cp -= 1;
> -YY_DO_BEFORE_ACTION; /* set up zconftext again */
> -YY_RULE_SETUP
> -{
> - current_file->lineno++;
> - zconf_endhelp();
> - return T_HELPTEXT;
> - }
> - YY_BREAK
> -case 35:
> -/* rule 35 can match eol */
> -YY_RULE_SETUP
> -{
> - current_file->lineno++;
> - append_string("\n", 1);
> - }
> - YY_BREAK
> -case 36:
> -YY_RULE_SETUP
> -{
> - while (zconfleng) {
> - if ((zconftext[zconfleng-1] != ' ') &&
> (zconftext[zconfleng-1] != '\t'))
> - break;
> - zconfleng--;
> - }
> - append_string(zconftext, zconfleng);
> - if (!first_ts)
> - first_ts = last_ts;
> - }
> - YY_BREAK
> -case YY_STATE_EOF(HELP):
> -{
> - zconf_endhelp();
> - return T_HELPTEXT;
> - }
> - YY_BREAK
> -
> -case YY_STATE_EOF(INITIAL):
> -case YY_STATE_EOF(COMMAND):
> -{
> - if (current_file) {
> - zconf_endfile();
> - return T_EOL;
> - }
> - fclose(zconfin);
> - yyterminate();
> -}
> - YY_BREAK
> -case 37:
> -YY_RULE_SETUP
> -YY_FATAL_ERROR( "flex scanner jammed" );
> - YY_BREAK
> -
> - case YY_END_OF_BUFFER:
> - {
> - /* Amount of text matched not including the EOB char. */
> - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) -
> 1;
> -
> - /* Undo the effects of YY_DO_BEFORE_ACTION. */
> - *yy_cp = (yy_hold_char);
> - YY_RESTORE_YY_MORE_OFFSET
> -
> - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
> YY_BUFFER_NEW )
> - {
> - /* We're scanning a new file or input source. It's
> - * possible that this happened because the user
> - * just pointed zconfin at a new source and called
> - * zconflex(). If so, then we have to assure
> - * consistency between YY_CURRENT_BUFFER and our
> - * globals. Here is the right place to do so, because
> - * this is the first action (other than possibly a
> - * back-up) that will match for the new input source.
> - */
> - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
> - YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
> - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
> YY_BUFFER_NORMAL;
> - }
> -
> - /* Note that here we test for yy_c_buf_p "<=" to the position
> - * of the first EOB in the buffer, since yy_c_buf_p will
> - * already have been incremented past the NUL character
> - * (since all states make transitions on EOB to the
> - * end-of-buffer state). Contrast this with the test
> - * in input().
> - */
> - if ( (yy_c_buf_p) <=
> &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
> - { /* This was really a NUL. */
> - yy_state_type yy_next_state;
> -
> - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
> -
> - yy_current_state = yy_get_previous_state( );
> -
> - /* Okay, we're now positioned to make the NUL
> - * transition. We couldn't have
> - * yy_get_previous_state() go ahead and do it
> - * for us because it doesn't know how to deal
> - * with the possibility of jamming (and we don't
> - * want to build jamming into it because then it
> - * will run more slowly).
> - */
> -
> - yy_next_state = yy_try_NUL_trans( yy_current_state );
> -
> - yy_bp = (yytext_ptr) + YY_MORE_ADJ;
> -
> - if ( yy_next_state )
> - {
> - /* Consume the NUL. */
> - yy_cp = ++(yy_c_buf_p);
> - yy_current_state = yy_next_state;
> - goto yy_match;
> - }
> -
> - else
> - {
> - yy_cp = (yy_c_buf_p);
> - goto yy_find_action;
> - }
> - }
> -
> - else switch ( yy_get_next_buffer( ) )
> - {
> - case EOB_ACT_END_OF_FILE:
> - {
> - (yy_did_buffer_switch_on_eof) = 0;
> -
> - if ( zconfwrap( ) )
> - {
> - /* Note: because we've taken care in
> - * yy_get_next_buffer() to have set up
> - * zconftext, we can now set up
> - * yy_c_buf_p so that if some total
> - * hoser (like flex itself) wants to
> - * call the scanner after we return the
> - * YY_NULL, it'll still work - another
> - * YY_NULL will get returned.
> - */
> - (yy_c_buf_p) = (yytext_ptr) +
> YY_MORE_ADJ;
> -
> - yy_act = YY_STATE_EOF(YY_START);
> - goto do_action;
> - }
> -
> - else
> - {
> - if ( ! (yy_did_buffer_switch_on_eof) )
> - YY_NEW_FILE;
> - }
> - break;
> - }
> -
> - case EOB_ACT_CONTINUE_SCAN:
> - (yy_c_buf_p) =
> - (yytext_ptr) +
> yy_amount_of_matched_text;
> -
> - yy_current_state = yy_get_previous_state( );
> -
> - yy_cp = (yy_c_buf_p);
> - yy_bp = (yytext_ptr) + YY_MORE_ADJ;
> - goto yy_match;
> -
> - case EOB_ACT_LAST_MATCH:
> - (yy_c_buf_p) =
> -
> &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
> -
> - yy_current_state = yy_get_previous_state( );
> -
> - yy_cp = (yy_c_buf_p);
> - yy_bp = (yytext_ptr) + YY_MORE_ADJ;
> - goto yy_find_action;
> - }
> - break;
> - }
> -
> - default:
> - YY_FATAL_ERROR(
> - "fatal flex scanner internal error--no action found" );
> - } /* end of action switch */
> - } /* end of scanning one token */
> -} /* end of zconflex */
> -
> -/* yy_get_next_buffer - try to read in a new buffer
> - *
> - * Returns a code representing an action:
> - * EOB_ACT_LAST_MATCH -
> - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
> - * EOB_ACT_END_OF_FILE - end of file
> - */
> -static int yy_get_next_buffer (void)
> -{
> - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
> - register char *source = (yytext_ptr);
> - register int number_to_move, i;
> - int ret_val;
> -
> - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) +
> 1] )
> - YY_FATAL_ERROR(
> - "fatal flex scanner internal error--end of buffer missed" );
> -
> - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
> - { /* Don't try to fill the buffer, so this is an EOF. */
> - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
> - {
> - /* We matched a single character, the EOB, so
> - * treat this as a final EOF.
> - */
> - return EOB_ACT_END_OF_FILE;
> - }
> -
> - else
> - {
> - /* We matched some text prior to the EOB, first
> - * process it.
> - */
> - return EOB_ACT_LAST_MATCH;
> - }
> - }
> -
> - /* Try to read more data. */
> -
> - /* First move last chars to start of buffer. */
> - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
> -
> - for ( i = 0; i < number_to_move; ++i )
> - *(dest++) = *(source++);
> -
> - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status ==
> YY_BUFFER_EOF_PENDING )
> - /* don't do the read, it's not guaranteed to return an EOF,
> - * just force an EOF
> - */
> - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
> -
> - else
> - {
> - int num_to_read =
> - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move
> - 1;
> -
> - while ( num_to_read <= 0 )
> - { /* Not enough room in the buffer - grow it. */
> -
> - /* just a shorter name for the current buffer */
> - YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
> -
> - int yy_c_buf_p_offset =
> - (int) ((yy_c_buf_p) - b->yy_ch_buf);
> -
> - if ( b->yy_is_our_buffer )
> - {
> - int new_size = b->yy_buf_size * 2;
> -
> - if ( new_size <= 0 )
> - b->yy_buf_size += b->yy_buf_size / 8;
> - else
> - b->yy_buf_size *= 2;
> -
> - b->yy_ch_buf = (char *)
> - /* Include room in for 2 EOB chars. */
> - zconfrealloc((void *)
> b->yy_ch_buf,b->yy_buf_size + 2 );
> - }
> - else
> - /* Can't grow it, we don't own it. */
> - b->yy_ch_buf = 0;
> -
> - if ( ! b->yy_ch_buf )
> - YY_FATAL_ERROR(
> - "fatal error - scanner input buffer overflow" );
> -
> - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
> -
> - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
> - number_to_move - 1;
> -
> - }
> -
> - if ( num_to_read > YY_READ_BUF_SIZE )
> - num_to_read = YY_READ_BUF_SIZE;
> -
> - /* Read in more data. */
> - YY_INPUT(
> (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
> - (yy_n_chars), (size_t) num_to_read );
> -
> - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
> - }
> -
> - if ( (yy_n_chars) == 0 )
> - {
> - if ( number_to_move == YY_MORE_ADJ )
> - {
> - ret_val = EOB_ACT_END_OF_FILE;
> - zconfrestart(zconfin );
> - }
> -
> - else
> - {
> - ret_val = EOB_ACT_LAST_MATCH;
> - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
> - YY_BUFFER_EOF_PENDING;
> - }
> - }
> -
> - else
> - ret_val = EOB_ACT_CONTINUE_SCAN;
> -
> - if ((yy_size_t) ((yy_n_chars) + number_to_move) >
> YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
> - /* Extend the array by 50%, plus the number we really need. */
> - yy_size_t new_size = (yy_n_chars) + number_to_move +
> ((yy_n_chars) >> 1);
> - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *)
> zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
> - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
> - YY_FATAL_ERROR( "out of dynamic memory in
> yy_get_next_buffer()" );
> - }
> -
> - (yy_n_chars) += number_to_move;
> - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] =
> YY_END_OF_BUFFER_CHAR;
> - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] =
> YY_END_OF_BUFFER_CHAR;
> -
> - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
> -
> - return ret_val;
> -}
> -
> -/* yy_get_previous_state - get the state just before the EOB char was
> reached */
> -
> - static yy_state_type yy_get_previous_state (void)
> -{
> - register yy_state_type yy_current_state;
> - register char *yy_cp;
> -
> - yy_current_state = (yy_start);
> -
> - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp
> )
> - {
> - yy_current_state = yy_nxt[yy_current_state][(*yy_cp ?
> yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
> - }
> -
> - return yy_current_state;
> -}
> -
> -/* yy_try_NUL_trans - try to make a transition on the NUL character
> - *
> - * synopsis
> - * next_state = yy_try_NUL_trans( current_state );
> - */
> - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
> -{
> - register int yy_is_jam;
> -
> - yy_current_state = yy_nxt[yy_current_state][1];
> - yy_is_jam = (yy_current_state <= 0);
> -
> - return yy_is_jam ? 0 : yy_current_state;
> -}
> -
> - static void yyunput (int c, register char * yy_bp )
> -{
> - register char *yy_cp;
> -
> - yy_cp = (yy_c_buf_p);
> -
> - /* undo effects of setting up zconftext */
> - *yy_cp = (yy_hold_char);
> -
> - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
> - { /* need to shift things up to make room */
> - /* +2 for EOB chars. */
> - register int number_to_move = (yy_n_chars) + 2;
> - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
> - YY_CURRENT_BUFFER_LVALUE->yy_buf_size +
> 2];
> - register char *source =
> -
> &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
> -
> - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
> - *--dest = *--source;
> -
> - yy_cp += (int) (dest - source);
> - yy_bp += (int) (dest - source);
> - YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
> - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
> -
> - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
> - YY_FATAL_ERROR( "flex scanner push-back overflow" );
> - }
> -
> - *--yy_cp = (char) c;
> -
> - (yytext_ptr) = yy_bp;
> - (yy_hold_char) = *yy_cp;
> - (yy_c_buf_p) = yy_cp;
> -}
> -
> -#ifndef YY_NO_INPUT
> -#ifdef __cplusplus
> - static int yyinput (void)
> -#else
> - static int input (void)
> -#endif
> -
> -{
> - int c;
> -
> - *(yy_c_buf_p) = (yy_hold_char);
> -
> - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
> - {
> - /* yy_c_buf_p now points to the character we want to return.
> - * If this occurs *before* the EOB characters, then it's a
> - * valid NUL; if not, then we've hit the end of the buffer.
> - */
> - if ( (yy_c_buf_p) <
> &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
> - /* This was really a NUL. */
> - *(yy_c_buf_p) = '\0';
> -
> - else
> - { /* need more input */
> - int offset = (yy_c_buf_p) - (yytext_ptr);
> - ++(yy_c_buf_p);
> -
> - switch ( yy_get_next_buffer( ) )
> - {
> - case EOB_ACT_LAST_MATCH:
> - /* This happens because yy_g_n_b()
> - * sees that we've accumulated a
> - * token and flags that we need to
> - * try matching the token before
> - * proceeding. But for input(),
> - * there's no matching to consider.
> - * So convert the EOB_ACT_LAST_MATCH
> - * to EOB_ACT_END_OF_FILE.
> - */
> -
> - /* Reset buffer status. */
> - zconfrestart(zconfin );
> -
> - /*FALLTHROUGH*/
> -
> - case EOB_ACT_END_OF_FILE:
> - {
> - if ( zconfwrap( ) )
> - return EOF;
> -
> - if ( ! (yy_did_buffer_switch_on_eof) )
> - YY_NEW_FILE;
> -#ifdef __cplusplus
> - return yyinput();
> -#else
> - return input();
> -#endif
> - }
> -
> - case EOB_ACT_CONTINUE_SCAN:
> - (yy_c_buf_p) = (yytext_ptr) + offset;
> - break;
> - }
> - }
> - }
> -
> - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
> - *(yy_c_buf_p) = '\0'; /* preserve zconftext */
> - (yy_hold_char) = *++(yy_c_buf_p);
> -
> - return c;
> -}
> -#endif /* ifndef YY_NO_INPUT */
> -
> -/** Immediately switch to a different input stream.
> - * @param input_file A readable stream.
> - *
> - * @note This function does not reset the start condition to @c INITIAL .
> - */
> - void zconfrestart (FILE * input_file )
> -{
> -
> - if ( ! YY_CURRENT_BUFFER ){
> - zconfensure_buffer_stack ();
> - YY_CURRENT_BUFFER_LVALUE =
> - zconf_create_buffer(zconfin,YY_BUF_SIZE );
> - }
> -
> - zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
> - zconf_load_buffer_state( );
> -}
> -
> -/** Switch to a different input buffer.
> - * @param new_buffer The new input buffer.
> - *
> - */
> - void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer )
> -{
> -
> - /* TODO. We should be able to replace this entire function body
> - * with
> - * zconfpop_buffer_state();
> - * zconfpush_buffer_state(new_buffer);
> - */
> - zconfensure_buffer_stack ();
> - if ( YY_CURRENT_BUFFER == new_buffer )
> - return;
> -
> - if ( YY_CURRENT_BUFFER )
> - {
> - /* Flush out information for old buffer. */
> - *(yy_c_buf_p) = (yy_hold_char);
> - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
> - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
> - }
> -
> - YY_CURRENT_BUFFER_LVALUE = new_buffer;
> - zconf_load_buffer_state( );
> -
> - /* We don't actually know whether we did this switch during
> - * EOF (zconfwrap()) processing, but the only time this flag
> - * is looked at is after zconfwrap() is called, so it's safe
> - * to go ahead and always set it.
> - */
> - (yy_did_buffer_switch_on_eof) = 1;
> -}
> -
> -static void zconf_load_buffer_state (void)
> -{
> - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
> - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
> - zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
> - (yy_hold_char) = *(yy_c_buf_p);
> -}
> -
> -/** Allocate and initialize an input buffer state.
> - * @param file A readable stream.
> - * @param size The character buffer size in bytes. When in doubt, use @c
> YY_BUF_SIZE.
> - *
> - * @return the allocated buffer state.
> - */
> - YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size )
> -{
> - YY_BUFFER_STATE b;
> -
> - b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) );
> - if ( ! b )
> - YY_FATAL_ERROR( "out of dynamic memory in
> zconf_create_buffer()" );
> -
> - b->yy_buf_size = size;
> -
> - /* yy_ch_buf has to be 2 characters longer than the size given because
> - * we need to put in 2 end-of-buffer characters.
> - */
> - b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2 );
> - if ( ! b->yy_ch_buf )
> - YY_FATAL_ERROR( "out of dynamic memory in
> zconf_create_buffer()" );
> -
> - b->yy_is_our_buffer = 1;
> -
> - zconf_init_buffer(b,file );
> -
> - return b;
> -}
> -
> -/** Destroy the buffer.
> - * @param b a buffer created with zconf_create_buffer()
> - *
> - */
> - void zconf_delete_buffer (YY_BUFFER_STATE b )
> -{
> -
> - if ( ! b )
> - return;
> -
> - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
> - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
> -
> - if ( b->yy_is_our_buffer )
> - zconffree((void *) b->yy_ch_buf );
> -
> - zconffree((void *) b );
> -}
> -
> -/* Initializes or reinitializes a buffer.
> - * This function is sometimes called more than once on the same buffer,
> - * such as during a zconfrestart() or at EOF.
> - */
> - static void zconf_init_buffer (YY_BUFFER_STATE b, FILE * file )
> -
> -{
> - int oerrno = errno;
> -
> - zconf_flush_buffer(b );
> -
> - b->yy_input_file = file;
> - b->yy_fill_buffer = 1;
> -
> - /* If b is the current buffer, then zconf_init_buffer was _probably_
> - * called from zconfrestart() or through yy_get_next_buffer.
> - * In that case, we don't want to reset the lineno or column.
> - */
> - if (b != YY_CURRENT_BUFFER){
> - b->yy_bs_lineno = 1;
> - b->yy_bs_column = 0;
> - }
> -
> - b->yy_is_interactive = 0;
> -
> - errno = oerrno;
> -}
> -
> -/** Discard all buffered characters. On the next scan, YY_INPUT will be
> called.
> - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
> - *
> - */
> - void zconf_flush_buffer (YY_BUFFER_STATE b )
> -{
> - if ( ! b )
> - return;
> -
> - b->yy_n_chars = 0;
> -
> - /* We always need two end-of-buffer characters. The first causes
> - * a transition to the end-of-buffer state. The second causes
> - * a jam in that state.
> - */
> - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
> - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
> -
> - b->yy_buf_pos = &b->yy_ch_buf[0];
> -
> - b->yy_at_bol = 1;
> - b->yy_buffer_status = YY_BUFFER_NEW;
> -
> - if ( b == YY_CURRENT_BUFFER )
> - zconf_load_buffer_state( );
> -}
> -
> -/** Pushes the new state onto the stack. The new state becomes
> - * the current state. This function will allocate the stack
> - * if necessary.
> - * @param new_buffer The new state.
> - *
> - */
> -void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
> -{
> - if (new_buffer == NULL)
> - return;
> -
> - zconfensure_buffer_stack();
> -
> - /* This block is copied from zconf_switch_to_buffer. */
> - if ( YY_CURRENT_BUFFER )
> - {
> - /* Flush out information for old buffer. */
> - *(yy_c_buf_p) = (yy_hold_char);
> - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
> - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
> - }
> -
> - /* Only push if top exists. Otherwise, replace top. */
> - if (YY_CURRENT_BUFFER)
> - (yy_buffer_stack_top)++;
> - YY_CURRENT_BUFFER_LVALUE = new_buffer;
> -
> - /* copied from zconf_switch_to_buffer. */
> - zconf_load_buffer_state( );
> - (yy_did_buffer_switch_on_eof) = 1;
> -}
> -
> -/** Removes and deletes the top of the stack, if present.
> - * The next element becomes the new top.
> - *
> - */
> -void zconfpop_buffer_state (void)
> -{
> - if (!YY_CURRENT_BUFFER)
> - return;
> -
> - zconf_delete_buffer(YY_CURRENT_BUFFER );
> - YY_CURRENT_BUFFER_LVALUE = NULL;
> - if ((yy_buffer_stack_top) > 0)
> - --(yy_buffer_stack_top);
> -
> - if (YY_CURRENT_BUFFER) {
> - zconf_load_buffer_state( );
> - (yy_did_buffer_switch_on_eof) = 1;
> - }
> -}
> -
> -/* Allocates the stack if it does not exist.
> - * Guarantees space for at least one push.
> - */
> -static void zconfensure_buffer_stack (void)
> -{
> - int num_to_alloc;
> -
> - if (!(yy_buffer_stack)) {
> -
> - /* First allocation is just for 2 elements, since we don't know
> if this
> - * scanner will even need a stack. We use 2 instead of 1 to
> avoid an
> - * immediate realloc on the next call.
> - */
> - num_to_alloc = 1;
> - (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
> - (num_to_alloc *
> sizeof(struct yy_buffer_state*)
> - );
> - if ( ! (yy_buffer_stack) )
> - YY_FATAL_ERROR( "out of dynamic memory in
> zconfensure_buffer_stack()" );
> -
> - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct
> yy_buffer_state*));
> -
> - (yy_buffer_stack_max) = num_to_alloc;
> - (yy_buffer_stack_top) = 0;
> - return;
> - }
> -
> - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
> -
> - /* Increase the buffer to prepare for a possible push. */
> - int grow_size = 8 /* arbitrary grow size */;
> -
> - num_to_alloc = (yy_buffer_stack_max) + grow_size;
> - (yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
> -
> ((yy_buffer_stack),
> - num_to_alloc *
> sizeof(struct yy_buffer_state*)
> - );
> - if ( ! (yy_buffer_stack) )
> - YY_FATAL_ERROR( "out of dynamic memory in
> zconfensure_buffer_stack()" );
> -
> - /* zero only the new slots.*/
> - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size
> * sizeof(struct yy_buffer_state*));
> - (yy_buffer_stack_max) = num_to_alloc;
> - }
> -}
> -
> -/** Setup the input buffer state to scan directly from a user-specified
> character buffer.
> - * @param base the character buffer
> - * @param size the size in bytes of the character buffer
> - *
> - * @return the newly allocated buffer state object.
> - */
> -YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )
> -{
> - YY_BUFFER_STATE b;
> -
> - if ( size < 2 ||
> - base[size-2] != YY_END_OF_BUFFER_CHAR ||
> - base[size-1] != YY_END_OF_BUFFER_CHAR )
> - /* They forgot to leave room for the EOB's. */
> - return 0;
> -
> - b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) );
> - if ( ! b )
> - YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()"
> );
> -
> - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
> - b->yy_buf_pos = b->yy_ch_buf = base;
> - b->yy_is_our_buffer = 0;
> - b->yy_input_file = 0;
> - b->yy_n_chars = b->yy_buf_size;
> - b->yy_is_interactive = 0;
> - b->yy_at_bol = 1;
> - b->yy_fill_buffer = 0;
> - b->yy_buffer_status = YY_BUFFER_NEW;
> -
> - zconf_switch_to_buffer(b );
> -
> - return b;
> -}
> -
> -/** Setup the input buffer state to scan a string. The next call to
> zconflex() will
> - * scan from a @e copy of @a str.
> - * @param yystr a NUL-terminated string to scan
> - *
> - * @return the newly allocated buffer state object.
> - * @note If you want to scan bytes that may contain NUL values, then use
> - * zconf_scan_bytes() instead.
> - */
> -YY_BUFFER_STATE zconf_scan_string (yyconst char * yystr )
> -{
> -
> - return zconf_scan_bytes(yystr,strlen(yystr) );
> -}
> -
> -/** Setup the input buffer state to scan the given bytes. The next call to
> zconflex() will
> - * scan from a @e copy of @a bytes.
> - * @param yybytes the byte buffer to scan
> - * @param _yybytes_len the number of bytes in the buffer pointed to by @a
> bytes.
> - *
> - * @return the newly allocated buffer state object.
> - */
> -YY_BUFFER_STATE zconf_scan_bytes (yyconst char * yybytes, int _yybytes_len
> )
> -{
> - YY_BUFFER_STATE b;
> - char *buf;
> - yy_size_t n;
> - int i;
> -
> - /* Get memory for full buffer, including space for trailing EOB's. */
> - n = _yybytes_len + 2;
> - buf = (char *) zconfalloc(n );
> - if ( ! buf )
> - YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
> -
> - for ( i = 0; i < _yybytes_len; ++i )
> - buf[i] = yybytes[i];
> -
> - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
> -
> - b = zconf_scan_buffer(buf,n );
> - if ( ! b )
> - YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
> -
> - /* It's okay to grow etc. this buffer, and we should throw it
> - * away when we're done.
> - */
> - b->yy_is_our_buffer = 1;
> -
> - return b;
> -}
> -
> -#ifndef YY_EXIT_FAILURE
> -#define YY_EXIT_FAILURE 2
> -#endif
> -
> -static void yy_fatal_error (yyconst char* msg )
> -{
> - (void) fprintf( stderr, "%s\n", msg );
> - exit( YY_EXIT_FAILURE );
> -}
> -
> -/* Redefine yyless() so it works in section 3 code. */
> -
> -#undef yyless
> -#define yyless(n) \
> - do \
> - { \
> - /* Undo effects of setting up zconftext. */ \
> - int yyless_macro_arg = (n); \
> - YY_LESS_LINENO(yyless_macro_arg);\
> - zconftext[zconfleng] = (yy_hold_char); \
> - (yy_c_buf_p) = zconftext + yyless_macro_arg; \
> - (yy_hold_char) = *(yy_c_buf_p); \
> - *(yy_c_buf_p) = '\0'; \
> - zconfleng = yyless_macro_arg; \
> - } \
> - while ( 0 )
> -
> -/* Accessor methods (get/set functions) to struct members. */
> -
> -/** Get the current line number.
> - *
> - */
> -int zconfget_lineno (void)
> -{
> -
> - return zconflineno;
> -}
> -
> -/** Get the input stream.
> - *
> - */
> -FILE *zconfget_in (void)
> -{
> - return zconfin;
> -}
> -
> -/** Get the output stream.
> - *
> - */
> -FILE *zconfget_out (void)
> -{
> - return zconfout;
> -}
> -
> -/** Get the length of the current token.
> - *
> - */
> -int zconfget_leng (void)
> -{
> - return zconfleng;
> -}
> -
> -/** Get the current token.
> - *
> - */
> -
> -char *zconfget_text (void)
> -{
> - return zconftext;
> -}
> -
> -/** Set the current line number.
> - * @param line_number
> - *
> - */
> -void zconfset_lineno (int line_number )
> -{
> -
> - zconflineno = line_number;
> -}
> -
> -/** Set the input stream. This does not discard the current
> - * input buffer.
> - * @param in_str A readable stream.
> - *
> - * @see zconf_switch_to_buffer
> - */
> -void zconfset_in (FILE * in_str )
> -{
> - zconfin = in_str ;
> -}
> -
> -void zconfset_out (FILE * out_str )
> -{
> - zconfout = out_str ;
> -}
> -
> -int zconfget_debug (void)
> -{
> - return zconf_flex_debug;
> -}
> -
> -void zconfset_debug (int bdebug )
> -{
> - zconf_flex_debug = bdebug ;
> -}
> -
> -static int yy_init_globals (void)
> -{
> - /* Initialization is the same as for the non-reentrant scanner.
> - * This function is called from zconflex_destroy(), so don't allocate
> here.
> - */
> -
> - (yy_buffer_stack) = 0;
> - (yy_buffer_stack_top) = 0;
> - (yy_buffer_stack_max) = 0;
> - (yy_c_buf_p) = (char *) 0;
> - (yy_init) = 0;
> - (yy_start) = 0;
> -
> -/* Defined in main.c */
> -#ifdef YY_STDINIT
> - zconfin = stdin;
> - zconfout = stdout;
> -#else
> - zconfin = (FILE *) 0;
> - zconfout = (FILE *) 0;
> -#endif
> -
> - /* For future reference: Set errno on error, since we are called by
> - * zconflex_init()
> - */
> - return 0;
> -}
> -
> -/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
> -int zconflex_destroy (void)
> -{
> -
> - /* Pop the buffer stack, destroying each element. */
> - while(YY_CURRENT_BUFFER){
> - zconf_delete_buffer(YY_CURRENT_BUFFER );
> - YY_CURRENT_BUFFER_LVALUE = NULL;
> - zconfpop_buffer_state();
> - }
> -
> - /* Destroy the stack itself. */
> - zconffree((yy_buffer_stack) );
> - (yy_buffer_stack) = NULL;
> -
> - /* Reset the globals. This is important in a non-reentrant scanner so
> the next time
> - * zconflex() is called, initialization will occur. */
> - yy_init_globals( );
> -
> - return 0;
> -}
> -
> -/*
> - * Internal utility routines.
> - */
> -
> -#ifndef yytext_ptr
> -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
> -{
> - register int i;
> - for ( i = 0; i < n; ++i )
> - s1[i] = s2[i];
> -}
> -#endif
> -
> -#ifdef YY_NEED_STRLEN
> -static int yy_flex_strlen (yyconst char * s )
> -{
> - register int n;
> - for ( n = 0; s[n]; ++n )
> - ;
> -
> - return n;
> -}
> -#endif
> -
> -void *zconfalloc (yy_size_t size )
> -{
> - return (void *) malloc( size );
> -}
> -
> -void *zconfrealloc (void * ptr, yy_size_t size )
> -{
> - /* The cast to (char *) in the following accommodates both
> - * implementations that use char* generic pointers, and those
> - * that use void* generic pointers. It works with the latter
> - * because both ANSI C and C++ allow castless assignment from
> - * any pointer type to void*, and deal with argument conversions
> - * as though doing an assignment.
> - */
> - return (void *) realloc( (char *) ptr, size );
> -}
> -
> -void zconffree (void * ptr )
> -{
> - free( (char *) ptr ); /* see zconfrealloc() for (char *) cast */
> -}
> -
> -#define YYTABLES_NAME "yytables"
> -
> -void zconf_starthelp(void)
> -{
> - new_string();
> - last_ts = first_ts = 0;
> - BEGIN(HELP);
> -}
> -
> -static void zconf_endhelp(void)
> -{
> - zconflval.string = text;
> - BEGIN(INITIAL);
> -}
> -
> -/*
> - * Try to open specified file with following names:
> - * ./name
> - * $(srctree)/name
> - * The latter is used when srctree is separate from objtree
> - * when compiling the kernel.
> - * Return NULL if file is not found.
> - */
> -FILE *zconf_fopen(const char *name)
> -{
> - char *env, fullname[PATH_MAX+1];
> - FILE *f;
> -
> - f = fopen(name, "r");
> - if (!f && name != NULL && name[0] != '/') {
> - env = getenv(SRCTREE);
> - if (env) {
> - sprintf(fullname, "%s/%s", env, name);
> - f = fopen(fullname, "r");
> - }
> - }
> - return f;
> -}
> -
> -void zconf_initscan(const char *name)
> -{
> - zconfin = zconf_fopen(name);
> - if (!zconfin) {
> - printf("can't find file %s\n", name);
> - exit(1);
> - }
> -
> - current_buf = xmalloc(sizeof(*current_buf));
> - memset(current_buf, 0, sizeof(*current_buf));
> -
> - current_file = file_lookup(name);
> - current_file->lineno = 1;
> -}
> -
> -void zconf_nextfile(const char *name)
> -{
> - struct file *iter;
> - struct file *file = file_lookup(name);
> - struct buffer *buf = xmalloc(sizeof(*buf));
> - memset(buf, 0, sizeof(*buf));
> -
> - current_buf->state = YY_CURRENT_BUFFER;
> - zconfin = zconf_fopen(file->name);
> - if (!zconfin) {
> - printf("%s:%d: can't open file \"%s\"\n",
> - zconf_curname(), zconf_lineno(), file->name);
> - exit(1);
> - }
> - zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
> - buf->parent = current_buf;
> - current_buf = buf;
> -
> - for (iter = current_file->parent; iter; iter = iter->parent ) {
> - if (!strcmp(current_file->name,iter->name) ) {
> - printf("%s:%d: recursive inclusion detected. "
> - "Inclusion path:\n current file : '%s'\n",
> - zconf_curname(), zconf_lineno(),
> - zconf_curname());
> - iter = current_file->parent;
> - while (iter && \
> - strcmp(iter->name,current_file->name)) {
> - printf(" included from: '%s:%d'\n",
> - iter->name, iter->lineno-1);
> - iter = iter->parent;
> - }
> - if (iter)
> - printf(" included from: '%s:%d'\n",
> - iter->name, iter->lineno+1);
> - exit(1);
> - }
> - }
> - file->lineno = 1;
> - file->parent = current_file;
> - current_file = file;
> -}
> -
> -static void zconf_endfile(void)
> -{
> - struct buffer *parent;
> -
> - current_file = current_file->parent;
> -
> - parent = current_buf->parent;
> - if (parent) {
> - fclose(zconfin);
> - zconf_delete_buffer(YY_CURRENT_BUFFER);
> - zconf_switch_to_buffer(parent->state);
> - }
> - free(current_buf);
> - current_buf = parent;
> -}
> -
> -int zconf_lineno(void)
> -{
> - return current_pos.lineno;
> -}
> -
> -const char *zconf_curname(void)
> -{
> - return current_pos.file ? current_pos.file->name : "<none>";
> -}
> -
> diff --git a/xen/tools/kconfig/zconf.tab.c_shipped
> b/xen/tools/kconfig/zconf.tab.c_shipped
> deleted file mode 100644
> index 7a4d658c20..0000000000
> --- a/xen/tools/kconfig/zconf.tab.c_shipped
> +++ /dev/null
> @@ -1,2580 +0,0 @@
> -/* A Bison parser, made by GNU Bison 2.5.1. */
> -
> -/* Bison implementation for Yacc-like parsers in C
> -
> - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
> -
> - 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
> - the Free Software Foundation, either version 3 of the License, or
> - (at your option) any later version.
> -
> - This program is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - GNU General Public License for more details.
> -
> - You should have received a copy of the GNU General Public License
> - along with this program. If not, see <http://www.gnu.org/licenses/>. */
> -
> -/* As a special exception, you may create a larger work that contains
> - part or all of the Bison parser skeleton and distribute that work
> - under terms of your choice, so long as that work isn't itself a
> - parser generator using the skeleton or a modified version thereof
> - as a parser skeleton. Alternatively, if you modify or redistribute
> - the parser skeleton itself, you may (at your option) remove this
> - special exception, which will cause the skeleton and the resulting
> - Bison output files to be licensed under the GNU General Public
> - License without this special exception.
> -
> - This special exception was added by the Free Software Foundation in
> - version 2.2 of Bison. */
> -
> -/* C LALR(1) parser skeleton written by Richard Stallman, by
> - simplifying the original so-called "semantic" parser. */
> -
> -/* All symbols defined below should begin with yy or YY, to avoid
> - infringing on user name space. This should be done even for local
> - variables, as they might otherwise be expanded by user macros.
> - There are some unavoidable exceptions within include files to
> - define necessary library symbols; they are noted "INFRINGES ON
> - USER NAME SPACE" below. */
> -
> -/* Identify Bison output. */
> -#define YYBISON 1
> -
> -/* Bison version. */
> -#define YYBISON_VERSION "2.5.1"
> -
> -/* Skeleton name. */
> -#define YYSKELETON_NAME "yacc.c"
> -
> -/* Pure parsers. */
> -#define YYPURE 0
> -
> -/* Push parsers. */
> -#define YYPUSH 0
> -
> -/* Pull parsers. */
> -#define YYPULL 1
> -
> -/* Using locations. */
> -#define YYLSP_NEEDED 0
> -
> -/* Substitute the variable and function names. */
> -#define yyparse zconfparse
> -#define yylex zconflex
> -#define yyerror zconferror
> -#define yylval zconflval
> -#define yychar zconfchar
> -#define yydebug zconfdebug
> -#define yynerrs zconfnerrs
> -
> -
> -/* Copy the first part of user declarations. */
> -
> -
> -/*
> - * Copyright (C) 2002 Roman Zippel <zippel@xxxxxxxxxxxxxx>
> - * Released under the terms of the GNU GPL v2.0.
> - */
> -
> -#include <ctype.h>
> -#include <stdarg.h>
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <stdbool.h>
> -
> -#include "lkc.h"
> -
> -#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
> -
> -#define PRINTD 0x0001
> -#define DEBUG_PARSE 0x0002
> -
> -int cdebug = PRINTD;
> -
> -extern int zconflex(void);
> -static void zconfprint(const char *err, ...);
> -static void zconf_error(const char *err, ...);
> -static void zconferror(const char *err);
> -static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int
> endtoken);
> -
> -struct symbol *symbol_hash[SYMBOL_HASHSIZE];
> -
> -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. */
> -#ifndef YYDEBUG
> -# define YYDEBUG 1
> -#endif
> -
> -/* Enabling verbose error messages. */
> -#ifdef YYERROR_VERBOSE
> -# undef YYERROR_VERBOSE
> -# define YYERROR_VERBOSE 1
> -#else
> -# define YYERROR_VERBOSE 0
> -#endif
> -
> -/* Enabling the token table. */
> -#ifndef YYTOKEN_TABLE
> -# define YYTOKEN_TABLE 0
> -#endif
> -
> -
> -/* Tokens. */
> -#ifndef YYTOKENTYPE
> -# define YYTOKENTYPE
> - /* Put the tokens into the symbol table, so that GDB and other debuggers
> - know about them. */
> - enum yytokentype {
> - T_MAINMENU = 258,
> - T_MENU = 259,
> - T_ENDMENU = 260,
> - T_SOURCE = 261,
> - T_CHOICE = 262,
> - T_ENDCHOICE = 263,
> - T_COMMENT = 264,
> - T_CONFIG = 265,
> - T_MENUCONFIG = 266,
> - T_HELP = 267,
> - T_HELPTEXT = 268,
> - T_IF = 269,
> - T_ENDIF = 270,
> - T_DEPENDS = 271,
> - T_OPTIONAL = 272,
> - T_PROMPT = 273,
> - T_TYPE = 274,
> - T_DEFAULT = 275,
> - T_SELECT = 276,
> - T_RANGE = 277,
> - T_VISIBLE = 278,
> - T_OPTION = 279,
> - T_ON = 280,
> - T_WORD = 281,
> - T_WORD_QUOTE = 282,
> - T_UNEQUAL = 283,
> - T_LESS = 284,
> - T_LESS_EQUAL = 285,
> - T_GREATER = 286,
> - T_GREATER_EQUAL = 287,
> - T_CLOSE_PAREN = 288,
> - T_OPEN_PAREN = 289,
> - T_EOL = 290,
> - T_OR = 291,
> - T_AND = 292,
> - T_EQUAL = 293,
> - T_NOT = 294
> - };
> -#endif
> -
> -
> -
> -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
> -typedef union YYSTYPE
> -{
> -
> -
> - char *string;
> - struct file *file;
> - struct symbol *symbol;
> - struct expr *expr;
> - struct menu *menu;
> - const struct kconf_id *id;
> -
> -
> -
> -} YYSTYPE;
> -# define YYSTYPE_IS_TRIVIAL 1
> -# define yystype YYSTYPE /* obsolescent; will be withdrawn */
> -# define YYSTYPE_IS_DECLARED 1
> -#endif
> -
> -
> -/* Copy the second part of user declarations. */
> -
> -
> -/* Include zconf.hash.c here so it can see the token constants. */
> -#include "zconf.hash.c"
> -
> -
> -
> -#ifdef short
> -# undef short
> -#endif
> -
> -#ifdef YYTYPE_UINT8
> -typedef YYTYPE_UINT8 yytype_uint8;
> -#else
> -typedef unsigned char yytype_uint8;
> -#endif
> -
> -#ifdef YYTYPE_INT8
> -typedef YYTYPE_INT8 yytype_int8;
> -#elif (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -typedef signed char yytype_int8;
> -#else
> -typedef short int yytype_int8;
> -#endif
> -
> -#ifdef YYTYPE_UINT16
> -typedef YYTYPE_UINT16 yytype_uint16;
> -#else
> -typedef unsigned short int yytype_uint16;
> -#endif
> -
> -#ifdef YYTYPE_INT16
> -typedef YYTYPE_INT16 yytype_int16;
> -#else
> -typedef short int yytype_int16;
> -#endif
> -
> -#ifndef YYSIZE_T
> -# ifdef __SIZE_TYPE__
> -# define YYSIZE_T __SIZE_TYPE__
> -# elif defined size_t
> -# define YYSIZE_T size_t
> -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
> -# define YYSIZE_T size_t
> -# else
> -# define YYSIZE_T unsigned int
> -# endif
> -#endif
> -
> -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
> -
> -#ifndef YY_
> -# if defined YYENABLE_NLS && YYENABLE_NLS
> -# if ENABLE_NLS
> -# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
> -# define YY_(msgid) dgettext ("bison-runtime", msgid)
> -# endif
> -# endif
> -# ifndef YY_
> -# define YY_(msgid) msgid
> -# endif
> -#endif
> -
> -/* Suppress unused-variable warnings by "using" E. */
> -#if ! defined lint || defined __GNUC__
> -# define YYUSE(e) ((void) (e))
> -#else
> -# define YYUSE(e) /* empty */
> -#endif
> -
> -/* Identity function, used to suppress warnings about constant conditions.
> */
> -#ifndef lint
> -# define YYID(n) (n)
> -#else
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static int
> -YYID (int yyi)
> -#else
> -static int
> -YYID (yyi)
> - int yyi;
> -#endif
> -{
> - return yyi;
> -}
> -#endif
> -
> -#if ! defined yyoverflow || YYERROR_VERBOSE
> -
> -/* The parser invokes alloca or malloc; define the necessary symbols. */
> -
> -# ifdef YYSTACK_USE_ALLOCA
> -# if YYSTACK_USE_ALLOCA
> -# ifdef __GNUC__
> -# define YYSTACK_ALLOC __builtin_alloca
> -# elif defined __BUILTIN_VA_ARG_INCR
> -# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
> -# elif defined _AIX
> -# define YYSTACK_ALLOC __alloca
> -# elif defined _MSC_VER
> -# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
> -# define alloca _alloca
> -# else
> -# define YYSTACK_ALLOC alloca
> -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__
> || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
> - /* Use EXIT_SUCCESS as a witness for stdlib.h. */
> -# ifndef EXIT_SUCCESS
> -# define EXIT_SUCCESS 0
> -# endif
> -# endif
> -# endif
> -# endif
> -# endif
> -
> -# ifdef YYSTACK_ALLOC
> - /* Pacify GCC's `empty if-body' warning. */
> -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
> -# ifndef YYSTACK_ALLOC_MAXIMUM
> - /* The OS might guarantee only one guard page at the bottom of the stack,
> - and a page size can be as small as 4096 bytes. So we cannot safely
> - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
> - to allow for a few compiler-allocated temporary stack slots. */
> -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
> -# endif
> -# else
> -# define YYSTACK_ALLOC YYMALLOC
> -# define YYSTACK_FREE YYFREE
> -# ifndef YYSTACK_ALLOC_MAXIMUM
> -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
> -# endif
> -# if (defined __cplusplus && ! defined EXIT_SUCCESS \
> - && ! ((defined YYMALLOC || defined malloc) \
> - && (defined YYFREE || defined free)))
> -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
> -# ifndef EXIT_SUCCESS
> -# define EXIT_SUCCESS 0
> -# endif
> -# endif
> -# ifndef YYMALLOC
> -# define YYMALLOC malloc
> -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ ||
> defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
> -# endif
> -# endif
> -# ifndef YYFREE
> -# define YYFREE free
> -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ ||
> defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -void free (void *); /* INFRINGES ON USER NAME SPACE */
> -# endif
> -# endif
> -# endif
> -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
> -
> -
> -#if (! defined yyoverflow \
> - && (! defined __cplusplus \
> - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
> -
> -/* A type that is properly aligned for any stack member. */
> -union yyalloc
> -{
> - yytype_int16 yyss_alloc;
> - YYSTYPE yyvs_alloc;
> -};
> -
> -/* The size of the maximum gap between one aligned stack and the next. */
> -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
> -
> -/* The size of an array large to enough to hold all stacks, each with
> - N elements. */
> -# define YYSTACK_BYTES(N) \
> - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
> - + YYSTACK_GAP_MAXIMUM)
> -
> -# define YYCOPY_NEEDED 1
> -
> -/* Relocate STACK from its old location to the new one. The
> - local variables YYSIZE and YYSTACKSIZE give the old and new number of
> - elements in the stack, and YYPTR gives the new location of the
> - stack. Advance YYPTR to a properly aligned location for the next
> - stack. */
> -# define YYSTACK_RELOCATE(Stack_alloc, Stack)
> \
> - do
> \
> - {
> \
> - YYSIZE_T yynewbytes; \
> - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
> - Stack = &yyptr->Stack_alloc; \
> - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
> - yyptr += yynewbytes / sizeof (*yyptr); \
> - }
> \
> - while (YYID (0))
> -
> -#endif
> -
> -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
> -/* Copy COUNT objects from SRC to DST. The source and destination do
> - not overlap. */
> -# ifndef YYCOPY
> -# if defined __GNUC__ && 1 < __GNUC__
> -# define YYCOPY(Dst, Src, Count) \
> - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
> -# else
> -# define YYCOPY(Dst, Src, Count) \
> - do \
> - { \
> - YYSIZE_T yyi; \
> - for (yyi = 0; yyi < (Count); yyi++) \
> - (Dst)[yyi] = (Src)[yyi]; \
> - } \
> - while (YYID (0))
> -# endif
> -# endif
> -#endif /* !YYCOPY_NEEDED */
> -
> -/* YYFINAL -- State number of the termination state. */
> -#define YYFINAL 11
> -/* YYLAST -- Last index in YYTABLE. */
> -#define YYLAST 298
> -
> -/* YYNTOKENS -- Number of terminals. */
> -#define YYNTOKENS 40
> -/* YYNNTS -- Number of nonterminals. */
> -#define YYNNTS 50
> -/* YYNRULES -- Number of rules. */
> -#define YYNRULES 122
> -/* YYNRULES -- Number of states. */
> -#define YYNSTATES 199
> -
> -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
> -#define YYUNDEFTOK 2
> -#define YYMAXUTOK 294
> -
> -#define YYTRANSLATE(YYX) \
> - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
> -
> -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
> -static const yytype_uint8 yytranslate[] =
> -{
> - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
> - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
> - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
> - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
> - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
> - 35, 36, 37, 38, 39
> -};
> -
> -#if YYDEBUG
> -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
> - YYRHS. */
> -static const yytype_uint16 yyprhs[] =
> -{
> - 0, 0, 3, 6, 8, 11, 13, 14, 17, 20,
> - 23, 26, 31, 36, 40, 42, 44, 46, 48, 50,
> - 52, 54, 56, 58, 60, 62, 64, 66, 68, 72,
> - 75, 79, 82, 86, 89, 90, 93, 96, 99, 102,
> - 105, 108, 112, 117, 122, 127, 133, 137, 138, 142,
> - 143, 146, 150, 153, 155, 159, 160, 163, 166, 169,
> - 172, 175, 180, 184, 187, 192, 193, 196, 200, 202,
> - 206, 207, 210, 213, 216, 220, 224, 228, 230, 234,
> - 235, 238, 241, 244, 248, 252, 255, 258, 261, 262,
> - 265, 268, 271, 276, 277, 280, 283, 286, 287, 290,
> - 292, 294, 297, 300, 303, 305, 308, 309, 312, 314,
> - 318, 322, 326, 330, 334, 338, 342, 345, 349, 353,
> - 355, 357, 358
> -};
> -
> -/* YYRHS -- A `-1'-separated list of the rules' RHS. */
> -static const yytype_int8 yyrhs[] =
> -{
> - 41, 0, -1, 85, 42, -1, 42, -1, 67, 43,
> - -1, 43, -1, -1, 43, 45, -1, 43, 59, -1,
> - 43, 71, -1, 43, 84, -1, 43, 26, 1, 35,
> - -1, 43, 44, 1, 35, -1, 43, 1, 35, -1,
> - 16, -1, 18, -1, 19, -1, 21, -1, 17, -1,
> - 22, -1, 20, -1, 23, -1, 35, -1, 65, -1,
> - 75, -1, 48, -1, 50, -1, 73, -1, 26, 1,
> - 35, -1, 1, 35, -1, 10, 26, 35, -1, 47,
> - 51, -1, 11, 26, 35, -1, 49, 51, -1, -1,
> - 51, 52, -1, 51, 53, -1, 51, 79, -1, 51,
> - 77, -1, 51, 46, -1, 51, 35, -1, 19, 82,
> - 35, -1, 18, 83, 86, 35, -1, 20, 87, 86,
> - 35, -1, 21, 26, 86, 35, -1, 22, 88, 88,
> - 86, 35, -1, 24, 54, 35, -1, -1, 54, 26,
> - 55, -1, -1, 38, 83, -1, 7, 89, 35, -1,
> - 56, 60, -1, 84, -1, 57, 62, 58, -1, -1,
> - 60, 61, -1, 60, 79, -1, 60, 77, -1, 60,
> - 35, -1, 60, 46, -1, 18, 83, 86, 35, -1,
> - 19, 82, 35, -1, 17, 35, -1, 20, 26, 86,
> - 35, -1, -1, 62, 45, -1, 14, 87, 85, -1,
> - 84, -1, 63, 66, 64, -1, -1, 66, 45, -1,
> - 66, 71, -1, 66, 59, -1, 3, 83, 85, -1,
> - 4, 83, 35, -1, 68, 80, 78, -1, 84, -1,
> - 69, 72, 70, -1, -1, 72, 45, -1, 72, 71,
> - -1, 72, 59, -1, 6, 83, 35, -1, 9, 83,
> - 35, -1, 74, 78, -1, 12, 35, -1, 76, 13,
> - -1, -1, 78, 79, -1, 78, 35, -1, 78, 46,
> - -1, 16, 25, 87, 35, -1, -1, 80, 81, -1,
> - 80, 35, -1, 23, 86, -1, -1, 83, 86, -1,
> - 26, -1, 27, -1, 5, 35, -1, 8, 35, -1,
> - 15, 35, -1, 35, -1, 85, 35, -1, -1, 14,
> - 87, -1, 88, -1, 88, 29, 88, -1, 88, 30,
> - 88, -1, 88, 31, 88, -1, 88, 32, 88, -1,
> - 88, 38, 88, -1, 88, 28, 88, -1, 34, 87,
> - 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. */
> -static const yytype_uint16 yyrline[] =
> -{
> - 0, 108, 108, 108, 110, 110, 112, 114, 115, 116,
> - 117, 118, 119, 123, 127, 127, 127, 127, 127, 127,
> - 127, 127, 131, 132, 133, 134, 135, 136, 140, 141,
> - 147, 155, 161, 169, 179, 181, 182, 183, 184, 185,
> - 186, 189, 197, 203, 213, 219, 225, 228, 230, 241,
> - 242, 247, 256, 261, 269, 272, 274, 275, 276, 277,
> - 278, 281, 287, 298, 304, 314, 316, 321, 329, 337,
> - 340, 342, 343, 344, 349, 356, 363, 368, 376, 379,
> - 381, 382, 383, 386, 394, 401, 408, 414, 421, 423,
> - 424, 425, 428, 436, 438, 439, 442, 449, 451, 456,
> - 457, 460, 461, 462, 466, 467, 470, 471, 474, 475,
> - 476, 477, 478, 479, 480, 481, 482, 483, 484, 487,
> - 488, 491, 492
> -};
> -#endif
> -
> -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
> -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
> - First, the terminals, then, starting at YYNTOKENS, nonterminals. */
> -static const char *const yytname[] =
> -{
> - "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
> - "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
> - "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_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_NOT", "$accept", "input", "start", "stmt_list", "option_name",
> - "common_stmt", "option_error", "config_entry_start", "config_stmt",
> - "menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
> - "config_option", "symbol_option", "symbol_option_list",
> - "symbol_option_arg", "choice", "choice_entry", "choice_end",
> - "choice_stmt", "choice_option_list", "choice_option", "choice_block",
> - "if_entry", "if_end", "if_stmt", "if_block", "mainmenu_stmt", "menu",
> - "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt",
> - "comment", "comment_stmt", "help_start", "help", "depends_list",
> - "depends", "visibility_list", "visible", "prompt_stmt_opt", "prompt",
> - "end", "nl", "if_expr", "expr", "symbol", "word_opt", YY_NULL
> -};
> -#endif
> -
> -# ifdef YYPRINT
> -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
> - token YYLEX-NUM. */
> -static const yytype_uint16 yytoknum[] =
> -{
> - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
> - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
> - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
> - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294
> -};
> -# endif
> -
> -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
> -static const yytype_uint8 yyr1[] =
> -{
> - 0, 40, 41, 41, 42, 42, 43, 43, 43, 43,
> - 43, 43, 43, 43, 44, 44, 44, 44, 44, 44,
> - 44, 44, 45, 45, 45, 45, 45, 45, 46, 46,
> - 47, 48, 49, 50, 51, 51, 51, 51, 51, 51,
> - 51, 52, 52, 52, 52, 52, 53, 54, 54, 55,
> - 55, 56, 57, 58, 59, 60, 60, 60, 60, 60,
> - 60, 61, 61, 61, 61, 62, 62, 63, 64, 65,
> - 66, 66, 66, 66, 67, 68, 69, 70, 71, 72,
> - 72, 72, 72, 73, 74, 75, 76, 77, 78, 78,
> - 78, 78, 79, 80, 80, 80, 81, 82, 82, 83,
> - 83, 84, 84, 84, 85, 85, 86, 86, 87, 87,
> - 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. */
> -static const yytype_uint8 yyr2[] =
> -{
> - 0, 2, 2, 1, 2, 1, 0, 2, 2, 2,
> - 2, 4, 4, 3, 1, 1, 1, 1, 1, 1,
> - 1, 1, 1, 1, 1, 1, 1, 1, 3, 2,
> - 3, 2, 3, 2, 0, 2, 2, 2, 2, 2,
> - 2, 3, 4, 4, 4, 5, 3, 0, 3, 0,
> - 2, 3, 2, 1, 3, 0, 2, 2, 2, 2,
> - 2, 4, 3, 2, 4, 0, 2, 3, 1, 3,
> - 0, 2, 2, 2, 3, 3, 3, 1, 3, 0,
> - 2, 2, 2, 3, 3, 2, 2, 2, 0, 2,
> - 2, 2, 4, 0, 2, 2, 2, 0, 2, 1,
> - 1, 2, 2, 2, 1, 2, 0, 2, 1, 3,
> - 3, 3, 3, 3, 3, 3, 2, 3, 3, 1,
> - 1, 0, 1
> -};
> -
> -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
> - Performed when YYTABLE doesn't specify something else to do. Zero
> - means the default is an error. */
> -static const yytype_uint8 yydefact[] =
> -{
> - 6, 0, 104, 0, 3, 0, 6, 6, 99, 100,
> - 0, 1, 0, 0, 0, 0, 121, 0, 0, 0,
> - 0, 0, 0, 14, 18, 15, 16, 20, 17, 19,
> - 21, 0, 22, 0, 7, 34, 25, 34, 26, 55,
> - 65, 8, 70, 23, 93, 79, 9, 27, 88, 24,
> - 10, 0, 105, 2, 74, 13, 0, 101, 0, 122,
> - 0, 102, 0, 0, 0, 119, 120, 0, 0, 0,
> - 108, 103, 0, 0, 0, 0, 0, 0, 0, 88,
> - 0, 0, 75, 83, 51, 84, 30, 32, 0, 116,
> - 0, 0, 67, 0, 0, 0, 0, 0, 0, 11,
> - 12, 0, 0, 0, 0, 97, 0, 0, 0, 47,
> - 0, 40, 39, 35, 36, 0, 38, 37, 0, 0,
> - 97, 0, 59, 60, 56, 58, 57, 66, 54, 53,
> - 71, 73, 69, 72, 68, 106, 95, 0, 94, 80,
> - 82, 78, 81, 77, 90, 91, 89, 115, 117, 118,
> - 114, 109, 110, 111, 112, 113, 29, 86, 0, 106,
> - 0, 106, 106, 106, 0, 0, 0, 87, 63, 106,
> - 0, 106, 0, 96, 0, 0, 41, 98, 0, 0,
> - 106, 49, 46, 28, 0, 62, 0, 107, 92, 42,
> - 43, 44, 0, 0, 48, 61, 64, 45, 50
> -};
> -
> -/* YYDEFGOTO[NTERM-NUM]. */
> -static const yytype_int16 yydefgoto[] =
> -{
> - -1, 3, 4, 5, 33, 34, 112, 35, 36, 37,
> - 38, 74, 113, 114, 165, 194, 39, 40, 128, 41,
> - 76, 124, 77, 42, 132, 43, 78, 6, 44, 45,
> - 141, 46, 80, 47, 48, 49, 115, 116, 81, 117,
> - 79, 138, 160, 161, 50, 7, 173, 69, 70, 60
> -};
> -
> -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
> - STATE-NUM. */
> -#define YYPACT_NINF -91
> -static const yytype_int16 yypact[] =
> -{
> - 19, 37, -91, 13, -91, 79, -91, 20, -91, -91,
> - -16, -91, 21, 37, 25, 37, 41, 36, 37, 78,
> - 83, 31, 56, -91, -91, -91, -91, -91, -91, -91,
> - -91, 116, -91, 127, -91, -91, -91, -91, -91, -91,
> - -91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
> - -91, 147, -91, -91, 105, -91, 109, -91, 111, -91,
> - 114, -91, 136, 137, 142, -91, -91, 31, 31, 76,
> - 254, -91, 143, 146, 27, 115, 207, 258, 243, -14,
> - 243, 179, -91, -91, -91, -91, -91, -91, -7, -91,
> - 31, 31, 105, 51, 51, 51, 51, 51, 51, -91,
> - -91, 156, 168, 181, 37, 37, 31, 178, 51, -91,
> - 206, -91, -91, -91, -91, 196, -91, -91, 175, 37,
> - 37, 185, -91, -91, -91, -91, -91, -91, -91, -91,
> - -91, -91, -91, -91, -91, 214, -91, 230, -91, -91,
> - -91, -91, -91, -91, -91, -91, -91, -91, 183, -91,
> - -91, -91, -91, -91, -91, -91, -91, -91, 31, 214,
> - 194, 214, 45, 214, 51, 26, 195, -91, -91, 214,
> - 197, 214, 31, -91, 139, 208, -91, -91, 220, 224,
> - 214, 222, -91, -91, 226, -91, 227, 123, -91, -91,
> - -91, -91, 235, 37, -91, -91, -91, -91, -91
> -};
> -
> -/* YYPGOTO[NTERM-NUM]. */
> -static const yytype_int16 yypgoto[] =
> -{
> - -91, -91, 264, 268, -91, 30, -65, -91, -91, -91,
> - -91, 238, -91, -91, -91, -91, -91, -91, -91, -12,
> - -91, -91, -91, -91, -91, -91, -91, -91, -91, -91,
> - -91, -5, -91, -91, -91, -91, -91, 200, 209, -61,
> - -91, -91, 170, -1, 65, 0, 118, -66, -90, -91
> -};
> -
> -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
> - positive, shift that token. If negative, reduce the rule which
> - number is the opposite. If YYTABLE_NINF, syntax error. */
> -#define YYTABLE_NINF -86
> -static const yytype_int16 yytable[] =
> -{
> - 10, 88, 89, 150, 151, 152, 153, 154, 155, 135,
> - 54, 123, 56, 11, 58, 126, 145, 62, 164, 2,
> - 146, 136, 1, 1, 148, 149, 147, -31, 101, 90,
> - 91, -31, -31, -31, -31, -31, -31, -31, -31, 102,
> - 162, -31, -31, 103, -31, 104, 105, 106, 107, 108,
> - -31, 109, 181, 110, 2, 52, 55, 65, 66, 172,
> - 57, 182, 111, 8, 9, 67, 131, 59, 140, 92,
> - 68, 61, 145, 133, 180, 142, 146, 65, 66, -5,
> - 12, 90, 91, 13, 14, 15, 16, 17, 18, 19,
> - 20, 71, 174, 21, 22, 23, 24, 25, 26, 27,
> - 28, 29, 30, 159, 63, 31, 187, 127, 130, 64,
> - 139, 2, 90, 91, 32, -33, 101, 72, 169, -33,
> - -33, -33, -33, -33, -33, -33, -33, 102, 73, -33,
> - -33, 103, -33, 104, 105, 106, 107, 108, -33, 109,
> - 52, 110, 129, 134, 82, 143, 83, -4, 12, 84,
> - 111, 13, 14, 15, 16, 17, 18, 19, 20, 90,
> - 91, 21, 22, 23, 24, 25, 26, 27, 28, 29,
> - 30, 85, 86, 31, 188, 90, 91, 87, 99, -85,
> - 101, 100, 32, -85, -85, -85, -85, -85, -85, -85,
> - -85, 156, 198, -85, -85, 103, -85, -85, -85, -85,
> - -85, -85, -85, 157, 163, 110, 158, 166, 101, 167,
> - 168, 171, -52, -52, 144, -52, -52, -52, -52, 102,
> - 91, -52, -52, 103, 118, 119, 120, 121, 172, 176,
> - 183, 101, 185, 110, -76, -76, -76, -76, -76, -76,
> - -76, -76, 122, 189, -76, -76, 103, 13, 14, 15,
> - 16, 17, 18, 19, 20, 190, 110, 21, 22, 191,
> - 193, 195, 196, 14, 15, 144, 17, 18, 19, 20,
> - 197, 53, 21, 22, 51, 75, 125, 175, 32, 177,
> - 178, 179, 93, 94, 95, 96, 97, 184, 137, 186,
> - 170, 0, 98, 32, 0, 0, 0, 0, 192
> -};
> -
> -#define yypact_value_is_default(yystate) \
> - ((yystate) == (-91))
> -
> -#define yytable_value_is_error(yytable_value) \
> - YYID (0)
> -
> -static const yytype_int16 yycheck[] =
> -{
> - 1, 67, 68, 93, 94, 95, 96, 97, 98, 23,
> - 10, 76, 13, 0, 15, 76, 81, 18, 108, 35,
> - 81, 35, 3, 3, 90, 91, 33, 0, 1, 36,
> - 37, 4, 5, 6, 7, 8, 9, 10, 11, 12,
> - 106, 14, 15, 16, 17, 18, 19, 20, 21, 22,
> - 23, 24, 26, 26, 35, 35, 35, 26, 27, 14,
> - 35, 35, 35, 26, 27, 34, 78, 26, 80, 69,
> - 39, 35, 137, 78, 164, 80, 137, 26, 27, 0,
> - 1, 36, 37, 4, 5, 6, 7, 8, 9, 10,
> - 11, 35, 158, 14, 15, 16, 17, 18, 19, 20,
> - 21, 22, 23, 104, 26, 26, 172, 77, 78, 26,
> - 80, 35, 36, 37, 35, 0, 1, 1, 119, 4,
> - 5, 6, 7, 8, 9, 10, 11, 12, 1, 14,
> - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
> - 35, 26, 77, 78, 35, 80, 35, 0, 1, 35,
> - 35, 4, 5, 6, 7, 8, 9, 10, 11, 36,
> - 37, 14, 15, 16, 17, 18, 19, 20, 21, 22,
> - 23, 35, 35, 26, 35, 36, 37, 35, 35, 0,
> - 1, 35, 35, 4, 5, 6, 7, 8, 9, 10,
> - 11, 35, 193, 14, 15, 16, 17, 18, 19, 20,
> - 21, 22, 23, 35, 26, 26, 25, 1, 1, 13,
> - 35, 26, 5, 6, 35, 8, 9, 10, 11, 12,
> - 37, 14, 15, 16, 17, 18, 19, 20, 14, 35,
> - 35, 1, 35, 26, 4, 5, 6, 7, 8, 9,
> - 10, 11, 35, 35, 14, 15, 16, 4, 5, 6,
> - 7, 8, 9, 10, 11, 35, 26, 14, 15, 35,
> - 38, 35, 35, 5, 6, 35, 8, 9, 10, 11,
> - 35, 7, 14, 15, 6, 37, 76, 159, 35, 161,
> - 162, 163, 28, 29, 30, 31, 32, 169, 79, 171,
> - 120, -1, 38, 35, -1, -1, -1, -1, 180
> -};
> -
> -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
> - symbol of state STATE-NUM. */
> -static const yytype_uint8 yystos[] =
> -{
> - 0, 3, 35, 41, 42, 43, 67, 85, 26, 27,
> - 83, 0, 1, 4, 5, 6, 7, 8, 9, 10,
> - 11, 14, 15, 16, 17, 18, 19, 20, 21, 22,
> - 23, 26, 35, 44, 45, 47, 48, 49, 50, 56,
> - 57, 59, 63, 65, 68, 69, 71, 73, 74, 75,
> - 84, 43, 35, 42, 85, 35, 83, 35, 83, 26,
> - 89, 35, 83, 26, 26, 26, 27, 34, 39, 87,
> - 88, 35, 1, 1, 51, 51, 60, 62, 66, 80,
> - 72, 78, 35, 35, 35, 35, 35, 35, 87, 87,
> - 36, 37, 85, 28, 29, 30, 31, 32, 38, 35,
> - 35, 1, 12, 16, 18, 19, 20, 21, 22, 24,
> - 26, 35, 46, 52, 53, 76, 77, 79, 17, 18,
> - 19, 20, 35, 46, 61, 77, 79, 45, 58, 84,
> - 45, 59, 64, 71, 84, 23, 35, 78, 81, 45,
> - 59, 70, 71, 84, 35, 46, 79, 33, 87, 87,
> - 88, 88, 88, 88, 88, 88, 35, 35, 25, 83,
> - 82, 83, 87, 26, 88, 54, 1, 13, 35, 83,
> - 82, 26, 14, 86, 87, 86, 35, 86, 86, 86,
> - 88, 26, 35, 35, 86, 35, 86, 87, 35, 35,
> - 35, 35, 86, 38, 55, 35, 35, 35, 83
> -};
> -
> -#define yyerrok (yyerrstatus = 0)
> -#define yyclearin (yychar = YYEMPTY)
> -#define YYEMPTY (-2)
> -#define YYEOF 0
> -
> -#define YYACCEPT goto yyacceptlab
> -#define YYABORT goto yyabortlab
> -#define YYERROR goto yyerrorlab
> -
> -
> -/* Like YYERROR except do call yyerror. This remains here temporarily
> - to ease the transition to the new meaning of YYERROR, for GCC.
> - Once GCC version 2 has supplanted version 1, this can go. However,
> - YYFAIL appears to be in use. Nevertheless, it is formally deprecated
> - in Bison 2.4.2's NEWS entry, where a plan to phase it out is
> - discussed. */
> -
> -#define YYFAIL goto yyerrlab
> -#if defined YYFAIL
> - /* This is here to suppress warnings from the GCC cpp's
> - -Wunused-macros. Normally we don't worry about that warning, but
> - some users do, and we want to make it easy for users to remove
> - YYFAIL uses, which will produce warnings from Bison 2.5. */
> -#endif
> -
> -#define YYRECOVERING() (!!yyerrstatus)
> -
> -#define YYBACKUP(Token, Value) \
> -do \
> - if (yychar == YYEMPTY) \
> - { \
> - yychar = (Token); \
> - yylval = (Value); \
> - YYPOPSTACK (yylen); \
> - yystate = *yyssp; \
> - goto yybackup; \
> - } \
> - else \
> - { \
> - yyerror (YY_("syntax error: cannot back up")); \
> - YYERROR; \
> - } \
> -while (YYID (0))
> -
> -
> -#define YYTERROR 1
> -#define YYERRCODE 256
> -
> -
> -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
> - If N is 0, then set CURRENT to the empty location which ends
> - the previous symbol: RHS[0] (always defined). */
> -
> -#define YYRHSLOC(Rhs, K) ((Rhs)[K])
> -#ifndef YYLLOC_DEFAULT
> -# define YYLLOC_DEFAULT(Current, Rhs, N) \
> - do
> \
> - if (YYID (N)) \
> - { \
> - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
> - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
> - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
> - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
> - } \
> - else \
> - { \
> - (Current).first_line = (Current).last_line = \
> - YYRHSLOC (Rhs, 0).last_line; \
> - (Current).first_column = (Current).last_column = \
> - YYRHSLOC (Rhs, 0).last_column; \
> - } \
> - while (YYID (0))
> -#endif
> -
> -
> -/* This macro is provided for backward compatibility. */
> -
> -#ifndef YY_LOCATION_PRINT
> -# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
> -#endif
> -
> -
> -/* YYLEX -- calling `yylex' with the right arguments. */
> -
> -#ifdef YYLEX_PARAM
> -# define YYLEX yylex (YYLEX_PARAM)
> -#else
> -# define YYLEX yylex ()
> -#endif
> -
> -/* Enable debugging if requested. */
> -#if YYDEBUG
> -
> -# ifndef YYFPRINTF
> -# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
> -# define YYFPRINTF fprintf
> -# endif
> -
> -# define YYDPRINTF(Args) \
> -do { \
> - if (yydebug) \
> - YYFPRINTF Args; \
> -} while (YYID (0))
> -
> -# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
> \
> -do { \
> - if (yydebug)
> \
> - {
> \
> - YYFPRINTF (stderr, "%s ", Title);
> \
> - yy_symbol_print (stderr,
> \
> - Type, Value); \
> - YYFPRINTF (stderr, "\n");
> \
> - }
> \
> -} while (YYID (0))
> -
> -
> -/*--------------------------------.
> -| Print this symbol on YYOUTPUT. |
> -`--------------------------------*/
> -
> -/*ARGSUSED*/
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static void
> -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const
> yyvaluep)
> -#else
> -static void
> -yy_symbol_value_print (yyoutput, yytype, yyvaluep)
> - FILE *yyoutput;
> - int yytype;
> - YYSTYPE const * const yyvaluep;
> -#endif
> -{
> - FILE *yyo = yyoutput;
> - YYUSE (yyo);
> - if (!yyvaluep)
> - return;
> -# ifdef YYPRINT
> - if (yytype < YYNTOKENS)
> - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
> -# else
> - YYUSE (yyoutput);
> -# endif
> - switch (yytype)
> - {
> - default:
> - break;
> - }
> -}
> -
> -
> -/*--------------------------------.
> -| Print this symbol on YYOUTPUT. |
> -`--------------------------------*/
> -
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static void
> -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
> -#else
> -static void
> -yy_symbol_print (yyoutput, yytype, yyvaluep)
> - FILE *yyoutput;
> - int yytype;
> - YYSTYPE const * const yyvaluep;
> -#endif
> -{
> - if (yytype < YYNTOKENS)
> - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
> - else
> - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
> -
> - yy_symbol_value_print (yyoutput, yytype, yyvaluep);
> - YYFPRINTF (yyoutput, ")");
> -}
> -
> -/*------------------------------------------------------------------.
> -| yy_stack_print -- Print the state stack from its BOTTOM up to its |
> -| TOP (included). |
> -`------------------------------------------------------------------*/
> -
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static void
> -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
> -#else
> -static void
> -yy_stack_print (yybottom, yytop)
> - yytype_int16 *yybottom;
> - yytype_int16 *yytop;
> -#endif
> -{
> - YYFPRINTF (stderr, "Stack now");
> - for (; yybottom <= yytop; yybottom++)
> - {
> - int yybot = *yybottom;
> - YYFPRINTF (stderr, " %d", yybot);
> - }
> - YYFPRINTF (stderr, "\n");
> -}
> -
> -# define YY_STACK_PRINT(Bottom, Top) \
> -do { \
> - if (yydebug) \
> - yy_stack_print ((Bottom), (Top)); \
> -} while (YYID (0))
> -
> -
> -/*------------------------------------------------.
> -| Report that the YYRULE is going to be reduced. |
> -`------------------------------------------------*/
> -
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static void
> -yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
> -#else
> -static void
> -yy_reduce_print (yyvsp, yyrule)
> - YYSTYPE *yyvsp;
> - int yyrule;
> -#endif
> -{
> - int yynrhs = yyr2[yyrule];
> - int yyi;
> - unsigned long int yylno = yyrline[yyrule];
> - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
> - yyrule - 1, yylno);
> - /* The symbols being reduced. */
> - for (yyi = 0; yyi < yynrhs; yyi++)
> - {
> - YYFPRINTF (stderr, " $%d = ", yyi + 1);
> - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
> - &(yyvsp[(yyi + 1) - (yynrhs)])
> - );
> - YYFPRINTF (stderr, "\n");
> - }
> -}
> -
> -# define YY_REDUCE_PRINT(Rule) \
> -do { \
> - if (yydebug) \
> - yy_reduce_print (yyvsp, Rule); \
> -} while (YYID (0))
> -
> -/* Nonzero means print parse trace. It is left uninitialized so that
> - multiple parsers can coexist. */
> -int yydebug;
> -#else /* !YYDEBUG */
> -# define YYDPRINTF(Args)
> -# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
> -# define YY_STACK_PRINT(Bottom, Top)
> -# define YY_REDUCE_PRINT(Rule)
> -#endif /* !YYDEBUG */
> -
> -
> -/* YYINITDEPTH -- initial size of the parser's stacks. */
> -#ifndef YYINITDEPTH
> -# define YYINITDEPTH 200
> -#endif
> -
> -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
> - if the built-in stack extension method is used).
> -
> - Do not make this value too large; the results are undefined if
> - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
> - evaluated with infinite-precision integer arithmetic. */
> -
> -#ifndef YYMAXDEPTH
> -# define YYMAXDEPTH 10000
> -#endif
> -
> -
> -#if YYERROR_VERBOSE
> -
> -# ifndef yystrlen
> -# if defined __GLIBC__ && defined _STRING_H
> -# define yystrlen strlen
> -# else
> -/* Return the length of YYSTR. */
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static YYSIZE_T
> -yystrlen (const char *yystr)
> -#else
> -static YYSIZE_T
> -yystrlen (yystr)
> - const char *yystr;
> -#endif
> -{
> - YYSIZE_T yylen;
> - for (yylen = 0; yystr[yylen]; yylen++)
> - continue;
> - return yylen;
> -}
> -# endif
> -# endif
> -
> -# ifndef yystpcpy
> -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
> -# define yystpcpy stpcpy
> -# else
> -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
> - YYDEST. */
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static char *
> -yystpcpy (char *yydest, const char *yysrc)
> -#else
> -static char *
> -yystpcpy (yydest, yysrc)
> - char *yydest;
> - const char *yysrc;
> -#endif
> -{
> - char *yyd = yydest;
> - const char *yys = yysrc;
> -
> - while ((*yyd++ = *yys++) != '\0')
> - continue;
> -
> - return yyd - 1;
> -}
> -# endif
> -# endif
> -
> -# ifndef yytnamerr
> -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
> - quotes and backslashes, so that it's suitable for yyerror. The
> - heuristic is that double-quoting is unnecessary unless the string
> - contains an apostrophe, a comma, or backslash (other than
> - backslash-backslash). YYSTR is taken from yytname. If YYRES is
> - null, do not copy; instead, return the length of what the result
> - would have been. */
> -static YYSIZE_T
> -yytnamerr (char *yyres, const char *yystr)
> -{
> - if (*yystr == '"')
> - {
> - YYSIZE_T yyn = 0;
> - char const *yyp = yystr;
> -
> - for (;;)
> - switch (*++yyp)
> - {
> - case '\'':
> - case ',':
> - goto do_not_strip_quotes;
> -
> - case '\\':
> - if (*++yyp != '\\')
> - goto do_not_strip_quotes;
> - /* Fall through. */
> - default:
> - if (yyres)
> - yyres[yyn] = *yyp;
> - yyn++;
> - break;
> -
> - case '"':
> - if (yyres)
> - yyres[yyn] = '\0';
> - return yyn;
> - }
> - do_not_strip_quotes: ;
> - }
> -
> - if (! yyres)
> - return yystrlen (yystr);
> -
> - return yystpcpy (yyres, yystr) - yyres;
> -}
> -# endif
> -
> -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
> - about the unexpected token YYTOKEN for the state stack whose top is
> - YYSSP.
> -
> - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
> - not large enough to hold the message. In that case, also set
> - *YYMSG_ALLOC to the required number of bytes. Return 2 if the
> - required number of bytes is too large to store. */
> -static int
> -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
> - yytype_int16 *yyssp, int yytoken)
> -{
> - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
> - YYSIZE_T yysize = yysize0;
> - YYSIZE_T yysize1;
> - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
> - /* Internationalized format string. */
> - const char *yyformat = YY_NULL;
> - /* Arguments of yyformat. */
> - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
> - /* Number of reported tokens (one for the "unexpected", one per
> - "expected"). */
> - int yycount = 0;
> -
> - /* There are many possibilities here to consider:
> - - Assume YYFAIL is not used. It's too flawed to consider. See
> -
> <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
> - for details. YYERROR is fine as it does not invoke this
> - function.
> - - If this state is a consistent state with a default action, then
> - the only way this function was invoked is if the default action
> - is an error action. In that case, don't check for expected
> - tokens because there are none.
> - - The only way there can be no lookahead present (in yychar) is if
> - this state is a consistent state with a default action. Thus,
> - detecting the absence of a lookahead is sufficient to determine
> - that there is no unexpected or expected token to report. In that
> - case, just report a simple "syntax error".
> - - Don't assume there isn't a lookahead just because this state is a
> - consistent state with a default action. There might have been a
> - previous inconsistent state, consistent state with a non-default
> - action, or user semantic action that manipulated yychar.
> - - Of course, the expected token list depends on states to have
> - correct lookahead information, and it depends on the parser not
> - to perform extra reductions after fetching a lookahead from the
> - scanner and before detecting a syntax error. Thus, state merging
> - (from LALR or IELR) and default reductions corrupt the expected
> - token list. However, the list is correct for canonical LR with
> - one exception: it will still contain any token that will not be
> - accepted due to an error action in a later state.
> - */
> - if (yytoken != YYEMPTY)
> - {
> - int yyn = yypact[*yyssp];
> - yyarg[yycount++] = yytname[yytoken];
> - if (!yypact_value_is_default (yyn))
> - {
> - /* Start YYX at -YYN if negative to avoid negative indexes in
> - YYCHECK. In other words, skip the first -YYN actions for
> - this state because they are default actions. */
> - int yyxbegin = yyn < 0 ? -yyn : 0;
> - /* Stay within bounds of both yycheck and yytname. */
> - int yychecklim = YYLAST - yyn + 1;
> - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
> - int yyx;
> -
> - for (yyx = yyxbegin; yyx < yyxend; ++yyx)
> - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
> - && !yytable_value_is_error (yytable[yyx + yyn]))
> - {
> - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
> - {
> - yycount = 1;
> - yysize = yysize0;
> - break;
> - }
> - yyarg[yycount++] = yytname[yyx];
> - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
> - if (! (yysize <= yysize1
> - && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
> - return 2;
> - yysize = yysize1;
> - }
> - }
> - }
> -
> - switch (yycount)
> - {
> -# define YYCASE_(N, S) \
> - case N: \
> - yyformat = S; \
> - break
> - YYCASE_(0, YY_("syntax error"));
> - YYCASE_(1, YY_("syntax error, unexpected %s"));
> - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
> - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
> - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or
> %s"));
> - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s
> or %s"));
> -# undef YYCASE_
> - }
> -
> - yysize1 = yysize + yystrlen (yyformat);
> - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
> - return 2;
> - yysize = yysize1;
> -
> - if (*yymsg_alloc < yysize)
> - {
> - *yymsg_alloc = 2 * yysize;
> - if (! (yysize <= *yymsg_alloc
> - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
> - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
> - return 1;
> - }
> -
> - /* Avoid sprintf, as that infringes on the user's name space.
> - Don't have undefined behavior even if the translation
> - produced a string with the wrong number of "%s"s. */
> - {
> - char *yyp = *yymsg;
> - int yyi = 0;
> - while ((*yyp = *yyformat) != '\0')
> - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
> - {
> - yyp += yytnamerr (yyp, yyarg[yyi++]);
> - yyformat += 2;
> - }
> - else
> - {
> - yyp++;
> - yyformat++;
> - }
> - }
> - return 0;
> -}
> -#endif /* YYERROR_VERBOSE */
> -
> -/*-----------------------------------------------.
> -| Release the memory associated to this symbol. |
> -`-----------------------------------------------*/
> -
> -/*ARGSUSED*/
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -static void
> -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
> -#else
> -static void
> -yydestruct (yymsg, yytype, yyvaluep)
> - const char *yymsg;
> - int yytype;
> - YYSTYPE *yyvaluep;
> -#endif
> -{
> - YYUSE (yyvaluep);
> -
> - if (!yymsg)
> - yymsg = "Deleting";
> - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
> -
> - switch (yytype)
> - {
> - case 57: /* "choice_entry" */
> -
> - {
> - fprintf(stderr, "%s:%d: missing end statement for this entry\n",
> - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
> - if (current_menu == (yyvaluep->menu))
> - menu_end_menu();
> -};
> -
> - break;
> - case 63: /* "if_entry" */
> -
> - {
> - fprintf(stderr, "%s:%d: missing end statement for this entry\n",
> - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
> - if (current_menu == (yyvaluep->menu))
> - menu_end_menu();
> -};
> -
> - break;
> - case 69: /* "menu_entry" */
> -
> - {
> - fprintf(stderr, "%s:%d: missing end statement for this entry\n",
> - (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
> - if (current_menu == (yyvaluep->menu))
> - menu_end_menu();
> -};
> -
> - break;
> -
> - default:
> - break;
> - }
> -}
> -
> -
> -/* Prevent warnings from -Wmissing-prototypes. */
> -#ifdef YYPARSE_PARAM
> -#if defined __STDC__ || defined __cplusplus
> -int yyparse (void *YYPARSE_PARAM);
> -#else
> -int yyparse ();
> -#endif
> -#else /* ! YYPARSE_PARAM */
> -#if defined __STDC__ || defined __cplusplus
> -int yyparse (void);
> -#else
> -int yyparse ();
> -#endif
> -#endif /* ! YYPARSE_PARAM */
> -
> -
> -/* The lookahead symbol. */
> -int yychar;
> -
> -/* The semantic value of the lookahead symbol. */
> -YYSTYPE yylval;
> -
> -/* Number of syntax errors so far. */
> -int yynerrs;
> -
> -
> -/*----------.
> -| yyparse. |
> -`----------*/
> -
> -#ifdef YYPARSE_PARAM
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -int
> -yyparse (void *YYPARSE_PARAM)
> -#else
> -int
> -yyparse (YYPARSE_PARAM)
> - void *YYPARSE_PARAM;
> -#endif
> -#else /* ! YYPARSE_PARAM */
> -#if (defined __STDC__ || defined __C99__FUNC__ \
> - || defined __cplusplus || defined _MSC_VER)
> -int
> -yyparse (void)
> -#else
> -int
> -yyparse ()
> -
> -#endif
> -#endif
> -{
> - int yystate;
> - /* Number of tokens to shift before error messages enabled. */
> - int yyerrstatus;
> -
> - /* The stacks and their tools:
> - `yyss': related to states.
> - `yyvs': related to semantic values.
> -
> - Refer to the stacks through separate pointers, to allow yyoverflow
> - to reallocate them elsewhere. */
> -
> - /* The state stack. */
> - yytype_int16 yyssa[YYINITDEPTH];
> - yytype_int16 *yyss;
> - yytype_int16 *yyssp;
> -
> - /* The semantic value stack. */
> - YYSTYPE yyvsa[YYINITDEPTH];
> - YYSTYPE *yyvs;
> - YYSTYPE *yyvsp;
> -
> - YYSIZE_T yystacksize;
> -
> - int yyn;
> - int yyresult;
> - /* Lookahead token as an internal (translated) token number. */
> - int yytoken;
> - /* The variables used to return semantic value and location from the
> - action routines. */
> - YYSTYPE yyval;
> -
> -#if YYERROR_VERBOSE
> - /* Buffer for error messages, and its allocated size. */
> - char yymsgbuf[128];
> - char *yymsg = yymsgbuf;
> - YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
> -#endif
> -
> -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
> -
> - /* The number of symbols on the RHS of the reduced rule.
> - Keep to zero when no symbol should be popped. */
> - int yylen = 0;
> -
> - yytoken = 0;
> - yyss = yyssa;
> - yyvs = yyvsa;
> - yystacksize = YYINITDEPTH;
> -
> - YYDPRINTF ((stderr, "Starting parse\n"));
> -
> - yystate = 0;
> - yyerrstatus = 0;
> - yynerrs = 0;
> - yychar = YYEMPTY; /* Cause a token to be read. */
> -
> - /* Initialize stack pointers.
> - Waste one element of value and location stack
> - so that they stay on the same level as the state stack.
> - The wasted elements are never initialized. */
> - yyssp = yyss;
> - yyvsp = yyvs;
> -
> - goto yysetstate;
> -
> -/*------------------------------------------------------------.
> -| yynewstate -- Push a new state, which is found in yystate. |
> -`------------------------------------------------------------*/
> - yynewstate:
> - /* In all cases, when you get here, the value and location stacks
> - have just been pushed. So pushing a state here evens the stacks. */
> - yyssp++;
> -
> - yysetstate:
> - *yyssp = yystate;
> -
> - if (yyss + yystacksize - 1 <= yyssp)
> - {
> - /* Get the current used size of the three stacks, in elements. */
> - YYSIZE_T yysize = yyssp - yyss + 1;
> -
> -#ifdef yyoverflow
> - {
> - /* Give user a chance to reallocate the stack. Use copies of
> - these so that the &'s don't force the real ones into
> - memory. */
> - YYSTYPE *yyvs1 = yyvs;
> - yytype_int16 *yyss1 = yyss;
> -
> - /* Each stack pointer address is followed by the size of the
> - data in use in that stack, in bytes. This used to be a
> - conditional around just the two extra args, but that might
> - be undefined if yyoverflow is a macro. */
> - yyoverflow (YY_("memory exhausted"),
> - &yyss1, yysize * sizeof (*yyssp),
> - &yyvs1, yysize * sizeof (*yyvsp),
> - &yystacksize);
> -
> - yyss = yyss1;
> - yyvs = yyvs1;
> - }
> -#else /* no yyoverflow */
> -# ifndef YYSTACK_RELOCATE
> - goto yyexhaustedlab;
> -# else
> - /* Extend the stack our own way. */
> - if (YYMAXDEPTH <= yystacksize)
> - goto yyexhaustedlab;
> - yystacksize *= 2;
> - if (YYMAXDEPTH < yystacksize)
> - yystacksize = YYMAXDEPTH;
> -
> - {
> - yytype_int16 *yyss1 = yyss;
> - union yyalloc *yyptr =
> - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
> - if (! yyptr)
> - goto yyexhaustedlab;
> - YYSTACK_RELOCATE (yyss_alloc, yyss);
> - YYSTACK_RELOCATE (yyvs_alloc, yyvs);
> -# undef YYSTACK_RELOCATE
> - if (yyss1 != yyssa)
> - YYSTACK_FREE (yyss1);
> - }
> -# endif
> -#endif /* no yyoverflow */
> -
> - yyssp = yyss + yysize - 1;
> - yyvsp = yyvs + yysize - 1;
> -
> - YYDPRINTF ((stderr, "Stack size increased to %lu\n",
> - (unsigned long int) yystacksize));
> -
> - if (yyss + yystacksize - 1 <= yyssp)
> - YYABORT;
> - }
> -
> - YYDPRINTF ((stderr, "Entering state %d\n", yystate));
> -
> - if (yystate == YYFINAL)
> - YYACCEPT;
> -
> - goto yybackup;
> -
> -/*-----------.
> -| yybackup. |
> -`-----------*/
> -yybackup:
> -
> - /* Do appropriate processing given the current state. Read a
> - lookahead token if we need one and don't already have one. */
> -
> - /* First try to decide what to do without reference to lookahead token. */
> - yyn = yypact[yystate];
> - if (yypact_value_is_default (yyn))
> - goto yydefault;
> -
> - /* Not known => get a lookahead token if don't already have one. */
> -
> - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
> - if (yychar == YYEMPTY)
> - {
> - YYDPRINTF ((stderr, "Reading a token: "));
> - yychar = YYLEX;
> - }
> -
> - if (yychar <= YYEOF)
> - {
> - yychar = yytoken = YYEOF;
> - YYDPRINTF ((stderr, "Now at end of input.\n"));
> - }
> - else
> - {
> - yytoken = YYTRANSLATE (yychar);
> - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
> - }
> -
> - /* If the proper action on seeing token YYTOKEN is to reduce or to
> - detect an error, take that action. */
> - yyn += yytoken;
> - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
> - goto yydefault;
> - yyn = yytable[yyn];
> - if (yyn <= 0)
> - {
> - if (yytable_value_is_error (yyn))
> - goto yyerrlab;
> - yyn = -yyn;
> - goto yyreduce;
> - }
> -
> - /* Count tokens shifted since error; after three, turn off error
> - status. */
> - if (yyerrstatus)
> - yyerrstatus--;
> -
> - /* Shift the lookahead token. */
> - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
> -
> - /* Discard the shifted token. */
> - yychar = YYEMPTY;
> -
> - yystate = yyn;
> - *++yyvsp = yylval;
> -
> - goto yynewstate;
> -
> -
> -/*-----------------------------------------------------------.
> -| yydefault -- do the default action for the current state. |
> -`-----------------------------------------------------------*/
> -yydefault:
> - yyn = yydefact[yystate];
> - if (yyn == 0)
> - goto yyerrlab;
> - goto yyreduce;
> -
> -
> -/*-----------------------------.
> -| yyreduce -- Do a reduction. |
> -`-----------------------------*/
> -yyreduce:
> - /* yyn is the number of a rule to reduce with. */
> - yylen = yyr2[yyn];
> -
> - /* If YYLEN is nonzero, implement the default value of the action:
> - `$$ = $1'.
> -
> - Otherwise, the following line sets YYVAL to garbage.
> - This behavior is undocumented and Bison
> - users should not rely upon it. Assigning to YYVAL
> - unconditionally makes the parser a bit smaller, and it avoids a
> - GCC warning that YYVAL may be used uninitialized. */
> - yyval = yyvsp[1-yylen];
> -
> -
> - YY_REDUCE_PRINT (yyn);
> - switch (yyn)
> - {
> - case 10:
> -
> - { zconf_error("unexpected end statement"); }
> - break;
> -
> - case 11:
> -
> - { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); }
> - break;
> -
> - case 12:
> -
> - {
> - zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) -
> (4)].id)->name);
> -}
> - break;
> -
> - case 13:
> -
> - { zconf_error("invalid statement"); }
> - break;
> -
> - case 28:
> -
> - { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); }
> - break;
> -
> - case 29:
> -
> - { zconf_error("invalid option"); }
> - break;
> -
> - case 30:
> -
> - {
> - struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
> - sym->flags |= SYMBOL_OPTIONAL;
> - menu_add_entry(sym);
> - printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(),
> zconf_lineno(), (yyvsp[(2) - (3)].string));
> -}
> - break;
> -
> - case 31:
> -
> - {
> - menu_end_entry();
> - printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(),
> zconf_lineno());
> -}
> - break;
> -
> - case 32:
> -
> - {
> - struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
> - sym->flags |= SYMBOL_OPTIONAL;
> - menu_add_entry(sym);
> - printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(),
> zconf_lineno(), (yyvsp[(2) - (3)].string));
> -}
> - break;
> -
> - case 33:
> -
> - {
> - if (current_entry->prompt)
> - current_entry->prompt->type = P_MENU;
> - else
> - zconfprint("warning: menuconfig statement without prompt");
> - menu_end_entry();
> - printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(),
> zconf_lineno());
> -}
> - break;
> -
> - case 41:
> -
> - {
> - menu_set_type((yyvsp[(1) - (3)].id)->stype);
> - printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
> - zconf_curname(), zconf_lineno(),
> - (yyvsp[(1) - (3)].id)->stype);
> -}
> - break;
> -
> - case 42:
> -
> - {
> - menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) -
> (4)].expr));
> - printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 43:
> -
> - {
> - menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) -
> (4)].expr));
> - if ((yyvsp[(1) - (4)].id)->stype != S_UNKNOWN)
> - menu_set_type((yyvsp[(1) - (4)].id)->stype);
> - printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
> - zconf_curname(), zconf_lineno(),
> - (yyvsp[(1) - (4)].id)->stype);
> -}
> - break;
> -
> - case 44:
> -
> - {
> - menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0),
> (yyvsp[(3) - (4)].expr));
> - printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 45:
> -
> - {
> - menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) -
> (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
> - printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 48:
> -
> - {
> - const struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string),
> strlen((yyvsp[(2) - (3)].string)));
> - if (id && id->flags & TF_OPTION)
> - menu_add_option(id->token, (yyvsp[(3) - (3)].string));
> - else
> - zconfprint("warning: ignoring unknown option %s", (yyvsp[(2) -
> (3)].string));
> - free((yyvsp[(2) - (3)].string));
> -}
> - break;
> -
> - case 49:
> -
> - { (yyval.string) = NULL; }
> - break;
> -
> - case 50:
> -
> - { (yyval.string) = (yyvsp[(2) - (2)].string); }
> - break;
> -
> - case 51:
> -
> - {
> - struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string),
> SYMBOL_CHOICE);
> - sym->flags |= SYMBOL_AUTO;
> - menu_add_entry(sym);
> - menu_add_expr(P_CHOICE, NULL, NULL);
> - printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 52:
> -
> - {
> - (yyval.menu) = menu_add_menu();
> -}
> - break;
> -
> - case 53:
> -
> - {
> - if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) {
> - menu_end_menu();
> - printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(),
> zconf_lineno());
> - }
> -}
> - break;
> -
> - case 61:
> -
> - {
> - menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) -
> (4)].expr));
> - printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 62:
> -
> - {
> - if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) -
> (3)].id)->stype == S_TRISTATE) {
> - menu_set_type((yyvsp[(1) - (3)].id)->stype);
> - printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
> - zconf_curname(), zconf_lineno(),
> - (yyvsp[(1) - (3)].id)->stype);
> - } else
> - YYERROR;
> -}
> - break;
> -
> - case 63:
> -
> - {
> - current_entry->sym->flags |= SYMBOL_OPTIONAL;
> - printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(),
> zconf_lineno());
> -}
> - break;
> -
> - case 64:
> -
> - {
> - if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) {
> - menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[(2) -
> (4)].string), 0), (yyvsp[(3) - (4)].expr));
> - printd(DEBUG_PARSE, "%s:%d:default\n",
> - zconf_curname(), zconf_lineno());
> - } else
> - YYERROR;
> -}
> - break;
> -
> - case 67:
> -
> - {
> - printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
> - menu_add_entry(NULL);
> - menu_add_dep((yyvsp[(2) - (3)].expr));
> - (yyval.menu) = menu_add_menu();
> -}
> - break;
> -
> - case 68:
> -
> - {
> - if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) {
> - menu_end_menu();
> - printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(),
> zconf_lineno());
> - }
> -}
> - break;
> -
> - case 74:
> -
> - {
> - menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
> -}
> - break;
> -
> - case 75:
> -
> - {
> - menu_add_entry(NULL);
> - menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
> - printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 76:
> -
> - {
> - (yyval.menu) = menu_add_menu();
> -}
> - break;
> -
> - case 77:
> -
> - {
> - if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) {
> - menu_end_menu();
> - printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(),
> zconf_lineno());
> - }
> -}
> - break;
> -
> - case 83:
> -
> - {
> - printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(),
> zconf_lineno(), (yyvsp[(2) - (3)].string));
> - zconf_nextfile((yyvsp[(2) - (3)].string));
> -}
> - break;
> -
> - case 84:
> -
> - {
> - menu_add_entry(NULL);
> - menu_add_prompt(P_COMMENT, (yyvsp[(2) - (3)].string), NULL);
> - printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
> -}
> - break;
> -
> - case 85:
> -
> - {
> - menu_end_entry();
> -}
> - break;
> -
> - case 86:
> -
> - {
> - printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
> - zconf_starthelp();
> -}
> - break;
> -
> - case 87:
> -
> - {
> - current_entry->help = (yyvsp[(2) - (2)].string);
> -}
> - break;
> -
> - case 92:
> -
> - {
> - menu_add_dep((yyvsp[(3) - (4)].expr));
> - printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(),
> zconf_lineno());
> -}
> - break;
> -
> - case 96:
> -
> - {
> - menu_add_visibility((yyvsp[(2) - (2)].expr));
> -}
> - break;
> -
> - case 98:
> -
> - {
> - menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) -
> (2)].expr));
> -}
> - break;
> -
> - case 101:
> -
> - { (yyval.id) = (yyvsp[(1) - (2)].id); }
> - break;
> -
> - case 102:
> -
> - { (yyval.id) = (yyvsp[(1) - (2)].id); }
> - break;
> -
> - case 103:
> -
> - { (yyval.id) = (yyvsp[(1) - (2)].id); }
> - break;
> -
> - case 106:
> -
> - { (yyval.expr) = NULL; }
> - break;
> -
> - case 107:
> -
> - { (yyval.expr) = (yyvsp[(2) - (2)].expr); }
> - break;
> -
> - case 108:
> -
> - { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); }
> - break;
> -
> - case 109:
> -
> - { (yyval.expr) = expr_alloc_comp(E_LTH, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 110:
> -
> - { (yyval.expr) = expr_alloc_comp(E_LEQ, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 111:
> -
> - { (yyval.expr) = expr_alloc_comp(E_GTH, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 112:
> -
> - { (yyval.expr) = expr_alloc_comp(E_GEQ, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 113:
> -
> - { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 114:
> -
> - { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol),
> (yyvsp[(3) - (3)].symbol)); }
> - break;
> -
> - case 115:
> -
> - { (yyval.expr) = (yyvsp[(2) - (3)].expr); }
> - break;
> -
> - case 116:
> -
> - { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); }
> - break;
> -
> - 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; }
> - break;
> -
> -
> -
> - default: break;
> - }
> - /* User semantic actions sometimes alter yychar, and that requires
> - that yytoken be updated with the new translation. We take the
> - approach of translating immediately before every use of yytoken.
> - One alternative is translating here after every semantic action,
> - but that translation would be missed if the semantic action invokes
> - YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
> - if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
> - incorrect destructor might then be invoked immediately. In the
> - case of YYERROR or YYBACKUP, subsequent parser actions might lead
> - to an incorrect destructor call or verbose syntax error message
> - before the lookahead is translated. */
> - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
> -
> - YYPOPSTACK (yylen);
> - yylen = 0;
> - YY_STACK_PRINT (yyss, yyssp);
> -
> - *++yyvsp = yyval;
> -
> - /* Now `shift' the result of the reduction. Determine what state
> - that goes to, based on the state we popped back to and the rule
> - number reduced by. */
> -
> - yyn = yyr1[yyn];
> -
> - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
> - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
> - yystate = yytable[yystate];
> - else
> - yystate = yydefgoto[yyn - YYNTOKENS];
> -
> - goto yynewstate;
> -
> -
> -/*------------------------------------.
> -| yyerrlab -- here on detecting error |
> -`------------------------------------*/
> -yyerrlab:
> - /* Make sure we have latest lookahead translation. See comments at
> - user semantic actions for why this is necessary. */
> - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
> -
> - /* If not already recovering from an error, report this error. */
> - if (!yyerrstatus)
> - {
> - ++yynerrs;
> -#if ! YYERROR_VERBOSE
> - yyerror (YY_("syntax error"));
> -#else
> -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
> - yyssp, yytoken)
> - {
> - char const *yymsgp = YY_("syntax error");
> - int yysyntax_error_status;
> - yysyntax_error_status = YYSYNTAX_ERROR;
> - if (yysyntax_error_status == 0)
> - yymsgp = yymsg;
> - else if (yysyntax_error_status == 1)
> - {
> - if (yymsg != yymsgbuf)
> - YYSTACK_FREE (yymsg);
> - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
> - if (!yymsg)
> - {
> - yymsg = yymsgbuf;
> - yymsg_alloc = sizeof yymsgbuf;
> - yysyntax_error_status = 2;
> - }
> - else
> - {
> - yysyntax_error_status = YYSYNTAX_ERROR;
> - yymsgp = yymsg;
> - }
> - }
> - yyerror (yymsgp);
> - if (yysyntax_error_status == 2)
> - goto yyexhaustedlab;
> - }
> -# undef YYSYNTAX_ERROR
> -#endif
> - }
> -
> -
> -
> - if (yyerrstatus == 3)
> - {
> - /* If just tried and failed to reuse lookahead token after an
> - error, discard it. */
> -
> - if (yychar <= YYEOF)
> - {
> - /* Return failure if at end of input. */
> - if (yychar == YYEOF)
> - YYABORT;
> - }
> - else
> - {
> - yydestruct ("Error: discarding",
> - yytoken, &yylval);
> - yychar = YYEMPTY;
> - }
> - }
> -
> - /* Else will try to reuse lookahead token after shifting the error
> - token. */
> - goto yyerrlab1;
> -
> -
> -/*---------------------------------------------------.
> -| yyerrorlab -- error raised explicitly by YYERROR. |
> -`---------------------------------------------------*/
> -yyerrorlab:
> -
> - /* Pacify compilers like GCC when the user code never invokes
> - YYERROR and the label yyerrorlab therefore never appears in user
> - code. */
> - if (/*CONSTCOND*/ 0)
> - goto yyerrorlab;
> -
> - /* Do not reclaim the symbols of the rule which action triggered
> - this YYERROR. */
> - YYPOPSTACK (yylen);
> - yylen = 0;
> - YY_STACK_PRINT (yyss, yyssp);
> - yystate = *yyssp;
> - goto yyerrlab1;
> -
> -
> -/*-------------------------------------------------------------.
> -| yyerrlab1 -- common code for both syntax error and YYERROR. |
> -`-------------------------------------------------------------*/
> -yyerrlab1:
> - yyerrstatus = 3; /* Each real token shifted decrements this. */
> -
> - for (;;)
> - {
> - yyn = yypact[yystate];
> - if (!yypact_value_is_default (yyn))
> - {
> - yyn += YYTERROR;
> - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
> - {
> - yyn = yytable[yyn];
> - if (0 < yyn)
> - break;
> - }
> - }
> -
> - /* Pop the current state because it cannot handle the error token. */
> - if (yyssp == yyss)
> - YYABORT;
> -
> -
> - yydestruct ("Error: popping",
> - yystos[yystate], yyvsp);
> - YYPOPSTACK (1);
> - yystate = *yyssp;
> - YY_STACK_PRINT (yyss, yyssp);
> - }
> -
> - *++yyvsp = yylval;
> -
> -
> - /* Shift the error token. */
> - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
> -
> - yystate = yyn;
> - goto yynewstate;
> -
> -
> -/*-------------------------------------.
> -| yyacceptlab -- YYACCEPT comes here. |
> -`-------------------------------------*/
> -yyacceptlab:
> - yyresult = 0;
> - goto yyreturn;
> -
> -/*-----------------------------------.
> -| yyabortlab -- YYABORT comes here. |
> -`-----------------------------------*/
> -yyabortlab:
> - yyresult = 1;
> - goto yyreturn;
> -
> -#if !defined yyoverflow || YYERROR_VERBOSE
> -/*-------------------------------------------------.
> -| yyexhaustedlab -- memory exhaustion comes here. |
> -`-------------------------------------------------*/
> -yyexhaustedlab:
> - yyerror (YY_("memory exhausted"));
> - yyresult = 2;
> - /* Fall through. */
> -#endif
> -
> -yyreturn:
> - if (yychar != YYEMPTY)
> - {
> - /* Make sure we have latest lookahead translation. See comments at
> - user semantic actions for why this is necessary. */
> - yytoken = YYTRANSLATE (yychar);
> - yydestruct ("Cleanup: discarding lookahead",
> - yytoken, &yylval);
> - }
> - /* Do not reclaim the symbols of the rule which action triggered
> - this YYABORT or YYACCEPT. */
> - YYPOPSTACK (yylen);
> - YY_STACK_PRINT (yyss, yyssp);
> - while (yyssp != yyss)
> - {
> - yydestruct ("Cleanup: popping",
> - yystos[*yyssp], yyvsp);
> - YYPOPSTACK (1);
> - }
> -#ifndef yyoverflow
> - if (yyss != yyssa)
> - YYSTACK_FREE (yyss);
> -#endif
> -#if YYERROR_VERBOSE
> - if (yymsg != yymsgbuf)
> - YYSTACK_FREE (yymsg);
> -#endif
> - /* Make sure YYID is used. */
> - return YYID (yyresult);
> -}
> -
> -
> -
> -
> -
> -void conf_parse(const char *name)
> -{
> - struct symbol *sym;
> - int i;
> -
> - zconf_initscan(name);
> -
> - sym_init();
> - _menu_init();
> - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration",
> NULL);
> -
> - if (getenv("ZCONF_DEBUG"))
> - zconfdebug = 1;
> - zconfparse();
> - if (zconfnerrs)
> - exit(1);
> - if (!modules_sym)
> - modules_sym = sym_find( "n" );
> -
> - rootmenu.prompt->text = _(rootmenu.prompt->text);
> - rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
> -
> - menu_finalize(&rootmenu);
> - for_all_symbols(i, sym) {
> - if (sym_check_deps(sym))
> - zconfnerrs++;
> - }
> - if (zconfnerrs)
> - exit(1);
> - sym_set_change_count(1);
> -}
> -
> -static const char *zconf_tokenname(int token)
> -{
> - switch (token) {
> - case T_MENU: return "menu";
> - case T_ENDMENU: return "endmenu";
> - case T_CHOICE: return "choice";
> - case T_ENDCHOICE: return "endchoice";
> - case T_IF: return "if";
> - case T_ENDIF: return "endif";
> - case T_DEPENDS: return "depends";
> - case T_VISIBLE: return "visible";
> - }
> - return "<token>";
> -}
> -
> -static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int
> endtoken)
> -{
> - if (id->token != endtoken) {
> - zconf_error("unexpected '%s' within %s block",
> - kconf_id_strings + id->name,
> zconf_tokenname(starttoken));
> - zconfnerrs++;
> - return false;
> - }
> - if (current_menu->file != current_file) {
> - zconf_error("'%s' in different file than '%s'",
> - kconf_id_strings + id->name,
> zconf_tokenname(starttoken));
> - fprintf(stderr, "%s:%d: location of the '%s'\n",
> - current_menu->file->name, current_menu->lineno,
> - zconf_tokenname(starttoken));
> - zconfnerrs++;
> - return false;
> - }
> - return true;
> -}
> -
> -static void zconfprint(const char *err, ...)
> -{
> - va_list ap;
> -
> - fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
> - va_start(ap, err);
> - vfprintf(stderr, err, ap);
> - va_end(ap);
> - fprintf(stderr, "\n");
> -}
> -
> -static void zconf_error(const char *err, ...)
> -{
> - va_list ap;
> -
> - zconfnerrs++;
> - fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
> - va_start(ap, err);
> - vfprintf(stderr, err, ap);
> - va_end(ap);
> - fprintf(stderr, "\n");
> -}
> -
> -static void zconferror(const char *err)
> -{
> - fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1,
> err);
> -}
> -
> -static void print_quoted_string(FILE *out, const char *str)
> -{
> - const char *p;
> - int len;
> -
> - putc('"', out);
> - while ((p = strchr(str, '"'))) {
> - len = p - str;
> - if (len)
> - fprintf(out, "%.*s", len, str);
> - fputs("\\\"", out);
> - str = p + 1;
> - }
> - fputs(str, out);
> - putc('"', out);
> -}
> -
> -static void print_symbol(FILE *out, struct menu *menu)
> -{
> - struct symbol *sym = menu->sym;
> - struct property *prop;
> -
> - if (sym_is_choice(sym))
> - fprintf(out, "\nchoice\n");
> - else
> - fprintf(out, "\nconfig %s\n", sym->name);
> - switch (sym->type) {
> - case S_BOOLEAN:
> - fputs(" boolean\n", out);
> - break;
> - case S_TRISTATE:
> - fputs(" tristate\n", out);
> - break;
> - case S_STRING:
> - fputs(" string\n", out);
> - break;
> - case S_INT:
> - fputs(" integer\n", out);
> - break;
> - case S_HEX:
> - fputs(" hex\n", out);
> - break;
> - default:
> - fputs(" ???\n", out);
> - break;
> - }
> - for (prop = sym->prop; prop; prop = prop->next) {
> - if (prop->menu != menu)
> - continue;
> - switch (prop->type) {
> - case P_PROMPT:
> - fputs(" prompt ", out);
> - print_quoted_string(out, prop->text);
> - if (!expr_is_yes(prop->visible.expr)) {
> - fputs(" if ", out);
> - expr_fprint(prop->visible.expr, out);
> - }
> - fputc('\n', out);
> - break;
> - case P_DEFAULT:
> - fputs( " default ", out);
> - expr_fprint(prop->expr, out);
> - if (!expr_is_yes(prop->visible.expr)) {
> - fputs(" if ", out);
> - expr_fprint(prop->visible.expr, out);
> - }
> - fputc('\n', out);
> - break;
> - case P_CHOICE:
> - fputs(" #choice value\n", out);
> - break;
> - case P_SELECT:
> - fputs( " select ", out);
> - expr_fprint(prop->expr, out);
> - fputc('\n', out);
> - break;
> - case P_RANGE:
> - fputs( " range ", out);
> - expr_fprint(prop->expr, out);
> - fputc('\n', out);
> - break;
> - case P_MENU:
> - fputs( " menu ", out);
> - print_quoted_string(out, prop->text);
> - fputc('\n', out);
> - break;
> - default:
> - fprintf(out, " unknown prop %d!\n", prop->type);
> - break;
> - }
> - }
> - if (menu->help) {
> - int len = strlen(menu->help);
> - while (menu->help[--len] == '\n')
> - menu->help[len] = 0;
> - fprintf(out, " help\n%s\n", menu->help);
> - }
> -}
> -
> -void zconfdump(FILE *out)
> -{
> - struct property *prop;
> - struct symbol *sym;
> - struct menu *menu;
> -
> - menu = rootmenu.list;
> - while (menu) {
> - if ((sym = menu->sym))
> - print_symbol(out, menu);
> - else if ((prop = menu->prompt)) {
> - switch (prop->type) {
> - case P_COMMENT:
> - fputs("\ncomment ", out);
> - print_quoted_string(out, prop->text);
> - fputs("\n", out);
> - break;
> - case P_MENU:
> - fputs("\nmenu ", out);
> - print_quoted_string(out, prop->text);
> - fputs("\n", out);
> - break;
> - default:
> - ;
> - }
> - if (!expr_is_yes(prop->visible.expr)) {
> - fputs(" depends ", out);
> - expr_fprint(prop->visible.expr, out);
> - fputc('\n', out);
> - }
> - }
> -
> - if (menu->list)
> - menu = menu->list;
> - else if (menu->next)
> - menu = menu->next;
> - else while ((menu = menu->parent)) {
> - if (menu->prompt && menu->prompt->type == P_MENU)
> - fputs("\nendmenu\n", out);
> - if (menu->next) {
> - menu = menu->next;
> - break;
> - }
> - }
> - }
> -}
> -
> -#include "zconf.lex.c"
> -#include "util.c"
> -#include "confdata.c"
> -#include "expr.c"
> -#include "symbol.c"
> -#include "menu.c"
> -
> diff --git a/xen/tools/kconfig/zconf.y b/xen/tools/kconfig/zconf.y
> index 71bf8bff69..ad6305b0f4 100644
> --- a/xen/tools/kconfig/zconf.y
> +++ b/xen/tools/kconfig/zconf.y
> @@ -20,10 +20,10 @@
>
> int cdebug = PRINTD;
>
> -extern int zconflex(void);
> +int yylex(void);
> +static void yyerror(const char *err);
> static void zconfprint(const char *err, ...);
> static void zconf_error(const char *err, ...);
> -static void zconferror(const char *err);
> static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int
> endtoken);
>
> struct symbol *symbol_hash[SYMBOL_HASHSIZE];
> @@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
> static struct menu *current_menu, *current_entry;
>
> %}
> -%expect 30
> +%expect 32
>
> %union
> {
> @@ -62,6 +62,7 @@ static struct menu *current_menu, *current_entry;
> %token <id>T_TYPE
> %token <id>T_DEFAULT
> %token <id>T_SELECT
> +%token <id>T_IMPLY
> %token <id>T_RANGE
> %token <id>T_VISIBLE
> %token <id>T_OPTION
> @@ -84,6 +85,7 @@ static struct menu *current_menu, *current_entry;
> %nonassoc T_NOT
>
> %type <string> prompt
> +%type <symbol> nonconst_symbol
> %type <symbol> symbol
> %type <expr> expr
> %type <expr> if_expr
> @@ -100,14 +102,34 @@ static struct menu *current_menu, *current_entry;
> } if_entry menu_entry choice_entry
>
> %{
> -/* Include zconf.hash.c here so it can see the token constants. */
> -#include "zconf.hash.c"
> +/* Include kconf_id.c here so it can see the token constants. */
> +#include "kconf_id.c"
> %}
>
> %%
> input: nl start | start;
>
> -start: mainmenu_stmt stmt_list | stmt_list;
> +start: mainmenu_stmt stmt_list | no_mainmenu_stmt stmt_list;
> +
> +/* mainmenu entry */
> +
> +mainmenu_stmt: T_MAINMENU prompt nl
> +{
> + menu_add_prompt(P_MENU, $2, NULL);
> +};
> +
> +/* Default main menu, if there's no mainmenu entry */
> +
> +no_mainmenu_stmt: /* empty */
> +{
> + /*
> + * Hack: Keep the main menu title on the heap so we can safely free it
> + * later regardless of whether it comes from the 'prompt' in
> + * mainmenu_stmt or here
> + */
> + menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
> +};
> +
>
> stmt_list:
> /* empty */
> @@ -118,13 +140,13 @@ stmt_list:
> | stmt_list T_WORD error T_EOL { zconf_error("unknown statement
> \"%s\"", $2); }
> | stmt_list option_name error T_EOL
> {
> - zconf_error("unexpected option \"%s\"", kconf_id_strings + $2->name);
> + zconf_error("unexpected option \"%s\"", $2->name);
> }
> | stmt_list error T_EOL { zconf_error("invalid statement"); }
> ;
>
> option_name:
> - T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_OPTIONAL | T_RANGE |
> T_DEFAULT | T_VISIBLE
> + T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_IMPLY | T_OPTIONAL |
> T_RANGE | T_DEFAULT | T_VISIBLE
> ;
>
> common_stmt:
> @@ -144,26 +166,23 @@ option_error:
>
> /* config/menuconfig entry */
>
> -config_entry_start: T_CONFIG T_WORD T_EOL
> +config_entry_start: T_CONFIG nonconst_symbol T_EOL
> {
> - struct symbol *sym = sym_lookup($2, 0);
> - sym->flags |= SYMBOL_OPTIONAL;
> - menu_add_entry(sym);
> - printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(),
> zconf_lineno(), $2);
> + $2->flags |= SYMBOL_OPTIONAL;
> + menu_add_entry($2);
> + printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(),
> zconf_lineno(), $2->name);
> };
>
> config_stmt: config_entry_start config_option_list
> {
> - menu_end_entry();
> printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(),
> zconf_lineno());
> };
>
> -menuconfig_entry_start: T_MENUCONFIG T_WORD T_EOL
> +menuconfig_entry_start: T_MENUCONFIG nonconst_symbol T_EOL
> {
> - struct symbol *sym = sym_lookup($2, 0);
> - sym->flags |= SYMBOL_OPTIONAL;
> - menu_add_entry(sym);
> - printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(),
> zconf_lineno(), $2);
> + $2->flags |= SYMBOL_OPTIONAL;
> + menu_add_entry($2);
> + printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(),
> zconf_lineno(), $2->name);
> };
>
> menuconfig_stmt: menuconfig_entry_start config_option_list
> @@ -172,7 +191,6 @@ menuconfig_stmt: menuconfig_entry_start config_option_list
> current_entry->prompt->type = P_MENU;
> else
> zconfprint("warning: menuconfig statement without prompt");
> - menu_end_entry();
> printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(),
> zconf_lineno());
> };
>
> @@ -210,12 +228,18 @@ config_option: T_DEFAULT expr if_expr T_EOL
> $1->stype);
> };
>
> -config_option: T_SELECT T_WORD if_expr T_EOL
> +config_option: T_SELECT nonconst_symbol if_expr T_EOL
> {
> - menu_add_symbol(P_SELECT, sym_lookup($2, 0), $3);
> + menu_add_symbol(P_SELECT, $2, $3);
> printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
> };
>
> +config_option: T_IMPLY nonconst_symbol if_expr T_EOL
> +{
> + menu_add_symbol(P_IMPLY, $2, $3);
> + printd(DEBUG_PARSE, "%s:%d:imply\n", zconf_curname(), zconf_lineno());
> +};
> +
> config_option: T_RANGE symbol symbol if_expr T_EOL
> {
> menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,$2, $3), $4);
> @@ -230,8 +254,10 @@ symbol_option_list:
> | symbol_option_list T_WORD symbol_option_arg
> {
> const struct kconf_id *id = kconf_id_lookup($2, strlen($2));
> - if (id && id->flags & TF_OPTION)
> + if (id && id->flags & TF_OPTION) {
> menu_add_option(id->token, $3);
> + free($3);
> + }
> else
> zconfprint("warning: ignoring unknown option %s", $2);
> free($2);
> @@ -250,6 +276,7 @@ choice: T_CHOICE word_opt T_EOL
> sym->flags |= SYMBOL_AUTO;
> menu_add_entry(sym);
> menu_add_expr(P_CHOICE, NULL, NULL);
> + free($2);
> printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
> };
>
> @@ -301,10 +328,10 @@ choice_option: T_OPTIONAL T_EOL
> printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(),
> zconf_lineno());
> };
>
> -choice_option: T_DEFAULT T_WORD if_expr T_EOL
> +choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL
> {
> if ($1->stype == S_UNKNOWN) {
> - menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
> + menu_add_symbol(P_DEFAULT, $2, $3);
> printd(DEBUG_PARSE, "%s:%d:default\n",
> zconf_curname(), zconf_lineno());
> } else
> @@ -344,13 +371,6 @@ if_block:
> | if_block choice_stmt
> ;
>
> -/* mainmenu entry */
> -
> -mainmenu_stmt: T_MAINMENU prompt nl
> -{
> - menu_add_prompt(P_MENU, $2, NULL);
> -};
> -
> /* menu entry */
>
> menu: T_MENU prompt T_EOL
> @@ -387,6 +407,7 @@ source_stmt: T_SOURCE prompt T_EOL
> {
> printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(),
> zconf_lineno(), $2);
> zconf_nextfile($2);
> + free($2);
> };
>
> /* comment entry */
> @@ -399,9 +420,7 @@ comment: T_COMMENT prompt T_EOL
> };
>
> comment_stmt: comment depends_list
> -{
> - menu_end_entry();
> -};
> +;
>
> /* help option */
>
> @@ -413,6 +432,17 @@ help_start: T_HELP T_EOL
>
> help: help_start T_HELPTEXT
> {
> + if (current_entry->help) {
> + free(current_entry->help);
> + zconfprint("warning: '%s' defined with more than one help text
> -- only the last one will be used",
> + current_entry->sym->name ?: "<choice>");
> + }
> +
> + /* Is the help text empty or all whitespace? */
> + if ($2[strspn($2, " \f\n\r\t\v")] == '\0')
> + zconfprint("warning: '%s' defined with blank help text",
> + current_entry->sym->name ?: "<choice>");
> +
> current_entry->help = $2;
> };
>
> @@ -484,7 +514,10 @@ expr: symbol { $$ =
> expr_alloc_symbol($1); }
> | expr T_AND expr { $$ = expr_alloc_two(E_AND,
> $1, $3); }
> ;
>
> -symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); }
> +/* For symbol definitions, selects, etc., where quotes are not accepted */
> +nonconst_symbol: T_WORD { $$ = sym_lookup($1, 0); free($1); };
> +
> +symbol: nonconst_symbol
> | T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); }
> ;
>
> @@ -495,6 +528,7 @@ word_opt: /* empty */ { $$ = NULL; }
>
> void conf_parse(const char *name)
> {
> + const char *tmp;
> struct symbol *sym;
> int i;
>
> @@ -502,25 +536,26 @@ void conf_parse(const char *name)
>
> sym_init();
> _menu_init();
> - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration",
> NULL);
>
> if (getenv("ZCONF_DEBUG"))
> - zconfdebug = 1;
> - zconfparse();
> - if (zconfnerrs)
> + yydebug = 1;
> + yyparse();
> + if (yynerrs)
> exit(1);
> if (!modules_sym)
> modules_sym = sym_find( "n" );
>
> + tmp = rootmenu.prompt->text;
> rootmenu.prompt->text = _(rootmenu.prompt->text);
> rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
> + free((char*)tmp);
>
> menu_finalize(&rootmenu);
> for_all_symbols(i, sym) {
> if (sym_check_deps(sym))
> - zconfnerrs++;
> + yynerrs++;
> }
> - if (zconfnerrs)
> + if (yynerrs)
> exit(1);
> sym_set_change_count(1);
> }
> @@ -544,17 +579,17 @@ static bool zconf_endtoken(const struct kconf_id *id,
> int starttoken, int endtok
> {
> if (id->token != endtoken) {
> zconf_error("unexpected '%s' within %s block",
> - kconf_id_strings + id->name,
> zconf_tokenname(starttoken));
> - zconfnerrs++;
> + id->name, zconf_tokenname(starttoken));
> + yynerrs++;
> return false;
> }
> if (current_menu->file != current_file) {
> zconf_error("'%s' in different file than '%s'",
> - kconf_id_strings + id->name,
> zconf_tokenname(starttoken));
> + id->name, zconf_tokenname(starttoken));
> fprintf(stderr, "%s:%d: location of the '%s'\n",
> current_menu->file->name, current_menu->lineno,
> zconf_tokenname(starttoken));
> - zconfnerrs++;
> + yynerrs++;
> return false;
> }
> return true;
> @@ -575,7 +610,7 @@ static void zconf_error(const char *err, ...)
> {
> va_list ap;
>
> - zconfnerrs++;
> + yynerrs++;
> fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
> va_start(ap, err);
> vfprintf(stderr, err, ap);
> @@ -583,7 +618,7 @@ static void zconf_error(const char *err, ...)
> fprintf(stderr, "\n");
> }
>
> -static void zconferror(const char *err)
> +static void yyerror(const char *err)
> {
> fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1,
> err);
> }
> @@ -616,7 +651,7 @@ static void print_symbol(FILE *out, struct menu *menu)
> fprintf(out, "\nconfig %s\n", sym->name);
> switch (sym->type) {
> case S_BOOLEAN:
> - fputs(" boolean\n", out);
> + fputs(" bool\n", out);
> break;
> case S_TRISTATE:
> fputs(" tristate\n", out);
> @@ -664,6 +699,11 @@ static void print_symbol(FILE *out, struct menu *menu)
> expr_fprint(prop->expr, out);
> fputc('\n', out);
> break;
> + case P_IMPLY:
> + fputs( " imply ", out);
> + expr_fprint(prop->expr, out);
> + fputc('\n', out);
> + break;
> case P_RANGE:
> fputs( " range ", out);
> expr_fprint(prop->expr, out);
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |