Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09cd7555 authored by Andreas Ruprecht's avatar Andreas Ruprecht Committed by Michal Marek
Browse files

kconfig: Regenerate shipped zconf.{hash,lex}.c files 



Update the shipped files generated by flex and gperf to support the
explicit use of "---help---" and to emit warnings for unsupported
characters on COMMAND tokens.

As I could not find out which flex/gperf version was used to generate
the previous version, I used flex 2.5.35  and gperf 3.0.4 from
Ubuntu 14.04 - this also leads to the big number of changed lines
in this patch.

Signed-off-by: default avatarAndreas Ruprecht <andreas.ruprecht@fau.de>
Reviewed-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
Tested-by: default avatarUlf Magnusson <ulfalizer@gmail.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent c2264564

scripts/kconfig/zconf.hash.c_shipped

+31 −27
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ kconf_id_hash (register const char *str, register unsigned int len) 
      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,
@@ -96,6 +96,7 @@ struct kconf_id_strings_t 
    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")];
@@ -132,6 +133,7 @@ static const struct kconf_id_strings_t kconf_id_strings_contents = 
    "default",

    "tristate",

    "endchoice",

    "---help---",

    "def_tristate",

    "def_bool",

    "defconfig_list",
@@ -172,7 +174,7 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
{

  enum

    {

      TOTAL_KEYWORDS = 33,

      TOTAL_KEYWORDS = 34,

      MIN_WORD_LENGTH = 2,

      MAX_WORD_LENGTH = 14,

      MIN_HASH_VALUE = 2,
@@ -182,34 +184,36 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
  static const struct kconf_id wordlist[] =

    {

      {-1}, {-1},

#line 25 "scripts/kconfig/zconf.gperf"

#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 36 "scripts/kconfig/zconf.gperf"

#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 26 "scripts/kconfig/zconf.gperf"

#line 27 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},

      {-1},

#line 29 "scripts/kconfig/zconf.gperf"

#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 31 "scripts/kconfig/zconf.gperf"

#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},

      {-1}, {-1},

#line 32 "scripts/kconfig/zconf.gperf"

#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 35 "scripts/kconfig/zconf.gperf"

#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 45 "scripts/kconfig/zconf.gperf"

#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 43 "scripts/kconfig/zconf.gperf"

#line 44 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,		T_ON,		TF_PARAM},

#line 28 "scripts/kconfig/zconf.gperf"

#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 42 "scripts/kconfig/zconf.gperf"

#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},
@@ -219,51 +223,51 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
#line 23 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25,	T_MENUCONFIG,	TF_COMMAND},

      {-1},

#line 44 "scripts/kconfig/zconf.gperf"

#line 45 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},

#line 47 "scripts/kconfig/zconf.gperf"

#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 39 "scripts/kconfig/zconf.gperf"

#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 46 "scripts/kconfig/zconf.gperf"

#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 40 "scripts/kconfig/zconf.gperf"

#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 33 "scripts/kconfig/zconf.gperf"

#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 41 "scripts/kconfig/zconf.gperf"

#line 42 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_VISIBLE,	TF_COMMAND},

#line 37 "scripts/kconfig/zconf.gperf"

#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 34 "scripts/kconfig/zconf.gperf"

#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 38 "scripts/kconfig/zconf.gperf"

#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 30 "scripts/kconfig/zconf.gperf"

#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 27 "scripts/kconfig/zconf.gperf"

#line 28 "scripts/kconfig/zconf.gperf"

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72,	T_DEPENDS,	TF_COMMAND}

    };
@@ -285,5 +289,5 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
    }

  return 0;

}

#line 48 "scripts/kconfig/zconf.gperf"

#line 49 "scripts/kconfig/zconf.gperf"

scripts/kconfig/zconf.lex.c_shipped

+161 −164

File changed.

Preview size limit exceeded, changes collapsed.