X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=26cc606b891999c3d1f49be4a4bdda81358e28e3;hb=b0a0b0da364a2379e3a26a0cd6af87fece1594fb;hp=707c0b48ed00774198cbbe9f5aebb3112e164a16;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 707c0b48ed..26cc606b89 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--2003 Han-Wen Nienhuys + Copyright (C) 1996--2012 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