X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fkeyword.hh;h=707c0b48ed00774198cbbe9f5aebb3112e164a16;hb=b5b00b10f242e4d22e352c8a0d61c384bf205277;hp=152d9dc15d8a178b61fb0dac55ace5ec53df3c57;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 152d9dc15d..707c0b48ed 100644 --- a/lily/include/keyword.hh +++ b/lily/include/keyword.hh @@ -1,25 +1,30 @@ /* - keyword.hh -- part of LilyPond + keyword.hh -- part of GNU LilyPond - (c) 1996,97 Han-Wen Nienhuys + (c) 1996--2003 Han-Wen Nienhuys */ #ifndef KEYWORD_HH #define KEYWORD_HH +#include "array.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; + Array table_; + + Keyword_table (Keyword_ent *); + int lookup (char const *s) const; };