Commit 14f31562 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: update _shipped files for kconfig syntax cleanup 



Update _shipped files so regular user does not
need to have bison/flex/gperf installed.
Code changes were contained in previous commit.

Used following program versions (on fedora):
bison (GNU Bison) 2.3
flex 2.5.33
GNU gperf 3.0.2

Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 247537b9

scripts/kconfig/lex.zconf.c_shipped

+22 −3
Original line number Diff line number Diff line
@@ -5,6 +5,25 @@ 


/* 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
@@ -335,7 +354,7 @@ void zconffree (void * ); 


/* Begin user sect3 */



#define zconfwrap() 1

#define zconfwrap(n) 1

#define YY_SKIP_YYWRAP



typedef unsigned char YY_CHAR;
@@ -1983,7 +2002,7 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) 


/** 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

 * @param str 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

scripts/kconfig/zconf.hash.c_shipped

+106 −114
Original line number Diff line number Diff line 
/* ANSI-C code produced by gperf version 3.0.1 */

/* ANSI-C code produced by gperf version 3.0.2 */

/* Command-line: gperf  */

/* Computed positions: -k'1,3' */
@@ -30,7 +30,7 @@ 
#endif



struct kconf_id;

/* maximum key range = 45, duplicates = 0 */

/* maximum key range = 47, duplicates = 0 */



#ifdef __GNUC__

