2003 -> 2004

[lilypond.git] / lily / include / keyword.hh

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 4b40a979fcfc85a1f0bf986bcca23593721ab05a..06d86a41429d276984028daccf3188d0d660f4b6 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,25 +1,30 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef KEYWORD_HH
 #define KEYWORD_HH
 
+#include "array.hh"
+
 /* for the keyword table */
 struct Keyword_ent
 {
-    char const *name;
-    int     tokcode;
+  char const *name_;
+  int     tokcode_;
 };
 
+/*
+  junkme, use  hash table.
+ */
 struct Keyword_table
 {
-    Keyword_ent *table;
-    int     maxkey;
-    Keyword_table (Keyword_ent *);
-    int     lookup (char const *s) const;
+  Array<Keyword_ent> table_;
+
+  Keyword_table (Keyword_ent *);
+  int     lookup (char const *s) const;
 };