release: 1.5.2

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

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index c2c6338a0a75b0d45666a4b1f13c4548a46592dd..8518f958da7148b42620acf49b5a608bb9f91b7d 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -7,11 +7,13 @@
 #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;
 };