diff options
Diffstat (limited to 'engines/sci/engine/grammar.cpp')
| -rw-r--r-- | engines/sci/engine/grammar.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index 2c035fcb53..275a31a0d4 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -414,7 +414,7 @@ parse_rule_list_t *Vocabulary::buildGNF(bool verbose) { static int _vbpt_pareno(parse_tree_node_t *nodes, int *pos, int base) { // Opens parentheses nodes[base].content.branches[0] = (*pos) + 1; - nodes[++(*pos)].type = PARSE_TREE_NODE_BRANCH; + nodes[++(*pos)].type = kParseTreeBranchNode; nodes[*pos].content.branches[0] = 0; nodes[*pos].content.branches[1] = 0; return *pos; @@ -423,7 +423,7 @@ static int _vbpt_pareno(parse_tree_node_t *nodes, int *pos, int base) { static int _vbpt_parenc(parse_tree_node_t *nodes, int *pos, int paren) { // Closes parentheses for appending nodes[paren].content.branches[1] = ++(*pos); - nodes[*pos].type = PARSE_TREE_NODE_BRANCH; + nodes[*pos].type = kParseTreeBranchNode; nodes[*pos].content.branches[0] = 0; nodes[*pos].content.branches[1] = 0; return *pos; @@ -432,10 +432,10 @@ static int _vbpt_parenc(parse_tree_node_t *nodes, int *pos, int paren) { static int _vbpt_append(parse_tree_node_t *nodes, int *pos, int base, int value) { // writes one value to an existing base node and creates a successor node for writing nodes[base].content.branches[0] = ++(*pos); - nodes[*pos].type = PARSE_TREE_NODE_LEAF; + nodes[*pos].type = kParseTreeLeafNode; nodes[*pos].content.value = value; nodes[base].content.branches[1] = ++(*pos); - nodes[*pos].type = PARSE_TREE_NODE_BRANCH; + nodes[*pos].type = kParseTreeBranchNode; nodes[*pos].content.branches[0] = 0; nodes[*pos].content.branches[1] = 0; return *pos; @@ -443,7 +443,7 @@ static int _vbpt_append(parse_tree_node_t *nodes, int *pos, int base, int value) static int _vbpt_terminate(parse_tree_node_t *nodes, int *pos, int base, int value) { // Terminates, overwriting a nextwrite forknode - nodes[base].type = PARSE_TREE_NODE_LEAF; + nodes[base].type = kParseTreeLeafNode; nodes[base].content.value = value; return *pos; } @@ -554,14 +554,14 @@ int Vocabulary::parseGNF(parse_tree_node_t *nodes, const ResultWordList &words, { int temp, pos; - nodes[0].type = PARSE_TREE_NODE_BRANCH; + nodes[0].type = kParseTreeBranchNode; nodes[0].content.branches[0] = 1; nodes[0].content.branches[1] = 2; - nodes[1].type = PARSE_TREE_NODE_LEAF; + nodes[1].type = kParseTreeLeafNode; nodes[1].content.value = 0x141; - nodes[2].type = PARSE_TREE_NODE_BRANCH; + nodes[2].type = kParseTreeBranchNode; nodes[2].content.branches[0] = 0; nodes[2].content.branches[1] = 0; |