Run `make grand-replace'.

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

diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 2db22765e0a197ea4016fe4813f8f62a1b747df6..628ac1f59593091fe31183bba4a73cb160155891 100644 (file)
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,27 +1,31 @@
 /*
   keyword.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef KEYWORD_HH
 #define KEYWORD_HH
 
+#include "std-vector.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;
+  vector<Keyword_ent> table_;
+
   Keyword_table (Keyword_ent *);
-  int     lookup (char const *s) const;
+  vsize lookup (char const *s) const;
 };
 
-
 #endif // KEYWORD_HH