2003 -> 2004

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

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 6edecf9c52ebecb8618da67d37ad7b983086cdad..06d86a41429d276984028daccf3188d0d660f4b6 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,17 +1,19 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 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_;
 };
 
 /*
@@ -19,8 +21,8 @@ struct Keyword_ent
  */
 struct Keyword_table
 {
-  Keyword_ent *table;
-  int     maxkey;
+  Array<Keyword_ent> table_;
+
   Keyword_table (Keyword_ent *);
   int     lookup (char const *s) const;
 };