summaryrefslogtreecommitdiff
path: root/scripts/kconfig/zconf.l
authorkergoth <kergoth>2003-06-17 17:03:49 (UTC)
committer kergoth <kergoth>2003-06-17 17:03:49 (UTC)
commit16e53b2a2e94742f3b55ee73700bb264e36638d4 (patch) (side-by-side diff)
tree4f2b65a635d25c1ce0cfeea7953623c2bf7d9534 /scripts/kconfig/zconf.l
parent384b7f1a42f9f2f101dc8fe11c3625055d96f672 (diff)
downloadopie-16e53b2a2e94742f3b55ee73700bb264e36638d4.zip
opie-16e53b2a2e94742f3b55ee73700bb264e36638d4.tar.gz
opie-16e53b2a2e94742f3b55ee73700bb264e36638d4.tar.bz2
Update LinuxKernelConf version to 1.4.
Diffstat (limited to 'scripts/kconfig/zconf.l') (more/less context) (show whitespace changes)
-rw-r--r--scripts/kconfig/zconf.l19
1 files changed, 13 insertions, 6 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
@@ -98,2 +98,3 @@ n [A-Za-z0-9_]
"config" BEGIN(PARAM); return T_CONFIG;
+ "menuconfig" BEGIN(PARAM); return T_MENUCONFIG;
"help" BEGIN(PARAM); return T_HELP;
@@ -107,4 +108,7 @@ n [A-Za-z0-9_]
"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;
@@ -112,2 +116,5 @@ n [A-Za-z0-9_]
"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}+ {
@@ -143,2 +150,3 @@ n [A-Za-z0-9_]
}
+ #.* /* comment */
\\\n current_file->lineno++;
@@ -154,3 +162,3 @@ n [A-Za-z0-9_]
zconflval.string = text;
- return T_STRING;
+ return T_WORD_QUOTE;
}
@@ -162,3 +170,3 @@ n [A-Za-z0-9_]
zconflval.string = text;
- return T_STRING;
+ return T_WORD_QUOTE;
}
@@ -171,3 +179,3 @@ n [A-Za-z0-9_]
zconflval.string = text;
- return T_STRING;
+ return T_WORD_QUOTE;
} else
@@ -208,5 +216,4 @@ n [A-Za-z0-9_]
}
-
}
- \n/[^ \t\n] {
+ [ \t]*\n/[^ \t\n] {
current_file->lineno++;
@@ -347,3 +354,3 @@ int zconf_lineno(void)
if (current_buf)
- return current_file->lineno;
+ return current_file->lineno - 1;
else