X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=0f36fe812b2229bdbf951fdcf3844012b805ea68;hb=dea413b36a5c2ba9b01dcab3fa764fa5ab9f8418;hp=f8f9c75bb32afd8208a7ac6c4a5272efa2ec5aac;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git
diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh
index f8f9c75bb3..0f36fe812b 100644
--- a/lily/include/keyword.hh
+++ b/lily/include/keyword.hh
@@ -1,32 +1,44 @@
/*
- keyword.hh -- part of GNU LilyPond
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1996--2002 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 "array.hh"
+#include "std-vector.hh"
/* for the keyword table */
struct Keyword_ent
{
char const *name_;
- int tokcode_;
+ int tokcode_;
};
/*
junkme, use hash table.
- */
+*/
struct Keyword_table
{
- Array table_;
+ vector table_;
Keyword_table (Keyword_ent *);
- int lookup (char const *s) const;
+ vsize lookup (char const *s) const;
};
-
#endif // KEYWORD_HH