Started objectifying the vocabulary functions (WIP)

svn-id: r41051
This commit is contained in:
Filippos Karapetis 2009-05-30 22:15:00 +00:00
parent 6059f84f6a
commit 76406c35ec
14 changed files with 602 additions and 645 deletions

View file

@ -203,7 +203,7 @@ reg_t kParse(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return s->r_acc;
}
bool res = vocab_tokenize_string(words, string, s->_parserWords, s->_parserSuffixes, &error);
bool res = vocab_tokenize_string(words, string, s->_vocabulary->_parserWords, s->_vocabulary->_parserSuffixes, &error);
s->parser_valid = 0; /* not valid */
if (res && !words.empty()) {
@ -221,7 +221,7 @@ reg_t kParse(EngineState *s, int funct_nr, int argc, reg_t *argv) {
debugC(2, kDebugLevelParser, " Type[%04x] Group[%04x]\n", i->_class, i->_group);
#endif
if (vocab_build_parse_tree(s->parser_nodes, words, s->_parserBranches[0],
if (vocab_build_parse_tree(s->parser_nodes, words, s->_vocabulary->_parserBranches[0],
s->parser_rules))
syntax_fail = 1; /* Building a tree failed */