Add missing keywords in ConfigCompiler::GetKeywords

refs #9960

diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 075dfa9321e1cb7ac945c6f05f671bc8b0e4bf98..7827a183d7d37e2741db0dca6c35c631f603e696 100644 (file)
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -169,7 +169,7 @@ object                              return T_OBJECT;
 template                       return T_TEMPLATE;
 include                                return T_INCLUDE;
 include_recursive              return T_INCLUDE_RECURSIVE;
-include_zones          return T_INCLUDE_ZONES;
+include_zones                  return T_INCLUDE_ZONES;
 library                                return T_LIBRARY;
 null                           return T_NULL;
 true                           { yylval->boolean = 1; return T_BOOLEAN; }

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index de91cb88344989a32a3ed511b4a61e2a6e4ea5fa..412801a87d88be256610461940f92d16f0c89efa 100644 (file)
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -323,6 +323,7 @@ const std::vector<String>& ConfigCompiler::GetKeywords(void)
                keywords.push_back("template");
                keywords.push_back("include");
                keywords.push_back("include_recursive");
+               keywords.push_back("include_zones");
                keywords.push_back("library");
                keywords.push_back("null");
                keywords.push_back("true");
@@ -333,6 +334,7 @@ const std::vector<String>& ConfigCompiler::GetKeywords(void)
                keywords.push_back("globals");
                keywords.push_back("locals");
                keywords.push_back("use");
+               keywords.push_back("ignore_on_error");
                keywords.push_back("apply");
                keywords.push_back("to");
                keywords.push_back("where");