X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=c139b8a7bb2c4a27449b13b4dab3ba11e2e68023;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=a38935b398fdc260f207a35550cf2e4c42d0e317;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git
diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index a38935b398..c139b8a7bb 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,27 +1,44 @@
/*
- keyword.hh -- part of GNU LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996,97 Han-Wen Nienhuys
+ Copyright (C) 1996--2014 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
{
- 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;
-};
+ vector table_;
+ Keyword_table (Keyword_ent *);
+ vsize lookup (char const *s) const;
+};
#endif // KEYWORD_HH