X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=0f36fe812b2229bdbf951fdcf3844012b805ea68;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=152d9dc15d8a178b61fb0dac55ace5ec53df3c57;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git
diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index 152d9dc15d..0f36fe812b 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,27 +1,44 @@
/*
- keyword.hh -- part of LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996,97 Han-Wen Nienhuys
+ Copyright (C) 1996--2015 Han-Wen Nienhuys
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see .
*/
#ifndef KEYWORD_HH
#define KEYWORD_HH
+#include "std-vector.hh"
+
/* for the keyword table */
struct Keyword_ent
{
- const char *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(const char *s) const;
-};
+ vector table_;
+ Keyword_table (Keyword_ent *);
+ vsize lookup (char const *s) const;
+};
#endif // KEYWORD_HH