diff options
author | Max Horn | 2009-05-26 11:30:21 +0000 |
---|---|---|
committer | Max Horn | 2009-05-26 11:30:21 +0000 |
commit | 7d5f3e1714dff2f0beed0f10bcce01be8204f377 (patch) | |
tree | 7a361b49a88617531c9b983c3e07fc73069b2207 /engines/sci/engine/grammar.cpp | |
parent | 94dfc8f6386ebf0f4a13094e68eaec289a974347 (diff) | |
download | scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.gz scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.tar.bz2 scummvm-rg350-7d5f3e1714dff2f0beed0f10bcce01be8204f377.zip |
Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
svn-id: r40908
Diffstat (limited to 'engines/sci/engine/grammar.cpp')
-rw-r--r-- | engines/sci/engine/grammar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index 63cd8a9b4a..f7d86a85ca 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -42,7 +42,7 @@ namespace Sci { #define TOKEN_NON_NT (TOKEN_OPAREN | TOKEN_TERMINAL_CLASS | TOKEN_TERMINAL_GROUP | TOKEN_STUFFING_WORD) #define TOKEN_TERMINAL (TOKEN_TERMINAL_CLASS | TOKEN_TERMINAL_GROUP) -int _allocd_rules = 0; +static int _allocd_rules = 0; // FIXME: Avoid static vars static void vocab_print_rule(parse_rule_t *rule) { int i; @@ -420,8 +420,7 @@ int vocab_build_parse_tree(parse_tree_node_t *nodes, const ResultWordList &words return vocab_gnf_parse(nodes, words, branch0, rules, 0); } -static int -_vbpt_pareno(parse_tree_node_t *nodes, int *pos, int base) { +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; |