Update LinuxKernelConf version to 1.4.

1 files changed, 15 insertions, 8 deletions

diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 1471630..55517b2 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -96,6 +96,7 @@ n	[A-Za-z0-9_]
                 "endchoice"     BEGIN(PARAM); return T_ENDCHOICE;
                 "comment"       BEGIN(PARAM); return T_COMMENT;
                 "config"        BEGIN(PARAM); return T_CONFIG;
+                "menuconfig"    BEGIN(PARAM); return T_MENUCONFIG;
                 "help"          BEGIN(PARAM); return T_HELP;
                 "if"            BEGIN(PARAM); return T_IF;
                 "endif"                 BEGIN(PARAM); return T_ENDIF;
@@ -105,11 +106,17 @@ n	[A-Za-z0-9_]
                 "default"       BEGIN(PARAM); return T_DEFAULT;
                 "prompt"        BEGIN(PARAM); return T_PROMPT;
                 "tristate"      BEGIN(PARAM); return T_TRISTATE;
+                "def_tristate"  BEGIN(PARAM); return T_DEF_TRISTATE;
                 "bool"          BEGIN(PARAM); return T_BOOLEAN;
                 "boolean"       BEGIN(PARAM); return T_BOOLEAN;
+                "def_bool"      BEGIN(PARAM); return T_DEF_BOOLEAN;
+                "def_boolean"   BEGIN(PARAM); return T_DEF_BOOLEAN;
                 "int"           BEGIN(PARAM); return T_INT;
                 "hex"           BEGIN(PARAM); return T_HEX;
                 "string"        BEGIN(PARAM); return T_STRING;
+                "select"        BEGIN(PARAM); return T_SELECT;
+                "enable"        BEGIN(PARAM); return T_SELECT;
+                "range"                 BEGIN(PARAM); return T_RANGE;
                 {n}+{
                 alloc_string(yytext, yyleng);
                 zconflval.string = text;
@@ -141,6 +148,7 @@ n	[A-Za-z0-9_]
                 zconflval.string = text;
                 return T_WORD;
         }
+                #.*/* comment */
                 \\\ncurrent_file->lineno++;
         .
         <<EOF>> {
@@ -152,7 +160,7 @@ n	[A-Za-z0-9_]
                 [^'"\\\n]+/\n{
                 append_string(yytext, yyleng);
                 zconflval.string = text;
-                return T_STRING;
+                return T_WORD_QUOTE;
         }
                 [^'"\\\n]+{
                 append_string(yytext, yyleng);
@@ -160,7 +168,7 @@ n	[A-Za-z0-9_]
                 \\.?/\n{
                 append_string(yytext + 1, yyleng - 1);
                 zconflval.string = text;
-                return T_STRING;
+                return T_WORD_QUOTE;
         }
                 \\.?{
                 append_string(yytext + 1, yyleng - 1);
@@ -169,7 +177,7 @@ n	[A-Za-z0-9_]
                 if (str == yytext[0]) {
                         BEGIN(PARAM);
                         zconflval.string = text;
-                        return T_STRING;
+                        return T_WORD_QUOTE;
                 } else
                         append_string(yytext, 1);
         }
@@ -206,9 +214,8 @@ n	[A-Za-z0-9_]
                         }
                         append_string("        ", ts);
                 }
-                
         }
-        \n/[^ \t\n] {
+        [ \t]*\n/[^ \t\n] {
                 current_file->lineno++;
                 zconf_endhelp();
                 return T_HELPTEXT;
@@ -248,11 +255,11 @@ void zconf_starthelp(void)
 static void zconf_endhelp(void)
 {
         zconflval.string = text;
-        BEGIN(INITIAL); 
+        BEGIN(INITIAL);
 }
 
 
-/* 
+/*
  * Try to open specified file with following names:
  * ./name
  * $(srctree)/name
@@ -345,7 +352,7 @@ static struct buffer *zconf_endfile(void)
 int zconf_lineno(void)
 {
         if (current_buf)
-                return current_file->lineno;
+                return current_file->lineno - 1;
         else
                 return 0;
 }