__inline
@@ -44,32 +44,32 @@ kconf_id_hash (register const char *str, register unsigned int len) 
{

  static unsigned char asso_values[] =

    {

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 25, 30, 15,

       0, 15,  0, 47,  5, 15, 47, 47, 30, 20,

       5,  0, 25, 15,  0,  0, 10, 35, 47, 47,

       5, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,

      47, 47, 47, 47, 47, 47

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 18, 11,  5,

       0,  0,  5, 49,  5, 20, 49, 49,  5, 20,

       5,  0, 30, 49,  0, 15,  0, 10, 49, 49,

      25, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,

      49, 49, 49, 49, 49, 49

    };

  register int hval = len;
@@ -89,74 +89,70 @@ kconf_id_hash (register const char *str, register unsigned int len) 
struct kconf_id_strings_t

  {

    char kconf_id_strings_str2[sizeof("on")];

    char kconf_id_strings_str6[sizeof("string")];

    char kconf_id_strings_str7[sizeof("default")];

    char kconf_id_strings_str8[sizeof("def_bool")];

    char kconf_id_strings_str5[sizeof("endif")];

    char kconf_id_strings_str6[sizeof("option")];

    char kconf_id_strings_str7[sizeof("endmenu")];

    char kconf_id_strings_str8[sizeof("optional")];

    char kconf_id_strings_str9[sizeof("endchoice")];

    char kconf_id_strings_str10[sizeof("range")];

    char kconf_id_strings_str11[sizeof("def_boolean")];

    char kconf_id_strings_str12[sizeof("def_tristate")];

    char kconf_id_strings_str13[sizeof("hex")];

    char kconf_id_strings_str14[sizeof("defconfig_list")];

    char kconf_id_strings_str16[sizeof("option")];

    char kconf_id_strings_str17[sizeof("if")];

    char kconf_id_strings_str18[sizeof("optional")];

    char kconf_id_strings_str20[sizeof("endif")];

    char kconf_id_strings_str21[sizeof("choice")];

    char kconf_id_strings_str22[sizeof("endmenu")];

    char kconf_id_strings_str23[sizeof("requires")];

    char kconf_id_strings_str24[sizeof("endchoice")];

    char kconf_id_strings_str26[sizeof("config")];

    char kconf_id_strings_str11[sizeof("choice")];

    char kconf_id_strings_str12[sizeof("default")];

    char kconf_id_strings_str13[sizeof("def_bool")];

    char kconf_id_strings_str14[sizeof("help")];

    char kconf_id_strings_str15[sizeof("bool")];

    char kconf_id_strings_str16[sizeof("config")];

    char kconf_id_strings_str17[sizeof("def_tristate")];

    char kconf_id_strings_str18[sizeof("boolean")];

    char kconf_id_strings_str19[sizeof("defconfig_list")];

    char kconf_id_strings_str21[sizeof("string")];

    char kconf_id_strings_str22[sizeof("if")];

    char kconf_id_strings_str23[sizeof("int")];

    char kconf_id_strings_str24[sizeof("enable")];

    char kconf_id_strings_str26[sizeof("select")];

    char kconf_id_strings_str27[sizeof("modules")];

    char kconf_id_strings_str28[sizeof("int")];

    char kconf_id_strings_str28[sizeof("tristate")];

    char kconf_id_strings_str29[sizeof("menu")];

    char kconf_id_strings_str31[sizeof("prompt")];

    char kconf_id_strings_str32[sizeof("depends")];

    char kconf_id_strings_str33[sizeof("tristate")];

    char kconf_id_strings_str34[sizeof("bool")];

    char kconf_id_strings_str31[sizeof("source")];

    char kconf_id_strings_str32[sizeof("comment")];

    char kconf_id_strings_str33[sizeof("hex")];

    char kconf_id_strings_str35[sizeof("menuconfig")];

    char kconf_id_strings_str36[sizeof("select")];

    char kconf_id_strings_str37[sizeof("boolean")];

    char kconf_id_strings_str39[sizeof("help")];

    char kconf_id_strings_str41[sizeof("source")];

    char kconf_id_strings_str42[sizeof("comment")];

    char kconf_id_strings_str43[sizeof("mainmenu")];

    char kconf_id_strings_str46[sizeof("enable")];

    char kconf_id_strings_str36[sizeof("prompt")];

    char kconf_id_strings_str37[sizeof("depends")];

    char kconf_id_strings_str48[sizeof("mainmenu")];

  };

static struct kconf_id_strings_t kconf_id_strings_contents =

  {

    "on",

    "string",

    "endif",

    "option",

    "endmenu",

    "optional",

    "endchoice",

    "range",

    "choice",

    "default",

    "def_bool",

    "range",

    "def_boolean",

    "help",

    "bool",

    "config",

    "def_tristate",

    "hex",

    "boolean",

    "defconfig_list",

    "option",

    "string",

    "if",

    "optional",

    "endif",

    "choice",

    "endmenu",

    "requires",

    "endchoice",

    "config",

    "modules",

    "int",

    "menu",

    "prompt",

    "depends",

    "tristate",

    "bool",

    "menuconfig",

    "enable",

    "select",

    "boolean",

    "help",

    "modules",

    "tristate",

    "menu",

    "source",

    "comment",

    "mainmenu",

    "enable"

    "hex",

    "menuconfig",

    "prompt",

    "depends",

    "mainmenu"

  };

#define kconf_id_strings ((const char *) &kconf_id_strings_contents)

#ifdef __GNUC__
@@ -167,58 +163,54 @@ kconf_id_lookup (register const char *str, register unsigned int len) 
{

  enum

    {

      TOTAL_KEYWORDS = 33,

      TOTAL_KEYWORDS = 31,

      MIN_WORD_LENGTH = 2,

      MAX_WORD_LENGTH = 14,

      MIN_HASH_VALUE = 2,

      MAX_HASH_VALUE = 46

      MAX_HASH_VALUE = 48

    };



  static struct kconf_id wordlist[] =

    {

      {-1}, {-1},

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

      {-1}, {-1}, {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_TYPE,		TF_COMMAND, S_STRING},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},

      {-1},

      {-1}, {-1},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_OPTION,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_OPTIONAL,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,		T_TYPE,		TF_COMMAND, S_HEX},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,	T_OPT_DEFCONFIG_LIST,TF_OPTION},

      {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_OPTION,	TF_COMMAND},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,	T_OPTIONAL,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_CHOICE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_HELP,		TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str15,		T_TYPE,		TF_COMMAND, S_BOOLEAN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_CONFIG,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,	T_TYPE,		TF_COMMAND, S_BOOLEAN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19,	T_OPT_DEFCONFIG_LIST,TF_OPTION},

      {-1},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_CHOICE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,	T_ENDMENU,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,	T_REQUIRES,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str24,	T_ENDCHOICE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_TYPE,		TF_COMMAND, S_STRING},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_IF,		TF_COMMAND|TF_PARAM},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_INT},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str24,		T_SELECT,	TF_COMMAND},

      {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_CONFIG,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_SELECT,	TF_COMMAND},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,		T_TYPE,		TF_COMMAND, S_INT},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_TYPE,		TF_COMMAND, S_TRISTATE},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},

      {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_PROMPT,	TF_COMMAND},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,	T_TYPE,		TF_COMMAND, S_TRISTATE},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34,		T_TYPE,		TF_COMMAND, S_BOOLEAN},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,		T_SELECT,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_TYPE,		TF_COMMAND, S_BOOLEAN},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SOURCE,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_TYPE,		TF_COMMAND, S_HEX},

      {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39,		T_HELP,		TF_COMMAND},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36,		T_PROMPT,	TF_COMMAND},

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

      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},

      {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_SOURCE,	TF_COMMAND},

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

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43,	T_MAINMENU,	TF_COMMAND},

      {-1}, {-1},

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,		T_SELECT,	TF_COMMAND}

      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48,	T_MAINMENU,	TF_COMMAND}

    };



  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

scripts/kconfig/zconf.tab.c_shipped

+769 −637

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE