--- deliantra/server/include/preprocess	2006/08/31 09:19:34	1.2
+++ deliantra/server/include/preprocess	2006/08/31 17:54:14	1.3
@@ -1,5 +1,7 @@
 #!/opt/bin/perl
 
+use List::Util;
+
 # todo: gather dynamically
 my @kw = qw(
    ac
@@ -253,12 +255,12 @@
 EOF
 
 for (@kw) {
-   printf GPERF "%s,%s\n", $_, "KW_" . uc;
+   printf GPERF "%s,%s\n", $_, "KW_$_";
 }
 
 print GPERF <<EOF;
 %%
-const char *const keyword_str [] = {
+extern const char *const keyword_str [] = {
   "<EOF>",
   "<ERROR>",
 EOF
@@ -267,7 +269,10 @@
    printf GPERF "  \"%s\",\n", $_;
 }
 
-print GPERF "};\n\n";
+print GPERF "};\n";
+
+printf GPERF "\nextern const unsigned char keyword_len [] = { 5, 7, %s };\n\n",
+       join ", ", map length, @kw;
 
 open KW, ">", "keyword.h";
 
@@ -276,11 +281,11 @@
 #define KW_H__
 
 enum keyword {
-  KW_eof, KW_error,
+  KW_EOF, KW_ERROR,
 EOF
 
 for (@kw) {
-   printf KW "  %s,\n", "KW_" . uc;
+   printf KW "  %s,\n", "KW_$_",
 }
 
 print KW <<EOF;
@@ -288,6 +293,13 @@
 };
 
 extern const char *const keyword_str [];
+extern const unsigned char keyword_len [];
+
+EOF
+
+printf KW "#define MAX_KEYWORD_LEN %d\n", List::Util::max map length, @kw;
+
+print KW <<EOF;
 
 #endif