diff --git a/src/Makefile.am b/src/Makefile.am index 01fb4ecb..0def545b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -271,7 +271,6 @@ libmodsecurity_la_SOURCES = \ rules.cc \ debug_log/debug_log.cc \ debug_log/debug_log_writer.cc \ - macro_expansion.cc \ run_time_string.cc \ rule.cc \ rule_message.cc \ diff --git a/src/actions/accuracy.cc b/src/actions/accuracy.cc index 1d5b6e55..c94ef39f 100644 --- a/src/actions/accuracy.cc +++ b/src/actions/accuracy.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/disruptive/redirect.cc b/src/actions/disruptive/redirect.cc index b8907f5f..64013027 100644 --- a/src/actions/disruptive/redirect.cc +++ b/src/actions/disruptive/redirect.cc @@ -21,7 +21,6 @@ #include #include "modsecurity/transaction.h" -#include "src/macro_expansion.h" #include "src/utils/string.h" namespace modsecurity { diff --git a/src/actions/exec.cc b/src/actions/exec.cc index c7dae9ba..9b3481ed 100644 --- a/src/actions/exec.cc +++ b/src/actions/exec.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" #include "src/utils/system.h" #include "src/engine/lua.h" diff --git a/src/actions/init_col.cc b/src/actions/init_col.cc index 0b153574..7669259f 100644 --- a/src/actions/init_col.cc +++ b/src/actions/init_col.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/log_data.cc b/src/actions/log_data.cc index b8088f5c..0ab5ced9 100644 --- a/src/actions/log_data.cc +++ b/src/actions/log_data.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "src/macro_expansion.h" #include "modsecurity/rule.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/maturity.cc b/src/actions/maturity.cc index 08d41e42..55c308df 100644 --- a/src/actions/maturity.cc +++ b/src/actions/maturity.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/msg.cc b/src/actions/msg.cc index a4e2a8fe..9ef2eb94 100644 --- a/src/actions/msg.cc +++ b/src/actions/msg.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "src/macro_expansion.h" #include "modsecurity/rule.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/rev.cc b/src/actions/rev.cc index f48eea3a..b489abf4 100644 --- a/src/actions/rev.cc +++ b/src/actions/rev.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/set_rsc.cc b/src/actions/set_rsc.cc index a12e5a42..a53fe01a 100644 --- a/src/actions/set_rsc.cc +++ b/src/actions/set_rsc.cc @@ -20,7 +20,6 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/set_sid.cc b/src/actions/set_sid.cc index bbf072dc..9165426c 100644 --- a/src/actions/set_sid.cc +++ b/src/actions/set_sid.cc @@ -20,7 +20,6 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/set_uid.cc b/src/actions/set_uid.cc index 8948f68c..8d978e58 100644 --- a/src/actions/set_uid.cc +++ b/src/actions/set_uid.cc @@ -20,7 +20,6 @@ #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" namespace modsecurity { diff --git a/src/actions/set_var.cc b/src/actions/set_var.cc index 767a315d..ee256807 100644 --- a/src/actions/set_var.cc +++ b/src/actions/set_var.cc @@ -22,7 +22,6 @@ #include "modsecurity/transaction.h" #include "modsecurity/rules.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" #include "src/utils/string.h" #include "src/variables/global.h" #include "src/variables/ip.h" @@ -80,7 +79,6 @@ bool SetVar::evaluate(Rule *rule, Transaction *t) { } else if (m_operation == setToOneOperation) { targetValue = std::string("1"); } else if (m_operation == unsetOperation) { - //m_variable t->m_collections.del(m_variable->m_collectionName + ":" + m_variableNameExpanded); goto end; diff --git a/src/actions/tag.cc b/src/actions/tag.cc index 419635d0..6f3f0663 100644 --- a/src/actions/tag.cc +++ b/src/actions/tag.cc @@ -21,7 +21,6 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" -#include "src/macro_expansion.h" #include "modsecurity/rule.h" #include "modsecurity/rule_message.h" diff --git a/src/actions/ver.cc b/src/actions/ver.cc index d52f4640..1f46cb15 100644 --- a/src/actions/ver.cc +++ b/src/actions/ver.cc @@ -21,7 +21,7 @@ #include "modsecurity/actions/action.h" #include "modsecurity/transaction.h" #include "modsecurity/rule.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace actions { diff --git a/src/engine/lua.cc b/src/engine/lua.cc index 3a16df36..b0318bfe 100644 --- a/src/engine/lua.cc +++ b/src/engine/lua.cc @@ -28,7 +28,6 @@ #include "modsecurity/modsecurity.h" #include "src/utils/string.h" -#include "src/macro_expansion.h" #include "modsecurity/transaction.h" #include "modsecurity/collection/variable.h" #include "src/variables/variable.h" diff --git a/src/macro_expansion.cc b/src/macro_expansion.cc deleted file mode 100644 index b0fdc097..00000000 --- a/src/macro_expansion.cc +++ /dev/null @@ -1,343 +0,0 @@ -/* - * ModSecurity, http://www.modsecurity.org/ - * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/) - * - * You may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address security@modsecurity.org. - * - */ - - -#include - -#include "src/macro_expansion.h" -#include "modsecurity/transaction.h" -#include "modsecurity/collection/variable.h" -#include "src/variables/rule.h" -#include "src/variables/tx.h" -#include "src/variables/highest_severity.h" -#include "src/utils/string.h" - - -namespace modsecurity { - -MacroExpansion::MacroExpansion() { } - - -std::string MacroExpansion::expandKeepOriginal(const std::string& input, - Transaction *transaction) { - std::string a = MacroExpansion::expand(input, transaction); - - if (a != input) { - return "\"" + a + "\" (Was: " + input + ")"; - } - - return input; -} - - -std::string MacroExpansion::expand(const std::string& input, - Transaction *transaction) { - return expand(input, NULL, transaction); -} - - -bool MacroExpansion::containsMacro(std::string& input) { - size_t pos = input.find("%{"); - size_t end = input.find("}"); - - if (pos == std::string::npos || end == std::string::npos) { - return false; - } - - return true; -} - - -std::string MacroExpansion::expand(const std::string& input, - modsecurity::Rule *rule, Transaction *transaction) { - std::string res; - size_t pos = input.find("%{"); - - if (pos != std::string::npos) { - res = input; - } else { - return input; - } - - while (pos != std::string::npos) { - size_t start = pos; - size_t end = res.find("}"); - size_t new_pos = start; - if (end == std::string::npos) { - return res; - } - std::string variable(res, start + 2, end - (start + 2)); - std::unique_ptr variableValue = nullptr; - size_t collection = variable.find("."); - if (collection == std::string::npos) { - collection = variable.find(":"); - } - if (collection == std::string::npos) { - if (compareStrNoCase(variable, "RESPONSE_CONTENT_TYPE")) { - variableValue = transaction->m_variableResponseContentType.resolveFirst(); - } - else if (compareStrNoCase(variable, "ARGS_COMBINED_SIZE")) { - variableValue = transaction->m_variableARGScombinedSize.resolveFirst(); - } - else if (compareStrNoCase(variable, "AUTH_TYPE")) { - variableValue = transaction->m_variableAuthType.resolveFirst(); - } - else if (compareStrNoCase(variable, "FILES_COMBINED_SIZE")) { - variableValue = transaction->m_variableFilesCombinedSize.resolveFirst(); - } - else if (compareStrNoCase(variable, "FULL_REQUEST")) { - variableValue = transaction->m_variableFullRequest.resolveFirst(); - } - else if (compareStrNoCase(variable, "FULL_REQUEST_LENGTH")) { - variableValue = transaction->m_variableFullRequestLength.resolveFirst(); - } - else if (compareStrNoCase(variable, "INBOUND_DATA_ERROR")) { - variableValue = transaction->m_variableInboundDataError.resolveFirst(); - } - else if (compareStrNoCase(variable, "MATCHED_VAR")) { - variableValue = transaction->m_variableMatchedVar.resolveFirst(); - } - else if (compareStrNoCase(variable, "MATCHED_VAR_NAME")) { - variableValue = transaction->m_variableMatchedVarName.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_CRLF_LF_LINES")) { - variableValue = transaction->m_variableMultipartCrlfLFLines.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_DATA_AFTER")) { - variableValue = transaction->m_variableMultipartDataAfter.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_FILE_LIMIT_EXCEEDED")) { - variableValue = transaction->m_variableMultipartFileLimitExceeded.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_STRICT_ERROR")) { - variableValue = transaction->m_variableMultipartStrictError.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_HEADER_FOLDING")) { - variableValue = transaction->m_variableMultipartHeaderFolding.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_INVALID_QUOTING")) { - variableValue = transaction->m_variableMultipartInvalidQuoting.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_INVALID_HEADER_FOLDING")) { - variableValue = transaction->m_variableMultipartInvalidHeaderFolding.resolveFirst(); - } - else if (compareStrNoCase(variable, "MULTIPART_UNMATCHED_BOUNDARY")) { - variableValue = transaction->m_variableMultipartUnmatchedBoundary.resolveFirst(); - } - else if (compareStrNoCase(variable, "OUTBOUND_DATA_ERROR")) { - variableValue = transaction->m_variableOutboundDataError.resolveFirst(); - } - else if (compareStrNoCase(variable, "PATH_INFO")) { - variableValue = transaction->m_variablePathInfo.resolveFirst(); - } - else if (compareStrNoCase(variable, "QUERY_STRING")) { - variableValue = transaction->m_variableQueryString.resolveFirst(); - } - else if (compareStrNoCase(variable, "REMOTE_ADDR")) { - variableValue = transaction->m_variableRemoteAddr.resolveFirst(); - } - else if (compareStrNoCase(variable, "REMOTE_HOST")) { - variableValue = transaction->m_variableRemoteHost.resolveFirst(); - } - else if (compareStrNoCase(variable, "REMOTE_PORT")) { - variableValue = transaction->m_variableRemotePort.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQBODY_ERROR")) { - variableValue = transaction->m_variableReqbodyError.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQBODY_ERROR_MSG")) { - variableValue = transaction->m_variableReqbodyErrorMsg.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQBODY_PROCESSOR_ERROR_MSG")) { - variableValue = transaction->m_variableReqbodyProcessorErrorMsg.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQBODY_PROCESSOR_ERROR")) { - variableValue = transaction->m_variableReqbodyProcessorError.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQBODY_PROCESSOR")) { - variableValue = transaction->m_variableReqbodyProcessor.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_BASENAME")) { - variableValue = transaction->m_variableRequestBasename.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_BODY")) { - variableValue = transaction->m_variableRequestBody.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_BODY_LENGTH")) { - variableValue = transaction->m_variableRequestBodyLength.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_FILENAME")) { - variableValue = transaction->m_variableRequestFilename.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_LINE")) { - variableValue = transaction->m_variableRequestLine.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_METHOD")) { - variableValue = transaction->m_variableRequestMethod.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_PROTOCOL")) { - variableValue = transaction->m_variableRequestProtocol.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_URI")) { - variableValue = transaction->m_variableRequestURI.resolveFirst(); - } - else if (compareStrNoCase(variable, "REQUEST_URI_RAW")) { - variableValue = transaction->m_variableRequestURIRaw.resolveFirst(); - } - else if (compareStrNoCase(variable, "RESOURCE")) { - variableValue = transaction->m_variableResource.resolveFirst(); - } - else if (compareStrNoCase(variable, "RESPONSE_BODY")) { - variableValue = transaction->m_variableResponseBody.resolveFirst(); - } - else if (compareStrNoCase(variable, "RESPONSE_CONTENT_LENGTH")) { - variableValue = transaction->m_variableResponseContentLength.resolveFirst(); - } - else if (compareStrNoCase(variable, "RESPONSE_PROTOCOL")) { - variableValue = transaction->m_variableResponseProtocol.resolveFirst(); - } - else if (compareStrNoCase(variable, "RESPONSE_STATUS")) { - variableValue = transaction->m_variableResponseStatus.resolveFirst(); - } - else if (compareStrNoCase(variable, "SERVER_ADDR")) { - variableValue = transaction->m_variableServerAddr.resolveFirst(); - } - else if (compareStrNoCase(variable, "SERVER_NAME")) { - variableValue = transaction->m_variableServerName.resolveFirst(); - } - else if (compareStrNoCase(variable, "SERVER_PORT")) { - variableValue = transaction->m_variableServerPort.resolveFirst(); - } - else if (compareStrNoCase(variable, "SESSIONID")) { - variableValue = transaction->m_variableSessionID.resolveFirst(); - } - else if (compareStrNoCase(variable, "UNIQUE_ID")) { - variableValue = transaction->m_variableUniqueID.resolveFirst(); - } - else if (compareStrNoCase(variable, "URLENCODED_ERROR")) { - variableValue = transaction->m_variableUrlEncodedError.resolveFirst(); - } - else if (compareStrNoCase(variable, "USERID")) { - variableValue = transaction->m_variableUserID.resolveFirst(); - } else { - variableValue = transaction->m_collections.resolveFirst( - variable); - } - } else { - std::string col = std::string(variable, 0, collection); - std::string var = std::string(variable, collection + 1, - variable.length() - (collection + 1)); - if (compareStrNoCase(col, "ARGS")) { - variableValue = transaction->m_variableArgs.resolveFirst(var); - } - else if (compareStrNoCase(variable, "ARGS_NAMES")) { - variableValue = transaction->m_variableArgsNames.resolveFirst(var); - } - else if (compareStrNoCase(variable, "ARGS_GET_NAMES")) { - variableValue = transaction->m_variableArgsGetNames.resolveFirst(var); - } - else if (compareStrNoCase(variable, "ARGS_POST_NAMES")) { - variableValue = transaction->m_variableArgsPostNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "RULE")) { - variableValue = transaction->m_variableRule.resolveFirst(var); - } - else if (compareStrNoCase(col, "ARGS_GET")) { - variableValue = transaction->m_variableArgsGet.resolveFirst(var); - } - else if (compareStrNoCase(col, "ARGS_POST")) { - variableValue = transaction->m_variableArgsPost.resolveFirst(var); - } - else if (compareStrNoCase(col, "FILES_SIZES")) { - variableValue = transaction->m_variableFilesSizes.resolveFirst(var); - } - else if (compareStrNoCase(col, "FILES_NAMES")) { - variableValue = transaction->m_variableFilesNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "FILES_TMP_CONTENT")) { - variableValue = transaction->m_variableFilesTmpContent.resolveFirst(var); - } - else if (compareStrNoCase(col, "MULTIPART_FILENAME")) { - variableValue = transaction->m_variableMultipartFileName.resolveFirst(var); - } - else if (compareStrNoCase(col, "MULTIPART_NAME")) { - variableValue = transaction->m_variableMultipartName.resolveFirst(var); - } - else if (compareStrNoCase(col, "MATCHED_VARS_NAMES")) { - variableValue = transaction->m_variableMatchedVarsNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "MATCHED_VARS")) { - variableValue = transaction->m_variableMatchedVars.resolveFirst(var); - } - else if (compareStrNoCase(col, "FILES")) { - variableValue = transaction->m_variableFiles.resolveFirst(var); - } - else if (compareStrNoCase(col, "REQUEST_COOKIES")) { - variableValue = transaction->m_variableRequestCookies.resolveFirst(var); - } - else if (compareStrNoCase(col, "REQUEST_HEADERS")) { - variableValue = transaction->m_variableRequestHeaders.resolveFirst(var); - } - else if (compareStrNoCase(variable, "REQUEST_HEADERS_NAMES")) { - variableValue = transaction->m_variableRequestHeadersNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "RESPONSE_HEADERS")) { - variableValue = transaction->m_variableResponseHeaders.resolveFirst(var); - } - else if (compareStrNoCase(variable, "RESPONSE_HEADERS_NAMES")) { - variableValue = transaction->m_variableResponseHeadersNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "GEO")) { - variableValue = transaction->m_variableGeo.resolveFirst(var); - } - else if (compareStrNoCase(col, "REQUEST_COOKIES_NAMES")) { - variableValue = transaction->m_variableRequestCookiesNames.resolveFirst(var); - } - else if (compareStrNoCase(col, "FILES_TMPNAMES")) { - variableValue = transaction->m_variableFilesTmpNames.resolveFirst(var); - } else { - variableValue = transaction->m_collections.resolveFirst(col, - var); - } - } - -#ifndef NO_LOGS - if (variableValue) { - transaction->debug(6, "Resolving: " + variable + " to: " + - *variableValue); - } else { - transaction->debug(6, "Resolving: " + variable + " to: NULL"); - } -#endif - res.erase(start, end - start + 1); - if (res[start] == '%') { - res.erase(start, 1); - } - - if (variableValue != NULL) { - res.insert(start, *variableValue); - new_pos = new_pos + (*variableValue).length(); - } - if (new_pos + 3 >= res.length()) { - break; - } - - pos = res.find("%{", new_pos); - } - - return res; -} - -} // namespace modsecurity diff --git a/src/macro_expansion.h b/src/macro_expansion.h deleted file mode 100644 index 30e90251..00000000 --- a/src/macro_expansion.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * ModSecurity, http://www.modsecurity.org/ - * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/) - * - * You may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * If any of the files related to licensing are missing or if you have any - * other questions related to licensing please contact Trustwave Holdings, Inc. - * directly using the email address security@modsecurity.org. - * - */ - - -#include -#include -#include -#include - -#include "modsecurity/modsecurity.h" -#include "modsecurity/transaction.h" - -#ifndef SRC_MACRO_EXPANSION_H_ -#define SRC_MACRO_EXPANSION_H_ - -namespace modsecurity { - - -class MacroExpansion { - public: - MacroExpansion(); - - static std::string expand(const std::string& input, - Transaction *transaction); - static std::string expand(const std::string& input, - modsecurity::Rule *r, Transaction *transaction); - static std::string expandKeepOriginal(const std::string& input, - Transaction *transaction); - - static inline bool compareStrNoCase(const std::string &a, - const std::string &b) { - return a.size() == b.size() - && std::equal(a.begin(), a.end(), b.begin(), - [](char aa, char bb) { - return toupper(aa) == bb; - }); - } - - static bool containsMacro(std::string& input); -}; - - -} // namespace modsecurity - - - -#endif // SRC_MACRO_EXPANSION_H_ diff --git a/src/operators/begins_with.cc b/src/operators/begins_with.cc index ae1204fe..c6d38ed6 100644 --- a/src/operators/begins_with.cc +++ b/src/operators/begins_with.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/contains.cc b/src/operators/contains.cc index e48288a3..e02d682e 100644 --- a/src/operators/contains.cc +++ b/src/operators/contains.cc @@ -17,7 +17,6 @@ #include -#include "src/macro_expansion.h" namespace modsecurity { namespace operators { diff --git a/src/operators/contains_word.cc b/src/operators/contains_word.cc index 81d5a1df..5b548739 100644 --- a/src/operators/contains_word.cc +++ b/src/operators/contains_word.cc @@ -18,7 +18,6 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" #include "modsecurity/rule_message.h" namespace modsecurity { diff --git a/src/operators/detect_xss.cc b/src/operators/detect_xss.cc index d3fae0a1..5b895823 100644 --- a/src/operators/detect_xss.cc +++ b/src/operators/detect_xss.cc @@ -19,7 +19,7 @@ #include "src/operators/operator.h" #include "others/libinjection/src/libinjection.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/ends_with.cc b/src/operators/ends_with.cc index ecad946e..f1f20247 100644 --- a/src/operators/ends_with.cc +++ b/src/operators/ends_with.cc @@ -18,7 +18,6 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" namespace modsecurity { namespace operators { diff --git a/src/operators/eq.cc b/src/operators/eq.cc index eafc2fb9..a4858650 100644 --- a/src/operators/eq.cc +++ b/src/operators/eq.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/fuzzy_hash.cc b/src/operators/fuzzy_hash.cc index 422714af..4b7144ea 100644 --- a/src/operators/fuzzy_hash.cc +++ b/src/operators/fuzzy_hash.cc @@ -18,7 +18,6 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" #include "src/utils/system.h" namespace modsecurity { diff --git a/src/operators/ge.cc b/src/operators/ge.cc index 80e0d130..f1c3def7 100644 --- a/src/operators/ge.cc +++ b/src/operators/ge.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/gt.cc b/src/operators/gt.cc index b662c016..9f45f3c1 100644 --- a/src/operators/gt.cc +++ b/src/operators/gt.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/le.cc b/src/operators/le.cc index 3849c2f2..ac944d3e 100644 --- a/src/operators/le.cc +++ b/src/operators/le.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/lt.cc b/src/operators/lt.cc index 7c802f6e..104c7c72 100644 --- a/src/operators/lt.cc +++ b/src/operators/lt.cc @@ -18,7 +18,6 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" namespace modsecurity { namespace operators { diff --git a/src/operators/rx.cc b/src/operators/rx.cc index d653fb2c..dcaa0a90 100644 --- a/src/operators/rx.cc +++ b/src/operators/rx.cc @@ -20,7 +20,6 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" #include "modsecurity/rule.h" #include "modsecurity/rule_message.h" diff --git a/src/operators/str_eq.cc b/src/operators/str_eq.cc index e7d181d7..a280630f 100644 --- a/src/operators/str_eq.cc +++ b/src/operators/str_eq.cc @@ -16,7 +16,6 @@ #include "src/operators/str_eq.h" #include -#include "src/macro_expansion.h" namespace modsecurity { namespace operators { diff --git a/src/operators/str_match.cc b/src/operators/str_match.cc index 284a7c35..7753b9b4 100644 --- a/src/operators/str_match.cc +++ b/src/operators/str_match.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/operators/within.cc b/src/operators/within.cc index de73fb89..507bb769 100644 --- a/src/operators/within.cc +++ b/src/operators/within.cc @@ -18,7 +18,7 @@ #include #include "src/operators/operator.h" -#include "src/macro_expansion.h" + namespace modsecurity { namespace operators { diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc index f98fbe10..2d5e562e 100644 --- a/src/parser/seclang-parser.cc +++ b/src/parser/seclang-parser.cc @@ -415,38 +415,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.move< std::string > (that.value); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.move< std::unique_ptr > (that.value); break; - case 324: // run_time_string + case 323: // run_time_string value.move< std::unique_ptr > (that.value); break; - case 321: // var + case 320: // var value.move< std::unique_ptr > (that.value); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.move< std::unique_ptr > (that.value); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.move< std::unique_ptr > > > (that.value); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.move< std::unique_ptr > > > (that.value); break; @@ -629,38 +628,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.copy< std::string > (that.value); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.copy< std::unique_ptr > (that.value); break; - case 324: // run_time_string + case 323: // run_time_string value.copy< std::unique_ptr > (that.value); break; - case 321: // var + case 320: // var value.copy< std::unique_ptr > (that.value); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.copy< std::unique_ptr > (that.value); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.copy< std::unique_ptr > > > (that.value); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.copy< std::unique_ptr > > > (that.value); break; @@ -811,7 +809,7 @@ namespace yy { yyla.location.begin.filename = yyla.location.end.filename = &driver.file; } -#line 815 "seclang-parser.cc" // lalr1.cc:741 +#line 813 "seclang-parser.cc" // lalr1.cc:741 /* Initialize the stack. The initial state will be set in yynewstate, since the latter expects the semantical and the @@ -1065,38 +1063,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" yylhs.value.build< std::string > (); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init yylhs.value.build< std::unique_ptr > (); break; - case 324: // run_time_string + case 323: // run_time_string yylhs.value.build< std::unique_ptr > (); break; - case 321: // var + case 320: // var yylhs.value.build< std::unique_ptr > (); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action yylhs.value.build< std::unique_ptr > (); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted yylhs.value.build< std::unique_ptr > > > (); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted yylhs.value.build< std::unique_ptr > > > (); break; @@ -1118,232 +1115,232 @@ namespace yy { switch (yyn) { case 2: -#line 712 "seclang-parser.yy" // lalr1.cc:859 +#line 710 "seclang-parser.yy" // lalr1.cc:859 { return 0; } -#line 1126 "seclang-parser.cc" // lalr1.cc:859 +#line 1123 "seclang-parser.cc" // lalr1.cc:859 break; case 6: -#line 725 "seclang-parser.yy" // lalr1.cc:859 +#line 723 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setStorageDirMode(strtol(yystack_[0].value.as< std::string > ().c_str(), NULL, 8)); } -#line 1134 "seclang-parser.cc" // lalr1.cc:859 +#line 1131 "seclang-parser.cc" // lalr1.cc:859 break; case 7: -#line 731 "seclang-parser.yy" // lalr1.cc:859 +#line 729 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setStorageDir(yystack_[0].value.as< std::string > ()); } -#line 1142 "seclang-parser.cc" // lalr1.cc:859 +#line 1139 "seclang-parser.cc" // lalr1.cc:859 break; case 8: -#line 737 "seclang-parser.yy" // lalr1.cc:859 +#line 735 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus); } -#line 1150 "seclang-parser.cc" // lalr1.cc:859 +#line 1147 "seclang-parser.cc" // lalr1.cc:859 break; case 9: -#line 741 "seclang-parser.yy" // lalr1.cc:859 +#line 739 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus); } -#line 1158 "seclang-parser.cc" // lalr1.cc:859 +#line 1155 "seclang-parser.cc" // lalr1.cc:859 break; case 10: -#line 745 "seclang-parser.yy" // lalr1.cc:859 +#line 743 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus); } -#line 1166 "seclang-parser.cc" // lalr1.cc:859 +#line 1163 "seclang-parser.cc" // lalr1.cc:859 break; case 11: -#line 751 "seclang-parser.yy" // lalr1.cc:859 +#line 749 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setFileMode(strtol(yystack_[0].value.as< std::string > ().c_str(), NULL, 8)); } -#line 1174 "seclang-parser.cc" // lalr1.cc:859 +#line 1171 "seclang-parser.cc" // lalr1.cc:859 break; case 12: -#line 757 "seclang-parser.yy" // lalr1.cc:859 +#line 755 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setFilePath2(yystack_[0].value.as< std::string > ()); } -#line 1182 "seclang-parser.cc" // lalr1.cc:859 +#line 1179 "seclang-parser.cc" // lalr1.cc:859 break; case 13: -#line 763 "seclang-parser.yy" // lalr1.cc:859 +#line 761 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setParts(yystack_[0].value.as< std::string > ()); } -#line 1190 "seclang-parser.cc" // lalr1.cc:859 +#line 1187 "seclang-parser.cc" // lalr1.cc:859 break; case 14: -#line 769 "seclang-parser.yy" // lalr1.cc:859 +#line 767 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setFilePath1(yystack_[0].value.as< std::string > ()); } -#line 1198 "seclang-parser.cc" // lalr1.cc:859 +#line 1195 "seclang-parser.cc" // lalr1.cc:859 break; case 15: -#line 774 "seclang-parser.yy" // lalr1.cc:859 +#line 772 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::JSONAuditLogFormat); } -#line 1206 "seclang-parser.cc" // lalr1.cc:859 +#line 1203 "seclang-parser.cc" // lalr1.cc:859 break; case 16: -#line 779 "seclang-parser.yy" // lalr1.cc:859 +#line 777 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setFormat(modsecurity::audit_log::AuditLog::NativeAuditLogFormat); } -#line 1214 "seclang-parser.cc" // lalr1.cc:859 +#line 1211 "seclang-parser.cc" // lalr1.cc:859 break; case 17: -#line 785 "seclang-parser.yy" // lalr1.cc:859 +#line 783 "seclang-parser.yy" // lalr1.cc:859 { std::string relevant_status(yystack_[0].value.as< std::string > ()); driver.m_auditLog->setRelevantStatus(relevant_status); } -#line 1223 "seclang-parser.cc" // lalr1.cc:859 +#line 1220 "seclang-parser.cc" // lalr1.cc:859 break; case 18: -#line 792 "seclang-parser.yy" // lalr1.cc:859 +#line 790 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType); } -#line 1231 "seclang-parser.cc" // lalr1.cc:859 +#line 1228 "seclang-parser.cc" // lalr1.cc:859 break; case 19: -#line 796 "seclang-parser.yy" // lalr1.cc:859 +#line 794 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType); } -#line 1239 "seclang-parser.cc" // lalr1.cc:859 +#line 1236 "seclang-parser.cc" // lalr1.cc:859 break; case 20: -#line 800 "seclang-parser.yy" // lalr1.cc:859 +#line 798 "seclang-parser.yy" // lalr1.cc:859 { driver.m_auditLog->setType(modsecurity::audit_log::AuditLog::HttpsAuditLogType); } -#line 1247 "seclang-parser.cc" // lalr1.cc:859 +#line 1244 "seclang-parser.cc" // lalr1.cc:859 break; case 21: -#line 806 "seclang-parser.yy" // lalr1.cc:859 +#line 804 "seclang-parser.yy" // lalr1.cc:859 { driver.m_uploadKeepFiles = modsecurity::RulesProperties::TrueConfigBoolean; } -#line 1255 "seclang-parser.cc" // lalr1.cc:859 +#line 1252 "seclang-parser.cc" // lalr1.cc:859 break; case 22: -#line 810 "seclang-parser.yy" // lalr1.cc:859 +#line 808 "seclang-parser.yy" // lalr1.cc:859 { driver.m_uploadKeepFiles = modsecurity::RulesProperties::FalseConfigBoolean; } -#line 1263 "seclang-parser.cc" // lalr1.cc:859 +#line 1260 "seclang-parser.cc" // lalr1.cc:859 break; case 23: -#line 814 "seclang-parser.yy" // lalr1.cc:859 +#line 812 "seclang-parser.yy" // lalr1.cc:859 { driver.m_uploadFileLimit.m_set = true; driver.m_uploadFileLimit.m_value = strtol(yystack_[0].value.as< std::string > ().c_str(), NULL, 10); } -#line 1272 "seclang-parser.cc" // lalr1.cc:859 +#line 1269 "seclang-parser.cc" // lalr1.cc:859 break; case 24: -#line 819 "seclang-parser.yy" // lalr1.cc:859 +#line 817 "seclang-parser.yy" // lalr1.cc:859 { driver.m_uploadFileMode.m_set = true; driver.m_uploadFileMode.m_value = strtol(yystack_[0].value.as< std::string > ().c_str(), NULL, 8); } -#line 1281 "seclang-parser.cc" // lalr1.cc:859 +#line 1278 "seclang-parser.cc" // lalr1.cc:859 break; case 25: -#line 824 "seclang-parser.yy" // lalr1.cc:859 +#line 822 "seclang-parser.yy" // lalr1.cc:859 { driver.m_uploadDirectory.m_set = true; driver.m_uploadDirectory.m_value = yystack_[0].value.as< std::string > (); } -#line 1290 "seclang-parser.cc" // lalr1.cc:859 +#line 1287 "seclang-parser.cc" // lalr1.cc:859 break; case 26: -#line 829 "seclang-parser.yy" // lalr1.cc:859 +#line 827 "seclang-parser.yy" // lalr1.cc:859 { driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::TrueConfigBoolean; } -#line 1298 "seclang-parser.cc" // lalr1.cc:859 +#line 1295 "seclang-parser.cc" // lalr1.cc:859 break; case 27: -#line 833 "seclang-parser.yy" // lalr1.cc:859 +#line 831 "seclang-parser.yy" // lalr1.cc:859 { driver.m_tmpSaveUploadedFiles = modsecurity::RulesProperties::FalseConfigBoolean; } -#line 1306 "seclang-parser.cc" // lalr1.cc:859 +#line 1303 "seclang-parser.cc" // lalr1.cc:859 break; case 28: -#line 840 "seclang-parser.yy" // lalr1.cc:859 +#line 838 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[1].value.as< std::unique_ptr > > > ()); } -#line 1314 "seclang-parser.cc" // lalr1.cc:859 +#line 1311 "seclang-parser.cc" // lalr1.cc:859 break; case 29: -#line 844 "seclang-parser.yy" // lalr1.cc:859 +#line 842 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[0].value.as< std::unique_ptr > > > ()); } -#line 1322 "seclang-parser.cc" // lalr1.cc:859 +#line 1319 "seclang-parser.cc" // lalr1.cc:859 break; case 30: -#line 851 "seclang-parser.yy" // lalr1.cc:859 +#line 849 "seclang-parser.yy" // lalr1.cc:859 { ACTION_INIT(yystack_[0].value.as< std::unique_ptr > (), yystack_[3].location) yystack_[2].value.as< std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[2].value.as< std::unique_ptr > > > ()); } -#line 1332 "seclang-parser.cc" // lalr1.cc:859 +#line 1329 "seclang-parser.cc" // lalr1.cc:859 break; case 31: -#line 857 "seclang-parser.yy" // lalr1.cc:859 +#line 855 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr>> b(new std::vector>()); ACTION_INIT(yystack_[0].value.as< std::unique_ptr > (), yystack_[1].location) b->push_back(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > > > () = std::move(b); } -#line 1343 "seclang-parser.cc" // lalr1.cc:859 +#line 1340 "seclang-parser.cc" // lalr1.cc:859 break; case 32: -#line 867 "seclang-parser.yy" // lalr1.cc:859 +#line 865 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > () = std::move(yystack_[0].value.as< std::unique_ptr > ()); std::string error; @@ -1352,11 +1349,11 @@ namespace yy { YYERROR; } } -#line 1356 "seclang-parser.cc" // lalr1.cc:859 +#line 1353 "seclang-parser.cc" // lalr1.cc:859 break; case 33: -#line 876 "seclang-parser.yy" // lalr1.cc:859 +#line 874 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > () = std::move(yystack_[0].value.as< std::unique_ptr > ()); yylhs.value.as< std::unique_ptr > ()->m_negation = true; @@ -1366,11 +1363,11 @@ namespace yy { YYERROR; } } -#line 1370 "seclang-parser.cc" // lalr1.cc:859 +#line 1367 "seclang-parser.cc" // lalr1.cc:859 break; case 34: -#line 886 "seclang-parser.yy" // lalr1.cc:859 +#line 884 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as< std::unique_ptr > ()))); std::string error; @@ -1379,11 +1376,11 @@ namespace yy { YYERROR; } } -#line 1383 "seclang-parser.cc" // lalr1.cc:859 +#line 1380 "seclang-parser.cc" // lalr1.cc:859 break; case 35: -#line 895 "seclang-parser.yy" // lalr1.cc:859 +#line 893 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as< std::unique_ptr > ()))); yylhs.value.as< std::unique_ptr > ()->m_negation = true; @@ -1393,288 +1390,288 @@ namespace yy { YYERROR; } } -#line 1397 "seclang-parser.cc" // lalr1.cc:859 +#line 1394 "seclang-parser.cc" // lalr1.cc:859 break; case 36: -#line 908 "seclang-parser.yy" // lalr1.cc:859 +#line 906 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::UnconditionalMatch()); } -#line 1405 "seclang-parser.cc" // lalr1.cc:859 +#line 1402 "seclang-parser.cc" // lalr1.cc:859 break; case 37: -#line 912 "seclang-parser.yy" // lalr1.cc:859 +#line 910 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::DetectSQLi()); } -#line 1413 "seclang-parser.cc" // lalr1.cc:859 +#line 1410 "seclang-parser.cc" // lalr1.cc:859 break; case 38: -#line 916 "seclang-parser.yy" // lalr1.cc:859 +#line 914 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::DetectXSS()); } -#line 1421 "seclang-parser.cc" // lalr1.cc:859 +#line 1418 "seclang-parser.cc" // lalr1.cc:859 break; case 39: -#line 920 "seclang-parser.yy" // lalr1.cc:859 +#line 918 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ValidateUrlEncoding()); } -#line 1429 "seclang-parser.cc" // lalr1.cc:859 +#line 1426 "seclang-parser.cc" // lalr1.cc:859 break; case 40: -#line 924 "seclang-parser.yy" // lalr1.cc:859 +#line 922 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ValidateUtf8Encoding()); } -#line 1437 "seclang-parser.cc" // lalr1.cc:859 +#line 1434 "seclang-parser.cc" // lalr1.cc:859 break; case 41: -#line 928 "seclang-parser.yy" // lalr1.cc:859 +#line 926 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::InspectFile(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1445 "seclang-parser.cc" // lalr1.cc:859 +#line 1442 "seclang-parser.cc" // lalr1.cc:859 break; case 42: -#line 932 "seclang-parser.yy" // lalr1.cc:859 +#line 930 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::FuzzyHash(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1453 "seclang-parser.cc" // lalr1.cc:859 +#line 1450 "seclang-parser.cc" // lalr1.cc:859 break; case 43: -#line 936 "seclang-parser.yy" // lalr1.cc:859 +#line 934 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ValidateByteRange(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1461 "seclang-parser.cc" // lalr1.cc:859 +#line 1458 "seclang-parser.cc" // lalr1.cc:859 break; case 44: -#line 940 "seclang-parser.yy" // lalr1.cc:859 +#line 938 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ValidateDTD(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1469 "seclang-parser.cc" // lalr1.cc:859 +#line 1466 "seclang-parser.cc" // lalr1.cc:859 break; case 45: -#line 944 "seclang-parser.yy" // lalr1.cc:859 +#line 942 "seclang-parser.yy" // lalr1.cc:859 { /* $$ = new operators::ValidateHash($1); */ OPERATOR_NOT_SUPPORTED("ValidateHash", yystack_[2].location); } -#line 1478 "seclang-parser.cc" // lalr1.cc:859 +#line 1475 "seclang-parser.cc" // lalr1.cc:859 break; case 46: -#line 949 "seclang-parser.yy" // lalr1.cc:859 +#line 947 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ValidateSchema(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1486 "seclang-parser.cc" // lalr1.cc:859 +#line 1483 "seclang-parser.cc" // lalr1.cc:859 break; case 47: -#line 953 "seclang-parser.yy" // lalr1.cc:859 +#line 951 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::VerifyCC(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1494 "seclang-parser.cc" // lalr1.cc:859 +#line 1491 "seclang-parser.cc" // lalr1.cc:859 break; case 48: -#line 957 "seclang-parser.yy" // lalr1.cc:859 +#line 955 "seclang-parser.yy" // lalr1.cc:859 { /* $$ = new operators::VerifyCPF($1); */ OPERATOR_NOT_SUPPORTED("VerifyCPF", yystack_[2].location); } -#line 1503 "seclang-parser.cc" // lalr1.cc:859 +#line 1500 "seclang-parser.cc" // lalr1.cc:859 break; case 49: -#line 962 "seclang-parser.yy" // lalr1.cc:859 +#line 960 "seclang-parser.yy" // lalr1.cc:859 { /* $$ = new operators::VerifySSN($1); */ OPERATOR_NOT_SUPPORTED("VerifySSN", yystack_[2].location); } -#line 1512 "seclang-parser.cc" // lalr1.cc:859 +#line 1509 "seclang-parser.cc" // lalr1.cc:859 break; case 50: -#line 967 "seclang-parser.yy" // lalr1.cc:859 +#line 965 "seclang-parser.yy" // lalr1.cc:859 { /* $$ = new operators::GsbLookup($1); */ OPERATOR_NOT_SUPPORTED("GsbLookup", yystack_[2].location); } -#line 1521 "seclang-parser.cc" // lalr1.cc:859 +#line 1518 "seclang-parser.cc" // lalr1.cc:859 break; case 51: -#line 972 "seclang-parser.yy" // lalr1.cc:859 +#line 970 "seclang-parser.yy" // lalr1.cc:859 { /* $$ = new operators::Rsub($1); */ OPERATOR_NOT_SUPPORTED("Rsub", yystack_[2].location); } -#line 1530 "seclang-parser.cc" // lalr1.cc:859 +#line 1527 "seclang-parser.cc" // lalr1.cc:859 break; case 52: -#line 977 "seclang-parser.yy" // lalr1.cc:859 +#line 975 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Within(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1538 "seclang-parser.cc" // lalr1.cc:859 +#line 1535 "seclang-parser.cc" // lalr1.cc:859 break; case 53: -#line 981 "seclang-parser.yy" // lalr1.cc:859 +#line 979 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::ContainsWord(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1546 "seclang-parser.cc" // lalr1.cc:859 +#line 1543 "seclang-parser.cc" // lalr1.cc:859 break; case 54: -#line 985 "seclang-parser.yy" // lalr1.cc:859 +#line 983 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Contains(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1554 "seclang-parser.cc" // lalr1.cc:859 +#line 1551 "seclang-parser.cc" // lalr1.cc:859 break; case 55: -#line 989 "seclang-parser.yy" // lalr1.cc:859 +#line 987 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::EndsWith(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1562 "seclang-parser.cc" // lalr1.cc:859 +#line 1559 "seclang-parser.cc" // lalr1.cc:859 break; case 56: -#line 993 "seclang-parser.yy" // lalr1.cc:859 +#line 991 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Eq(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1570 "seclang-parser.cc" // lalr1.cc:859 +#line 1567 "seclang-parser.cc" // lalr1.cc:859 break; case 57: -#line 997 "seclang-parser.yy" // lalr1.cc:859 +#line 995 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Ge(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1578 "seclang-parser.cc" // lalr1.cc:859 +#line 1575 "seclang-parser.cc" // lalr1.cc:859 break; case 58: -#line 1001 "seclang-parser.yy" // lalr1.cc:859 +#line 999 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Gt(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1586 "seclang-parser.cc" // lalr1.cc:859 +#line 1583 "seclang-parser.cc" // lalr1.cc:859 break; case 59: -#line 1005 "seclang-parser.yy" // lalr1.cc:859 +#line 1003 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::IpMatchF(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1594 "seclang-parser.cc" // lalr1.cc:859 +#line 1591 "seclang-parser.cc" // lalr1.cc:859 break; case 60: -#line 1009 "seclang-parser.yy" // lalr1.cc:859 +#line 1007 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::IpMatch(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1602 "seclang-parser.cc" // lalr1.cc:859 +#line 1599 "seclang-parser.cc" // lalr1.cc:859 break; case 61: -#line 1013 "seclang-parser.yy" // lalr1.cc:859 +#line 1011 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Le(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1610 "seclang-parser.cc" // lalr1.cc:859 +#line 1607 "seclang-parser.cc" // lalr1.cc:859 break; case 62: -#line 1017 "seclang-parser.yy" // lalr1.cc:859 +#line 1015 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Lt(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1618 "seclang-parser.cc" // lalr1.cc:859 +#line 1615 "seclang-parser.cc" // lalr1.cc:859 break; case 63: -#line 1021 "seclang-parser.yy" // lalr1.cc:859 +#line 1019 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::PmFromFile(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1626 "seclang-parser.cc" // lalr1.cc:859 +#line 1623 "seclang-parser.cc" // lalr1.cc:859 break; case 64: -#line 1025 "seclang-parser.yy" // lalr1.cc:859 +#line 1023 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Pm(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1634 "seclang-parser.cc" // lalr1.cc:859 +#line 1631 "seclang-parser.cc" // lalr1.cc:859 break; case 65: -#line 1029 "seclang-parser.yy" // lalr1.cc:859 +#line 1027 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Rbl(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1642 "seclang-parser.cc" // lalr1.cc:859 +#line 1639 "seclang-parser.cc" // lalr1.cc:859 break; case 66: -#line 1033 "seclang-parser.yy" // lalr1.cc:859 +#line 1031 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::Rx(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1650 "seclang-parser.cc" // lalr1.cc:859 +#line 1647 "seclang-parser.cc" // lalr1.cc:859 break; case 67: -#line 1037 "seclang-parser.yy" // lalr1.cc:859 +#line 1035 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::StrEq(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1658 "seclang-parser.cc" // lalr1.cc:859 +#line 1655 "seclang-parser.cc" // lalr1.cc:859 break; case 68: -#line 1041 "seclang-parser.yy" // lalr1.cc:859 +#line 1039 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::StrMatch(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1666 "seclang-parser.cc" // lalr1.cc:859 +#line 1663 "seclang-parser.cc" // lalr1.cc:859 break; case 69: -#line 1045 "seclang-parser.yy" // lalr1.cc:859 +#line 1043 "seclang-parser.yy" // lalr1.cc:859 { OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::BeginsWith(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 1674 "seclang-parser.cc" // lalr1.cc:859 +#line 1671 "seclang-parser.cc" // lalr1.cc:859 break; case 70: -#line 1049 "seclang-parser.yy" // lalr1.cc:859 +#line 1047 "seclang-parser.yy" // lalr1.cc:859 { #ifdef WITH_GEOIP OPERATOR_CONTAINER(yylhs.value.as< std::unique_ptr > (), new operators::GeoLookup()); @@ -1685,11 +1682,11 @@ namespace yy { YYERROR; #endif // WITH_GEOIP } -#line 1689 "seclang-parser.cc" // lalr1.cc:859 +#line 1686 "seclang-parser.cc" // lalr1.cc:859 break; case 72: -#line 1064 "seclang-parser.yy" // lalr1.cc:859 +#line 1062 "seclang-parser.yy" // lalr1.cc:859 { std::vector *a = new std::vector(); for (auto &i : *yystack_[0].value.as< std::unique_ptr > > > ().get()) { @@ -1713,11 +1710,11 @@ namespace yy { YYERROR; } } -#line 1717 "seclang-parser.cc" // lalr1.cc:859 +#line 1714 "seclang-parser.cc" // lalr1.cc:859 break; case 73: -#line 1088 "seclang-parser.yy" // lalr1.cc:859 +#line 1086 "seclang-parser.yy" // lalr1.cc:859 { std::vector *v = new std::vector(); for (auto &i : *yystack_[1].value.as< std::unique_ptr > > > ().get()) { @@ -1736,11 +1733,11 @@ namespace yy { YYERROR; } } -#line 1740 "seclang-parser.cc" // lalr1.cc:859 +#line 1737 "seclang-parser.cc" // lalr1.cc:859 break; case 74: -#line 1107 "seclang-parser.yy" // lalr1.cc:859 +#line 1105 "seclang-parser.yy" // lalr1.cc:859 { std::vector *a = new std::vector(); for (auto &i : *yystack_[0].value.as< std::unique_ptr > > > ().get()) { @@ -1755,11 +1752,11 @@ namespace yy { ); driver.addSecAction(rule); } -#line 1759 "seclang-parser.cc" // lalr1.cc:859 +#line 1756 "seclang-parser.cc" // lalr1.cc:859 break; case 75: -#line 1122 "seclang-parser.yy" // lalr1.cc:859 +#line 1120 "seclang-parser.yy" // lalr1.cc:859 { std::string err; std::vector *a = new std::vector(); @@ -1783,11 +1780,11 @@ namespace yy { YYERROR; } } -#line 1787 "seclang-parser.cc" // lalr1.cc:859 +#line 1784 "seclang-parser.cc" // lalr1.cc:859 break; case 76: -#line 1146 "seclang-parser.yy" // lalr1.cc:859 +#line 1144 "seclang-parser.yy" // lalr1.cc:859 { std::vector *actions = new std::vector(); for (auto &i : *yystack_[0].value.as< std::unique_ptr > > > ().get()) { @@ -1834,75 +1831,75 @@ namespace yy { delete actions; } -#line 1838 "seclang-parser.cc" // lalr1.cc:859 +#line 1835 "seclang-parser.cc" // lalr1.cc:859 break; case 77: -#line 1193 "seclang-parser.yy" // lalr1.cc:859 +#line 1191 "seclang-parser.yy" // lalr1.cc:859 { driver.addSecMarker(modsecurity::utils::string::removeBracketsIfNeeded(yystack_[0].value.as< std::string > ())); } -#line 1846 "seclang-parser.cc" // lalr1.cc:859 +#line 1843 "seclang-parser.cc" // lalr1.cc:859 break; case 78: -#line 1197 "seclang-parser.yy" // lalr1.cc:859 +#line 1195 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secRuleEngine = modsecurity::Rules::DisabledRuleEngine; } -#line 1854 "seclang-parser.cc" // lalr1.cc:859 +#line 1851 "seclang-parser.cc" // lalr1.cc:859 break; case 79: -#line 1201 "seclang-parser.yy" // lalr1.cc:859 +#line 1199 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secRuleEngine = modsecurity::Rules::EnabledRuleEngine; } -#line 1862 "seclang-parser.cc" // lalr1.cc:859 +#line 1859 "seclang-parser.cc" // lalr1.cc:859 break; case 80: -#line 1205 "seclang-parser.yy" // lalr1.cc:859 +#line 1203 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secRuleEngine = modsecurity::Rules::DetectionOnlyRuleEngine; } -#line 1870 "seclang-parser.cc" // lalr1.cc:859 +#line 1867 "seclang-parser.cc" // lalr1.cc:859 break; case 81: -#line 1209 "seclang-parser.yy" // lalr1.cc:859 +#line 1207 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secRequestBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean; } -#line 1878 "seclang-parser.cc" // lalr1.cc:859 +#line 1875 "seclang-parser.cc" // lalr1.cc:859 break; case 82: -#line 1213 "seclang-parser.yy" // lalr1.cc:859 +#line 1211 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secRequestBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean; } -#line 1886 "seclang-parser.cc" // lalr1.cc:859 +#line 1883 "seclang-parser.cc" // lalr1.cc:859 break; case 83: -#line 1217 "seclang-parser.yy" // lalr1.cc:859 +#line 1215 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secResponseBodyAccess = modsecurity::RulesProperties::TrueConfigBoolean; } -#line 1894 "seclang-parser.cc" // lalr1.cc:859 +#line 1891 "seclang-parser.cc" // lalr1.cc:859 break; case 84: -#line 1221 "seclang-parser.yy" // lalr1.cc:859 +#line 1219 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secResponseBodyAccess = modsecurity::RulesProperties::FalseConfigBoolean; } -#line 1902 "seclang-parser.cc" // lalr1.cc:859 +#line 1899 "seclang-parser.cc" // lalr1.cc:859 break; case 85: -#line 1225 "seclang-parser.yy" // lalr1.cc:859 +#line 1223 "seclang-parser.yy" // lalr1.cc:859 { if (yystack_[0].value.as< std::string > ().length() != 1) { driver.error(yystack_[1].location, "Argument separator should be set to a single character."); @@ -1911,64 +1908,64 @@ namespace yy { driver.m_secArgumentSeparator.m_value = yystack_[0].value.as< std::string > (); driver.m_secArgumentSeparator.m_set = true; } -#line 1915 "seclang-parser.cc" // lalr1.cc:859 +#line 1912 "seclang-parser.cc" // lalr1.cc:859 break; case 86: -#line 1234 "seclang-parser.yy" // lalr1.cc:859 +#line 1232 "seclang-parser.yy" // lalr1.cc:859 { driver.m_components.push_back(yystack_[0].value.as< std::string > ()); } -#line 1923 "seclang-parser.cc" // lalr1.cc:859 +#line 1920 "seclang-parser.cc" // lalr1.cc:859 break; case 87: -#line 1238 "seclang-parser.yy" // lalr1.cc:859 +#line 1236 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secWebAppId.m_value = yystack_[0].value.as< std::string > (); driver.m_secWebAppId.m_set = true; } -#line 1932 "seclang-parser.cc" // lalr1.cc:859 +#line 1929 "seclang-parser.cc" // lalr1.cc:859 break; case 88: -#line 1243 "seclang-parser.yy" // lalr1.cc:859 +#line 1241 "seclang-parser.yy" // lalr1.cc:859 { driver.error(yystack_[1].location, "SecServerSignature is not supported."); YYERROR; } -#line 1941 "seclang-parser.cc" // lalr1.cc:859 +#line 1938 "seclang-parser.cc" // lalr1.cc:859 break; case 89: -#line 1248 "seclang-parser.yy" // lalr1.cc:859 +#line 1246 "seclang-parser.yy" // lalr1.cc:859 { driver.error(yystack_[2].location, "ContentInjection is not yet supported."); YYERROR; } -#line 1950 "seclang-parser.cc" // lalr1.cc:859 +#line 1947 "seclang-parser.cc" // lalr1.cc:859 break; case 90: -#line 1253 "seclang-parser.yy" // lalr1.cc:859 +#line 1251 "seclang-parser.yy" // lalr1.cc:859 { driver.error(yystack_[1].location, "SecCacheTransformations is not supported."); YYERROR; } -#line 1959 "seclang-parser.cc" // lalr1.cc:859 +#line 1956 "seclang-parser.cc" // lalr1.cc:859 break; case 91: -#line 1258 "seclang-parser.yy" // lalr1.cc:859 +#line 1256 "seclang-parser.yy" // lalr1.cc:859 { driver.error(yystack_[2].location, "ContentInjection is not yet supported."); YYERROR; } -#line 1968 "seclang-parser.cc" // lalr1.cc:859 +#line 1965 "seclang-parser.cc" // lalr1.cc:859 break; case 92: -#line 1263 "seclang-parser.yy" // lalr1.cc:859 +#line 1261 "seclang-parser.yy" // lalr1.cc:859 { std::string error; if (driver.m_exceptions.load(yystack_[0].value.as< std::string > (), &error) == false) { @@ -1981,11 +1978,11 @@ namespace yy { YYERROR; } } -#line 1985 "seclang-parser.cc" // lalr1.cc:859 +#line 1982 "seclang-parser.cc" // lalr1.cc:859 break; case 93: -#line 1276 "seclang-parser.yy" // lalr1.cc:859 +#line 1274 "seclang-parser.yy" // lalr1.cc:859 { std::string error; if (driver.m_exceptions.loadRemoveRuleByTag(yystack_[0].value.as< std::string > (), &error) == false) { @@ -1998,11 +1995,11 @@ namespace yy { YYERROR; } } -#line 2002 "seclang-parser.cc" // lalr1.cc:859 +#line 1999 "seclang-parser.cc" // lalr1.cc:859 break; case 94: -#line 1289 "seclang-parser.yy" // lalr1.cc:859 +#line 1287 "seclang-parser.yy" // lalr1.cc:859 { std::string error; if (driver.m_exceptions.loadRemoveRuleByMsg(yystack_[0].value.as< std::string > (), &error) == false) { @@ -2015,11 +2012,11 @@ namespace yy { YYERROR; } } -#line 2019 "seclang-parser.cc" // lalr1.cc:859 +#line 2016 "seclang-parser.cc" // lalr1.cc:859 break; case 95: -#line 1302 "seclang-parser.yy" // lalr1.cc:859 +#line 1300 "seclang-parser.yy" // lalr1.cc:859 { std::string error; if (driver.m_exceptions.loadUpdateTargetByTag(yystack_[1].value.as< std::string > (), std::move(yystack_[0].value.as< std::unique_ptr > > > ()), &error) == false) { @@ -2032,11 +2029,11 @@ namespace yy { YYERROR; } } -#line 2036 "seclang-parser.cc" // lalr1.cc:859 +#line 2033 "seclang-parser.cc" // lalr1.cc:859 break; case 96: -#line 1315 "seclang-parser.yy" // lalr1.cc:859 +#line 1313 "seclang-parser.yy" // lalr1.cc:859 { std::string error; if (driver.m_exceptions.loadUpdateTargetByMsg(yystack_[1].value.as< std::string > (), std::move(yystack_[0].value.as< std::unique_ptr > > > ()), &error) == false) { @@ -2049,11 +2046,11 @@ namespace yy { YYERROR; } } -#line 2053 "seclang-parser.cc" // lalr1.cc:859 +#line 2050 "seclang-parser.cc" // lalr1.cc:859 break; case 97: -#line 1328 "seclang-parser.yy" // lalr1.cc:859 +#line 1326 "seclang-parser.yy" // lalr1.cc:859 { std::string error; double ruleId; @@ -2079,11 +2076,11 @@ namespace yy { YYERROR; } } -#line 2083 "seclang-parser.cc" // lalr1.cc:859 +#line 2080 "seclang-parser.cc" // lalr1.cc:859 break; case 98: -#line 1354 "seclang-parser.yy" // lalr1.cc:859 +#line 1352 "seclang-parser.yy" // lalr1.cc:859 { std::string error; double ruleId; @@ -2108,11 +2105,11 @@ namespace yy { driver.error(yystack_[2].location, "SecRuleUpdateActionById is not yet supported"); YYERROR; } -#line 2112 "seclang-parser.cc" // lalr1.cc:859 +#line 2109 "seclang-parser.cc" // lalr1.cc:859 break; case 99: -#line 1380 "seclang-parser.yy" // lalr1.cc:859 +#line 1378 "seclang-parser.yy" // lalr1.cc:859 { if (driver.m_debugLog != NULL) { driver.m_debugLog->setDebugLogLevel(atoi(yystack_[0].value.as< std::string > ().c_str())); @@ -2124,11 +2121,11 @@ namespace yy { YYERROR; } } -#line 2128 "seclang-parser.cc" // lalr1.cc:859 +#line 2125 "seclang-parser.cc" // lalr1.cc:859 break; case 100: -#line 1392 "seclang-parser.yy" // lalr1.cc:859 +#line 1390 "seclang-parser.yy" // lalr1.cc:859 { if (driver.m_debugLog != NULL) { std::string error; @@ -2147,11 +2144,11 @@ namespace yy { YYERROR; } } -#line 2151 "seclang-parser.cc" // lalr1.cc:859 +#line 2148 "seclang-parser.cc" // lalr1.cc:859 break; case 101: -#line 1412 "seclang-parser.yy" // lalr1.cc:859 +#line 1410 "seclang-parser.yy" // lalr1.cc:859 { #ifdef WITH_GEOIP std::string err; @@ -2178,29 +2175,29 @@ namespace yy { YYERROR; #endif // WITH_GEOIP } -#line 2182 "seclang-parser.cc" // lalr1.cc:859 +#line 2179 "seclang-parser.cc" // lalr1.cc:859 break; case 102: -#line 1440 "seclang-parser.yy" // lalr1.cc:859 +#line 1438 "seclang-parser.yy" // lalr1.cc:859 { driver.m_requestBodyLimit.m_set = true; driver.m_requestBodyLimit.m_value = atoi(yystack_[0].value.as< std::string > ().c_str()); } -#line 2191 "seclang-parser.cc" // lalr1.cc:859 +#line 2188 "seclang-parser.cc" // lalr1.cc:859 break; case 103: -#line 1445 "seclang-parser.yy" // lalr1.cc:859 +#line 1443 "seclang-parser.yy" // lalr1.cc:859 { driver.m_requestBodyNoFilesLimit.m_set = true; driver.m_requestBodyNoFilesLimit.m_value = atoi(yystack_[0].value.as< std::string > ().c_str()); } -#line 2200 "seclang-parser.cc" // lalr1.cc:859 +#line 2197 "seclang-parser.cc" // lalr1.cc:859 break; case 104: -#line 1450 "seclang-parser.yy" // lalr1.cc:859 +#line 1448 "seclang-parser.yy" // lalr1.cc:859 { std::stringstream ss; ss << "As of ModSecurity version 3.0, SecRequestBodyInMemoryLimit is no longer "; @@ -2209,68 +2206,68 @@ namespace yy { driver.error(yystack_[1].location, ss.str()); YYERROR; } -#line 2213 "seclang-parser.cc" // lalr1.cc:859 +#line 2210 "seclang-parser.cc" // lalr1.cc:859 break; case 105: -#line 1459 "seclang-parser.yy" // lalr1.cc:859 +#line 1457 "seclang-parser.yy" // lalr1.cc:859 { driver.m_responseBodyLimit.m_set = true; driver.m_responseBodyLimit.m_value = atoi(yystack_[0].value.as< std::string > ().c_str()); } -#line 2222 "seclang-parser.cc" // lalr1.cc:859 +#line 2219 "seclang-parser.cc" // lalr1.cc:859 break; case 106: -#line 1464 "seclang-parser.yy" // lalr1.cc:859 +#line 1462 "seclang-parser.yy" // lalr1.cc:859 { driver.m_requestBodyLimitAction = modsecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; } -#line 2230 "seclang-parser.cc" // lalr1.cc:859 +#line 2227 "seclang-parser.cc" // lalr1.cc:859 break; case 107: -#line 1468 "seclang-parser.yy" // lalr1.cc:859 +#line 1466 "seclang-parser.yy" // lalr1.cc:859 { driver.m_requestBodyLimitAction = modsecurity::Rules::BodyLimitAction::RejectBodyLimitAction; } -#line 2238 "seclang-parser.cc" // lalr1.cc:859 +#line 2235 "seclang-parser.cc" // lalr1.cc:859 break; case 108: -#line 1472 "seclang-parser.yy" // lalr1.cc:859 +#line 1470 "seclang-parser.yy" // lalr1.cc:859 { driver.m_responseBodyLimitAction = modsecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; } -#line 2246 "seclang-parser.cc" // lalr1.cc:859 +#line 2243 "seclang-parser.cc" // lalr1.cc:859 break; case 109: -#line 1476 "seclang-parser.yy" // lalr1.cc:859 +#line 1474 "seclang-parser.yy" // lalr1.cc:859 { driver.m_responseBodyLimitAction = modsecurity::Rules::BodyLimitAction::RejectBodyLimitAction; } -#line 2254 "seclang-parser.cc" // lalr1.cc:859 +#line 2251 "seclang-parser.cc" // lalr1.cc:859 break; case 110: -#line 1480 "seclang-parser.yy" // lalr1.cc:859 +#line 1478 "seclang-parser.yy" // lalr1.cc:859 { driver.m_remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; } -#line 2262 "seclang-parser.cc" // lalr1.cc:859 +#line 2259 "seclang-parser.cc" // lalr1.cc:859 break; case 111: -#line 1484 "seclang-parser.yy" // lalr1.cc:859 +#line 1482 "seclang-parser.yy" // lalr1.cc:859 { driver.m_remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; } -#line 2270 "seclang-parser.cc" // lalr1.cc:859 +#line 2267 "seclang-parser.cc" // lalr1.cc:859 break; case 114: -#line 1490 "seclang-parser.yy" // lalr1.cc:859 +#line 1488 "seclang-parser.yy" // lalr1.cc:859 { std::istringstream buf(yystack_[0].value.as< std::string > ()); std::istream_iterator beg(buf), end; @@ -2282,2318 +2279,2318 @@ namespace yy { driver.m_responseBodyTypeToBeInspected.m_value.insert(*it); } } -#line 2286 "seclang-parser.cc" // lalr1.cc:859 +#line 2283 "seclang-parser.cc" // lalr1.cc:859 break; case 115: -#line 1502 "seclang-parser.yy" // lalr1.cc:859 +#line 1500 "seclang-parser.yy" // lalr1.cc:859 { driver.m_responseBodyTypeToBeInspected.m_set = true; driver.m_responseBodyTypeToBeInspected.m_clear = true; driver.m_responseBodyTypeToBeInspected.m_value.clear(); } -#line 2296 "seclang-parser.cc" // lalr1.cc:859 +#line 2293 "seclang-parser.cc" // lalr1.cc:859 break; case 116: -#line 1508 "seclang-parser.yy" // lalr1.cc:859 +#line 1506 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secXMLExternalEntity = modsecurity::RulesProperties::FalseConfigBoolean; } -#line 2304 "seclang-parser.cc" // lalr1.cc:859 +#line 2301 "seclang-parser.cc" // lalr1.cc:859 break; case 117: -#line 1512 "seclang-parser.yy" // lalr1.cc:859 +#line 1510 "seclang-parser.yy" // lalr1.cc:859 { driver.m_secXMLExternalEntity = modsecurity::RulesProperties::TrueConfigBoolean; } -#line 2312 "seclang-parser.cc" // lalr1.cc:859 +#line 2309 "seclang-parser.cc" // lalr1.cc:859 break; case 124: -#line 1522 "seclang-parser.yy" // lalr1.cc:859 +#line 1520 "seclang-parser.yy" // lalr1.cc:859 { } -#line 2319 "seclang-parser.cc" // lalr1.cc:859 +#line 2316 "seclang-parser.cc" // lalr1.cc:859 break; case 125: -#line 1525 "seclang-parser.yy" // lalr1.cc:859 +#line 1523 "seclang-parser.yy" // lalr1.cc:859 { driver.m_httpblKey.m_set = true; driver.m_httpblKey.m_value = yystack_[0].value.as< std::string > (); } -#line 2328 "seclang-parser.cc" // lalr1.cc:859 +#line 2325 "seclang-parser.cc" // lalr1.cc:859 break; case 126: -#line 1533 "seclang-parser.yy" // lalr1.cc:859 +#line 1531 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[0].value.as< std::unique_ptr > > > ()); } -#line 2336 "seclang-parser.cc" // lalr1.cc:859 +#line 2333 "seclang-parser.cc" // lalr1.cc:859 break; case 127: -#line 1537 "seclang-parser.yy" // lalr1.cc:859 +#line 1535 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[1].value.as< std::unique_ptr > > > ()); } -#line 2344 "seclang-parser.cc" // lalr1.cc:859 +#line 2341 "seclang-parser.cc" // lalr1.cc:859 break; case 128: -#line 1544 "seclang-parser.yy" // lalr1.cc:859 +#line 1542 "seclang-parser.yy" // lalr1.cc:859 { yystack_[2].value.as< std::unique_ptr > > > ()->push_back(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[2].value.as< std::unique_ptr > > > ()); } -#line 2353 "seclang-parser.cc" // lalr1.cc:859 +#line 2350 "seclang-parser.cc" // lalr1.cc:859 break; case 129: -#line 1549 "seclang-parser.yy" // lalr1.cc:859 +#line 1547 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as< std::unique_ptr > ()))); yystack_[3].value.as< std::unique_ptr > > > ()->push_back(std::move(c)); yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[3].value.as< std::unique_ptr > > > ()); } -#line 2363 "seclang-parser.cc" // lalr1.cc:859 +#line 2360 "seclang-parser.cc" // lalr1.cc:859 break; case 130: -#line 1555 "seclang-parser.yy" // lalr1.cc:859 +#line 1553 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as< std::unique_ptr > ()))); yystack_[3].value.as< std::unique_ptr > > > ()->push_back(std::move(c)); yylhs.value.as< std::unique_ptr > > > () = std::move(yystack_[3].value.as< std::unique_ptr > > > ()); } -#line 2373 "seclang-parser.cc" // lalr1.cc:859 +#line 2370 "seclang-parser.cc" // lalr1.cc:859 break; case 131: -#line 1561 "seclang-parser.yy" // lalr1.cc:859 +#line 1559 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr>> b(new std::vector>()); b->push_back(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > > > () = std::move(b); } -#line 2383 "seclang-parser.cc" // lalr1.cc:859 +#line 2380 "seclang-parser.cc" // lalr1.cc:859 break; case 132: -#line 1567 "seclang-parser.yy" // lalr1.cc:859 +#line 1565 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr>> b(new std::vector>()); std::unique_ptr c(new VariableModificatorExclusion(std::move(yystack_[0].value.as< std::unique_ptr > ()))); b->push_back(std::move(c)); yylhs.value.as< std::unique_ptr > > > () = std::move(b); } -#line 2394 "seclang-parser.cc" // lalr1.cc:859 +#line 2391 "seclang-parser.cc" // lalr1.cc:859 break; case 133: -#line 1574 "seclang-parser.yy" // lalr1.cc:859 +#line 1572 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr>> b(new std::vector>()); std::unique_ptr c(new VariableModificatorCount(std::move(yystack_[0].value.as< std::unique_ptr > ()))); b->push_back(std::move(c)); yylhs.value.as< std::unique_ptr > > > () = std::move(b); } -#line 2405 "seclang-parser.cc" // lalr1.cc:859 +#line 2402 "seclang-parser.cc" // lalr1.cc:859 break; case 134: -#line 1584 "seclang-parser.yy" // lalr1.cc:859 +#line 1582 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2413 "seclang-parser.cc" // lalr1.cc:859 +#line 2410 "seclang-parser.cc" // lalr1.cc:859 break; case 135: -#line 1588 "seclang-parser.yy" // lalr1.cc:859 +#line 1586 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2421 "seclang-parser.cc" // lalr1.cc:859 +#line 2418 "seclang-parser.cc" // lalr1.cc:859 break; case 136: -#line 1592 "seclang-parser.yy" // lalr1.cc:859 +#line 1590 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_NoDictElement()); } -#line 2429 "seclang-parser.cc" // lalr1.cc:859 +#line 2426 "seclang-parser.cc" // lalr1.cc:859 break; case 137: -#line 1596 "seclang-parser.yy" // lalr1.cc:859 +#line 1594 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2437 "seclang-parser.cc" // lalr1.cc:859 +#line 2434 "seclang-parser.cc" // lalr1.cc:859 break; case 138: -#line 1600 "seclang-parser.yy" // lalr1.cc:859 +#line 1598 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2445 "seclang-parser.cc" // lalr1.cc:859 +#line 2442 "seclang-parser.cc" // lalr1.cc:859 break; case 139: -#line 1604 "seclang-parser.yy" // lalr1.cc:859 +#line 1602 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_NoDictElement()); } -#line 2453 "seclang-parser.cc" // lalr1.cc:859 +#line 2450 "seclang-parser.cc" // lalr1.cc:859 break; case 140: -#line 1608 "seclang-parser.yy" // lalr1.cc:859 +#line 1606 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2461 "seclang-parser.cc" // lalr1.cc:859 +#line 2458 "seclang-parser.cc" // lalr1.cc:859 break; case 141: -#line 1612 "seclang-parser.yy" // lalr1.cc:859 +#line 1610 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2469 "seclang-parser.cc" // lalr1.cc:859 +#line 2466 "seclang-parser.cc" // lalr1.cc:859 break; case 142: -#line 1616 "seclang-parser.yy" // lalr1.cc:859 +#line 1614 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_NoDictElement()); } -#line 2477 "seclang-parser.cc" // lalr1.cc:859 +#line 2474 "seclang-parser.cc" // lalr1.cc:859 break; case 143: -#line 1620 "seclang-parser.yy" // lalr1.cc:859 +#line 1618 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2485 "seclang-parser.cc" // lalr1.cc:859 +#line 2482 "seclang-parser.cc" // lalr1.cc:859 break; case 144: -#line 1624 "seclang-parser.yy" // lalr1.cc:859 +#line 1622 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2493 "seclang-parser.cc" // lalr1.cc:859 +#line 2490 "seclang-parser.cc" // lalr1.cc:859 break; case 145: -#line 1628 "seclang-parser.yy" // lalr1.cc:859 +#line 1626 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_NoDictElement()); } -#line 2501 "seclang-parser.cc" // lalr1.cc:859 +#line 2498 "seclang-parser.cc" // lalr1.cc:859 break; case 146: -#line 1632 "seclang-parser.yy" // lalr1.cc:859 +#line 1630 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2509 "seclang-parser.cc" // lalr1.cc:859 +#line 2506 "seclang-parser.cc" // lalr1.cc:859 break; case 147: -#line 1636 "seclang-parser.yy" // lalr1.cc:859 +#line 1634 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2517 "seclang-parser.cc" // lalr1.cc:859 +#line 2514 "seclang-parser.cc" // lalr1.cc:859 break; case 148: -#line 1640 "seclang-parser.yy" // lalr1.cc:859 +#line 1638 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_NoDictElement()); } -#line 2525 "seclang-parser.cc" // lalr1.cc:859 +#line 2522 "seclang-parser.cc" // lalr1.cc:859 break; case 149: -#line 1644 "seclang-parser.yy" // lalr1.cc:859 +#line 1642 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2533 "seclang-parser.cc" // lalr1.cc:859 +#line 2530 "seclang-parser.cc" // lalr1.cc:859 break; case 150: -#line 1648 "seclang-parser.yy" // lalr1.cc:859 +#line 1646 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2541 "seclang-parser.cc" // lalr1.cc:859 +#line 2538 "seclang-parser.cc" // lalr1.cc:859 break; case 151: -#line 1652 "seclang-parser.yy" // lalr1.cc:859 +#line 1650 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_NoDictElement()); } -#line 2549 "seclang-parser.cc" // lalr1.cc:859 +#line 2546 "seclang-parser.cc" // lalr1.cc:859 break; case 152: -#line 1656 "seclang-parser.yy" // lalr1.cc:859 +#line 1654 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2557 "seclang-parser.cc" // lalr1.cc:859 +#line 2554 "seclang-parser.cc" // lalr1.cc:859 break; case 153: -#line 1660 "seclang-parser.yy" // lalr1.cc:859 +#line 1658 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2565 "seclang-parser.cc" // lalr1.cc:859 +#line 2562 "seclang-parser.cc" // lalr1.cc:859 break; case 154: -#line 1664 "seclang-parser.yy" // lalr1.cc:859 +#line 1662 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_NoDictElement()); } -#line 2573 "seclang-parser.cc" // lalr1.cc:859 +#line 2570 "seclang-parser.cc" // lalr1.cc:859 break; case 155: -#line 1668 "seclang-parser.yy" // lalr1.cc:859 +#line 1666 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2581 "seclang-parser.cc" // lalr1.cc:859 +#line 2578 "seclang-parser.cc" // lalr1.cc:859 break; case 156: -#line 1672 "seclang-parser.yy" // lalr1.cc:859 +#line 1670 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2589 "seclang-parser.cc" // lalr1.cc:859 +#line 2586 "seclang-parser.cc" // lalr1.cc:859 break; case 157: -#line 1676 "seclang-parser.yy" // lalr1.cc:859 +#line 1674 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_NoDictElement()); } -#line 2597 "seclang-parser.cc" // lalr1.cc:859 +#line 2594 "seclang-parser.cc" // lalr1.cc:859 break; case 158: -#line 1680 "seclang-parser.yy" // lalr1.cc:859 +#line 1678 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2605 "seclang-parser.cc" // lalr1.cc:859 +#line 2602 "seclang-parser.cc" // lalr1.cc:859 break; case 159: -#line 1684 "seclang-parser.yy" // lalr1.cc:859 +#line 1682 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2613 "seclang-parser.cc" // lalr1.cc:859 +#line 2610 "seclang-parser.cc" // lalr1.cc:859 break; case 160: -#line 1688 "seclang-parser.yy" // lalr1.cc:859 +#line 1686 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_NoDictElement()); } -#line 2621 "seclang-parser.cc" // lalr1.cc:859 +#line 2618 "seclang-parser.cc" // lalr1.cc:859 break; case 161: -#line 1692 "seclang-parser.yy" // lalr1.cc:859 +#line 1690 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2629 "seclang-parser.cc" // lalr1.cc:859 +#line 2626 "seclang-parser.cc" // lalr1.cc:859 break; case 162: -#line 1696 "seclang-parser.yy" // lalr1.cc:859 +#line 1694 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2637 "seclang-parser.cc" // lalr1.cc:859 +#line 2634 "seclang-parser.cc" // lalr1.cc:859 break; case 163: -#line 1700 "seclang-parser.yy" // lalr1.cc:859 +#line 1698 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_NoDictElement()); } -#line 2645 "seclang-parser.cc" // lalr1.cc:859 +#line 2642 "seclang-parser.cc" // lalr1.cc:859 break; case 164: -#line 1704 "seclang-parser.yy" // lalr1.cc:859 +#line 1702 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2653 "seclang-parser.cc" // lalr1.cc:859 +#line 2650 "seclang-parser.cc" // lalr1.cc:859 break; case 165: -#line 1708 "seclang-parser.yy" // lalr1.cc:859 +#line 1706 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2661 "seclang-parser.cc" // lalr1.cc:859 +#line 2658 "seclang-parser.cc" // lalr1.cc:859 break; case 166: -#line 1712 "seclang-parser.yy" // lalr1.cc:859 +#line 1710 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_NoDictElement()); } -#line 2669 "seclang-parser.cc" // lalr1.cc:859 +#line 2666 "seclang-parser.cc" // lalr1.cc:859 break; case 167: -#line 1716 "seclang-parser.yy" // lalr1.cc:859 +#line 1714 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2677 "seclang-parser.cc" // lalr1.cc:859 +#line 2674 "seclang-parser.cc" // lalr1.cc:859 break; case 168: -#line 1720 "seclang-parser.yy" // lalr1.cc:859 +#line 1718 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2685 "seclang-parser.cc" // lalr1.cc:859 +#line 2682 "seclang-parser.cc" // lalr1.cc:859 break; case 169: -#line 1724 "seclang-parser.yy" // lalr1.cc:859 +#line 1722 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_NoDictElement()); } -#line 2693 "seclang-parser.cc" // lalr1.cc:859 +#line 2690 "seclang-parser.cc" // lalr1.cc:859 break; case 170: -#line 1728 "seclang-parser.yy" // lalr1.cc:859 +#line 1726 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2701 "seclang-parser.cc" // lalr1.cc:859 +#line 2698 "seclang-parser.cc" // lalr1.cc:859 break; case 171: -#line 1732 "seclang-parser.yy" // lalr1.cc:859 +#line 1730 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2709 "seclang-parser.cc" // lalr1.cc:859 +#line 2706 "seclang-parser.cc" // lalr1.cc:859 break; case 172: -#line 1736 "seclang-parser.yy" // lalr1.cc:859 +#line 1734 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_NoDictElement()); } -#line 2717 "seclang-parser.cc" // lalr1.cc:859 +#line 2714 "seclang-parser.cc" // lalr1.cc:859 break; case 173: -#line 1740 "seclang-parser.yy" // lalr1.cc:859 +#line 1738 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2725 "seclang-parser.cc" // lalr1.cc:859 +#line 2722 "seclang-parser.cc" // lalr1.cc:859 break; case 174: -#line 1744 "seclang-parser.yy" // lalr1.cc:859 +#line 1742 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2733 "seclang-parser.cc" // lalr1.cc:859 +#line 2730 "seclang-parser.cc" // lalr1.cc:859 break; case 175: -#line 1748 "seclang-parser.yy" // lalr1.cc:859 +#line 1746 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_NoDictElement()); } -#line 2741 "seclang-parser.cc" // lalr1.cc:859 +#line 2738 "seclang-parser.cc" // lalr1.cc:859 break; case 176: -#line 1752 "seclang-parser.yy" // lalr1.cc:859 +#line 1750 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2749 "seclang-parser.cc" // lalr1.cc:859 +#line 2746 "seclang-parser.cc" // lalr1.cc:859 break; case 177: -#line 1756 "seclang-parser.yy" // lalr1.cc:859 +#line 1754 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2757 "seclang-parser.cc" // lalr1.cc:859 +#line 2754 "seclang-parser.cc" // lalr1.cc:859 break; case 178: -#line 1760 "seclang-parser.yy" // lalr1.cc:859 +#line 1758 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_NoDictElement()); } -#line 2765 "seclang-parser.cc" // lalr1.cc:859 +#line 2762 "seclang-parser.cc" // lalr1.cc:859 break; case 179: -#line 1764 "seclang-parser.yy" // lalr1.cc:859 +#line 1762 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2773 "seclang-parser.cc" // lalr1.cc:859 +#line 2770 "seclang-parser.cc" // lalr1.cc:859 break; case 180: -#line 1768 "seclang-parser.yy" // lalr1.cc:859 +#line 1766 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2781 "seclang-parser.cc" // lalr1.cc:859 +#line 2778 "seclang-parser.cc" // lalr1.cc:859 break; case 181: -#line 1772 "seclang-parser.yy" // lalr1.cc:859 +#line 1770 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_NoDictElement()); } -#line 2789 "seclang-parser.cc" // lalr1.cc:859 +#line 2786 "seclang-parser.cc" // lalr1.cc:859 break; case 182: -#line 1776 "seclang-parser.yy" // lalr1.cc:859 +#line 1774 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2797 "seclang-parser.cc" // lalr1.cc:859 +#line 2794 "seclang-parser.cc" // lalr1.cc:859 break; case 183: -#line 1780 "seclang-parser.yy" // lalr1.cc:859 +#line 1778 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2805 "seclang-parser.cc" // lalr1.cc:859 +#line 2802 "seclang-parser.cc" // lalr1.cc:859 break; case 184: -#line 1784 "seclang-parser.yy" // lalr1.cc:859 +#line 1782 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_NoDictElement()); } -#line 2813 "seclang-parser.cc" // lalr1.cc:859 +#line 2810 "seclang-parser.cc" // lalr1.cc:859 break; case 185: -#line 1788 "seclang-parser.yy" // lalr1.cc:859 +#line 1786 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); } -#line 2821 "seclang-parser.cc" // lalr1.cc:859 +#line 2818 "seclang-parser.cc" // lalr1.cc:859 break; case 186: -#line 1792 "seclang-parser.yy" // lalr1.cc:859 +#line 1790 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); } -#line 2829 "seclang-parser.cc" // lalr1.cc:859 +#line 2826 "seclang-parser.cc" // lalr1.cc:859 break; case 187: -#line 1796 "seclang-parser.yy" // lalr1.cc:859 +#line 1794 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV")); } -#line 2837 "seclang-parser.cc" // lalr1.cc:859 +#line 2834 "seclang-parser.cc" // lalr1.cc:859 break; case 188: -#line 1800 "seclang-parser.yy" // lalr1.cc:859 +#line 1798 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML("XML:" + yystack_[0].value.as< std::string > ())); } -#line 2845 "seclang-parser.cc" // lalr1.cc:859 +#line 2842 "seclang-parser.cc" // lalr1.cc:859 break; case 189: -#line 1804 "seclang-parser.yy" // lalr1.cc:859 +#line 1802 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML("XML:" + yystack_[0].value.as< std::string > ())); } -#line 2853 "seclang-parser.cc" // lalr1.cc:859 +#line 2850 "seclang-parser.cc" // lalr1.cc:859 break; case 190: -#line 1808 "seclang-parser.yy" // lalr1.cc:859 +#line 1806 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML_NoDictElement()); } -#line 2861 "seclang-parser.cc" // lalr1.cc:859 +#line 2858 "seclang-parser.cc" // lalr1.cc:859 break; case 191: -#line 1812 "seclang-parser.yy" // lalr1.cc:859 +#line 1810 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2869 "seclang-parser.cc" // lalr1.cc:859 +#line 2866 "seclang-parser.cc" // lalr1.cc:859 break; case 192: -#line 1816 "seclang-parser.yy" // lalr1.cc:859 +#line 1814 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2877 "seclang-parser.cc" // lalr1.cc:859 +#line 2874 "seclang-parser.cc" // lalr1.cc:859 break; case 193: -#line 1820 "seclang-parser.yy" // lalr1.cc:859 +#line 1818 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_NoDictElement()); } -#line 2885 "seclang-parser.cc" // lalr1.cc:859 +#line 2882 "seclang-parser.cc" // lalr1.cc:859 break; case 194: -#line 1824 "seclang-parser.yy" // lalr1.cc:859 +#line 1822 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 2893 "seclang-parser.cc" // lalr1.cc:859 +#line 2890 "seclang-parser.cc" // lalr1.cc:859 break; case 195: -#line 1828 "seclang-parser.yy" // lalr1.cc:859 +#line 1826 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2901 "seclang-parser.cc" // lalr1.cc:859 +#line 2898 "seclang-parser.cc" // lalr1.cc:859 break; case 196: -#line 1832 "seclang-parser.yy" // lalr1.cc:859 +#line 1830 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2909 "seclang-parser.cc" // lalr1.cc:859 +#line 2906 "seclang-parser.cc" // lalr1.cc:859 break; case 197: -#line 1836 "seclang-parser.yy" // lalr1.cc:859 +#line 1834 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_NoDictElement()); } -#line 2917 "seclang-parser.cc" // lalr1.cc:859 +#line 2914 "seclang-parser.cc" // lalr1.cc:859 break; case 198: -#line 1840 "seclang-parser.yy" // lalr1.cc:859 +#line 1838 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 2925 "seclang-parser.cc" // lalr1.cc:859 +#line 2922 "seclang-parser.cc" // lalr1.cc:859 break; case 199: -#line 1844 "seclang-parser.yy" // lalr1.cc:859 +#line 1842 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2933 "seclang-parser.cc" // lalr1.cc:859 +#line 2930 "seclang-parser.cc" // lalr1.cc:859 break; case 200: -#line 1848 "seclang-parser.yy" // lalr1.cc:859 +#line 1846 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2941 "seclang-parser.cc" // lalr1.cc:859 +#line 2938 "seclang-parser.cc" // lalr1.cc:859 break; case 201: -#line 1852 "seclang-parser.yy" // lalr1.cc:859 +#line 1850 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_NoDictElement()); } -#line 2949 "seclang-parser.cc" // lalr1.cc:859 +#line 2946 "seclang-parser.cc" // lalr1.cc:859 break; case 202: -#line 1856 "seclang-parser.yy" // lalr1.cc:859 +#line 1854 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 2957 "seclang-parser.cc" // lalr1.cc:859 +#line 2954 "seclang-parser.cc" // lalr1.cc:859 break; case 203: -#line 1860 "seclang-parser.yy" // lalr1.cc:859 +#line 1858 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2965 "seclang-parser.cc" // lalr1.cc:859 +#line 2962 "seclang-parser.cc" // lalr1.cc:859 break; case 204: -#line 1864 "seclang-parser.yy" // lalr1.cc:859 +#line 1862 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 2973 "seclang-parser.cc" // lalr1.cc:859 +#line 2970 "seclang-parser.cc" // lalr1.cc:859 break; case 205: -#line 1868 "seclang-parser.yy" // lalr1.cc:859 +#line 1866 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_NoDictElement()); } -#line 2981 "seclang-parser.cc" // lalr1.cc:859 +#line 2978 "seclang-parser.cc" // lalr1.cc:859 break; case 206: -#line 1872 "seclang-parser.yy" // lalr1.cc:859 +#line 1870 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 2989 "seclang-parser.cc" // lalr1.cc:859 +#line 2986 "seclang-parser.cc" // lalr1.cc:859 break; case 207: -#line 1876 "seclang-parser.yy" // lalr1.cc:859 +#line 1874 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DictElement(yystack_[0].value.as< std::string > ())); } -#line 2997 "seclang-parser.cc" // lalr1.cc:859 +#line 2994 "seclang-parser.cc" // lalr1.cc:859 break; case 208: -#line 1880 "seclang-parser.yy" // lalr1.cc:859 +#line 1878 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3005 "seclang-parser.cc" // lalr1.cc:859 +#line 3002 "seclang-parser.cc" // lalr1.cc:859 break; case 209: -#line 1884 "seclang-parser.yy" // lalr1.cc:859 +#line 1882 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_NoDictElement()); } -#line 3013 "seclang-parser.cc" // lalr1.cc:859 +#line 3010 "seclang-parser.cc" // lalr1.cc:859 break; case 210: -#line 1888 "seclang-parser.yy" // lalr1.cc:859 +#line 1886 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 3021 "seclang-parser.cc" // lalr1.cc:859 +#line 3018 "seclang-parser.cc" // lalr1.cc:859 break; case 211: -#line 1892 "seclang-parser.yy" // lalr1.cc:859 +#line 1890 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3029 "seclang-parser.cc" // lalr1.cc:859 +#line 3026 "seclang-parser.cc" // lalr1.cc:859 break; case 212: -#line 1896 "seclang-parser.yy" // lalr1.cc:859 +#line 1894 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3037 "seclang-parser.cc" // lalr1.cc:859 +#line 3034 "seclang-parser.cc" // lalr1.cc:859 break; case 213: -#line 1900 "seclang-parser.yy" // lalr1.cc:859 +#line 1898 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_NoDictElement()); } -#line 3045 "seclang-parser.cc" // lalr1.cc:859 +#line 3042 "seclang-parser.cc" // lalr1.cc:859 break; case 214: -#line 1904 "seclang-parser.yy" // lalr1.cc:859 +#line 1902 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 3053 "seclang-parser.cc" // lalr1.cc:859 +#line 3050 "seclang-parser.cc" // lalr1.cc:859 break; case 215: -#line 1908 "seclang-parser.yy" // lalr1.cc:859 +#line 1906 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3061 "seclang-parser.cc" // lalr1.cc:859 +#line 3058 "seclang-parser.cc" // lalr1.cc:859 break; case 216: -#line 1912 "seclang-parser.yy" // lalr1.cc:859 +#line 1910 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3069 "seclang-parser.cc" // lalr1.cc:859 +#line 3066 "seclang-parser.cc" // lalr1.cc:859 break; case 217: -#line 1916 "seclang-parser.yy" // lalr1.cc:859 +#line 1914 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_NoDictElement()); } -#line 3077 "seclang-parser.cc" // lalr1.cc:859 +#line 3074 "seclang-parser.cc" // lalr1.cc:859 break; case 218: -#line 1920 "seclang-parser.yy" // lalr1.cc:859 +#line 1918 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3085 "seclang-parser.cc" // lalr1.cc:859 +#line 3082 "seclang-parser.cc" // lalr1.cc:859 break; case 219: -#line 1924 "seclang-parser.yy" // lalr1.cc:859 +#line 1922 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3093 "seclang-parser.cc" // lalr1.cc:859 +#line 3090 "seclang-parser.cc" // lalr1.cc:859 break; case 220: -#line 1928 "seclang-parser.yy" // lalr1.cc:859 +#line 1926 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_NoDictElement()); } -#line 3101 "seclang-parser.cc" // lalr1.cc:859 +#line 3098 "seclang-parser.cc" // lalr1.cc:859 break; case 221: -#line 1932 "seclang-parser.yy" // lalr1.cc:859 +#line 1930 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3109 "seclang-parser.cc" // lalr1.cc:859 +#line 3106 "seclang-parser.cc" // lalr1.cc:859 break; case 222: -#line 1936 "seclang-parser.yy" // lalr1.cc:859 +#line 1934 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3117 "seclang-parser.cc" // lalr1.cc:859 +#line 3114 "seclang-parser.cc" // lalr1.cc:859 break; case 223: -#line 1940 "seclang-parser.yy" // lalr1.cc:859 +#line 1938 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_NoDictElement()); } -#line 3125 "seclang-parser.cc" // lalr1.cc:859 +#line 3122 "seclang-parser.cc" // lalr1.cc:859 break; case 224: -#line 1945 "seclang-parser.yy" // lalr1.cc:859 +#line 1943 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3133 "seclang-parser.cc" // lalr1.cc:859 +#line 3130 "seclang-parser.cc" // lalr1.cc:859 break; case 225: -#line 1949 "seclang-parser.yy" // lalr1.cc:859 +#line 1947 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3141 "seclang-parser.cc" // lalr1.cc:859 +#line 3138 "seclang-parser.cc" // lalr1.cc:859 break; case 226: -#line 1953 "seclang-parser.yy" // lalr1.cc:859 +#line 1951 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_NoDictElement()); } -#line 3149 "seclang-parser.cc" // lalr1.cc:859 +#line 3146 "seclang-parser.cc" // lalr1.cc:859 break; case 227: -#line 1958 "seclang-parser.yy" // lalr1.cc:859 +#line 1956 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3157 "seclang-parser.cc" // lalr1.cc:859 +#line 3154 "seclang-parser.cc" // lalr1.cc:859 break; case 228: -#line 1962 "seclang-parser.yy" // lalr1.cc:859 +#line 1960 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3165 "seclang-parser.cc" // lalr1.cc:859 +#line 3162 "seclang-parser.cc" // lalr1.cc:859 break; case 229: -#line 1966 "seclang-parser.yy" // lalr1.cc:859 +#line 1964 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_NoDictElement()); } -#line 3173 "seclang-parser.cc" // lalr1.cc:859 +#line 3170 "seclang-parser.cc" // lalr1.cc:859 break; case 230: -#line 1971 "seclang-parser.yy" // lalr1.cc:859 +#line 1969 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseContentType()); } -#line 3181 "seclang-parser.cc" // lalr1.cc:859 +#line 3178 "seclang-parser.cc" // lalr1.cc:859 break; case 231: -#line 1976 "seclang-parser.yy" // lalr1.cc:859 +#line 1974 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); } -#line 3189 "seclang-parser.cc" // lalr1.cc:859 +#line 3186 "seclang-parser.cc" // lalr1.cc:859 break; case 232: -#line 1980 "seclang-parser.yy" // lalr1.cc:859 +#line 1978 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } -#line 3197 "seclang-parser.cc" // lalr1.cc:859 +#line 3194 "seclang-parser.cc" // lalr1.cc:859 break; case 233: -#line 1984 "seclang-parser.yy" // lalr1.cc:859 +#line 1982 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_NoDictElement()); } -#line 3205 "seclang-parser.cc" // lalr1.cc:859 +#line 3202 "seclang-parser.cc" // lalr1.cc:859 break; case 234: -#line 1988 "seclang-parser.yy" // lalr1.cc:859 +#line 1986 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsCombinedSize()); } -#line 3213 "seclang-parser.cc" // lalr1.cc:859 +#line 3210 "seclang-parser.cc" // lalr1.cc:859 break; case 235: -#line 1992 "seclang-parser.yy" // lalr1.cc:859 +#line 1990 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::AuthType()); } -#line 3221 "seclang-parser.cc" // lalr1.cc:859 +#line 3218 "seclang-parser.cc" // lalr1.cc:859 break; case 236: -#line 1996 "seclang-parser.yy" // lalr1.cc:859 +#line 1994 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesCombinedSize()); } -#line 3229 "seclang-parser.cc" // lalr1.cc:859 +#line 3226 "seclang-parser.cc" // lalr1.cc:859 break; case 237: -#line 2000 "seclang-parser.yy" // lalr1.cc:859 +#line 1998 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FullRequest()); } -#line 3237 "seclang-parser.cc" // lalr1.cc:859 +#line 3234 "seclang-parser.cc" // lalr1.cc:859 break; case 238: -#line 2004 "seclang-parser.yy" // lalr1.cc:859 +#line 2002 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FullRequestLength()); } -#line 3245 "seclang-parser.cc" // lalr1.cc:859 +#line 3242 "seclang-parser.cc" // lalr1.cc:859 break; case 239: -#line 2008 "seclang-parser.yy" // lalr1.cc:859 +#line 2006 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::InboundDataError()); } -#line 3253 "seclang-parser.cc" // lalr1.cc:859 +#line 3250 "seclang-parser.cc" // lalr1.cc:859 break; case 240: -#line 2012 "seclang-parser.yy" // lalr1.cc:859 +#line 2010 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVar()); } -#line 3261 "seclang-parser.cc" // lalr1.cc:859 +#line 3258 "seclang-parser.cc" // lalr1.cc:859 break; case 241: -#line 2016 "seclang-parser.yy" // lalr1.cc:859 +#line 2014 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarName()); } -#line 3269 "seclang-parser.cc" // lalr1.cc:859 +#line 3266 "seclang-parser.cc" // lalr1.cc:859 break; case 242: -#line 2020 "seclang-parser.yy" // lalr1.cc:859 +#line 2018 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartBoundaryQuoted()); } -#line 3277 "seclang-parser.cc" // lalr1.cc:859 +#line 3274 "seclang-parser.cc" // lalr1.cc:859 break; case 243: -#line 2024 "seclang-parser.yy" // lalr1.cc:859 +#line 2022 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartBoundaryWhiteSpace()); } -#line 3285 "seclang-parser.cc" // lalr1.cc:859 +#line 3282 "seclang-parser.cc" // lalr1.cc:859 break; case 244: -#line 2028 "seclang-parser.yy" // lalr1.cc:859 +#line 2026 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartCrlfLFLines()); } -#line 3293 "seclang-parser.cc" // lalr1.cc:859 +#line 3290 "seclang-parser.cc" // lalr1.cc:859 break; case 245: -#line 2032 "seclang-parser.yy" // lalr1.cc:859 +#line 2030 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartDateAfter()); } -#line 3301 "seclang-parser.cc" // lalr1.cc:859 +#line 3298 "seclang-parser.cc" // lalr1.cc:859 break; case 246: -#line 2036 "seclang-parser.yy" // lalr1.cc:859 +#line 2034 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartDateBefore()); } -#line 3309 "seclang-parser.cc" // lalr1.cc:859 +#line 3306 "seclang-parser.cc" // lalr1.cc:859 break; case 247: -#line 2040 "seclang-parser.yy" // lalr1.cc:859 +#line 2038 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartFileLimitExceeded()); } -#line 3317 "seclang-parser.cc" // lalr1.cc:859 +#line 3314 "seclang-parser.cc" // lalr1.cc:859 break; case 248: -#line 2044 "seclang-parser.yy" // lalr1.cc:859 +#line 2042 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartHeaderFolding()); } -#line 3325 "seclang-parser.cc" // lalr1.cc:859 +#line 3322 "seclang-parser.cc" // lalr1.cc:859 break; case 249: -#line 2048 "seclang-parser.yy" // lalr1.cc:859 +#line 2046 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidHeaderFolding()); } -#line 3333 "seclang-parser.cc" // lalr1.cc:859 +#line 3330 "seclang-parser.cc" // lalr1.cc:859 break; case 250: -#line 2052 "seclang-parser.yy" // lalr1.cc:859 +#line 2050 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidPart()); } -#line 3341 "seclang-parser.cc" // lalr1.cc:859 +#line 3338 "seclang-parser.cc" // lalr1.cc:859 break; case 251: -#line 2056 "seclang-parser.yy" // lalr1.cc:859 +#line 2054 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidQuoting()); } -#line 3349 "seclang-parser.cc" // lalr1.cc:859 +#line 3346 "seclang-parser.cc" // lalr1.cc:859 break; case 252: -#line 2060 "seclang-parser.yy" // lalr1.cc:859 +#line 2058 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartLFLine()); } -#line 3357 "seclang-parser.cc" // lalr1.cc:859 +#line 3354 "seclang-parser.cc" // lalr1.cc:859 break; case 253: -#line 2064 "seclang-parser.yy" // lalr1.cc:859 +#line 2062 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartMissingSemicolon()); } -#line 3365 "seclang-parser.cc" // lalr1.cc:859 +#line 3362 "seclang-parser.cc" // lalr1.cc:859 break; case 254: -#line 2068 "seclang-parser.yy" // lalr1.cc:859 +#line 2066 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartStrictError()); } -#line 3373 "seclang-parser.cc" // lalr1.cc:859 +#line 3370 "seclang-parser.cc" // lalr1.cc:859 break; case 255: -#line 2072 "seclang-parser.yy" // lalr1.cc:859 +#line 2070 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartUnmatchedBoundary()); } -#line 3381 "seclang-parser.cc" // lalr1.cc:859 +#line 3378 "seclang-parser.cc" // lalr1.cc:859 break; case 256: -#line 2076 "seclang-parser.yy" // lalr1.cc:859 +#line 2074 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::OutboundDataError()); } -#line 3389 "seclang-parser.cc" // lalr1.cc:859 +#line 3386 "seclang-parser.cc" // lalr1.cc:859 break; case 257: -#line 2080 "seclang-parser.yy" // lalr1.cc:859 +#line 2078 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::PathInfo()); } -#line 3397 "seclang-parser.cc" // lalr1.cc:859 +#line 3394 "seclang-parser.cc" // lalr1.cc:859 break; case 258: -#line 2084 "seclang-parser.yy" // lalr1.cc:859 +#line 2082 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::QueryString()); } -#line 3405 "seclang-parser.cc" // lalr1.cc:859 +#line 3402 "seclang-parser.cc" // lalr1.cc:859 break; case 259: -#line 2088 "seclang-parser.yy" // lalr1.cc:859 +#line 2086 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemoteAddr()); } -#line 3413 "seclang-parser.cc" // lalr1.cc:859 +#line 3410 "seclang-parser.cc" // lalr1.cc:859 break; case 260: -#line 2092 "seclang-parser.yy" // lalr1.cc:859 +#line 2090 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemoteHost()); } -#line 3421 "seclang-parser.cc" // lalr1.cc:859 +#line 3418 "seclang-parser.cc" // lalr1.cc:859 break; case 261: -#line 2096 "seclang-parser.yy" // lalr1.cc:859 +#line 2094 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemotePort()); } -#line 3429 "seclang-parser.cc" // lalr1.cc:859 +#line 3426 "seclang-parser.cc" // lalr1.cc:859 break; case 262: -#line 2100 "seclang-parser.yy" // lalr1.cc:859 +#line 2098 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyError()); } -#line 3437 "seclang-parser.cc" // lalr1.cc:859 +#line 3434 "seclang-parser.cc" // lalr1.cc:859 break; case 263: -#line 2104 "seclang-parser.yy" // lalr1.cc:859 +#line 2102 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyErrorMsg()); } -#line 3445 "seclang-parser.cc" // lalr1.cc:859 +#line 3442 "seclang-parser.cc" // lalr1.cc:859 break; case 264: -#line 2108 "seclang-parser.yy" // lalr1.cc:859 +#line 2106 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessor()); } -#line 3453 "seclang-parser.cc" // lalr1.cc:859 +#line 3450 "seclang-parser.cc" // lalr1.cc:859 break; case 265: -#line 2112 "seclang-parser.yy" // lalr1.cc:859 +#line 2110 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessorError()); } -#line 3461 "seclang-parser.cc" // lalr1.cc:859 +#line 3458 "seclang-parser.cc" // lalr1.cc:859 break; case 266: -#line 2116 "seclang-parser.yy" // lalr1.cc:859 +#line 2114 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessorErrorMsg()); } -#line 3469 "seclang-parser.cc" // lalr1.cc:859 +#line 3466 "seclang-parser.cc" // lalr1.cc:859 break; case 267: -#line 2120 "seclang-parser.yy" // lalr1.cc:859 +#line 2118 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBasename()); } -#line 3477 "seclang-parser.cc" // lalr1.cc:859 +#line 3474 "seclang-parser.cc" // lalr1.cc:859 break; case 268: -#line 2124 "seclang-parser.yy" // lalr1.cc:859 +#line 2122 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBody()); } -#line 3485 "seclang-parser.cc" // lalr1.cc:859 +#line 3482 "seclang-parser.cc" // lalr1.cc:859 break; case 269: -#line 2128 "seclang-parser.yy" // lalr1.cc:859 +#line 2126 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBodyLength()); } -#line 3493 "seclang-parser.cc" // lalr1.cc:859 +#line 3490 "seclang-parser.cc" // lalr1.cc:859 break; case 270: -#line 2132 "seclang-parser.yy" // lalr1.cc:859 +#line 2130 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestFilename()); } -#line 3501 "seclang-parser.cc" // lalr1.cc:859 +#line 3498 "seclang-parser.cc" // lalr1.cc:859 break; case 271: -#line 2136 "seclang-parser.yy" // lalr1.cc:859 +#line 2134 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestLine()); } -#line 3509 "seclang-parser.cc" // lalr1.cc:859 +#line 3506 "seclang-parser.cc" // lalr1.cc:859 break; case 272: -#line 2140 "seclang-parser.yy" // lalr1.cc:859 +#line 2138 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestMethod()); } -#line 3517 "seclang-parser.cc" // lalr1.cc:859 +#line 3514 "seclang-parser.cc" // lalr1.cc:859 break; case 273: -#line 2144 "seclang-parser.yy" // lalr1.cc:859 +#line 2142 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestProtocol()); } -#line 3525 "seclang-parser.cc" // lalr1.cc:859 +#line 3522 "seclang-parser.cc" // lalr1.cc:859 break; case 274: -#line 2148 "seclang-parser.yy" // lalr1.cc:859 +#line 2146 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestURI()); } -#line 3533 "seclang-parser.cc" // lalr1.cc:859 +#line 3530 "seclang-parser.cc" // lalr1.cc:859 break; case 275: -#line 2152 "seclang-parser.yy" // lalr1.cc:859 +#line 2150 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestURIRaw()); } -#line 3541 "seclang-parser.cc" // lalr1.cc:859 +#line 3538 "seclang-parser.cc" // lalr1.cc:859 break; case 276: -#line 2156 "seclang-parser.yy" // lalr1.cc:859 +#line 2154 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseBody()); } -#line 3549 "seclang-parser.cc" // lalr1.cc:859 +#line 3546 "seclang-parser.cc" // lalr1.cc:859 break; case 277: -#line 2160 "seclang-parser.yy" // lalr1.cc:859 +#line 2158 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseContentLength()); } -#line 3557 "seclang-parser.cc" // lalr1.cc:859 +#line 3554 "seclang-parser.cc" // lalr1.cc:859 break; case 278: -#line 2164 "seclang-parser.yy" // lalr1.cc:859 +#line 2162 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseProtocol()); } -#line 3565 "seclang-parser.cc" // lalr1.cc:859 +#line 3562 "seclang-parser.cc" // lalr1.cc:859 break; case 279: -#line 2168 "seclang-parser.yy" // lalr1.cc:859 +#line 2166 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseStatus()); } -#line 3573 "seclang-parser.cc" // lalr1.cc:859 +#line 3570 "seclang-parser.cc" // lalr1.cc:859 break; case 280: -#line 2172 "seclang-parser.yy" // lalr1.cc:859 +#line 2170 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerAddr()); } -#line 3581 "seclang-parser.cc" // lalr1.cc:859 +#line 3578 "seclang-parser.cc" // lalr1.cc:859 break; case 281: -#line 2176 "seclang-parser.yy" // lalr1.cc:859 +#line 2174 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerName()); } -#line 3589 "seclang-parser.cc" // lalr1.cc:859 +#line 3586 "seclang-parser.cc" // lalr1.cc:859 break; case 282: -#line 2180 "seclang-parser.yy" // lalr1.cc:859 +#line 2178 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerPort()); } -#line 3597 "seclang-parser.cc" // lalr1.cc:859 +#line 3594 "seclang-parser.cc" // lalr1.cc:859 break; case 283: -#line 2184 "seclang-parser.yy" // lalr1.cc:859 +#line 2182 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::SessionID()); } -#line 3605 "seclang-parser.cc" // lalr1.cc:859 +#line 3602 "seclang-parser.cc" // lalr1.cc:859 break; case 284: -#line 2188 "seclang-parser.yy" // lalr1.cc:859 +#line 2186 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UniqueID()); } -#line 3613 "seclang-parser.cc" // lalr1.cc:859 +#line 3610 "seclang-parser.cc" // lalr1.cc:859 break; case 285: -#line 2192 "seclang-parser.yy" // lalr1.cc:859 +#line 2190 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UrlEncodedError()); } -#line 3621 "seclang-parser.cc" // lalr1.cc:859 +#line 3618 "seclang-parser.cc" // lalr1.cc:859 break; case 286: -#line 2196 "seclang-parser.yy" // lalr1.cc:859 +#line 2194 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UserID()); } -#line 3629 "seclang-parser.cc" // lalr1.cc:859 +#line 3626 "seclang-parser.cc" // lalr1.cc:859 break; case 287: -#line 2200 "seclang-parser.yy" // lalr1.cc:859 +#line 2198 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Status()); } -#line 3637 "seclang-parser.cc" // lalr1.cc:859 +#line 3634 "seclang-parser.cc" // lalr1.cc:859 break; case 288: -#line 2204 "seclang-parser.yy" // lalr1.cc:859 +#line 2202 "seclang-parser.yy" // lalr1.cc:859 { VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::WebAppId()); } -#line 3645 "seclang-parser.cc" // lalr1.cc:859 +#line 3642 "seclang-parser.cc" // lalr1.cc:859 break; case 289: -#line 2208 "seclang-parser.yy" // lalr1.cc:859 +#line 2206 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new Duration(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3656 "seclang-parser.cc" // lalr1.cc:859 +#line 3653 "seclang-parser.cc" // lalr1.cc:859 break; case 290: -#line 2216 "seclang-parser.yy" // lalr1.cc:859 +#line 2214 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new ModsecBuild(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3667 "seclang-parser.cc" // lalr1.cc:859 +#line 3664 "seclang-parser.cc" // lalr1.cc:859 break; case 291: -#line 2223 "seclang-parser.yy" // lalr1.cc:859 +#line 2221 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new HighestSeverity(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3678 "seclang-parser.cc" // lalr1.cc:859 +#line 3675 "seclang-parser.cc" // lalr1.cc:859 break; case 292: -#line 2230 "seclang-parser.yy" // lalr1.cc:859 +#line 2228 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new RemoteUser(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3689 "seclang-parser.cc" // lalr1.cc:859 +#line 3686 "seclang-parser.cc" // lalr1.cc:859 break; case 293: -#line 2237 "seclang-parser.yy" // lalr1.cc:859 +#line 2235 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new Time(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3700 "seclang-parser.cc" // lalr1.cc:859 +#line 3697 "seclang-parser.cc" // lalr1.cc:859 break; case 294: -#line 2244 "seclang-parser.yy" // lalr1.cc:859 +#line 2242 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeDay(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3711 "seclang-parser.cc" // lalr1.cc:859 +#line 3708 "seclang-parser.cc" // lalr1.cc:859 break; case 295: -#line 2251 "seclang-parser.yy" // lalr1.cc:859 +#line 2249 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeEpoch(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3722 "seclang-parser.cc" // lalr1.cc:859 +#line 3719 "seclang-parser.cc" // lalr1.cc:859 break; case 296: -#line 2258 "seclang-parser.yy" // lalr1.cc:859 +#line 2256 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeHour(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3733 "seclang-parser.cc" // lalr1.cc:859 +#line 3730 "seclang-parser.cc" // lalr1.cc:859 break; case 297: -#line 2265 "seclang-parser.yy" // lalr1.cc:859 +#line 2263 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeMin(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3744 "seclang-parser.cc" // lalr1.cc:859 +#line 3741 "seclang-parser.cc" // lalr1.cc:859 break; case 298: -#line 2272 "seclang-parser.yy" // lalr1.cc:859 +#line 2270 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeMon(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3755 "seclang-parser.cc" // lalr1.cc:859 +#line 3752 "seclang-parser.cc" // lalr1.cc:859 break; case 299: -#line 2279 "seclang-parser.yy" // lalr1.cc:859 +#line 2277 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeSec(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3766 "seclang-parser.cc" // lalr1.cc:859 +#line 3763 "seclang-parser.cc" // lalr1.cc:859 break; case 300: -#line 2286 "seclang-parser.yy" // lalr1.cc:859 +#line 2284 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeWDay(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3777 "seclang-parser.cc" // lalr1.cc:859 +#line 3774 "seclang-parser.cc" // lalr1.cc:859 break; case 301: -#line 2293 "seclang-parser.yy" // lalr1.cc:859 +#line 2291 "seclang-parser.yy" // lalr1.cc:859 { std::string name(yystack_[0].value.as< std::string > ()); char z = name.at(0); std::unique_ptr c(new TimeYear(name)); yylhs.value.as< std::unique_ptr > () = std::move(c); } -#line 3788 "seclang-parser.cc" // lalr1.cc:859 +#line 3785 "seclang-parser.cc" // lalr1.cc:859 break; case 302: -#line 2303 "seclang-parser.yy" // lalr1.cc:859 +#line 2301 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Accuracy(yystack_[0].value.as< std::string > ())); } -#line 3796 "seclang-parser.cc" // lalr1.cc:859 +#line 3793 "seclang-parser.cc" // lalr1.cc:859 break; case 303: -#line 2307 "seclang-parser.yy" // lalr1.cc:859 +#line 2305 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::disruptive::Allow(yystack_[0].value.as< std::string > ())); } -#line 3804 "seclang-parser.cc" // lalr1.cc:859 +#line 3801 "seclang-parser.cc" // lalr1.cc:859 break; case 304: -#line 2311 "seclang-parser.yy" // lalr1.cc:859 +#line 2309 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("Append", yystack_[1].location); } -#line 3812 "seclang-parser.cc" // lalr1.cc:859 +#line 3809 "seclang-parser.cc" // lalr1.cc:859 break; case 305: -#line 2315 "seclang-parser.yy" // lalr1.cc:859 +#line 2313 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::AuditLog(yystack_[0].value.as< std::string > ())); } -#line 3820 "seclang-parser.cc" // lalr1.cc:859 +#line 3817 "seclang-parser.cc" // lalr1.cc:859 break; case 306: -#line 2319 "seclang-parser.yy" // lalr1.cc:859 +#line 2317 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::disruptive::Block(yystack_[0].value.as< std::string > ())); } -#line 3828 "seclang-parser.cc" // lalr1.cc:859 +#line 3825 "seclang-parser.cc" // lalr1.cc:859 break; case 307: -#line 2323 "seclang-parser.yy" // lalr1.cc:859 +#line 2321 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Capture(yystack_[0].value.as< std::string > ())); } -#line 3836 "seclang-parser.cc" // lalr1.cc:859 +#line 3833 "seclang-parser.cc" // lalr1.cc:859 break; case 308: -#line 2327 "seclang-parser.yy" // lalr1.cc:859 +#line 2325 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Chain(yystack_[0].value.as< std::string > ())); } -#line 3844 "seclang-parser.cc" // lalr1.cc:859 +#line 3841 "seclang-parser.cc" // lalr1.cc:859 break; case 309: -#line 2331 "seclang-parser.yy" // lalr1.cc:859 +#line 2329 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[1].value.as< std::string > ())); } -#line 3853 "seclang-parser.cc" // lalr1.cc:859 +#line 3850 "seclang-parser.cc" // lalr1.cc:859 break; case 310: -#line 2336 "seclang-parser.yy" // lalr1.cc:859 +#line 2334 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[1].value.as< std::string > ())); } -#line 3862 "seclang-parser.cc" // lalr1.cc:859 +#line 3859 "seclang-parser.cc" // lalr1.cc:859 break; case 311: -#line 2341 "seclang-parser.yy" // lalr1.cc:859 +#line 2339 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[1].value.as< std::string > ())); } -#line 3871 "seclang-parser.cc" // lalr1.cc:859 +#line 3868 "seclang-parser.cc" // lalr1.cc:859 break; case 312: -#line 2346 "seclang-parser.yy" // lalr1.cc:859 +#line 2344 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::AuditLogParts(yystack_[0].value.as< std::string > ())); } -#line 3879 "seclang-parser.cc" // lalr1.cc:859 +#line 3876 "seclang-parser.cc" // lalr1.cc:859 break; case 313: -#line 2350 "seclang-parser.yy" // lalr1.cc:859 +#line 2348 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RequestBodyProcessorJSON(yystack_[0].value.as< std::string > ())); } -#line 3887 "seclang-parser.cc" // lalr1.cc:859 +#line 3884 "seclang-parser.cc" // lalr1.cc:859 break; case 314: -#line 2354 "seclang-parser.yy" // lalr1.cc:859 +#line 2352 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RequestBodyProcessorXML(yystack_[0].value.as< std::string > ())); } -#line 3895 "seclang-parser.cc" // lalr1.cc:859 +#line 3892 "seclang-parser.cc" // lalr1.cc:859 break; case 315: -#line 2358 "seclang-parser.yy" // lalr1.cc:859 +#line 2356 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[1].value.as< std::string > ())); } -#line 3904 "seclang-parser.cc" // lalr1.cc:859 +#line 3901 "seclang-parser.cc" // lalr1.cc:859 break; case 316: -#line 2363 "seclang-parser.yy" // lalr1.cc:859 +#line 2361 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[1].value.as< std::string > ())); } -#line 3913 "seclang-parser.cc" // lalr1.cc:859 +#line 3910 "seclang-parser.cc" // lalr1.cc:859 break; case 317: -#line 2368 "seclang-parser.yy" // lalr1.cc:859 +#line 2366 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as< std::string > () + "true")); } -#line 3921 "seclang-parser.cc" // lalr1.cc:859 +#line 3918 "seclang-parser.cc" // lalr1.cc:859 break; case 318: -#line 2372 "seclang-parser.yy" // lalr1.cc:859 +#line 2370 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RequestBodyAccess(yystack_[1].value.as< std::string > () + "false")); } -#line 3929 "seclang-parser.cc" // lalr1.cc:859 +#line 3926 "seclang-parser.cc" // lalr1.cc:859 break; case 319: -#line 2376 "seclang-parser.yy" // lalr1.cc:859 +#line 2374 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=on")); } -#line 3937 "seclang-parser.cc" // lalr1.cc:859 +#line 3934 "seclang-parser.cc" // lalr1.cc:859 break; case 320: -#line 2380 "seclang-parser.yy" // lalr1.cc:859 +#line 2378 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=off")); } -#line 3945 "seclang-parser.cc" // lalr1.cc:859 +#line 3942 "seclang-parser.cc" // lalr1.cc:859 break; case 321: -#line 2384 "seclang-parser.yy" // lalr1.cc:859 +#line 2382 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleEngine("ctl:RuleEngine=detectiononly")); } -#line 3953 "seclang-parser.cc" // lalr1.cc:859 +#line 3950 "seclang-parser.cc" // lalr1.cc:859 break; case 322: -#line 2388 "seclang-parser.yy" // lalr1.cc:859 +#line 2386 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleRemoveById(yystack_[0].value.as< std::string > ())); } -#line 3961 "seclang-parser.cc" // lalr1.cc:859 +#line 3958 "seclang-parser.cc" // lalr1.cc:859 break; case 323: -#line 2392 "seclang-parser.yy" // lalr1.cc:859 +#line 2390 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleRemoveTargetById(yystack_[0].value.as< std::string > ())); } -#line 3969 "seclang-parser.cc" // lalr1.cc:859 +#line 3966 "seclang-parser.cc" // lalr1.cc:859 break; case 324: -#line 2396 "seclang-parser.yy" // lalr1.cc:859 +#line 2394 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::ctl::RuleRemoveTargetByTag(yystack_[0].value.as< std::string > ())); } -#line 3977 "seclang-parser.cc" // lalr1.cc:859 +#line 3974 "seclang-parser.cc" // lalr1.cc:859 break; case 325: -#line 2400 "seclang-parser.yy" // lalr1.cc:859 +#line 2398 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::disruptive::Deny(yystack_[0].value.as< std::string > ())); } -#line 3985 "seclang-parser.cc" // lalr1.cc:859 +#line 3982 "seclang-parser.cc" // lalr1.cc:859 break; case 326: -#line 2404 "seclang-parser.yy" // lalr1.cc:859 +#line 2402 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("DeprecateVar", yystack_[1].location); } -#line 3993 "seclang-parser.cc" // lalr1.cc:859 +#line 3990 "seclang-parser.cc" // lalr1.cc:859 break; case 327: -#line 2408 "seclang-parser.yy" // lalr1.cc:859 +#line 2406 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("Drop", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[0].value.as< std::string > ())); } -#line 4002 "seclang-parser.cc" // lalr1.cc:859 +#line 3999 "seclang-parser.cc" // lalr1.cc:859 break; case 328: -#line 2413 "seclang-parser.yy" // lalr1.cc:859 +#line 2411 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Exec(yystack_[0].value.as< std::string > ())); } -#line 4010 "seclang-parser.cc" // lalr1.cc:859 +#line 4007 "seclang-parser.cc" // lalr1.cc:859 break; case 329: -#line 2417 "seclang-parser.yy" // lalr1.cc:859 +#line 2415 "seclang-parser.yy" // lalr1.cc:859 { //ACTION_NOT_SUPPORTED("ExpireVar", @0); ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Action(yystack_[0].value.as< std::string > ())); } -#line 4019 "seclang-parser.cc" // lalr1.cc:859 +#line 4016 "seclang-parser.cc" // lalr1.cc:859 break; case 330: -#line 2422 "seclang-parser.yy" // lalr1.cc:859 +#line 2420 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::RuleId(yystack_[0].value.as< std::string > ())); } -#line 4027 "seclang-parser.cc" // lalr1.cc:859 +#line 4024 "seclang-parser.cc" // lalr1.cc:859 break; case 331: -#line 2426 "seclang-parser.yy" // lalr1.cc:859 +#line 2424 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::InitCol(yystack_[1].value.as< std::string > (), std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4035 "seclang-parser.cc" // lalr1.cc:859 +#line 4032 "seclang-parser.cc" // lalr1.cc:859 break; case 332: -#line 2430 "seclang-parser.yy" // lalr1.cc:859 +#line 2428 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::LogData(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4043 "seclang-parser.cc" // lalr1.cc:859 +#line 4040 "seclang-parser.cc" // lalr1.cc:859 break; case 333: -#line 2434 "seclang-parser.yy" // lalr1.cc:859 +#line 2432 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Log(yystack_[0].value.as< std::string > ())); } -#line 4051 "seclang-parser.cc" // lalr1.cc:859 +#line 4048 "seclang-parser.cc" // lalr1.cc:859 break; case 334: -#line 2438 "seclang-parser.yy" // lalr1.cc:859 +#line 2436 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Maturity(yystack_[0].value.as< std::string > ())); } -#line 4059 "seclang-parser.cc" // lalr1.cc:859 +#line 4056 "seclang-parser.cc" // lalr1.cc:859 break; case 335: -#line 2442 "seclang-parser.yy" // lalr1.cc:859 +#line 2440 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Msg(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4067 "seclang-parser.cc" // lalr1.cc:859 +#line 4064 "seclang-parser.cc" // lalr1.cc:859 break; case 336: -#line 2446 "seclang-parser.yy" // lalr1.cc:859 +#line 2444 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::MultiMatch(yystack_[0].value.as< std::string > ())); } -#line 4075 "seclang-parser.cc" // lalr1.cc:859 +#line 4072 "seclang-parser.cc" // lalr1.cc:859 break; case 337: -#line 2450 "seclang-parser.yy" // lalr1.cc:859 +#line 2448 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::NoAuditLog(yystack_[0].value.as< std::string > ())); } -#line 4083 "seclang-parser.cc" // lalr1.cc:859 +#line 4080 "seclang-parser.cc" // lalr1.cc:859 break; case 338: -#line 2454 "seclang-parser.yy" // lalr1.cc:859 +#line 2452 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::NoLog(yystack_[0].value.as< std::string > ())); } -#line 4091 "seclang-parser.cc" // lalr1.cc:859 +#line 4088 "seclang-parser.cc" // lalr1.cc:859 break; case 339: -#line 2458 "seclang-parser.yy" // lalr1.cc:859 +#line 2456 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::disruptive::Pass(yystack_[0].value.as< std::string > ())); } -#line 4099 "seclang-parser.cc" // lalr1.cc:859 +#line 4096 "seclang-parser.cc" // lalr1.cc:859 break; case 340: -#line 2462 "seclang-parser.yy" // lalr1.cc:859 +#line 2460 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("Pause", yystack_[1].location); } -#line 4107 "seclang-parser.cc" // lalr1.cc:859 +#line 4104 "seclang-parser.cc" // lalr1.cc:859 break; case 341: -#line 2466 "seclang-parser.yy" // lalr1.cc:859 +#line 2464 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Phase(yystack_[0].value.as< std::string > ())); } -#line 4115 "seclang-parser.cc" // lalr1.cc:859 +#line 4112 "seclang-parser.cc" // lalr1.cc:859 break; case 342: -#line 2470 "seclang-parser.yy" // lalr1.cc:859 +#line 2468 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("Prepend", yystack_[1].location); } -#line 4123 "seclang-parser.cc" // lalr1.cc:859 +#line 4120 "seclang-parser.cc" // lalr1.cc:859 break; case 343: -#line 2474 "seclang-parser.yy" // lalr1.cc:859 +#line 2472 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("Proxy", yystack_[1].location); } -#line 4131 "seclang-parser.cc" // lalr1.cc:859 +#line 4128 "seclang-parser.cc" // lalr1.cc:859 break; case 344: -#line 2478 "seclang-parser.yy" // lalr1.cc:859 +#line 2476 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::disruptive::Redirect(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4139 "seclang-parser.cc" // lalr1.cc:859 +#line 4136 "seclang-parser.cc" // lalr1.cc:859 break; case 345: -#line 2482 "seclang-parser.yy" // lalr1.cc:859 +#line 2480 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Rev(yystack_[0].value.as< std::string > ())); } -#line 4147 "seclang-parser.cc" // lalr1.cc:859 +#line 4144 "seclang-parser.cc" // lalr1.cc:859 break; case 346: -#line 2486 "seclang-parser.yy" // lalr1.cc:859 +#line 2484 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SanatiseArg", yystack_[1].location); } -#line 4155 "seclang-parser.cc" // lalr1.cc:859 +#line 4152 "seclang-parser.cc" // lalr1.cc:859 break; case 347: -#line 2490 "seclang-parser.yy" // lalr1.cc:859 +#line 2488 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SanatiseMatched", yystack_[1].location); } -#line 4163 "seclang-parser.cc" // lalr1.cc:859 +#line 4160 "seclang-parser.cc" // lalr1.cc:859 break; case 348: -#line 2494 "seclang-parser.yy" // lalr1.cc:859 +#line 2492 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SanatiseMatchedBytes", yystack_[1].location); } -#line 4171 "seclang-parser.cc" // lalr1.cc:859 +#line 4168 "seclang-parser.cc" // lalr1.cc:859 break; case 349: -#line 2498 "seclang-parser.yy" // lalr1.cc:859 +#line 2496 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SanatiseRequestHeader", yystack_[1].location); } -#line 4179 "seclang-parser.cc" // lalr1.cc:859 +#line 4176 "seclang-parser.cc" // lalr1.cc:859 break; case 350: -#line 2502 "seclang-parser.yy" // lalr1.cc:859 +#line 2500 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SanatiseResponseHeader", yystack_[1].location); } -#line 4187 "seclang-parser.cc" // lalr1.cc:859 +#line 4184 "seclang-parser.cc" // lalr1.cc:859 break; case 351: -#line 2506 "seclang-parser.yy" // lalr1.cc:859 +#line 2504 "seclang-parser.yy" // lalr1.cc:859 { ACTION_NOT_SUPPORTED("SetEnv", yystack_[1].location); } -#line 4195 "seclang-parser.cc" // lalr1.cc:859 +#line 4192 "seclang-parser.cc" // lalr1.cc:859 break; case 352: -#line 2510 "seclang-parser.yy" // lalr1.cc:859 +#line 2508 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetRSC(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4203 "seclang-parser.cc" // lalr1.cc:859 +#line 4200 "seclang-parser.cc" // lalr1.cc:859 break; case 353: -#line 2514 "seclang-parser.yy" // lalr1.cc:859 +#line 2512 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetSID(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4211 "seclang-parser.cc" // lalr1.cc:859 +#line 4208 "seclang-parser.cc" // lalr1.cc:859 break; case 354: -#line 2518 "seclang-parser.yy" // lalr1.cc:859 +#line 2516 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetUID(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4219 "seclang-parser.cc" // lalr1.cc:859 +#line 4216 "seclang-parser.cc" // lalr1.cc:859 break; case 355: -#line 2522 "seclang-parser.yy" // lalr1.cc:859 +#line 2520 "seclang-parser.yy" // lalr1.cc:859 { yylhs.value.as< std::unique_ptr > () = std::move(yystack_[0].value.as< std::unique_ptr > ()); } -#line 4227 "seclang-parser.cc" // lalr1.cc:859 +#line 4224 "seclang-parser.cc" // lalr1.cc:859 break; case 356: -#line 2526 "seclang-parser.yy" // lalr1.cc:859 +#line 2524 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Severity(yystack_[0].value.as< std::string > ())); } -#line 4235 "seclang-parser.cc" // lalr1.cc:859 +#line 4232 "seclang-parser.cc" // lalr1.cc:859 break; case 357: -#line 2530 "seclang-parser.yy" // lalr1.cc:859 +#line 2528 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Skip(yystack_[0].value.as< std::string > ())); } -#line 4243 "seclang-parser.cc" // lalr1.cc:859 +#line 4240 "seclang-parser.cc" // lalr1.cc:859 break; case 358: -#line 2534 "seclang-parser.yy" // lalr1.cc:859 +#line 2532 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SkipAfter(yystack_[0].value.as< std::string > ())); } -#line 4251 "seclang-parser.cc" // lalr1.cc:859 +#line 4248 "seclang-parser.cc" // lalr1.cc:859 break; case 359: -#line 2538 "seclang-parser.yy" // lalr1.cc:859 +#line 2536 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::data::Status(yystack_[0].value.as< std::string > ())); } -#line 4259 "seclang-parser.cc" // lalr1.cc:859 +#line 4256 "seclang-parser.cc" // lalr1.cc:859 break; case 360: -#line 2542 "seclang-parser.yy" // lalr1.cc:859 +#line 2540 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Tag(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4267 "seclang-parser.cc" // lalr1.cc:859 +#line 4264 "seclang-parser.cc" // lalr1.cc:859 break; case 361: -#line 2546 "seclang-parser.yy" // lalr1.cc:859 +#line 2544 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::Ver(yystack_[0].value.as< std::string > ())); } -#line 4275 "seclang-parser.cc" // lalr1.cc:859 +#line 4272 "seclang-parser.cc" // lalr1.cc:859 break; case 362: -#line 2550 "seclang-parser.yy" // lalr1.cc:859 +#line 2548 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::XmlNS(yystack_[0].value.as< std::string > ())); } -#line 4283 "seclang-parser.cc" // lalr1.cc:859 +#line 4280 "seclang-parser.cc" // lalr1.cc:859 break; case 363: -#line 2554 "seclang-parser.yy" // lalr1.cc:859 +#line 2552 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::ParityZero7bit(yystack_[0].value.as< std::string > ())); } -#line 4291 "seclang-parser.cc" // lalr1.cc:859 +#line 4288 "seclang-parser.cc" // lalr1.cc:859 break; case 364: -#line 2558 "seclang-parser.yy" // lalr1.cc:859 +#line 2556 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::ParityOdd7bit(yystack_[0].value.as< std::string > ())); } -#line 4299 "seclang-parser.cc" // lalr1.cc:859 +#line 4296 "seclang-parser.cc" // lalr1.cc:859 break; case 365: -#line 2562 "seclang-parser.yy" // lalr1.cc:859 +#line 2560 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::ParityEven7bit(yystack_[0].value.as< std::string > ())); } -#line 4307 "seclang-parser.cc" // lalr1.cc:859 +#line 4304 "seclang-parser.cc" // lalr1.cc:859 break; case 366: -#line 2566 "seclang-parser.yy" // lalr1.cc:859 +#line 2564 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::SqlHexDecode(yystack_[0].value.as< std::string > ())); } -#line 4315 "seclang-parser.cc" // lalr1.cc:859 +#line 4312 "seclang-parser.cc" // lalr1.cc:859 break; case 367: -#line 2570 "seclang-parser.yy" // lalr1.cc:859 +#line 2568 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::CmdLine(yystack_[0].value.as< std::string > ())); } -#line 4323 "seclang-parser.cc" // lalr1.cc:859 +#line 4320 "seclang-parser.cc" // lalr1.cc:859 break; case 368: -#line 2574 "seclang-parser.yy" // lalr1.cc:859 +#line 2572 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::Sha1(yystack_[0].value.as< std::string > ())); } -#line 4331 "seclang-parser.cc" // lalr1.cc:859 +#line 4328 "seclang-parser.cc" // lalr1.cc:859 break; case 369: -#line 2578 "seclang-parser.yy" // lalr1.cc:859 +#line 2576 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::Md5(yystack_[0].value.as< std::string > ())); } -#line 4339 "seclang-parser.cc" // lalr1.cc:859 +#line 4336 "seclang-parser.cc" // lalr1.cc:859 break; case 370: -#line 2582 "seclang-parser.yy" // lalr1.cc:859 +#line 2580 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::HexEncode(yystack_[0].value.as< std::string > ())); } -#line 4347 "seclang-parser.cc" // lalr1.cc:859 +#line 4344 "seclang-parser.cc" // lalr1.cc:859 break; case 371: -#line 2586 "seclang-parser.yy" // lalr1.cc:859 +#line 2584 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::HexDecode(yystack_[0].value.as< std::string > ())); } -#line 4355 "seclang-parser.cc" // lalr1.cc:859 +#line 4352 "seclang-parser.cc" // lalr1.cc:859 break; case 372: -#line 2590 "seclang-parser.yy" // lalr1.cc:859 +#line 2588 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::LowerCase(yystack_[0].value.as< std::string > ())); } -#line 4363 "seclang-parser.cc" // lalr1.cc:859 +#line 4360 "seclang-parser.cc" // lalr1.cc:859 break; case 373: -#line 2594 "seclang-parser.yy" // lalr1.cc:859 +#line 2592 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::UpperCase(yystack_[0].value.as< std::string > ())); } -#line 4371 "seclang-parser.cc" // lalr1.cc:859 +#line 4368 "seclang-parser.cc" // lalr1.cc:859 break; case 374: -#line 2598 "seclang-parser.yy" // lalr1.cc:859 +#line 2596 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::UrlDecodeUni(yystack_[0].value.as< std::string > ())); } -#line 4379 "seclang-parser.cc" // lalr1.cc:859 +#line 4376 "seclang-parser.cc" // lalr1.cc:859 break; case 375: -#line 2602 "seclang-parser.yy" // lalr1.cc:859 +#line 2600 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::UrlDecode(yystack_[0].value.as< std::string > ())); } -#line 4387 "seclang-parser.cc" // lalr1.cc:859 +#line 4384 "seclang-parser.cc" // lalr1.cc:859 break; case 376: -#line 2606 "seclang-parser.yy" // lalr1.cc:859 +#line 2604 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::None(yystack_[0].value.as< std::string > ())); } -#line 4395 "seclang-parser.cc" // lalr1.cc:859 +#line 4392 "seclang-parser.cc" // lalr1.cc:859 break; case 377: -#line 2610 "seclang-parser.yy" // lalr1.cc:859 +#line 2608 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::CompressWhitespace(yystack_[0].value.as< std::string > ())); } -#line 4403 "seclang-parser.cc" // lalr1.cc:859 +#line 4400 "seclang-parser.cc" // lalr1.cc:859 break; case 378: -#line 2614 "seclang-parser.yy" // lalr1.cc:859 +#line 2612 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::RemoveWhitespace(yystack_[0].value.as< std::string > ())); } -#line 4411 "seclang-parser.cc" // lalr1.cc:859 +#line 4408 "seclang-parser.cc" // lalr1.cc:859 break; case 379: -#line 2618 "seclang-parser.yy" // lalr1.cc:859 +#line 2616 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::ReplaceNulls(yystack_[0].value.as< std::string > ())); } -#line 4419 "seclang-parser.cc" // lalr1.cc:859 +#line 4416 "seclang-parser.cc" // lalr1.cc:859 break; case 380: -#line 2622 "seclang-parser.yy" // lalr1.cc:859 +#line 2620 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::RemoveNulls(yystack_[0].value.as< std::string > ())); } -#line 4427 "seclang-parser.cc" // lalr1.cc:859 +#line 4424 "seclang-parser.cc" // lalr1.cc:859 break; case 381: -#line 2626 "seclang-parser.yy" // lalr1.cc:859 +#line 2624 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::HtmlEntityDecode(yystack_[0].value.as< std::string > ())); } -#line 4435 "seclang-parser.cc" // lalr1.cc:859 +#line 4432 "seclang-parser.cc" // lalr1.cc:859 break; case 382: -#line 2630 "seclang-parser.yy" // lalr1.cc:859 +#line 2628 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::JsDecode(yystack_[0].value.as< std::string > ())); } -#line 4443 "seclang-parser.cc" // lalr1.cc:859 +#line 4440 "seclang-parser.cc" // lalr1.cc:859 break; case 383: -#line 2634 "seclang-parser.yy" // lalr1.cc:859 +#line 2632 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::CssDecode(yystack_[0].value.as< std::string > ())); } -#line 4451 "seclang-parser.cc" // lalr1.cc:859 +#line 4448 "seclang-parser.cc" // lalr1.cc:859 break; case 384: -#line 2638 "seclang-parser.yy" // lalr1.cc:859 +#line 2636 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::Trim(yystack_[0].value.as< std::string > ())); } -#line 4459 "seclang-parser.cc" // lalr1.cc:859 +#line 4456 "seclang-parser.cc" // lalr1.cc:859 break; case 385: -#line 2642 "seclang-parser.yy" // lalr1.cc:859 +#line 2640 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::NormalisePathWin(yystack_[0].value.as< std::string > ())); } -#line 4467 "seclang-parser.cc" // lalr1.cc:859 +#line 4464 "seclang-parser.cc" // lalr1.cc:859 break; case 386: -#line 2646 "seclang-parser.yy" // lalr1.cc:859 +#line 2644 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::NormalisePath(yystack_[0].value.as< std::string > ())); } -#line 4475 "seclang-parser.cc" // lalr1.cc:859 +#line 4472 "seclang-parser.cc" // lalr1.cc:859 break; case 387: -#line 2650 "seclang-parser.yy" // lalr1.cc:859 +#line 2648 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::Length(yystack_[0].value.as< std::string > ())); } -#line 4483 "seclang-parser.cc" // lalr1.cc:859 +#line 4480 "seclang-parser.cc" // lalr1.cc:859 break; case 388: -#line 2654 "seclang-parser.yy" // lalr1.cc:859 +#line 2652 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::Utf8ToUnicode(yystack_[0].value.as< std::string > ())); } -#line 4491 "seclang-parser.cc" // lalr1.cc:859 +#line 4488 "seclang-parser.cc" // lalr1.cc:859 break; case 389: -#line 2658 "seclang-parser.yy" // lalr1.cc:859 +#line 2656 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::RemoveCommentsChar(yystack_[0].value.as< std::string > ())); } -#line 4499 "seclang-parser.cc" // lalr1.cc:859 +#line 4496 "seclang-parser.cc" // lalr1.cc:859 break; case 390: -#line 2662 "seclang-parser.yy" // lalr1.cc:859 +#line 2660 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::RemoveComments(yystack_[0].value.as< std::string > ())); } -#line 4507 "seclang-parser.cc" // lalr1.cc:859 +#line 4504 "seclang-parser.cc" // lalr1.cc:859 break; case 391: -#line 2666 "seclang-parser.yy" // lalr1.cc:859 +#line 2664 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::transformations::ReplaceComments(yystack_[0].value.as< std::string > ())); } -#line 4515 "seclang-parser.cc" // lalr1.cc:859 +#line 4512 "seclang-parser.cc" // lalr1.cc:859 break; case 392: -#line 2673 "seclang-parser.yy" // lalr1.cc:859 +#line 2671 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::unsetOperation, std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4523 "seclang-parser.cc" // lalr1.cc:859 +#line 4520 "seclang-parser.cc" // lalr1.cc:859 break; case 393: -#line 2677 "seclang-parser.yy" // lalr1.cc:859 +#line 2675 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setToOneOperation, std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4531 "seclang-parser.cc" // lalr1.cc:859 +#line 4528 "seclang-parser.cc" // lalr1.cc:859 break; case 394: -#line 2681 "seclang-parser.yy" // lalr1.cc:859 +#line 2679 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::setOperation, std::move(yystack_[2].value.as< std::unique_ptr > ()), std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4539 "seclang-parser.cc" // lalr1.cc:859 +#line 4536 "seclang-parser.cc" // lalr1.cc:859 break; case 395: -#line 2685 "seclang-parser.yy" // lalr1.cc:859 +#line 2683 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::sumAndSetOperation, std::move(yystack_[2].value.as< std::unique_ptr > ()), std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4547 "seclang-parser.cc" // lalr1.cc:859 +#line 4544 "seclang-parser.cc" // lalr1.cc:859 break; case 396: -#line 2689 "seclang-parser.yy" // lalr1.cc:859 +#line 2687 "seclang-parser.yy" // lalr1.cc:859 { ACTION_CONTAINER(yylhs.value.as< std::unique_ptr > (), new actions::SetVar(actions::SetVarOperation::substractAndSetOperation, std::move(yystack_[2].value.as< std::unique_ptr > ()), std::move(yystack_[0].value.as< std::unique_ptr > ()))); } -#line 4555 "seclang-parser.cc" // lalr1.cc:859 +#line 4552 "seclang-parser.cc" // lalr1.cc:859 break; case 397: -#line 2696 "seclang-parser.yy" // lalr1.cc:859 +#line 2694 "seclang-parser.yy" // lalr1.cc:859 { yystack_[1].value.as< std::unique_ptr > ()->appendText(yystack_[0].value.as< std::string > ()); yylhs.value.as< std::unique_ptr > () = std::move(yystack_[1].value.as< std::unique_ptr > ()); } -#line 4564 "seclang-parser.cc" // lalr1.cc:859 +#line 4561 "seclang-parser.cc" // lalr1.cc:859 break; case 398: -#line 2701 "seclang-parser.yy" // lalr1.cc:859 +#line 2699 "seclang-parser.yy" // lalr1.cc:859 { yystack_[1].value.as< std::unique_ptr > ()->appendVar(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > () = std::move(yystack_[1].value.as< std::unique_ptr > ()); } -#line 4573 "seclang-parser.cc" // lalr1.cc:859 +#line 4570 "seclang-parser.cc" // lalr1.cc:859 break; case 399: -#line 2706 "seclang-parser.yy" // lalr1.cc:859 +#line 2704 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr r(new RunTimeString()); r->appendText(yystack_[0].value.as< std::string > ()); yylhs.value.as< std::unique_ptr > () = std::move(r); } -#line 4583 "seclang-parser.cc" // lalr1.cc:859 +#line 4580 "seclang-parser.cc" // lalr1.cc:859 break; case 400: -#line 2712 "seclang-parser.yy" // lalr1.cc:859 +#line 2710 "seclang-parser.yy" // lalr1.cc:859 { std::unique_ptr r(new RunTimeString()); r->appendVar(std::move(yystack_[0].value.as< std::unique_ptr > ())); yylhs.value.as< std::unique_ptr > () = std::move(r); } -#line 4593 "seclang-parser.cc" // lalr1.cc:859 +#line 4590 "seclang-parser.cc" // lalr1.cc:859 break; -#line 4597 "seclang-parser.cc" // lalr1.cc:859 +#line 4594 "seclang-parser.cc" // lalr1.cc:859 default: break; } @@ -4855,54 +4852,54 @@ namespace yy { const short int seclang_parser::yypact_[] = { - 2539, -360, -262, -360, 1, -360, -360, -360, -360, -360, + 2537, -360, -262, -360, 1, -360, -360, -360, -360, -360, -360, -238, -360, -360, -360, -360, -360, -241, -360, -360, -360, -360, -360, -360, -228, -360, -360, -135, -360, -130, -360, -131, -253, -93, -93, -360, -360, -360, -360, -261, - -360, -360, -360, 1376, 1376, 1376, -93, -126, -124, -360, - -360, -360, -122, -360, -360, -360, -360, -360, -360, 1376, - -93, 2674, -360, -360, -360, -360, -360, -360, -360, -360, + -360, -360, -360, 1374, 1374, 1374, -93, -126, -124, -360, + -360, -360, -122, -360, -360, -360, -360, -360, -360, 1374, + -93, 2672, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, - -360, -360, -360, -360, -360, -360, 2146, -230, -360, -360, + -360, -360, -360, -360, -360, -360, 2144, -230, -360, -360, -360, -360, -360, -360, -360, -143, -360, -360, -360, -115, -113, -360, -360, -360, -360, -360, -360, -360, -360, -360, - 2274, -360, 2274, -360, 2274, -360, -360, -360, -360, -360, - -360, -360, -360, 2274, -360, -360, -360, -360, -360, -360, - -360, 2274, 2274, 2274, -360, -360, -360, -360, 2274, -360, + 2272, -360, 2272, -360, 2272, -360, -360, -360, -360, -360, + -360, -360, -360, 2272, -360, -360, -360, -360, -360, -360, + -360, 2272, 2272, 2272, -360, -360, -360, -360, 2272, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, - 2848, -360, 3, -360, -360, -360, -360, 2570, 2570, -145, + 2846, -360, 3, -360, -360, -360, -360, 2568, 2568, -144, -142, -140, -138, -136, -134, -132, -129, -127, -125, -123, - -120, -118, -116, -114, -112, -360, -108, -106, -104, -102, - -360, -360, -100, -360, -360, -360, -360, -360, -360, -360, + -119, -117, -114, -112, -110, -360, -107, -104, -102, -100, + -360, -360, -98, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, - -360, -360, -360, -360, -360, -360, -360, -98, -360, -360, - -360, -360, -360, 426, -360, -360, -360, -96, -360, -360, + -360, -360, -360, -360, -360, -360, -360, -96, -360, -360, + -360, -360, -360, 426, -360, -360, -360, -94, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, 513, - 600, 900, 987, 1074, -94, -92, 1465, -360, -360, -360, + 600, 899, 986, 1073, -92, -90, 1463, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, 2, -360, -360, -360, -360, -360, -360, -360, -360, - -360, -360, 1850, -360, -360, -360, 2570, -75, -360, -360, + -360, -360, 1848, -360, -360, -360, 2568, -75, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, - -360, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 0, - 2848, -360, -360, -360, -360, -360, -360, -360, -360, -360, + -360, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 0, + 2846, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, -360, - -360, -360, -360, -360, -360, -360, -360, -360, -360, 2442, - -360, -360, -360, -360, 2442, -360, -360, 2442, -360, -360, - 2442, -360, -360, 2442, -360, -360, 2442, -360, -360, -360, - -360, 5, 1554, 1978, 2274, 2274, 2274, -360, -360, 2274, - 2274, 2274, -360, 2274, 2274, 2274, 2274, 2274, 2274, 2274, - 2274, 2274, 2274, 2274, 2274, 2274, 2274, 2274, -360, 2274, - 2274, 2274, 2274, -360, -360, 2274, 2274, 2274, 2274, -93, - -360, 2442, -360, 2274, 2274, 2274, -360, -360, -360, -360, - -360, 2570, 2570, -360, -360, 2442, 2442, 2442, 2442, 2442, - 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, - 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, 2442, - 2442, 2442, 2442, 2442, 2442, -360, 2442, 2442, 2442, -360, + -360, -360, -360, -360, -360, -360, -360, -360, -360, 2440, + -360, -360, -360, -360, 2440, -360, -360, 2440, -360, -360, + 2440, -360, -360, 2440, -360, -360, 2440, -360, -360, -360, + -360, 5, 1552, 1976, 2272, 2272, 2272, -360, -360, 2272, + 2272, 2272, -360, 2272, 2272, 2272, 2272, 2272, 2272, 2272, + 2272, 2272, 2272, 2272, 2272, 2272, 2272, 2272, -360, 2272, + 2272, 2272, 2272, -360, -360, 2272, 2272, 2272, 2272, -93, + -360, 2440, -360, 2272, 2272, 2272, -360, -360, -360, -360, + -360, 2568, 2568, -360, -360, 2440, 2440, 2440, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, + 2440, 2440, 2440, 2440, 2440, -360, 2440, 2440, 2440, -360, -360 }; @@ -4993,12 +4990,12 @@ namespace yy { 169, 302, 303, 319, 321, 322, 304, 0, 369, 0, 67, 68, 77, 78, 79, 80, 81, 82, 286, 287, 288, 289, 290, 291, 374, 377, 380, 383, 386, 305, - 306, 307, 308, 323, 324, 0, 325, 326, 327, 328, - 329, 330, 331, 332, 333, 334, 335, 336, 0, 337, - 338, 339, 340, 341, 342, 343, 344, 431, 345, 346, - 347, 348, 349, 350, 351, 352, 353, 354, 0, 170, - 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 370, 371, 387, 388, 389, 390, 0, 0, + 306, 307, 308, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 0, 337, 338, + 339, 340, 341, 342, 343, 344, 0, 431, 345, 346, + 347, 348, 0, 349, 350, 351, 352, 353, 354, 170, + 355, 356, 0, 357, 358, 359, 360, 361, 362, 363, + 364, 365, 366, 370, 371, 387, 388, 389, 390, 0, 0, 0, 0, 282, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5050,7 +5047,7 @@ namespace yy { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - 278, 279, 0, 0, 367, 368, 0, 0, 0, 0, + 278, 279, 0, 367, 368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5059,7 +5056,7 @@ namespace yy { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 0, - 0, 372, 373, 0, 0, 0, 0, 0, 0, 0, + 372, 373, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5067,55 +5064,16 @@ namespace yy { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 0, 0, 375, 376, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, - 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, - 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, - 262, 263, 264, 265, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 0, 0, 378, 379, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 309, 0, - 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, - 277, 278, 279, 0, 0, 381, 382, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 0, 0, 384, 385, 177, 178, 179, 180, 181, 182, + 274, 275, 276, 277, 278, 279, 0, 375, 376, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, @@ -5124,16 +5082,37 @@ namespace yy { 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, - 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 441, 442, 179, 180, 181, 182, 183, 184, + 263, 264, 265, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 309, 0, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 0, 378, 379, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 309, 0, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 278, 279, 0, 381, 382, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 309, 0, 267, 268, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 0, + 384, 385, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, @@ -5142,19 +5121,96 @@ namespace yy { 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 266, 267, + 265, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, + 441, 442, 179, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, + 257, 258, 259, 260, 261, 262, 263, 264, 265, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 267, 268, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 267, 268, 269, 270, 271, + 272, 273, 274, 275, 276, 277, 278, 279, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, + 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, + 261, 262, 263, 264, 265, 0, 0, 0, 0, 393, + 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, + 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + 414, 0, 415, 416, 417, 418, 419, 420, 421, 422, + 423, 424, 425, 426, 427, 428, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, + 263, 264, 265, 0, 0, 0, 0, 0, 394, 395, + 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 412, 413, 414, 0, + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 425, 426, 427, 428, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 309, + 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, + 276, 277, 278, 279, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, + 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 0, 0, 0, 0, 296, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - 278, 279, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 278, 279, 179, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, + 257, 258, 259, 260, 261, 262, 263, 264, 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -5171,11 +5227,11 @@ namespace yy { 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 0, 0, 0, - 0, 393, 394, 395, 396, 397, 398, 399, 400, 401, - 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, - 412, 413, 414, 0, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 179, 180, + 259, 260, 261, 262, 263, 264, 265, 1, 0, 0, + 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 309, 0, 267, 268, 269, 270, 271, + 272, 273, 274, 275, 276, 277, 278, 279, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, @@ -5185,106 +5241,46 @@ namespace yy { 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 0, 0, 0, 0, 0, - 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, - 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, - 414, 0, 415, 416, 417, 418, 419, 420, 421, 422, - 423, 424, 425, 426, 427, 428, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 309, 0, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, - 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, - 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 0, 0, 0, 0, 296, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 309, - 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, - 276, 277, 278, 279, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 294, 0, 0, 4, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 267, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - 278, 279, 179, 180, 181, 182, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, - 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, - 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, - 257, 258, 259, 260, 261, 262, 263, 264, 265, 1, - 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 309, 0, 267, 268, 269, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, - 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, - 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 0, 0, 0, - 0, 0, 0, 0, 294, 0, 0, 4, 2, 3, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 436, 0, 267, 268, 269, 270, 271, - 272, 273, 274, 275, 276, 277, 278, 279, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 0, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 267, 268, 269, 270, 271, 272, 273, + 0, 436, 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 86, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 0, 0, 0, 0, 0, + 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 267, 268, 269, 270, 271, 272, 273, 274, 275, + 276, 277, 278, 279, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 86, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169 }; const short int @@ -5306,12 +5302,12 @@ namespace yy { 223, 274, 275, 170, 177, 178, 279, -1, 243, -1, 139, 140, 277, 278, 274, 275, 277, 278, 274, 275, 274, 275, 274, 275, 259, 260, 261, 262, 263, 274, - 275, 274, 275, 308, 309, -1, 308, 309, 308, 309, - 308, 309, 308, 309, 308, 309, 308, 309, -1, 308, - 309, 308, 309, 308, 309, 308, 309, 292, 308, 309, - 308, 309, 308, 309, 308, 309, 308, 309, -1, 292, - 308, 309, 308, 309, 308, 309, 308, 309, 308, 309, - 308, 309, 308, 309, 308, 309, 308, 309, -1, -1, + 275, 274, 275, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, -1, 307, 308, + 307, 308, 307, 308, 307, 308, -1, 292, 307, 308, + 307, 308, -1, 307, 308, 307, 308, 307, 308, 292, + 307, 308, -1, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, 307, 308, -1, -1, -1, -1, 266, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -5363,7 +5359,7 @@ namespace yy { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, -1, -1, 308, 309, -1, -1, -1, -1, + 304, 305, -1, 307, 308, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -5372,7 +5368,7 @@ namespace yy { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, -1, - -1, 308, 309, -1, -1, -1, -1, -1, -1, -1, + 307, 308, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -5380,55 +5376,16 @@ namespace yy { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, -1, -1, 308, 309, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, -1, -1, 308, 309, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 291, -1, - 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, - 303, 304, 305, -1, -1, 308, 309, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - -1, -1, 308, 309, 8, 9, 10, 11, 12, 13, + 300, 301, 302, 303, 304, 305, -1, 307, 308, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 95, 96, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, @@ -5437,16 +5394,37 @@ namespace yy { 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 8, 9, 10, 11, 12, 13, 14, 15, + 94, 95, 96, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 291, -1, 293, 294, 295, 296, 297, 298, 299, 300, + 301, 302, 303, 304, 305, -1, 307, 308, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, -1, 307, 308, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, -1, + 307, 308, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, @@ -5455,19 +5433,96 @@ namespace yy { 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 292, 293, + 96, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, -1, -1, -1, -1, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, -1, 124, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, -1, -1, -1, -1, -1, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, -1, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, + -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, -1, -1, -1, -1, 101, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 304, 305, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -5484,11 +5539,11 @@ namespace yy { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, -1, -1, -1, - -1, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, -1, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 10, 11, + 90, 91, 92, 93, 94, 95, 96, 0, -1, -1, + -1, 4, 5, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -5498,106 +5553,46 @@ namespace yy { 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, -1, -1, -1, -1, -1, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, -1, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, -1, -1, -1, -1, + -1, -1, 0, -1, -1, 138, 4, 5, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, -1, -1, -1, -1, 101, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 291, - -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 293, - 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 0, - -1, -1, -1, 4, 5, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 291, -1, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, -1, -1, -1, - -1, -1, -1, -1, 0, -1, -1, 138, 4, 5, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 291, -1, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 302, 303, 304, 305, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 224, 225, 226, 227, 228, 229, 230, - 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, - 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, - 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, - 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, - -1, -1, 138, -1, -1, -1, -1, -1, -1, -1, - -1, 282, 283, 284, 285, 286, 287, 288, 289, 290, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 224, 225, - 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, - 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 97, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 282, 283, 284, 285, - 286, 287, 288, 289, 290, -1, -1, -1, -1, -1, + -1, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, + 263, 264, 265, 266, 267, 268, 269, 270, -1, -1, + 138, -1, -1, -1, -1, -1, -1, -1, -1, 282, + 283, 284, 285, 286, 287, 288, 289, 290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, - 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 293, 294, 295, 296, 297, 298, 299, 300, 301, + 302, 303, 304, 305, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 224, 225, 226, 227, + 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 97, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 282, 283, 284, 285, 286, 287, + 288, 289, 290, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223 }; const unsigned short int @@ -5609,7 +5604,7 @@ namespace yy { 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 282, 283, 284, 285, 286, 287, 288, 289, - 290, 311, 312, 313, 318, 274, 275, 139, 140, 274, + 290, 310, 311, 312, 317, 274, 275, 139, 140, 274, 275, 279, 273, 276, 280, 274, 275, 277, 278, 274, 275, 277, 278, 272, 274, 275, 97, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, @@ -5620,7 +5615,7 @@ namespace yy { 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 292, 314, 315, 322, 314, 271, 281, 8, 9, 10, + 292, 313, 314, 321, 313, 271, 281, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, @@ -5631,46 +5626,63 @@ namespace yy { 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 319, 320, 321, 319, 319, 314, 274, 275, 274, 275, - 274, 275, 319, 314, 0, 312, 101, 321, 323, 272, + 318, 319, 320, 318, 318, 313, 274, 275, 274, 275, + 274, 275, 318, 313, 0, 311, 101, 320, 322, 272, 274, 275, 274, 275, 279, 274, 275, 274, 275, 291, - 321, 324, 324, 324, 324, 324, 324, 324, 324, 315, - 3, 321, 321, 308, 309, 308, 309, 308, 309, 308, - 309, 308, 309, 308, 309, 308, 309, 308, 309, 308, - 309, 308, 309, 308, 309, 308, 309, 308, 309, 308, - 309, 308, 309, 308, 309, 308, 309, 308, 309, 308, - 309, 308, 309, 308, 309, 308, 309, 308, 309, 324, - 308, 309, 308, 309, 324, 308, 309, 324, 308, 309, - 324, 308, 309, 324, 308, 309, 324, 308, 309, 308, - 309, 320, 6, 101, 102, 103, 104, 105, 106, 107, + 320, 323, 323, 323, 323, 323, 323, 323, 323, 314, + 3, 320, 320, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, 307, 308, 307, + 308, 307, 308, 307, 308, 307, 308, 307, 308, 323, + 307, 308, 307, 308, 323, 307, 308, 323, 307, 308, + 323, 307, 308, 323, 307, 308, 323, 307, 308, 307, + 308, 319, 6, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 316, - 317, 324, 321, 98, 99, 100, 291, 321, 292, 322, - 292, 8, 9, 321, 317, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, - 324, 324, 324, 324, 324, 314, 324, 324, 324, 321, - 321 + 129, 130, 131, 132, 133, 134, 135, 136, 137, 315, + 316, 323, 320, 98, 99, 100, 291, 320, 292, 321, + 292, 8, 9, 320, 316, 323, 323, 323, 323, 323, + 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, + 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, + 323, 323, 323, 323, 323, 313, 323, 323, 323, 320, + 320 }; const unsigned short int seclang_parser::yyr1_[] = { - 0, 310, 311, 311, 311, 312, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 313, 313, 313, 314, 314, - 315, 315, 316, 316, 316, 316, 317, 317, 317, 317, + 0, 309, 310, 310, 310, 311, 312, 312, 312, 312, + 312, 312, 312, 312, 312, 312, 312, 312, 312, 312, + 312, 312, 312, 312, 312, 312, 312, 312, 313, 313, + 314, 314, 315, 315, 315, 315, 316, 316, 316, 316, + 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, + 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, + 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, + 316, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, - 317, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 319, 319, 320, 320, - 320, 320, 320, 320, 321, 321, 321, 321, 321, 321, + 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, + 317, 317, 317, 317, 317, 317, 318, 318, 319, 319, + 319, 319, 319, 319, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, @@ -5679,25 +5691,8 @@ namespace yy { 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 323, 323, 323, 323, 323, 324, 324, 324, - 324 + 321, 321, 322, 322, 322, 322, 322, 323, 323, 323, + 323 }; const unsigned char @@ -5896,59 +5891,58 @@ namespace yy { "\"RUN_TIME_VAR_TIME_EPOCH\"", "\"RUN_TIME_VAR_TIME_HOUR\"", "\"RUN_TIME_VAR_TIME_MIN\"", "\"RUN_TIME_VAR_TIME_MON\"", "\"RUN_TIME_VAR_TIME_SEC\"", "\"RUN_TIME_VAR_TIME_WDAY\"", - "\"RUN_TIME_VAR_TIME_YEAR\"", "\"SETVAR_CONTENT_PART\"", "\"VARIABLE\"", - "\"Dictionary element\"", "\"Dictionary element, selected by regexp\"", - "$accept", "input", "line", "audit_log", "actions", "actions_may_quoted", - "op", "op_before_init", "expression", "variables", - "variables_may_be_quoted", "var", "act", "setvar_action", - "run_time_string", YY_NULLPTR + "\"RUN_TIME_VAR_TIME_YEAR\"", "\"VARIABLE\"", "\"Dictionary element\"", + "\"Dictionary element, selected by regexp\"", "$accept", "input", "line", + "audit_log", "actions", "actions_may_quoted", "op", "op_before_init", + "expression", "variables", "variables_may_be_quoted", "var", "act", + "setvar_action", "run_time_string", YY_NULLPTR }; #if YYDEBUG const unsigned short int seclang_parser::yyrline_[] = { - 0, 711, 711, 715, 716, 719, 724, 730, 736, 740, - 744, 750, 756, 762, 768, 773, 778, 784, 791, 795, - 799, 805, 809, 813, 818, 823, 828, 832, 839, 843, - 850, 856, 866, 875, 885, 894, 907, 911, 915, 919, - 923, 927, 931, 935, 939, 943, 948, 952, 956, 961, - 966, 971, 976, 980, 984, 988, 992, 996, 1000, 1004, - 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040, 1044, - 1048, 1062, 1063, 1087, 1106, 1121, 1145, 1192, 1196, 1200, - 1204, 1208, 1212, 1216, 1220, 1224, 1233, 1237, 1242, 1247, - 1252, 1257, 1262, 1275, 1288, 1301, 1314, 1327, 1353, 1379, - 1391, 1411, 1439, 1444, 1449, 1458, 1463, 1467, 1471, 1475, - 1479, 1483, 1487, 1488, 1489, 1501, 1507, 1511, 1515, 1516, - 1517, 1518, 1519, 1520, 1521, 1524, 1532, 1536, 1543, 1548, - 1554, 1560, 1566, 1573, 1583, 1587, 1591, 1595, 1599, 1603, - 1607, 1611, 1615, 1619, 1623, 1627, 1631, 1635, 1639, 1643, - 1647, 1651, 1655, 1659, 1663, 1667, 1671, 1675, 1679, 1683, - 1687, 1691, 1695, 1699, 1703, 1707, 1711, 1715, 1719, 1723, - 1727, 1731, 1735, 1739, 1743, 1747, 1751, 1755, 1759, 1763, - 1767, 1771, 1775, 1779, 1783, 1787, 1791, 1795, 1799, 1803, - 1807, 1811, 1815, 1819, 1823, 1827, 1831, 1835, 1839, 1843, - 1847, 1851, 1855, 1859, 1863, 1867, 1871, 1875, 1879, 1883, - 1887, 1891, 1895, 1899, 1903, 1907, 1911, 1915, 1919, 1923, - 1927, 1931, 1935, 1939, 1944, 1948, 1952, 1957, 1961, 1965, - 1970, 1975, 1979, 1983, 1987, 1991, 1995, 1999, 2003, 2007, - 2011, 2015, 2019, 2023, 2027, 2031, 2035, 2039, 2043, 2047, - 2051, 2055, 2059, 2063, 2067, 2071, 2075, 2079, 2083, 2087, - 2091, 2095, 2099, 2103, 2107, 2111, 2115, 2119, 2123, 2127, - 2131, 2135, 2139, 2143, 2147, 2151, 2155, 2159, 2163, 2167, - 2171, 2175, 2179, 2183, 2187, 2191, 2195, 2199, 2203, 2207, - 2215, 2222, 2229, 2236, 2243, 2250, 2257, 2264, 2271, 2278, - 2285, 2292, 2302, 2306, 2310, 2314, 2318, 2322, 2326, 2330, - 2335, 2340, 2345, 2349, 2353, 2357, 2362, 2367, 2371, 2375, - 2379, 2383, 2387, 2391, 2395, 2399, 2403, 2407, 2412, 2416, - 2421, 2425, 2429, 2433, 2437, 2441, 2445, 2449, 2453, 2457, - 2461, 2465, 2469, 2473, 2477, 2481, 2485, 2489, 2493, 2497, - 2501, 2505, 2509, 2513, 2517, 2521, 2525, 2529, 2533, 2537, - 2541, 2545, 2549, 2553, 2557, 2561, 2565, 2569, 2573, 2577, - 2581, 2585, 2589, 2593, 2597, 2601, 2605, 2609, 2613, 2617, - 2621, 2625, 2629, 2633, 2637, 2641, 2645, 2649, 2653, 2657, - 2661, 2665, 2672, 2676, 2680, 2684, 2688, 2695, 2700, 2705, - 2711 + 0, 709, 709, 713, 714, 717, 722, 728, 734, 738, + 742, 748, 754, 760, 766, 771, 776, 782, 789, 793, + 797, 803, 807, 811, 816, 821, 826, 830, 837, 841, + 848, 854, 864, 873, 883, 892, 905, 909, 913, 917, + 921, 925, 929, 933, 937, 941, 946, 950, 954, 959, + 964, 969, 974, 978, 982, 986, 990, 994, 998, 1002, + 1006, 1010, 1014, 1018, 1022, 1026, 1030, 1034, 1038, 1042, + 1046, 1060, 1061, 1085, 1104, 1119, 1143, 1190, 1194, 1198, + 1202, 1206, 1210, 1214, 1218, 1222, 1231, 1235, 1240, 1245, + 1250, 1255, 1260, 1273, 1286, 1299, 1312, 1325, 1351, 1377, + 1389, 1409, 1437, 1442, 1447, 1456, 1461, 1465, 1469, 1473, + 1477, 1481, 1485, 1486, 1487, 1499, 1505, 1509, 1513, 1514, + 1515, 1516, 1517, 1518, 1519, 1522, 1530, 1534, 1541, 1546, + 1552, 1558, 1564, 1571, 1581, 1585, 1589, 1593, 1597, 1601, + 1605, 1609, 1613, 1617, 1621, 1625, 1629, 1633, 1637, 1641, + 1645, 1649, 1653, 1657, 1661, 1665, 1669, 1673, 1677, 1681, + 1685, 1689, 1693, 1697, 1701, 1705, 1709, 1713, 1717, 1721, + 1725, 1729, 1733, 1737, 1741, 1745, 1749, 1753, 1757, 1761, + 1765, 1769, 1773, 1777, 1781, 1785, 1789, 1793, 1797, 1801, + 1805, 1809, 1813, 1817, 1821, 1825, 1829, 1833, 1837, 1841, + 1845, 1849, 1853, 1857, 1861, 1865, 1869, 1873, 1877, 1881, + 1885, 1889, 1893, 1897, 1901, 1905, 1909, 1913, 1917, 1921, + 1925, 1929, 1933, 1937, 1942, 1946, 1950, 1955, 1959, 1963, + 1968, 1973, 1977, 1981, 1985, 1989, 1993, 1997, 2001, 2005, + 2009, 2013, 2017, 2021, 2025, 2029, 2033, 2037, 2041, 2045, + 2049, 2053, 2057, 2061, 2065, 2069, 2073, 2077, 2081, 2085, + 2089, 2093, 2097, 2101, 2105, 2109, 2113, 2117, 2121, 2125, + 2129, 2133, 2137, 2141, 2145, 2149, 2153, 2157, 2161, 2165, + 2169, 2173, 2177, 2181, 2185, 2189, 2193, 2197, 2201, 2205, + 2213, 2220, 2227, 2234, 2241, 2248, 2255, 2262, 2269, 2276, + 2283, 2290, 2300, 2304, 2308, 2312, 2316, 2320, 2324, 2328, + 2333, 2338, 2343, 2347, 2351, 2355, 2360, 2365, 2369, 2373, + 2377, 2381, 2385, 2389, 2393, 2397, 2401, 2405, 2410, 2414, + 2419, 2423, 2427, 2431, 2435, 2439, 2443, 2447, 2451, 2455, + 2459, 2463, 2467, 2471, 2475, 2479, 2483, 2487, 2491, 2495, + 2499, 2503, 2507, 2511, 2515, 2519, 2523, 2527, 2531, 2535, + 2539, 2543, 2547, 2551, 2555, 2559, 2563, 2567, 2571, 2575, + 2579, 2583, 2587, 2591, 2595, 2599, 2603, 2607, 2611, 2615, + 2619, 2623, 2627, 2631, 2635, 2639, 2643, 2647, 2651, 2655, + 2659, 2663, 2670, 2674, 2678, 2682, 2686, 2693, 2698, 2703, + 2709 }; // Print the state stack on the debug stream. @@ -5983,8 +5977,8 @@ namespace yy { } // yy -#line 5987 "seclang-parser.cc" // lalr1.cc:1167 -#line 2718 "seclang-parser.yy" // lalr1.cc:1168 +#line 5981 "seclang-parser.cc" // lalr1.cc:1167 +#line 2716 "seclang-parser.yy" // lalr1.cc:1168 void yy::seclang_parser::error (const location_type& l, const std::string& m) { diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh index d332f495..84c3f989 100644 --- a/src/parser/seclang-parser.hh +++ b/src/parser/seclang-parser.hh @@ -786,7 +786,6 @@ namespace yy { // "RUN_TIME_VAR_TIME_SEC" // "RUN_TIME_VAR_TIME_WDAY" // "RUN_TIME_VAR_TIME_YEAR" - // "SETVAR_CONTENT_PART" // "VARIABLE" // "Dictionary element" // "Dictionary element, selected by regexp" @@ -1139,10 +1138,9 @@ namespace yy { TOK_RUN_TIME_VAR_TIME_SEC = 558, TOK_RUN_TIME_VAR_TIME_WDAY = 559, TOK_RUN_TIME_VAR_TIME_YEAR = 560, - TOK_SETVAR_CONTENT_PART = 561, - TOK_VARIABLE = 562, - TOK_DICT_ELEMENT = 563, - TOK_DICT_ELEMENT_REGEXP = 564 + TOK_VARIABLE = 561, + TOK_DICT_ELEMENT = 562, + TOK_DICT_ELEMENT_REGEXP = 563 }; }; @@ -2477,10 +2475,6 @@ namespace yy { symbol_type make_RUN_TIME_VAR_TIME_YEAR (const std::string& v, const location_type& l); - static inline - symbol_type - make_SETVAR_CONTENT_PART (const std::string& v, const location_type& l); - static inline symbol_type make_VARIABLE (const std::string& v, const location_type& l); @@ -2698,12 +2692,12 @@ namespace yy { enum { yyeof_ = 0, - yylast_ = 3071, ///< Last index in yytable_. + yylast_ = 3069, ///< Last index in yytable_. yynnts_ = 15, ///< Number of nonterminal symbols. yyfinal_ = 294, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 310 ///< Number of tokens. + yyntokens_ = 309 ///< Number of tokens. }; @@ -2776,9 +2770,9 @@ namespace yy { 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309 + 305, 306, 307, 308 }; - const unsigned int user_token_number_max_ = 564; + const unsigned int user_token_number_max_ = 563; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -2975,38 +2969,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.copy< std::string > (other.value); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.copy< std::unique_ptr > (other.value); break; - case 324: // run_time_string + case 323: // run_time_string value.copy< std::unique_ptr > (other.value); break; - case 321: // var + case 320: // var value.copy< std::unique_ptr > (other.value); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.copy< std::unique_ptr > (other.value); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.copy< std::unique_ptr > > > (other.value); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.copy< std::unique_ptr > > > (other.value); break; @@ -3191,38 +3184,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.copy< std::string > (v); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.copy< std::unique_ptr > (v); break; - case 324: // run_time_string + case 323: // run_time_string value.copy< std::unique_ptr > (v); break; - case 321: // var + case 320: // var value.copy< std::unique_ptr > (v); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.copy< std::unique_ptr > (v); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.copy< std::unique_ptr > > > (v); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.copy< std::unique_ptr > > > (v); break; @@ -3480,38 +3472,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.template destroy< std::string > (); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.template destroy< std::unique_ptr > (); break; - case 324: // run_time_string + case 323: // run_time_string value.template destroy< std::unique_ptr > (); break; - case 321: // var + case 320: // var value.template destroy< std::unique_ptr > (); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.template destroy< std::unique_ptr > (); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.template destroy< std::unique_ptr > > > (); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.template destroy< std::unique_ptr > > > (); break; @@ -3702,38 +3693,37 @@ namespace yy { case 303: // "RUN_TIME_VAR_TIME_SEC" case 304: // "RUN_TIME_VAR_TIME_WDAY" case 305: // "RUN_TIME_VAR_TIME_YEAR" - case 306: // "SETVAR_CONTENT_PART" - case 307: // "VARIABLE" - case 308: // "Dictionary element" - case 309: // "Dictionary element, selected by regexp" + case 306: // "VARIABLE" + case 307: // "Dictionary element" + case 308: // "Dictionary element, selected by regexp" value.move< std::string > (s.value); break; - case 316: // op - case 317: // op_before_init + case 315: // op + case 316: // op_before_init value.move< std::unique_ptr > (s.value); break; - case 324: // run_time_string + case 323: // run_time_string value.move< std::unique_ptr > (s.value); break; - case 321: // var + case 320: // var value.move< std::unique_ptr > (s.value); break; - case 322: // act - case 323: // setvar_action + case 321: // act + case 322: // setvar_action value.move< std::unique_ptr > (s.value); break; - case 319: // variables - case 320: // variables_may_be_quoted + case 318: // variables + case 319: // variables_may_be_quoted value.move< std::unique_ptr > > > (s.value); break; - case 314: // actions - case 315: // actions_may_quoted + case 313: // actions + case 314: // actions_may_quoted value.move< std::unique_ptr > > > (s.value); break; @@ -3822,7 +3812,7 @@ namespace yy { 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, - 555, 556, 557, 558, 559, 560, 561, 562, 563, 564 + 555, 556, 557, 558, 559, 560, 561, 562, 563 }; return static_cast (yytoken_number_[type]); } @@ -5651,12 +5641,6 @@ namespace yy { return symbol_type (token::TOK_RUN_TIME_VAR_TIME_YEAR, v, l); } - seclang_parser::symbol_type - seclang_parser::make_SETVAR_CONTENT_PART (const std::string& v, const location_type& l) - { - return symbol_type (token::TOK_SETVAR_CONTENT_PART, v, l); - } - seclang_parser::symbol_type seclang_parser::make_VARIABLE (const std::string& v, const location_type& l) { @@ -5678,7 +5662,7 @@ namespace yy { } // yy -#line 5682 "seclang-parser.hh" // lalr1.cc:377 +#line 5666 "seclang-parser.hh" // lalr1.cc:377 diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc index ec74a8ef..0d49d8f8 100644 --- a/src/parser/seclang-scanner.cc +++ b/src/parser/seclang-scanner.cc @@ -4844,60 +4844,60 @@ int yy_flex_debug = 1; static const flex_int16_t yy_rule_linenum[494] = { 0, - 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, - 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, - 499, 500, 502, 503, 504, 505, 506, 507, 508, 509, - 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, - 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, - 530, 531, 532, 533, 534, 535, 536, 538, 539, 542, - 543, 544, 545, 546, 547, 548, 550, 551, 552, 553, - 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, - 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, - 574, 575, 576, 577, 578, 579, 581, 582, 583, 584, + 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, + 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, + 491, 492, 494, 495, 496, 497, 498, 499, 500, 501, + 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, + 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, + 522, 523, 524, 525, 526, 527, 528, 530, 531, 534, + 535, 536, 537, 538, 539, 540, 542, 543, 544, 545, + 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, + 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, + 566, 567, 568, 569, 570, 571, 573, 574, 575, 576, - 585, 589, 594, 595, 600, 601, 602, 607, 608, 609, - 614, 619, 620, 621, 626, 627, 631, 632, 636, 637, - 641, 642, 646, 647, 648, 652, 653, 657, 658, 663, - 664, 665, 669, 673, 674, 682, 687, 688, 693, 694, - 695, 704, 707, 708, 709, 710, 711, 712, 713, 714, - 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, - 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, - 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, - 745, 746, 747, 748, 749, 750, 751, 752, 753, 755, - 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, + 577, 581, 586, 587, 592, 593, 594, 599, 600, 601, + 606, 611, 612, 613, 618, 619, 623, 624, 628, 629, + 633, 634, 638, 639, 640, 644, 645, 649, 650, 655, + 656, 657, 661, 665, 666, 674, 679, 680, 685, 686, + 687, 696, 699, 700, 701, 702, 703, 704, 705, 706, + 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, + 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, + 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, + 737, 738, 739, 740, 741, 742, 743, 744, 745, 747, + 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, - 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, - 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, - 786, 787, 788, 789, 790, 791, 792, 795, 796, 797, - 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, - 811, 815, 816, 817, 818, 819, 823, 824, 825, 826, - 827, 828, 832, 833, 834, 835, 840, 841, 842, 843, - 844, 845, 846, 847, 848, 849, 850, 851, 852, 853, - 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, - 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, - 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, + 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, + 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, + 778, 779, 780, 781, 782, 783, 784, 787, 788, 789, + 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, + 803, 807, 808, 809, 810, 811, 815, 816, 817, 818, + 819, 820, 824, 825, 826, 827, 832, 833, 834, 835, + 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, + 846, 847, 848, 849, 850, 851, 852, 853, 854, 855, + 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, + 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, - 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, - 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, - 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, - 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, - 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, - 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, - 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, - 954, 955, 956, 957, 958, 959, 962, 963, 964, 965, - 966, 967, 968, 969, 973, 974, 975, 976, 977, 978, - 983, 984, 985, 986, 987, 988, 989, 990, 992, 993, + 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, + 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, + 896, 897, 898, 899, 900, 901, 902, 903, 904, 905, + 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, + 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, + 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, + 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, + 946, 947, 948, 949, 950, 951, 954, 955, 956, 957, + 958, 959, 960, 961, 965, 966, 967, 968, 969, 970, + 975, 976, 977, 978, 979, 980, 981, 982, 984, 985, - 994, 995, 996, 1001, 1002, 1003, 1004, 1005, 1007, 1008, - 1010, 1011, 1017, 1018, 1019, 1020, 1021, 1022, 1025, 1026, - 1027, 1028, 1029, 1030, 1034, 1035, 1036, 1037, 1038, 1039, - 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, - 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, - 1060, 1061, 1062, 1064, 1065, 1070, 1074, 1078, 1079, 1083, - 1084, 1087, 1088, 1092, 1093, 1097, 1098, 1102, 1103, 1108, - 1109, 1110, 1111, 1112, 1113, 1115, 1116, 1118, 1119, 1120, - 1125, 1126, 1127, 1131, 1132, 1133, 1138, 1140, 1141, 1142, - 1167, 1193, 1221 + 986, 987, 988, 993, 994, 995, 996, 997, 999, 1000, + 1002, 1003, 1009, 1010, 1011, 1012, 1013, 1014, 1017, 1018, + 1019, 1020, 1021, 1022, 1026, 1027, 1028, 1029, 1030, 1031, + 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, + 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, + 1052, 1053, 1054, 1056, 1057, 1062, 1066, 1070, 1071, 1075, + 1076, 1079, 1080, 1084, 1085, 1089, 1090, 1094, 1095, 1100, + 1101, 1102, 1103, 1104, 1105, 1107, 1108, 1110, 1111, 1112, + 1117, 1118, 1119, 1123, 1124, 1125, 1130, 1132, 1133, 1134, + 1159, 1185, 1213 } ; @@ -4968,14 +4968,6 @@ static std::stack YY_PREVIOUS_STATE; } -#define BEGIN_ACTION_COLLECTION_ELEMENT() { \ - if (YY_START == SETVAR_ACTION_NONQUOTED) { \ - BEGIN(SETVAR_ACTION_NONQUOTED_WAITING_COLLECTION_ELEM); \ - } else { \ - BEGIN(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM); \ - } \ -} - #define BEGIN_ACTION_WAITING_CONTENT() { \ if (YY_START == SETVAR_ACTION_NONQUOTED_WAITING_OPERATION) { \ BEGIN(SETVAR_ACTION_NONQUOTED_WAITING_CONTENT); \ @@ -4992,15 +4984,15 @@ static std::stack YY_PREVIOUS_STATE; #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); } // The location of the current token. -#line 4995 "seclang-scanner.cc" +#line 4987 "seclang-scanner.cc" #define YY_NO_INPUT 1 -#line 466 "seclang-scanner.ll" +#line 458 "seclang-scanner.ll" // Code run each time a pattern is matched. # define YY_USER_ACTION driver.loc.back()->columns (yyleng); -#line 5002 "seclang-scanner.cc" -#line 5003 "seclang-scanner.cc" +#line 4994 "seclang-scanner.cc" +#line 4995 "seclang-scanner.cc" #define INITIAL 0 #define EXPECTING_ACTION_PREDICATE_VARIABLE 1 @@ -5314,15 +5306,15 @@ YY_DECL { /* %% [7.0] user's declarations go here */ -#line 471 "seclang-scanner.ll" +#line 463 "seclang-scanner.ll" -#line 475 "seclang-scanner.ll" +#line 467 "seclang-scanner.ll" // Code run each time yylex is called. driver.loc.back()->step(); -#line 5325 "seclang-scanner.cc" +#line 5317 "seclang-scanner.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -5400,533 +5392,533 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 479 "seclang-scanner.ll" +#line 471 "seclang-scanner.ll" { return p::make_ACTION_APPEND(yytext, *driver.loc.back()); } YY_BREAK case 2: YY_RULE_SETUP -#line 480 "seclang-scanner.ll" +#line 472 "seclang-scanner.ll" { return p::make_ACTION_BLOCK(yytext, *driver.loc.back()); } YY_BREAK case 3: YY_RULE_SETUP -#line 481 "seclang-scanner.ll" +#line 473 "seclang-scanner.ll" { return p::make_ACTION_CAPTURE(yytext, *driver.loc.back()); } YY_BREAK case 4: YY_RULE_SETUP -#line 482 "seclang-scanner.ll" +#line 474 "seclang-scanner.ll" { return p::make_ACTION_CHAIN(yytext, *driver.loc.back()); } YY_BREAK case 5: YY_RULE_SETUP -#line 483 "seclang-scanner.ll" +#line 475 "seclang-scanner.ll" { return p::make_ACTION_DENY(yytext, *driver.loc.back()); } YY_BREAK case 6: YY_RULE_SETUP -#line 484 "seclang-scanner.ll" +#line 476 "seclang-scanner.ll" { return p::make_ACTION_DEPRECATE_VAR(yytext, *driver.loc.back()); } YY_BREAK case 7: YY_RULE_SETUP -#line 485 "seclang-scanner.ll" +#line 477 "seclang-scanner.ll" { return p::make_ACTION_DROP(yytext, *driver.loc.back()); } YY_BREAK case 8: YY_RULE_SETUP -#line 486 "seclang-scanner.ll" +#line 478 "seclang-scanner.ll" { return p::make_ACTION_ID(yytext, *driver.loc.back()); } YY_BREAK case 9: YY_RULE_SETUP -#line 487 "seclang-scanner.ll" +#line 479 "seclang-scanner.ll" { return p::make_ACTION_LOG(yytext, *driver.loc.back()); } YY_BREAK case 10: YY_RULE_SETUP -#line 488 "seclang-scanner.ll" +#line 480 "seclang-scanner.ll" { return p::make_ACTION_MULTI_MATCH(yytext, *driver.loc.back()); } YY_BREAK case 11: YY_RULE_SETUP -#line 489 "seclang-scanner.ll" +#line 481 "seclang-scanner.ll" { return p::make_ACTION_NO_AUDIT_LOG(yytext, *driver.loc.back()); } YY_BREAK case 12: YY_RULE_SETUP -#line 490 "seclang-scanner.ll" +#line 482 "seclang-scanner.ll" { return p::make_ACTION_NO_LOG(yytext, *driver.loc.back()); } YY_BREAK case 13: YY_RULE_SETUP -#line 491 "seclang-scanner.ll" +#line 483 "seclang-scanner.ll" { return p::make_ACTION_PASS(yytext, *driver.loc.back()); } YY_BREAK case 14: YY_RULE_SETUP -#line 492 "seclang-scanner.ll" +#line 484 "seclang-scanner.ll" { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } YY_BREAK case 15: YY_RULE_SETUP -#line 493 "seclang-scanner.ll" +#line 485 "seclang-scanner.ll" { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } YY_BREAK case 16: YY_RULE_SETUP -#line 494 "seclang-scanner.ll" +#line 486 "seclang-scanner.ll" { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } YY_BREAK case 17: YY_RULE_SETUP -#line 495 "seclang-scanner.ll" +#line 487 "seclang-scanner.ll" { return p::make_ACTION_SANATISE_ARG(yytext, *driver.loc.back()); } YY_BREAK case 18: YY_RULE_SETUP -#line 496 "seclang-scanner.ll" +#line 488 "seclang-scanner.ll" { return p::make_ACTION_SANATISE_MATCHED(yytext, *driver.loc.back()); } YY_BREAK case 19: YY_RULE_SETUP -#line 497 "seclang-scanner.ll" +#line 489 "seclang-scanner.ll" { return p::make_ACTION_SANATISE_MATCHED_BYTES(yytext, *driver.loc.back()); } YY_BREAK case 20: YY_RULE_SETUP -#line 498 "seclang-scanner.ll" +#line 490 "seclang-scanner.ll" { return p::make_ACTION_SANATISE_REQUEST_HEADER(yytext, *driver.loc.back()); } YY_BREAK case 21: YY_RULE_SETUP -#line 499 "seclang-scanner.ll" +#line 491 "seclang-scanner.ll" { return p::make_ACTION_SANATISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } YY_BREAK case 22: YY_RULE_SETUP -#line 500 "seclang-scanner.ll" +#line 492 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } YY_BREAK case 23: YY_RULE_SETUP -#line 502 "seclang-scanner.ll" +#line 494 "seclang-scanner.ll" { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); } YY_BREAK case 24: /* rule 24 can match eol */ YY_RULE_SETUP -#line 503 "seclang-scanner.ll" +#line 495 "seclang-scanner.ll" { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } YY_BREAK case 25: /* rule 25 can match eol */ YY_RULE_SETUP -#line 504 "seclang-scanner.ll" +#line 496 "seclang-scanner.ll" { return p::make_ACTION_ACCURACY(yytext, *driver.loc.back()); } YY_BREAK case 26: YY_RULE_SETUP -#line 505 "seclang-scanner.ll" +#line 497 "seclang-scanner.ll" { return p::make_ACTION_ALLOW(yytext, *driver.loc.back()); } YY_BREAK case 27: YY_RULE_SETUP -#line 506 "seclang-scanner.ll" +#line 498 "seclang-scanner.ll" { return p::make_ACTION_AUDIT_LOG(yytext, *driver.loc.back()); } YY_BREAK case 28: YY_RULE_SETUP -#line 507 "seclang-scanner.ll" +#line 499 "seclang-scanner.ll" { return p::make_ACTION_CTL_AUDIT_ENGINE(yytext, *driver.loc.back()); } YY_BREAK case 29: YY_RULE_SETUP -#line 508 "seclang-scanner.ll" +#line 500 "seclang-scanner.ll" { return p::make_ACTION_CTL_AUDIT_LOG_PARTS(yytext, *driver.loc.back()); } YY_BREAK case 30: YY_RULE_SETUP -#line 509 "seclang-scanner.ll" +#line 501 "seclang-scanner.ll" { return p::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); } YY_BREAK case 31: YY_RULE_SETUP -#line 510 "seclang-scanner.ll" +#line 502 "seclang-scanner.ll" { return p::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } YY_BREAK case 32: YY_RULE_SETUP -#line 511 "seclang-scanner.ll" +#line 503 "seclang-scanner.ll" { return p::make_ACTION_CTL_FORCE_REQ_BODY_VAR(yytext, *driver.loc.back()); } YY_BREAK case 33: YY_RULE_SETUP -#line 512 "seclang-scanner.ll" +#line 504 "seclang-scanner.ll" { return p::make_ACTION_CTL_REQUEST_BODY_ACCESS(yytext, *driver.loc.back()); } YY_BREAK case 34: YY_RULE_SETUP -#line 513 "seclang-scanner.ll" +#line 505 "seclang-scanner.ll" { return p::make_ACTION_CTL_RULE_ENGINE(*driver.loc.back()); } YY_BREAK case 35: YY_RULE_SETUP -#line 514 "seclang-scanner.ll" +#line 506 "seclang-scanner.ll" { return p::make_ACTION_CTL_RULE_REMOVE_BY_ID(yytext, *driver.loc.back()); } YY_BREAK case 36: YY_RULE_SETUP -#line 515 "seclang-scanner.ll" +#line 507 "seclang-scanner.ll" { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_ID(yytext, *driver.loc.back()); } YY_BREAK case 37: YY_RULE_SETUP -#line 516 "seclang-scanner.ll" +#line 508 "seclang-scanner.ll" { return p::make_ACTION_CTL_RULE_REMOVE_TARGET_BY_TAG(yytext, *driver.loc.back()); } YY_BREAK case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 517 "seclang-scanner.ll" +#line 509 "seclang-scanner.ll" { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } YY_BREAK case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 518 "seclang-scanner.ll" +#line 510 "seclang-scanner.ll" { return p::make_ACTION_EXEC(yytext, *driver.loc.back()); } YY_BREAK case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 519 "seclang-scanner.ll" +#line 511 "seclang-scanner.ll" { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } YY_BREAK case 41: /* rule 41 can match eol */ YY_RULE_SETUP -#line 520 "seclang-scanner.ll" +#line 512 "seclang-scanner.ll" { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } YY_BREAK case 42: /* rule 42 can match eol */ YY_RULE_SETUP -#line 521 "seclang-scanner.ll" +#line 513 "seclang-scanner.ll" { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } YY_BREAK case 43: /* rule 43 can match eol */ YY_RULE_SETUP -#line 522 "seclang-scanner.ll" +#line 514 "seclang-scanner.ll" { return p::make_ACTION_EXPIRE_VAR(yytext, *driver.loc.back()); } YY_BREAK case 44: YY_RULE_SETUP -#line 523 "seclang-scanner.ll" +#line 515 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_INITCOL(yytext, *driver.loc.back()); } YY_BREAK case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 524 "seclang-scanner.ll" +#line 516 "seclang-scanner.ll" { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } YY_BREAK case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 525 "seclang-scanner.ll" +#line 517 "seclang-scanner.ll" { return p::make_ACTION_MATURITY(yytext, *driver.loc.back()); } YY_BREAK case 47: YY_RULE_SETUP -#line 526 "seclang-scanner.ll" +#line 518 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_MSG(yytext, *driver.loc.back()); } YY_BREAK case 48: YY_RULE_SETUP -#line 527 "seclang-scanner.ll" +#line 519 "seclang-scanner.ll" { return p::make_ACTION_PHASE(yytext, *driver.loc.back()); } YY_BREAK case 49: YY_RULE_SETUP -#line 528 "seclang-scanner.ll" +#line 520 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_REDIRECT(yytext, *driver.loc.back()); } YY_BREAK case 50: /* rule 50 can match eol */ YY_RULE_SETUP -#line 529 "seclang-scanner.ll" +#line 521 "seclang-scanner.ll" { return p::make_ACTION_REV(yytext, *driver.loc.back()); } YY_BREAK case 51: /* rule 51 can match eol */ YY_RULE_SETUP -#line 530 "seclang-scanner.ll" +#line 522 "seclang-scanner.ll" { return p::make_ACTION_REV(yytext, *driver.loc.back()); } YY_BREAK case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 531 "seclang-scanner.ll" +#line 523 "seclang-scanner.ll" { return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } YY_BREAK case 53: /* rule 53 can match eol */ YY_RULE_SETUP -#line 532 "seclang-scanner.ll" +#line 524 "seclang-scanner.ll" { return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } YY_BREAK case 54: /* rule 54 can match eol */ YY_RULE_SETUP -#line 533 "seclang-scanner.ll" +#line 525 "seclang-scanner.ll" { return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } YY_BREAK case 55: /* rule 55 can match eol */ YY_RULE_SETUP -#line 534 "seclang-scanner.ll" +#line 526 "seclang-scanner.ll" { return p::make_ACTION_SETENV(yytext, *driver.loc.back()); } YY_BREAK case 56: YY_RULE_SETUP -#line 535 "seclang-scanner.ll" +#line 527 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETSID(yytext, *driver.loc.back()); } YY_BREAK case 57: YY_RULE_SETUP -#line 536 "seclang-scanner.ll" +#line 528 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETUID(yytext, *driver.loc.back()); } YY_BREAK case 58: YY_RULE_SETUP -#line 538 "seclang-scanner.ll" +#line 530 "seclang-scanner.ll" { BEGIN(SETVAR_ACTION_QUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } YY_BREAK case 59: YY_RULE_SETUP -#line 539 "seclang-scanner.ll" +#line 531 "seclang-scanner.ll" { BEGIN(SETVAR_ACTION_NONQUOTED); return p::make_ACTION_SETVAR(*driver.loc.back()); } YY_BREAK case 60: YY_RULE_SETUP -#line 542 "seclang-scanner.ll" +#line 534 "seclang-scanner.ll" { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } YY_BREAK case 61: YY_RULE_SETUP -#line 543 "seclang-scanner.ll" +#line 535 "seclang-scanner.ll" { return p::make_ACTION_SEVERITY(yytext, *driver.loc.back()); } YY_BREAK case 62: YY_RULE_SETUP -#line 544 "seclang-scanner.ll" +#line 536 "seclang-scanner.ll" { return p::make_ACTION_SKIP_AFTER(yytext, *driver.loc.back()); } YY_BREAK case 63: YY_RULE_SETUP -#line 545 "seclang-scanner.ll" +#line 537 "seclang-scanner.ll" { return p::make_ACTION_SKIP(yytext, *driver.loc.back()); } YY_BREAK case 64: YY_RULE_SETUP -#line 546 "seclang-scanner.ll" +#line 538 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_TAG(yytext, *driver.loc.back()); } YY_BREAK case 65: /* rule 65 can match eol */ YY_RULE_SETUP -#line 547 "seclang-scanner.ll" +#line 539 "seclang-scanner.ll" { return p::make_ACTION_VER(yytext, *driver.loc.back()); } YY_BREAK case 66: YY_RULE_SETUP -#line 548 "seclang-scanner.ll" +#line 540 "seclang-scanner.ll" { return p::make_ACTION_XMLNS(yytext, *driver.loc.back()); } YY_BREAK case 67: YY_RULE_SETUP -#line 550 "seclang-scanner.ll" +#line 542 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_PARITY_ZERO_7_BIT(yytext, *driver.loc.back()); } YY_BREAK case 68: YY_RULE_SETUP -#line 551 "seclang-scanner.ll" +#line 543 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_PARITY_ODD_7_BIT(yytext, *driver.loc.back()); } YY_BREAK case 69: YY_RULE_SETUP -#line 552 "seclang-scanner.ll" +#line 544 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_PARITY_EVEN_7_BIT(yytext, *driver.loc.back()); } YY_BREAK case 70: YY_RULE_SETUP -#line 553 "seclang-scanner.ll" +#line 545 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_SQL_HEX_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 71: YY_RULE_SETUP -#line 554 "seclang-scanner.ll" +#line 546 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_CMD_LINE(yytext, *driver.loc.back()); } YY_BREAK case 72: YY_RULE_SETUP -#line 555 "seclang-scanner.ll" +#line 547 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_SHA1(yytext, *driver.loc.back()); } YY_BREAK case 73: YY_RULE_SETUP -#line 556 "seclang-scanner.ll" +#line 548 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_MD5(yytext, *driver.loc.back()); } YY_BREAK case 74: YY_RULE_SETUP -#line 557 "seclang-scanner.ll" +#line 549 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_HEX_ENCODE(yytext, *driver.loc.back()); } YY_BREAK case 75: YY_RULE_SETUP -#line 558 "seclang-scanner.ll" +#line 550 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_HEX_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 76: YY_RULE_SETUP -#line 559 "seclang-scanner.ll" +#line 551 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_LOWERCASE(yytext, *driver.loc.back()); } YY_BREAK case 77: YY_RULE_SETUP -#line 560 "seclang-scanner.ll" +#line 552 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_UPPERCASE(yytext, *driver.loc.back()); } YY_BREAK case 78: YY_RULE_SETUP -#line 561 "seclang-scanner.ll" +#line 553 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_URL_DECODE_UNI(yytext, *driver.loc.back()); } YY_BREAK case 79: YY_RULE_SETUP -#line 562 "seclang-scanner.ll" +#line 554 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_URL_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 80: YY_RULE_SETUP -#line 563 "seclang-scanner.ll" +#line 555 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_NONE(yytext, *driver.loc.back()); } YY_BREAK case 81: YY_RULE_SETUP -#line 564 "seclang-scanner.ll" +#line 556 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_COMPRESS_WHITESPACE(yytext, *driver.loc.back()); } YY_BREAK case 82: YY_RULE_SETUP -#line 565 "seclang-scanner.ll" +#line 557 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REMOVE_WHITESPACE(yytext, *driver.loc.back()); } YY_BREAK case 83: YY_RULE_SETUP -#line 566 "seclang-scanner.ll" +#line 558 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REPLACE_NULLS(yytext, *driver.loc.back()); } YY_BREAK case 84: YY_RULE_SETUP -#line 567 "seclang-scanner.ll" +#line 559 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REMOVE_NULLS(yytext, *driver.loc.back()); } YY_BREAK case 85: YY_RULE_SETUP -#line 568 "seclang-scanner.ll" +#line 560 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_HTML_ENTITY_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 86: YY_RULE_SETUP -#line 569 "seclang-scanner.ll" +#line 561 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_JS_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 87: YY_RULE_SETUP -#line 570 "seclang-scanner.ll" +#line 562 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_CSS_DECODE(yytext, *driver.loc.back()); } YY_BREAK case 88: YY_RULE_SETUP -#line 571 "seclang-scanner.ll" +#line 563 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_TRIM(yytext, *driver.loc.back()); } YY_BREAK case 89: YY_RULE_SETUP -#line 572 "seclang-scanner.ll" +#line 564 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH_WIN(yytext, *driver.loc.back()); } YY_BREAK case 90: YY_RULE_SETUP -#line 573 "seclang-scanner.ll" +#line 565 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_NORMALISE_PATH(yytext, *driver.loc.back()); } YY_BREAK case 91: YY_RULE_SETUP -#line 574 "seclang-scanner.ll" +#line 566 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_LENGTH(yytext, *driver.loc.back()); } YY_BREAK case 92: YY_RULE_SETUP -#line 575 "seclang-scanner.ll" +#line 567 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_UTF8_TO_UNICODE(yytext, *driver.loc.back()); } YY_BREAK case 93: YY_RULE_SETUP -#line 576 "seclang-scanner.ll" +#line 568 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS_CHAR(yytext, *driver.loc.back()); } YY_BREAK case 94: YY_RULE_SETUP -#line 577 "seclang-scanner.ll" +#line 569 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REMOVE_COMMENTS(yytext, *driver.loc.back()); } YY_BREAK case 95: YY_RULE_SETUP -#line 578 "seclang-scanner.ll" +#line 570 "seclang-scanner.ll" { return p::make_ACTION_TRANSFORMATION_REPLACE_COMMENTS(yytext, *driver.loc.back()); } YY_BREAK case 96: YY_RULE_SETUP -#line 579 "seclang-scanner.ll" +#line 571 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_LOG_DATA(yytext, *driver.loc.back()); } YY_BREAK case 97: YY_RULE_SETUP -#line 581 "seclang-scanner.ll" +#line 573 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } YY_BREAK case 98: YY_RULE_SETUP -#line 582 "seclang-scanner.ll" +#line 574 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } YY_BREAK case 99: YY_RULE_SETUP -#line 583 "seclang-scanner.ll" +#line 575 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } YY_BREAK case 100: /* rule 100 can match eol */ YY_RULE_SETUP -#line 584 "seclang-scanner.ll" +#line 576 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 101: /* rule 101 can match eol */ YY_RULE_SETUP -#line 585 "seclang-scanner.ll" +#line 577 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 102: YY_RULE_SETUP -#line 589 "seclang-scanner.ll" +#line 581 "seclang-scanner.ll" { return p::make_COMMA(*driver.loc.back()); } YY_BREAK @@ -5934,75 +5926,75 @@ YY_RULE_SETUP case 103: /* rule 103 can match eol */ YY_RULE_SETUP -#line 594 "seclang-scanner.ll" +#line 586 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 104: /* rule 104 can match eol */ YY_RULE_SETUP -#line 595 "seclang-scanner.ll" +#line 587 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(yyleng); driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 105: YY_RULE_SETUP -#line 600 "seclang-scanner.ll" +#line 592 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(yyleng); } YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 601 "seclang-scanner.ll" +#line 593 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(1); } YY_BREAK case 107: /* rule 107 can match eol */ YY_RULE_SETUP -#line 602 "seclang-scanner.ll" +#line 594 "seclang-scanner.ll" { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 108: YY_RULE_SETUP -#line 607 "seclang-scanner.ll" +#line 599 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(yyleng); p::make_NEW_LINE(*driver.loc.back()); } YY_BREAK case 109: /* rule 109 can match eol */ YY_RULE_SETUP -#line 608 "seclang-scanner.ll" +#line 600 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(1); } YY_BREAK case 110: /* rule 110 can match eol */ YY_RULE_SETUP -#line 609 "seclang-scanner.ll" +#line 601 "seclang-scanner.ll" { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 111: YY_RULE_SETUP -#line 614 "seclang-scanner.ll" +#line 606 "seclang-scanner.ll" { BEGIN(LEXING_ERROR_ACTION); yyless(0); } YY_BREAK case 112: YY_RULE_SETUP -#line 619 "seclang-scanner.ll" +#line 611 "seclang-scanner.ll" { BEGIN(ACTION_PREDICATE_ENDS_WITH_QUOTE); } YY_BREAK case 113: YY_RULE_SETUP -#line 620 "seclang-scanner.ll" +#line 612 "seclang-scanner.ll" { BEGIN(ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 114: YY_RULE_SETUP -#line 621 "seclang-scanner.ll" +#line 613 "seclang-scanner.ll" { BEGIN(ACTION_PREDICATE_ENDS_WITH_COMMA_OR_DOUBLE_QUOTE); yyless(0); } YY_BREAK @@ -6010,111 +6002,111 @@ YY_RULE_SETUP case 115: /* rule 115 can match eol */ YY_RULE_SETUP -#line 626 "seclang-scanner.ll" +#line 618 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 116: /* rule 116 can match eol */ YY_RULE_SETUP -#line 627 "seclang-scanner.ll" +#line 619 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 117: YY_RULE_SETUP -#line 631 "seclang-scanner.ll" +#line 623 "seclang-scanner.ll" { BEGIN_PREVIOUS(); } YY_BREAK case 118: YY_RULE_SETUP -#line 632 "seclang-scanner.ll" +#line 624 "seclang-scanner.ll" { BEGIN_PREVIOUS(); } YY_BREAK case 119: YY_RULE_SETUP -#line 636 "seclang-scanner.ll" +#line 628 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } YY_BREAK case 120: /* rule 120 can match eol */ YY_RULE_SETUP -#line 637 "seclang-scanner.ll" +#line 629 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 121: YY_RULE_SETUP -#line 641 "seclang-scanner.ll" +#line 633 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(yyleng); } YY_BREAK case 122: /* rule 122 can match eol */ YY_RULE_SETUP -#line 642 "seclang-scanner.ll" +#line 634 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 123: YY_RULE_SETUP -#line 646 "seclang-scanner.ll" +#line 638 "seclang-scanner.ll" { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 124: YY_RULE_SETUP -#line 647 "seclang-scanner.ll" +#line 639 "seclang-scanner.ll" { yyless(0); BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE);} YY_BREAK case 125: /* rule 125 can match eol */ YY_RULE_SETUP -#line 648 "seclang-scanner.ll" +#line 640 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 126: YY_RULE_SETUP -#line 652 "seclang-scanner.ll" +#line 644 "seclang-scanner.ll" { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } YY_BREAK case 127: YY_RULE_SETUP -#line 653 "seclang-scanner.ll" +#line 645 "seclang-scanner.ll" { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } YY_BREAK case 128: YY_RULE_SETUP -#line 657 "seclang-scanner.ll" +#line 649 "seclang-scanner.ll" { return p::make_NOT(*driver.loc.back()); } YY_BREAK case 129: /* rule 129 can match eol */ YY_RULE_SETUP -#line 658 "seclang-scanner.ll" +#line 650 "seclang-scanner.ll" { BEGIN_ACTION_OPERATION(); yyless(0); } YY_BREAK case 130: YY_RULE_SETUP -#line 663 "seclang-scanner.ll" +#line 655 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } YY_BREAK case 131: YY_RULE_SETUP -#line 664 "seclang-scanner.ll" +#line 656 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } YY_BREAK case 132: YY_RULE_SETUP -#line 665 "seclang-scanner.ll" +#line 657 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } YY_BREAK @@ -6122,27 +6114,27 @@ YY_RULE_SETUP case 133: /* rule 133 can match eol */ YY_RULE_SETUP -#line 669 "seclang-scanner.ll" +#line 661 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0);} YY_BREAK case 134: YY_RULE_SETUP -#line 673 "seclang-scanner.ll" +#line 665 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 135: /* rule 135 can match eol */ YY_RULE_SETUP -#line 674 "seclang-scanner.ll" +#line 666 "seclang-scanner.ll" { BEGIN(LEXING_ERROR_ACTION); yyless(0); } YY_BREAK case 136: YY_RULE_SETUP -#line 682 "seclang-scanner.ll" +#line 674 "seclang-scanner.ll" { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } YY_BREAK @@ -6150,13 +6142,13 @@ YY_RULE_SETUP case 137: /* rule 137 can match eol */ YY_RULE_SETUP -#line 687 "seclang-scanner.ll" +#line 679 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 138: /* rule 138 can match eol */ YY_RULE_SETUP -#line 688 "seclang-scanner.ll" +#line 680 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } YY_BREAK @@ -6164,1369 +6156,1369 @@ YY_RULE_SETUP case 139: /* rule 139 can match eol */ YY_RULE_SETUP -#line 693 "seclang-scanner.ll" +#line 685 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 140: YY_RULE_SETUP -#line 694 "seclang-scanner.ll" +#line 686 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 141: /* rule 141 can match eol */ YY_RULE_SETUP -#line 695 "seclang-scanner.ll" +#line 687 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); yyless(0); } YY_BREAK case YY_STATE_EOF(FINISH_ACTIONS): -#line 703 "seclang-scanner.ll" +#line 695 "seclang-scanner.ll" { BEGIN(INITIAL); yyless(0); p::make_NEW_LINE(*driver.loc.back()); } YY_BREAK case 142: YY_RULE_SETUP -#line 704 "seclang-scanner.ll" +#line 696 "seclang-scanner.ll" { BEGIN(INITIAL); } YY_BREAK case 143: /* rule 143 can match eol */ YY_RULE_SETUP -#line 707 "seclang-scanner.ll" +#line 699 "seclang-scanner.ll" { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } YY_BREAK case 144: /* rule 144 can match eol */ YY_RULE_SETUP -#line 708 "seclang-scanner.ll" +#line 700 "seclang-scanner.ll" { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); } YY_BREAK case 145: /* rule 145 can match eol */ YY_RULE_SETUP -#line 709 "seclang-scanner.ll" +#line 701 "seclang-scanner.ll" { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); } YY_BREAK case 146: YY_RULE_SETUP -#line 710 "seclang-scanner.ll" +#line 702 "seclang-scanner.ll" { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 147: YY_RULE_SETUP -#line 711 "seclang-scanner.ll" +#line 703 "seclang-scanner.ll" { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); } YY_BREAK case 148: YY_RULE_SETUP -#line 712 "seclang-scanner.ll" +#line 704 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 149: YY_RULE_SETUP -#line 713 "seclang-scanner.ll" +#line 705 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 150: YY_RULE_SETUP -#line 714 "seclang-scanner.ll" +#line 706 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 151: YY_RULE_SETUP -#line 715 "seclang-scanner.ll" +#line 707 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 152: YY_RULE_SETUP -#line 716 "seclang-scanner.ll" +#line 708 "seclang-scanner.ll" { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 153: YY_RULE_SETUP -#line 717 "seclang-scanner.ll" +#line 709 "seclang-scanner.ll" { return p::make_CONFIG_SEC_ARGUMENT_SEPARATOR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 154: YY_RULE_SETUP -#line 718 "seclang-scanner.ll" +#line 710 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_ENG(yytext, *driver.loc.back()); } YY_BREAK case 155: YY_RULE_SETUP -#line 719 "seclang-scanner.ll" +#line 711 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_FLE_MOD(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 156: YY_RULE_SETUP -#line 720 "seclang-scanner.ll" +#line 712 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG2(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 157: YY_RULE_SETUP -#line 721 "seclang-scanner.ll" +#line 713 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 158: YY_RULE_SETUP -#line 722 "seclang-scanner.ll" +#line 714 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG_P(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 159: YY_RULE_SETUP -#line 723 "seclang-scanner.ll" +#line 715 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 160: YY_RULE_SETUP -#line 724 "seclang-scanner.ll" +#line 716 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG_FMT(*driver.loc.back()); } YY_BREAK case 161: YY_RULE_SETUP -#line 725 "seclang-scanner.ll" +#line 717 "seclang-scanner.ll" { return p::make_JSON(*driver.loc.back()); } YY_BREAK case 162: YY_RULE_SETUP -#line 726 "seclang-scanner.ll" +#line 718 "seclang-scanner.ll" { return p::make_NATIVE(*driver.loc.back()); } YY_BREAK case 163: YY_RULE_SETUP -#line 727 "seclang-scanner.ll" +#line 719 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 164: YY_RULE_SETUP -#line 728 "seclang-scanner.ll" +#line 720 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 165: YY_RULE_SETUP -#line 729 "seclang-scanner.ll" +#line 721 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_STS(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 166: YY_RULE_SETUP -#line 730 "seclang-scanner.ll" +#line 722 "seclang-scanner.ll" { return p::make_CONFIG_DIR_AUDIT_TPE(yytext, *driver.loc.back()); } YY_BREAK case 167: YY_RULE_SETUP -#line 731 "seclang-scanner.ll" +#line 723 "seclang-scanner.ll" { return p::make_CONFIG_DIR_DEBUG_LOG(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 168: YY_RULE_SETUP -#line 732 "seclang-scanner.ll" +#line 724 "seclang-scanner.ll" { return p::make_CONFIG_DIR_DEBUG_LOG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 169: YY_RULE_SETUP -#line 733 "seclang-scanner.ll" +#line 725 "seclang-scanner.ll" { return p::make_CONFIG_DIR_DEBUG_LVL(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 170: YY_RULE_SETUP -#line 734 "seclang-scanner.ll" +#line 726 "seclang-scanner.ll" { return p::make_CONFIG_DIR_GEO_DB(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 171: YY_RULE_SETUP -#line 735 "seclang-scanner.ll" +#line 727 "seclang-scanner.ll" { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT_RECURSION(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 172: YY_RULE_SETUP -#line 736 "seclang-scanner.ll" +#line 728 "seclang-scanner.ll" { return p::make_CONFIG_DIR_PCRE_MATCH_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 173: YY_RULE_SETUP -#line 737 "seclang-scanner.ll" +#line 729 "seclang-scanner.ll" { return p::make_CONFIG_DIR_REQ_BODY_IN_MEMORY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 174: YY_RULE_SETUP -#line 738 "seclang-scanner.ll" +#line 730 "seclang-scanner.ll" { return p::make_CONFIG_DIR_REQ_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } YY_BREAK case 175: YY_RULE_SETUP -#line 739 "seclang-scanner.ll" +#line 731 "seclang-scanner.ll" { return p::make_CONFIG_DIR_REQ_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 176: YY_RULE_SETUP -#line 740 "seclang-scanner.ll" +#line 732 "seclang-scanner.ll" { return p::make_CONFIG_DIR_REQ_BODY_NO_FILES_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 177: YY_RULE_SETUP -#line 741 "seclang-scanner.ll" +#line 733 "seclang-scanner.ll" { return p::make_CONFIG_DIR_REQ_BODY(yytext, *driver.loc.back()); } YY_BREAK case 178: YY_RULE_SETUP -#line 742 "seclang-scanner.ll" +#line 734 "seclang-scanner.ll" { return p::make_CONFIG_DIR_RES_BODY_LIMIT_ACTION(yytext, *driver.loc.back()); } YY_BREAK case 179: YY_RULE_SETUP -#line 743 "seclang-scanner.ll" +#line 735 "seclang-scanner.ll" { return p::make_CONFIG_DIR_RES_BODY_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 180: YY_RULE_SETUP -#line 744 "seclang-scanner.ll" +#line 736 "seclang-scanner.ll" { return p::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } YY_BREAK case 181: YY_RULE_SETUP -#line 745 "seclang-scanner.ll" +#line 737 "seclang-scanner.ll" { return p::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } YY_BREAK case 182: YY_RULE_SETUP -#line 746 "seclang-scanner.ll" +#line 738 "seclang-scanner.ll" { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 183: YY_RULE_SETUP -#line 747 "seclang-scanner.ll" +#line 739 "seclang-scanner.ll" { return p::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 184: YY_RULE_SETUP -#line 748 "seclang-scanner.ll" +#line 740 "seclang-scanner.ll" { return p::make_CONFIG_DIR_UNICODE_MAP_FILE(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 185: YY_RULE_SETUP -#line 749 "seclang-scanner.ll" +#line 741 "seclang-scanner.ll" { return p::make_CONFIG_SEC_RULE_REMOVE_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 186: YY_RULE_SETUP -#line 750 "seclang-scanner.ll" +#line 742 "seclang-scanner.ll" { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 187: YY_RULE_SETUP -#line 751 "seclang-scanner.ll" +#line 743 "seclang-scanner.ll" { return p::make_CONFIG_SEC_RULE_REMOVE_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 188: YY_RULE_SETUP -#line 752 "seclang-scanner.ll" +#line 744 "seclang-scanner.ll" { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 189: YY_RULE_SETUP -#line 753 "seclang-scanner.ll" +#line 745 "seclang-scanner.ll" { return p::make_CONFIG_SEC_RULE_REMOVE_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 190: YY_RULE_SETUP -#line 755 "seclang-scanner.ll" +#line 747 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 191: YY_RULE_SETUP -#line 756 "seclang-scanner.ll" +#line 748 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_TAG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 192: YY_RULE_SETUP -#line 757 "seclang-scanner.ll" +#line 749 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 193: YY_RULE_SETUP -#line 758 "seclang-scanner.ll" +#line 750 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 194: YY_RULE_SETUP -#line 759 "seclang-scanner.ll" +#line 751 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 195: YY_RULE_SETUP -#line 760 "seclang-scanner.ll" +#line 752 "seclang-scanner.ll" { state_variable_from = 1; BEGIN(TRANSACTION_TO_VARIABLE); return p::make_CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 196: YY_RULE_SETUP -#line 761 "seclang-scanner.ll" +#line 753 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 197: YY_RULE_SETUP -#line 762 "seclang-scanner.ll" +#line 754 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_CONFIG_SEC_RULE_UPDATE_ACTION_BY_ID(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 198: YY_RULE_SETUP -#line 763 "seclang-scanner.ll" +#line 755 "seclang-scanner.ll" { return p::make_CONFIG_UPDLOAD_KEEP_FILES(yytext, *driver.loc.back()); } YY_BREAK case 199: YY_RULE_SETUP -#line 764 "seclang-scanner.ll" +#line 756 "seclang-scanner.ll" { return p::make_CONFIG_UPDLOAD_SAVE_TMP_FILES(yytext, *driver.loc.back()); } YY_BREAK case 200: YY_RULE_SETUP -#line 765 "seclang-scanner.ll" +#line 757 "seclang-scanner.ll" { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 201: YY_RULE_SETUP -#line 766 "seclang-scanner.ll" +#line 758 "seclang-scanner.ll" { return p::make_CONFIG_UPLOAD_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 202: YY_RULE_SETUP -#line 767 "seclang-scanner.ll" +#line 759 "seclang-scanner.ll" { return p::make_CONFIG_UPLOAD_FILE_LIMIT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 203: YY_RULE_SETUP -#line 768 "seclang-scanner.ll" +#line 760 "seclang-scanner.ll" { return p::make_CONFIG_UPLOAD_FILE_MODE(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 204: YY_RULE_SETUP -#line 769 "seclang-scanner.ll" +#line 761 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_ABORT(yytext, *driver.loc.back()); } YY_BREAK case 205: YY_RULE_SETUP -#line 770 "seclang-scanner.ll" +#line 762 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_DETC(yytext, *driver.loc.back()); } YY_BREAK case 206: YY_RULE_SETUP -#line 771 "seclang-scanner.ll" +#line 763 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_HTTPS(yytext, *driver.loc.back()); } YY_BREAK case 207: YY_RULE_SETUP -#line 772 "seclang-scanner.ll" +#line 764 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_OFF(yytext, *driver.loc.back()); } YY_BREAK case 208: YY_RULE_SETUP -#line 773 "seclang-scanner.ll" +#line 765 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_ON(yytext, *driver.loc.back()); } YY_BREAK case 209: YY_RULE_SETUP -#line 774 "seclang-scanner.ll" +#line 766 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_PARALLEL(yytext, *driver.loc.back()); } YY_BREAK case 210: YY_RULE_SETUP -#line 775 "seclang-scanner.ll" +#line 767 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_PROCESS_PARTIAL(yytext, *driver.loc.back()); } YY_BREAK case 211: YY_RULE_SETUP -#line 776 "seclang-scanner.ll" +#line 768 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_REJECT(yytext, *driver.loc.back()); } YY_BREAK case 212: YY_RULE_SETUP -#line 777 "seclang-scanner.ll" +#line 769 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_RELEVANT_ONLY(yytext, *driver.loc.back()); } YY_BREAK case 213: YY_RULE_SETUP -#line 778 "seclang-scanner.ll" +#line 770 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_SERIAL(yytext, *driver.loc.back()); } YY_BREAK case 214: YY_RULE_SETUP -#line 779 "seclang-scanner.ll" +#line 771 "seclang-scanner.ll" { return p::make_CONFIG_VALUE_WARN(yytext, *driver.loc.back()); } YY_BREAK case 215: YY_RULE_SETUP -#line 780 "seclang-scanner.ll" +#line 772 "seclang-scanner.ll" { return p::make_CONFIG_XML_EXTERNAL_ENTITY(yytext, *driver.loc.back()); } YY_BREAK case 216: YY_RULE_SETUP -#line 781 "seclang-scanner.ll" +#line 773 "seclang-scanner.ll" { return p::make_CONGIG_DIR_RESPONSE_BODY_MP(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 217: YY_RULE_SETUP -#line 782 "seclang-scanner.ll" +#line 774 "seclang-scanner.ll" { return p::make_CONGIG_DIR_RESPONSE_BODY_MP_CLEAR(*driver.loc.back()); } YY_BREAK case 218: YY_RULE_SETUP -#line 783 "seclang-scanner.ll" +#line 775 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_ARG_SEP(yytext, *driver.loc.back()); } YY_BREAK case 219: YY_RULE_SETUP -#line 784 "seclang-scanner.ll" +#line 776 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_COOKIE_FORMAT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 220: YY_RULE_SETUP -#line 785 "seclang-scanner.ll" +#line 777 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 221: YY_RULE_SETUP -#line 786 "seclang-scanner.ll" +#line 778 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_DATA_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 222: YY_RULE_SETUP -#line 787 "seclang-scanner.ll" +#line 779 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_STATUS_ENGINE(yytext, *driver.loc.back()); } YY_BREAK case 223: YY_RULE_SETUP -#line 788 "seclang-scanner.ll" +#line 780 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 224: YY_RULE_SETUP -#line 789 "seclang-scanner.ll" +#line 781 "seclang-scanner.ll" { return p::make_CONGIG_DIR_SEC_TMP_DIR(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 225: YY_RULE_SETUP -#line 790 "seclang-scanner.ll" +#line 782 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 226: YY_RULE_SETUP -#line 791 "seclang-scanner.ll" +#line 783 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_DIRECTIVE_SECRULESCRIPT(parserSanitizer(strchr(yytext, ' ') + 1), *driver.loc.back()); } YY_BREAK case 227: YY_RULE_SETUP -#line 792 "seclang-scanner.ll" +#line 784 "seclang-scanner.ll" { return p::make_CONFIG_SEC_CACHE_TRANSFORMATIONS(yytext, *driver.loc.back()); } YY_BREAK case 228: YY_RULE_SETUP -#line 795 "seclang-scanner.ll" +#line 787 "seclang-scanner.ll" { BEGIN(TRANSACTION_TO_VARIABLE); return p::make_DIRECTIVE(yytext, *driver.loc.back()); } YY_BREAK case 229: YY_RULE_SETUP -#line 796 "seclang-scanner.ll" +#line 788 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } YY_BREAK case 230: YY_RULE_SETUP -#line 797 "seclang-scanner.ll" +#line 789 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_DIRECTIVE_TO_ACTIONS); return p::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } YY_BREAK case 231: YY_RULE_SETUP -#line 799 "seclang-scanner.ll" +#line 791 "seclang-scanner.ll" { return p::make_CONFIG_SEC_REMOTE_RULES_FAIL_ACTION(yytext, *driver.loc.back()); } YY_BREAK case 232: YY_RULE_SETUP -#line 800 "seclang-scanner.ll" +#line 792 "seclang-scanner.ll" { return p::make_CONFIG_SEC_COLLECTION_TIMEOUT(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 233: YY_RULE_SETUP -#line 801 "seclang-scanner.ll" +#line 793 "seclang-scanner.ll" { return p::make_CONFIG_SEC_HTTP_BLKEY(strchr(yytext, ' ') + 1, *driver.loc.back()); } YY_BREAK case 234: /* rule 234 can match eol */ YY_RULE_SETUP -#line 802 "seclang-scanner.ll" +#line 794 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 235: /* rule 235 can match eol */ YY_RULE_SETUP -#line 803 "seclang-scanner.ll" +#line 795 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } YY_BREAK case 236: /* rule 236 can match eol */ YY_RULE_SETUP -#line 804 "seclang-scanner.ll" +#line 796 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } YY_BREAK case 237: YY_RULE_SETUP -#line 805 "seclang-scanner.ll" +#line 797 "seclang-scanner.ll" { driver.loc.back()->step(); /* comment, just ignore. */ } YY_BREAK case 238: YY_RULE_SETUP -#line 806 "seclang-scanner.ll" +#line 798 "seclang-scanner.ll" { driver.loc.back()->step(); /* carriage return, just ignore. */} YY_BREAK case 239: YY_RULE_SETUP -#line 807 "seclang-scanner.ll" +#line 799 "seclang-scanner.ll" { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } YY_BREAK case 240: YY_RULE_SETUP -#line 808 "seclang-scanner.ll" +#line 800 "seclang-scanner.ll" { return p::make_COMMA(*driver.loc.back()); } YY_BREAK case 241: YY_RULE_SETUP -#line 811 "seclang-scanner.ll" +#line 803 "seclang-scanner.ll" { BEGIN(EXPECTING_VARIABLE); } YY_BREAK case 242: YY_RULE_SETUP -#line 815 "seclang-scanner.ll" +#line 807 "seclang-scanner.ll" { return p::make_PIPE(*driver.loc.back()); } YY_BREAK case 243: YY_RULE_SETUP -#line 816 "seclang-scanner.ll" +#line 808 "seclang-scanner.ll" { return p::make_PIPE(*driver.loc.back()); } YY_BREAK case 244: YY_RULE_SETUP -#line 817 "seclang-scanner.ll" +#line 809 "seclang-scanner.ll" { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } YY_BREAK case 245: YY_RULE_SETUP -#line 818 "seclang-scanner.ll" +#line 810 "seclang-scanner.ll" { return p::make_VAR_EXCLUSION(*driver.loc.back()); } YY_BREAK case 246: YY_RULE_SETUP -#line 819 "seclang-scanner.ll" +#line 811 "seclang-scanner.ll" { return p::make_VAR_COUNT(*driver.loc.back()); } YY_BREAK case 247: YY_RULE_SETUP -#line 823 "seclang-scanner.ll" +#line 815 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 248: YY_RULE_SETUP -#line 824 "seclang-scanner.ll" +#line 816 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 249: /* rule 249 can match eol */ YY_RULE_SETUP -#line 825 "seclang-scanner.ll" +#line 817 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 250: /* rule 250 can match eol */ YY_RULE_SETUP -#line 826 "seclang-scanner.ll" +#line 818 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 251: /* rule 251 can match eol */ YY_RULE_SETUP -#line 827 "seclang-scanner.ll" +#line 819 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_SPACE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 252: /* rule 252 can match eol */ YY_RULE_SETUP -#line 828 "seclang-scanner.ll" +#line 820 "seclang-scanner.ll" { if (state_variable_from == 0) { BEGIN(EXPECTING_OPERATOR_ENDS_WITH_QUOTE); } else { state_variable_from = 0; BEGIN(INITIAL);} } YY_BREAK case 253: YY_RULE_SETUP -#line 832 "seclang-scanner.ll" +#line 824 "seclang-scanner.ll" { } YY_BREAK case 254: YY_RULE_SETUP -#line 833 "seclang-scanner.ll" +#line 825 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 255: /* rule 255 can match eol */ YY_RULE_SETUP -#line 834 "seclang-scanner.ll" +#line 826 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 256: /* rule 256 can match eol */ YY_RULE_SETUP -#line 835 "seclang-scanner.ll" +#line 827 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 257: YY_RULE_SETUP -#line 840 "seclang-scanner.ll" +#line 832 "seclang-scanner.ll" { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } YY_BREAK case 258: YY_RULE_SETUP -#line 841 "seclang-scanner.ll" +#line 833 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_COMBINED_SIZE(*driver.loc.back()); } YY_BREAK case 259: YY_RULE_SETUP -#line 842 "seclang-scanner.ll" +#line 834 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } YY_BREAK case 260: YY_RULE_SETUP -#line 843 "seclang-scanner.ll" +#line 835 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET_NAMES(*driver.loc.back()); } YY_BREAK case 261: YY_RULE_SETUP -#line 844 "seclang-scanner.ll" +#line 836 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } YY_BREAK case 262: YY_RULE_SETUP -#line 845 "seclang-scanner.ll" +#line 837 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_NAMES(*driver.loc.back()); } YY_BREAK case 263: YY_RULE_SETUP -#line 846 "seclang-scanner.ll" +#line 838 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } YY_BREAK case 264: YY_RULE_SETUP -#line 847 "seclang-scanner.ll" +#line 839 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST_NAMES(*driver.loc.back()); } YY_BREAK case 265: YY_RULE_SETUP -#line 848 "seclang-scanner.ll" +#line 840 "seclang-scanner.ll" { return p::make_VARIABLE_AUTH_TYPE(*driver.loc.back()); } YY_BREAK case 266: YY_RULE_SETUP -#line 849 "seclang-scanner.ll" +#line 841 "seclang-scanner.ll" { return p::make_VARIABLE_FILES_COMBINED_SIZE(*driver.loc.back()); } YY_BREAK case 267: YY_RULE_SETUP -#line 850 "seclang-scanner.ll" +#line 842 "seclang-scanner.ll" { return p::make_VARIABLE_FULL_REQUEST_LENGTH(*driver.loc.back()); } YY_BREAK case 268: YY_RULE_SETUP -#line 851 "seclang-scanner.ll" +#line 843 "seclang-scanner.ll" { return p::make_VARIABLE_FULL_REQUEST(*driver.loc.back()); } YY_BREAK case 269: YY_RULE_SETUP -#line 852 "seclang-scanner.ll" +#line 844 "seclang-scanner.ll" { return p::make_VARIABLE_INBOUND_DATA_ERROR(*driver.loc.back()); } YY_BREAK case 270: YY_RULE_SETUP -#line 853 "seclang-scanner.ll" +#line 845 "seclang-scanner.ll" { return p::make_VARIABLE_MATCHED_VAR_NAME(*driver.loc.back()); } YY_BREAK case 271: YY_RULE_SETUP -#line 854 "seclang-scanner.ll" +#line 846 "seclang-scanner.ll" { return p::make_VARIABLE_MATCHED_VAR(*driver.loc.back()); } YY_BREAK case 272: YY_RULE_SETUP -#line 855 "seclang-scanner.ll" +#line 847 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_BOUNDARY_QUOTED(*driver.loc.back()); } YY_BREAK case 273: YY_RULE_SETUP -#line 856 "seclang-scanner.ll" +#line 848 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_BOUNDARY_WHITESPACE(*driver.loc.back()); } YY_BREAK case 274: YY_RULE_SETUP -#line 857 "seclang-scanner.ll" +#line 849 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_CRLF_LF_LINES(*driver.loc.back()); } YY_BREAK case 275: YY_RULE_SETUP -#line 858 "seclang-scanner.ll" +#line 850 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_DATA_AFTER(*driver.loc.back()); } YY_BREAK case 276: YY_RULE_SETUP -#line 859 "seclang-scanner.ll" +#line 851 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_DATA_BEFORE(*driver.loc.back()); } YY_BREAK case 277: YY_RULE_SETUP -#line 860 "seclang-scanner.ll" +#line 852 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED(*driver.loc.back()); } YY_BREAK case 278: YY_RULE_SETUP -#line 861 "seclang-scanner.ll" +#line 853 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } YY_BREAK case 279: YY_RULE_SETUP -#line 862 "seclang-scanner.ll" +#line 854 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_FILENAME(*driver.loc.back()); } YY_BREAK case 280: YY_RULE_SETUP -#line 863 "seclang-scanner.ll" +#line 855 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } YY_BREAK case 281: YY_RULE_SETUP -#line 864 "seclang-scanner.ll" +#line 856 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_HEADER_FOLDING(*driver.loc.back()); } YY_BREAK case 282: YY_RULE_SETUP -#line 865 "seclang-scanner.ll" +#line 857 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_INVALID_HEADER_FOLDING(*driver.loc.back()); } YY_BREAK case 283: YY_RULE_SETUP -#line 866 "seclang-scanner.ll" +#line 858 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_INVALID_PART(*driver.loc.back()); } YY_BREAK case 284: YY_RULE_SETUP -#line 867 "seclang-scanner.ll" +#line 859 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_INVALID_QUOTING(*driver.loc.back()); } YY_BREAK case 285: YY_RULE_SETUP -#line 868 "seclang-scanner.ll" +#line 860 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_LF_LINE(*driver.loc.back()); } YY_BREAK case 286: YY_RULE_SETUP -#line 869 "seclang-scanner.ll" +#line 861 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_MISSING_SEMICOLON(*driver.loc.back()); } YY_BREAK case 287: YY_RULE_SETUP -#line 870 "seclang-scanner.ll" +#line 862 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } YY_BREAK case 288: YY_RULE_SETUP -#line 871 "seclang-scanner.ll" +#line 863 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_NAME(*driver.loc.back()); } YY_BREAK case 289: YY_RULE_SETUP -#line 872 "seclang-scanner.ll" +#line 864 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_STRICT_ERROR(*driver.loc.back()); } YY_BREAK case 290: YY_RULE_SETUP -#line 873 "seclang-scanner.ll" +#line 865 "seclang-scanner.ll" { return p::make_VARIABLE_MULTIPART_UNMATCHED_BOUNDARY(*driver.loc.back()); } YY_BREAK case 291: YY_RULE_SETUP -#line 874 "seclang-scanner.ll" +#line 866 "seclang-scanner.ll" { return p::make_VARIABLE_OUTBOUND_DATA_ERROR(*driver.loc.back()); } YY_BREAK case 292: YY_RULE_SETUP -#line 875 "seclang-scanner.ll" +#line 867 "seclang-scanner.ll" { return p::make_VARIABLE_PATH_INFO(*driver.loc.back()); } YY_BREAK case 293: YY_RULE_SETUP -#line 876 "seclang-scanner.ll" +#line 868 "seclang-scanner.ll" { return p::make_VARIABLE_QUERY_STRING(*driver.loc.back()); } YY_BREAK case 294: YY_RULE_SETUP -#line 877 "seclang-scanner.ll" +#line 869 "seclang-scanner.ll" { return p::make_VARIABLE_REMOTE_ADDR(*driver.loc.back()); } YY_BREAK case 295: YY_RULE_SETUP -#line 878 "seclang-scanner.ll" +#line 870 "seclang-scanner.ll" { return p::make_VARIABLE_REMOTE_HOST(*driver.loc.back()); } YY_BREAK case 296: YY_RULE_SETUP -#line 879 "seclang-scanner.ll" +#line 871 "seclang-scanner.ll" { return p::make_VARIABLE_REMOTE_PORT(*driver.loc.back()); } YY_BREAK case 297: YY_RULE_SETUP -#line 880 "seclang-scanner.ll" +#line 872 "seclang-scanner.ll" { return p::make_VARIABLE_REQBODY_ERROR_MSG(*driver.loc.back()); } YY_BREAK case 298: YY_RULE_SETUP -#line 881 "seclang-scanner.ll" +#line 873 "seclang-scanner.ll" { return p::make_VARIABLE_REQBODY_ERROR(*driver.loc.back()); } YY_BREAK case 299: YY_RULE_SETUP -#line 882 "seclang-scanner.ll" +#line 874 "seclang-scanner.ll" { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR_MSG(*driver.loc.back()); } YY_BREAK case 300: YY_RULE_SETUP -#line 883 "seclang-scanner.ll" +#line 875 "seclang-scanner.ll" { return p::make_VARIABLE_REQBODY_PROCESSOR_ERROR(*driver.loc.back()); } YY_BREAK case 301: YY_RULE_SETUP -#line 884 "seclang-scanner.ll" +#line 876 "seclang-scanner.ll" { return p::make_VARIABLE_REQBODY_PROCESSOR(*driver.loc.back()); } YY_BREAK case 302: YY_RULE_SETUP -#line 885 "seclang-scanner.ll" +#line 877 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_BASENAME(*driver.loc.back()); } YY_BREAK case 303: YY_RULE_SETUP -#line 886 "seclang-scanner.ll" +#line 878 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_BODY_LENGTH(*driver.loc.back()); } YY_BREAK case 304: YY_RULE_SETUP -#line 887 "seclang-scanner.ll" +#line 879 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_BODY(*driver.loc.back()); } YY_BREAK case 305: YY_RULE_SETUP -#line 888 "seclang-scanner.ll" +#line 880 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_FILE_NAME(*driver.loc.back()); } YY_BREAK case 306: YY_RULE_SETUP -#line 889 "seclang-scanner.ll" +#line 881 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } YY_BREAK case 307: YY_RULE_SETUP -#line 890 "seclang-scanner.ll" +#line 882 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS_NAMES(*driver.loc.back()); } YY_BREAK case 308: YY_RULE_SETUP -#line 891 "seclang-scanner.ll" +#line 883 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_LINE(*driver.loc.back()); } YY_BREAK case 309: YY_RULE_SETUP -#line 892 "seclang-scanner.ll" +#line 884 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_METHOD(*driver.loc.back()); } YY_BREAK case 310: YY_RULE_SETUP -#line 893 "seclang-scanner.ll" +#line 885 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_PROTOCOL(*driver.loc.back()); } YY_BREAK case 311: YY_RULE_SETUP -#line 894 "seclang-scanner.ll" +#line 886 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_URI_RAW(*driver.loc.back()); } YY_BREAK case 312: YY_RULE_SETUP -#line 895 "seclang-scanner.ll" +#line 887 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_URI(*driver.loc.back()); } YY_BREAK case 313: YY_RULE_SETUP -#line 896 "seclang-scanner.ll" +#line 888 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_BODY(*driver.loc.back()); } YY_BREAK case 314: YY_RULE_SETUP -#line 897 "seclang-scanner.ll" +#line 889 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_CONTENT_LENGTH(*driver.loc.back()); } YY_BREAK case 315: YY_RULE_SETUP -#line 898 "seclang-scanner.ll" +#line 890 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_CONTENT_TYPE(*driver.loc.back()); } YY_BREAK case 316: YY_RULE_SETUP -#line 899 "seclang-scanner.ll" +#line 891 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } YY_BREAK case 317: YY_RULE_SETUP -#line 900 "seclang-scanner.ll" +#line 892 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS_NAMES(*driver.loc.back()); } YY_BREAK case 318: YY_RULE_SETUP -#line 901 "seclang-scanner.ll" +#line 893 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_PROTOCOL(*driver.loc.back()); } YY_BREAK case 319: YY_RULE_SETUP -#line 902 "seclang-scanner.ll" +#line 894 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_STATUS(*driver.loc.back()); } YY_BREAK case 320: YY_RULE_SETUP -#line 903 "seclang-scanner.ll" +#line 895 "seclang-scanner.ll" { return p::make_VARIABLE_SERVER_ADDR(*driver.loc.back()); } YY_BREAK case 321: YY_RULE_SETUP -#line 904 "seclang-scanner.ll" +#line 896 "seclang-scanner.ll" { return p::make_VARIABLE_SERVER_NAME(*driver.loc.back()); } YY_BREAK case 322: YY_RULE_SETUP -#line 905 "seclang-scanner.ll" +#line 897 "seclang-scanner.ll" { return p::make_VARIABLE_SERVER_PORT(*driver.loc.back()); } YY_BREAK case 323: YY_RULE_SETUP -#line 906 "seclang-scanner.ll" +#line 898 "seclang-scanner.ll" { return p::make_VARIABLE_SESSION_ID(*driver.loc.back()); } YY_BREAK case 324: YY_RULE_SETUP -#line 907 "seclang-scanner.ll" +#line 899 "seclang-scanner.ll" { return p::make_VARIABLE_UNIQUE_ID(*driver.loc.back()); } YY_BREAK case 325: YY_RULE_SETUP -#line 908 "seclang-scanner.ll" +#line 900 "seclang-scanner.ll" { return p::make_VARIABLE_URL_ENCODED_ERROR(*driver.loc.back()); } YY_BREAK case 326: YY_RULE_SETUP -#line 909 "seclang-scanner.ll" +#line 901 "seclang-scanner.ll" { return p::make_VARIABLE_USER_ID(*driver.loc.back()); } YY_BREAK case 327: YY_RULE_SETUP -#line 910 "seclang-scanner.ll" +#line 902 "seclang-scanner.ll" { return p::make_VARIABLE_WEB_APP_ID(*driver.loc.back()); } YY_BREAK case 328: YY_RULE_SETUP -#line 911 "seclang-scanner.ll" +#line 903 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS(*driver.loc.back()); } YY_BREAK case 329: YY_RULE_SETUP -#line 912 "seclang-scanner.ll" +#line 904 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS(*driver.loc.back()); } YY_BREAK case 330: YY_RULE_SETUP -#line 913 "seclang-scanner.ll" +#line 905 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } YY_BREAK case 331: YY_RULE_SETUP -#line 914 "seclang-scanner.ll" +#line 906 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_GET(*driver.loc.back()); } YY_BREAK case 332: YY_RULE_SETUP -#line 915 "seclang-scanner.ll" +#line 907 "seclang-scanner.ll" { return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } YY_BREAK case 333: YY_RULE_SETUP -#line 916 "seclang-scanner.ll" +#line 908 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_ARGS_POST(*driver.loc.back()); } YY_BREAK case 334: YY_RULE_SETUP -#line 917 "seclang-scanner.ll" +#line 909 "seclang-scanner.ll" { return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } YY_BREAK case 335: YY_RULE_SETUP -#line 918 "seclang-scanner.ll" +#line 910 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_SIZES(*driver.loc.back()); } YY_BREAK case 336: YY_RULE_SETUP -#line 919 "seclang-scanner.ll" +#line 911 "seclang-scanner.ll" { return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } YY_BREAK case 337: YY_RULE_SETUP -#line 920 "seclang-scanner.ll" +#line 912 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_NAMES(*driver.loc.back()); } YY_BREAK case 338: YY_RULE_SETUP -#line 921 "seclang-scanner.ll" +#line 913 "seclang-scanner.ll" { return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } YY_BREAK case 339: YY_RULE_SETUP -#line 922 "seclang-scanner.ll" +#line 914 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_CONTENT(*driver.loc.back()); } YY_BREAK case 340: YY_RULE_SETUP -#line 923 "seclang-scanner.ll" +#line 915 "seclang-scanner.ll" { return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } YY_BREAK case 341: YY_RULE_SETUP -#line 924 "seclang-scanner.ll" +#line 916 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS_NAMES(*driver.loc.back()); } YY_BREAK case 342: YY_RULE_SETUP -#line 925 "seclang-scanner.ll" +#line 917 "seclang-scanner.ll" { return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } YY_BREAK case 343: YY_RULE_SETUP -#line 926 "seclang-scanner.ll" +#line 918 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_MATCHED_VARS(*driver.loc.back()); } YY_BREAK case 344: YY_RULE_SETUP -#line 927 "seclang-scanner.ll" +#line 919 "seclang-scanner.ll" { return p::make_VARIABLE_FILES(*driver.loc.back()); } YY_BREAK case 345: YY_RULE_SETUP -#line 928 "seclang-scanner.ll" +#line 920 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES(*driver.loc.back()); } YY_BREAK case 346: YY_RULE_SETUP -#line 929 "seclang-scanner.ll" +#line 921 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } YY_BREAK case 347: YY_RULE_SETUP -#line 930 "seclang-scanner.ll" +#line 922 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES(*driver.loc.back()); } YY_BREAK case 348: YY_RULE_SETUP -#line 931 "seclang-scanner.ll" +#line 923 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } YY_BREAK case 349: YY_RULE_SETUP -#line 932 "seclang-scanner.ll" +#line 924 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_HEADERS(*driver.loc.back()); } YY_BREAK case 350: YY_RULE_SETUP -#line 933 "seclang-scanner.ll" +#line 925 "seclang-scanner.ll" { return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } YY_BREAK case 351: YY_RULE_SETUP -#line 934 "seclang-scanner.ll" +#line 926 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESPONSE_HEADERS(*driver.loc.back()); } YY_BREAK case 352: YY_RULE_SETUP -#line 935 "seclang-scanner.ll" +#line 927 "seclang-scanner.ll" { return p::make_VARIABLE_GEO(*driver.loc.back()); } YY_BREAK case 353: YY_RULE_SETUP -#line 936 "seclang-scanner.ll" +#line 928 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GEO(*driver.loc.back()); } YY_BREAK case 354: YY_RULE_SETUP -#line 937 "seclang-scanner.ll" +#line 929 "seclang-scanner.ll" { return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } YY_BREAK case 355: YY_RULE_SETUP -#line 938 "seclang-scanner.ll" +#line 930 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_REQUEST_COOKIES_NAMES(*driver.loc.back()); } YY_BREAK case 356: YY_RULE_SETUP -#line 939 "seclang-scanner.ll" +#line 931 "seclang-scanner.ll" { return p::make_VARIABLE_RULE(*driver.loc.back()); } YY_BREAK case 357: YY_RULE_SETUP -#line 940 "seclang-scanner.ll" +#line 932 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RULE(*driver.loc.back()); } YY_BREAK case 358: YY_RULE_SETUP -#line 941 "seclang-scanner.ll" +#line 933 "seclang-scanner.ll" { return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } YY_BREAK case 359: YY_RULE_SETUP -#line 942 "seclang-scanner.ll" +#line 934 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_FILES_TMP_NAMES(*driver.loc.back()); } YY_BREAK case 360: YY_RULE_SETUP -#line 943 "seclang-scanner.ll" +#line 935 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } YY_BREAK case 361: YY_RULE_SETUP -#line 944 "seclang-scanner.ll" +#line 936 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_XML(*driver.loc.back()); } YY_BREAK case 362: YY_RULE_SETUP -#line 945 "seclang-scanner.ll" +#line 937 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } YY_BREAK case 363: YY_RULE_SETUP -#line 946 "seclang-scanner.ll" +#line 938 "seclang-scanner.ll" { BEGINX(EXPECTING_VAR_PARAMETER); return p::make_RUN_TIME_VAR_ENV(*driver.loc.back()); } YY_BREAK case 364: YY_RULE_SETUP -#line 947 "seclang-scanner.ll" +#line 939 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_BLD(yytext, *driver.loc.back()); } YY_BREAK case 365: YY_RULE_SETUP -#line 948 "seclang-scanner.ll" +#line 940 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_DUR(yytext, *driver.loc.back()); } YY_BREAK case 366: YY_RULE_SETUP -#line 949 "seclang-scanner.ll" +#line 941 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_HSV(yytext, *driver.loc.back()); } YY_BREAK case 367: YY_RULE_SETUP -#line 950 "seclang-scanner.ll" +#line 942 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_REMOTE_USER(yytext, *driver.loc.back()); } YY_BREAK case 368: YY_RULE_SETUP -#line 951 "seclang-scanner.ll" +#line 943 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_DAY(yytext, *driver.loc.back()); } YY_BREAK case 369: YY_RULE_SETUP -#line 952 "seclang-scanner.ll" +#line 944 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_EPOCH(yytext, *driver.loc.back()); } YY_BREAK case 370: YY_RULE_SETUP -#line 953 "seclang-scanner.ll" +#line 945 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_HOUR(yytext, *driver.loc.back()); } YY_BREAK case 371: YY_RULE_SETUP -#line 954 "seclang-scanner.ll" +#line 946 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_MIN(yytext, *driver.loc.back()); } YY_BREAK case 372: YY_RULE_SETUP -#line 955 "seclang-scanner.ll" +#line 947 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_MON(yytext, *driver.loc.back()); } YY_BREAK case 373: YY_RULE_SETUP -#line 956 "seclang-scanner.ll" +#line 948 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_SEC(yytext, *driver.loc.back()); } YY_BREAK case 374: YY_RULE_SETUP -#line 957 "seclang-scanner.ll" +#line 949 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_YEAR(yytext, *driver.loc.back()); } YY_BREAK case 375: YY_RULE_SETUP -#line 958 "seclang-scanner.ll" +#line 950 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME(yytext, *driver.loc.back()); } YY_BREAK case 376: YY_RULE_SETUP -#line 959 "seclang-scanner.ll" +#line 951 "seclang-scanner.ll" { return p::make_RUN_TIME_VAR_TIME_WDAY(yytext, *driver.loc.back()); } YY_BREAK case 377: YY_RULE_SETUP -#line 962 "seclang-scanner.ll" +#line 954 "seclang-scanner.ll" { driver.error (*driver.loc.back(), "Variable VARIABLE_WEBSERVER_ERROR_LOG is not supported by libModSecurity", ""); throw p::syntax_error(*driver.loc.back(), "");} YY_BREAK case 378: YY_RULE_SETUP -#line 963 "seclang-scanner.ll" +#line 955 "seclang-scanner.ll" { return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } YY_BREAK case 379: YY_RULE_SETUP -#line 964 "seclang-scanner.ll" +#line 956 "seclang-scanner.ll" { return p::make_VARIABLE_IP(*driver.loc.back()); } YY_BREAK case 380: YY_RULE_SETUP -#line 965 "seclang-scanner.ll" +#line 957 "seclang-scanner.ll" { return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } YY_BREAK case 381: YY_RULE_SETUP -#line 966 "seclang-scanner.ll" +#line 958 "seclang-scanner.ll" { return p::make_VARIABLE_SESSION(*driver.loc.back()); } YY_BREAK case 382: /* rule 382 can match eol */ YY_RULE_SETUP -#line 967 "seclang-scanner.ll" +#line 959 "seclang-scanner.ll" { return p::make_VARIABLE_STATUS(*driver.loc.back()); } YY_BREAK case 383: YY_RULE_SETUP -#line 968 "seclang-scanner.ll" +#line 960 "seclang-scanner.ll" { return p::make_VARIABLE_TX(*driver.loc.back()); } YY_BREAK case 384: YY_RULE_SETUP -#line 969 "seclang-scanner.ll" +#line 961 "seclang-scanner.ll" { return p::make_VARIABLE_USER(*driver.loc.back()); } YY_BREAK case 385: YY_RULE_SETUP -#line 973 "seclang-scanner.ll" +#line 965 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); } YY_BREAK case 386: YY_RULE_SETUP -#line 974 "seclang-scanner.ll" +#line 966 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_IP(*driver.loc.back()); } YY_BREAK case 387: YY_RULE_SETUP -#line 975 "seclang-scanner.ll" +#line 967 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); } YY_BREAK case 388: YY_RULE_SETUP -#line 976 "seclang-scanner.ll" +#line 968 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_SESSION(*driver.loc.back()); } YY_BREAK case 389: YY_RULE_SETUP -#line 977 "seclang-scanner.ll" +#line 969 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_TX(*driver.loc.back()); } YY_BREAK case 390: YY_RULE_SETUP -#line 978 "seclang-scanner.ll" +#line 970 "seclang-scanner.ll" { BEGINX_(); return p::make_VARIABLE_USER(*driver.loc.back()); } YY_BREAK case 391: YY_RULE_SETUP -#line 983 "seclang-scanner.ll" +#line 975 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_PLUS(*driver.loc.back()); } YY_BREAK case 392: YY_RULE_SETUP -#line 984 "seclang-scanner.ll" +#line 976 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS_MINUS(*driver.loc.back()); } YY_BREAK case 393: YY_RULE_SETUP -#line 985 "seclang-scanner.ll" +#line 977 "seclang-scanner.ll" { BEGIN_ACTION_WAITING_CONTENT(); return p::make_SETVAR_OPERATION_EQUALS(*driver.loc.back()); } YY_BREAK case 394: /* rule 394 can match eol */ YY_RULE_SETUP -#line 986 "seclang-scanner.ll" +#line 978 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 395: /* rule 395 can match eol */ YY_RULE_SETUP -#line 987 "seclang-scanner.ll" +#line 979 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 396: /* rule 396 can match eol */ YY_RULE_SETUP -#line 988 "seclang-scanner.ll" +#line 980 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 397: /* rule 397 can match eol */ YY_RULE_SETUP -#line 989 "seclang-scanner.ll" +#line 981 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 398: /* rule 398 can match eol */ YY_RULE_SETUP -#line 990 "seclang-scanner.ll" +#line 982 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 399: /* rule 399 can match eol */ YY_RULE_SETUP -#line 992 "seclang-scanner.ll" +#line 984 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 400: /* rule 400 can match eol */ YY_RULE_SETUP -#line 993 "seclang-scanner.ll" +#line 985 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 401: YY_RULE_SETUP -#line 994 "seclang-scanner.ll" +#line 986 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(0); } YY_BREAK case 402: YY_RULE_SETUP -#line 995 "seclang-scanner.ll" +#line 987 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(0); } YY_BREAK case 403: YY_RULE_SETUP -#line 996 "seclang-scanner.ll" +#line 988 "seclang-scanner.ll" { BEGINX(LEXING_ERROR_ACTION); yyless(0); } YY_BREAK @@ -7534,448 +7526,448 @@ YY_RULE_SETUP case 404: /* rule 404 can match eol */ YY_RULE_SETUP -#line 1001 "seclang-scanner.ll" +#line 993 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 405: /* rule 405 can match eol */ YY_RULE_SETUP -#line 1002 "seclang-scanner.ll" +#line 994 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 406: /* rule 406 can match eol */ YY_RULE_SETUP -#line 1003 "seclang-scanner.ll" +#line 995 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 407: /* rule 407 can match eol */ YY_RULE_SETUP -#line 1004 "seclang-scanner.ll" +#line 996 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 408: /* rule 408 can match eol */ YY_RULE_SETUP -#line 1005 "seclang-scanner.ll" +#line 997 "seclang-scanner.ll" { BEGIN_PREVIOUS(); return p::make_DICT_ELEMENT(yytext, *driver.loc.back()); } YY_BREAK case 409: /* rule 409 can match eol */ YY_RULE_SETUP -#line 1007 "seclang-scanner.ll" +#line 999 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } YY_BREAK case 410: /* rule 410 can match eol */ YY_RULE_SETUP -#line 1008 "seclang-scanner.ll" +#line 1000 "seclang-scanner.ll" { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } YY_BREAK case 411: YY_RULE_SETUP -#line 1010 "seclang-scanner.ll" +#line 1002 "seclang-scanner.ll" { BEGINX(LEXING_ERROR_ACTION); yyless(0); } YY_BREAK case 412: YY_RULE_SETUP -#line 1011 "seclang-scanner.ll" +#line 1003 "seclang-scanner.ll" { return p::make_QUOTATION_MARK(yytext, *driver.loc.back()); } YY_BREAK case 413: YY_RULE_SETUP -#line 1017 "seclang-scanner.ll" +#line 1009 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } YY_BREAK case 414: YY_RULE_SETUP -#line 1018 "seclang-scanner.ll" +#line 1010 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } YY_BREAK case 415: YY_RULE_SETUP -#line 1019 "seclang-scanner.ll" +#line 1011 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } YY_BREAK case 416: YY_RULE_SETUP -#line 1020 "seclang-scanner.ll" +#line 1012 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } YY_BREAK case 417: YY_RULE_SETUP -#line 1021 "seclang-scanner.ll" +#line 1013 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } YY_BREAK case 418: YY_RULE_SETUP -#line 1022 "seclang-scanner.ll" +#line 1014 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } YY_BREAK case 419: YY_RULE_SETUP -#line 1025 "seclang-scanner.ll" +#line 1017 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_GEOLOOKUP(*driver.loc.back()); } YY_BREAK case 420: YY_RULE_SETUP -#line 1026 "seclang-scanner.ll" +#line 1018 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_UNCONDITIONAL_MATCH(*driver.loc.back()); } YY_BREAK case 421: YY_RULE_SETUP -#line 1027 "seclang-scanner.ll" +#line 1019 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_SQLI(*driver.loc.back()); } YY_BREAK case 422: YY_RULE_SETUP -#line 1028 "seclang-scanner.ll" +#line 1020 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_DETECT_XSS(*driver.loc.back()); } YY_BREAK case 423: YY_RULE_SETUP -#line 1029 "seclang-scanner.ll" +#line 1021 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_URL_ENCODING(*driver.loc.back()); } YY_BREAK case 424: YY_RULE_SETUP -#line 1030 "seclang-scanner.ll" +#line 1022 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_TO_ACTIONS); return p::make_OPERATOR_VALIDATE_UTF8_ENCODING(*driver.loc.back()); } YY_BREAK case 425: YY_RULE_SETUP -#line 1034 "seclang-scanner.ll" +#line 1026 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_WITHIN(*driver.loc.back()); } YY_BREAK case 426: YY_RULE_SETUP -#line 1035 "seclang-scanner.ll" +#line 1027 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS_WORD(*driver.loc.back()); } YY_BREAK case 427: YY_RULE_SETUP -#line 1036 "seclang-scanner.ll" +#line 1028 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_CONTAINS(*driver.loc.back()); } YY_BREAK case 428: YY_RULE_SETUP -#line 1037 "seclang-scanner.ll" +#line 1029 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_ENDS_WITH(*driver.loc.back()); } YY_BREAK case 429: YY_RULE_SETUP -#line 1038 "seclang-scanner.ll" +#line 1030 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_EQ(*driver.loc.back()); } YY_BREAK case 430: YY_RULE_SETUP -#line 1039 "seclang-scanner.ll" +#line 1031 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_GE(*driver.loc.back()); } YY_BREAK case 431: YY_RULE_SETUP -#line 1040 "seclang-scanner.ll" +#line 1032 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_GT(*driver.loc.back()); } YY_BREAK case 432: YY_RULE_SETUP -#line 1041 "seclang-scanner.ll" +#line 1033 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH_FROM_FILE(*driver.loc.back()); } YY_BREAK case 433: YY_RULE_SETUP -#line 1042 "seclang-scanner.ll" +#line 1034 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_IP_MATCH(*driver.loc.back()); } YY_BREAK case 434: YY_RULE_SETUP -#line 1043 "seclang-scanner.ll" +#line 1035 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_LE(*driver.loc.back()); } YY_BREAK case 435: YY_RULE_SETUP -#line 1044 "seclang-scanner.ll" +#line 1036 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_LT(*driver.loc.back()); } YY_BREAK case 436: YY_RULE_SETUP -#line 1045 "seclang-scanner.ll" +#line 1037 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_PM_FROM_FILE(*driver.loc.back()); } YY_BREAK case 437: YY_RULE_SETUP -#line 1046 "seclang-scanner.ll" +#line 1038 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_PM(*driver.loc.back()); } YY_BREAK case 438: YY_RULE_SETUP -#line 1047 "seclang-scanner.ll" +#line 1039 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_RBL( *driver.loc.back()); } YY_BREAK case 439: YY_RULE_SETUP -#line 1048 "seclang-scanner.ll" +#line 1040 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_RX(*driver.loc.back()); } YY_BREAK case 440: YY_RULE_SETUP -#line 1049 "seclang-scanner.ll" +#line 1041 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_STR_EQ(*driver.loc.back()); } YY_BREAK case 441: YY_RULE_SETUP -#line 1050 "seclang-scanner.ll" +#line 1042 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_STR_MATCH(*driver.loc.back()); } YY_BREAK case 442: YY_RULE_SETUP -#line 1051 "seclang-scanner.ll" +#line 1043 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_BEGINS_WITH(*driver.loc.back()); } YY_BREAK case 443: YY_RULE_SETUP -#line 1052 "seclang-scanner.ll" +#line 1044 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_INSPECT_FILE(*driver.loc.back()); } YY_BREAK case 444: YY_RULE_SETUP -#line 1053 "seclang-scanner.ll" +#line 1045 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_FUZZY_HASH(*driver.loc.back()); } YY_BREAK case 445: YY_RULE_SETUP -#line 1054 "seclang-scanner.ll" +#line 1046 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_BYTE_RANGE(*driver.loc.back()); } YY_BREAK case 446: YY_RULE_SETUP -#line 1055 "seclang-scanner.ll" +#line 1047 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_DTD(*driver.loc.back()); } YY_BREAK case 447: YY_RULE_SETUP -#line 1056 "seclang-scanner.ll" +#line 1048 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_HASH(*driver.loc.back()); } YY_BREAK case 448: YY_RULE_SETUP -#line 1057 "seclang-scanner.ll" +#line 1049 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VALIDATE_SCHEMA(*driver.loc.back()); } YY_BREAK case 449: YY_RULE_SETUP -#line 1058 "seclang-scanner.ll" +#line 1050 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CC(*driver.loc.back()); } YY_BREAK case 450: YY_RULE_SETUP -#line 1059 "seclang-scanner.ll" +#line 1051 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_CPF(*driver.loc.back()); } YY_BREAK case 451: YY_RULE_SETUP -#line 1060 "seclang-scanner.ll" +#line 1052 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_VERIFY_SSN(*driver.loc.back()); } YY_BREAK case 452: YY_RULE_SETUP -#line 1061 "seclang-scanner.ll" +#line 1053 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_GSB_LOOKUP(*driver.loc.back()); } YY_BREAK case 453: YY_RULE_SETUP -#line 1062 "seclang-scanner.ll" +#line 1054 "seclang-scanner.ll" { BEGIN_PARAMETER(); return p::make_OPERATOR_RSUB(*driver.loc.back()); } YY_BREAK case 454: YY_RULE_SETUP -#line 1064 "seclang-scanner.ll" +#line 1056 "seclang-scanner.ll" { return p::make_NOT(*driver.loc.back()); } YY_BREAK case 455: YY_RULE_SETUP -#line 1065 "seclang-scanner.ll" +#line 1057 "seclang-scanner.ll" { BEGIN_NO_OP_INFORMED(); yyless(0); } YY_BREAK case 456: YY_RULE_SETUP -#line 1070 "seclang-scanner.ll" +#line 1062 "seclang-scanner.ll" { BEGIN(EXPECTING_PARAMETER_ENDS_WITH_SPACE); } YY_BREAK case 457: YY_RULE_SETUP -#line 1074 "seclang-scanner.ll" +#line 1066 "seclang-scanner.ll" { BEGIN(EXPECTING_PARAMETER_ENDS_WITH_QUOTE); } YY_BREAK case 458: YY_RULE_SETUP -#line 1078 "seclang-scanner.ll" +#line 1070 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } YY_BREAK case 459: /* rule 459 can match eol */ YY_RULE_SETUP -#line 1079 "seclang-scanner.ll" +#line 1071 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 460: YY_RULE_SETUP -#line 1083 "seclang-scanner.ll" +#line 1075 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } YY_BREAK case 461: /* rule 461 can match eol */ YY_RULE_SETUP -#line 1084 "seclang-scanner.ll" +#line 1076 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 462: YY_RULE_SETUP -#line 1087 "seclang-scanner.ll" +#line 1079 "seclang-scanner.ll" { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } YY_BREAK case 463: YY_RULE_SETUP -#line 1088 "seclang-scanner.ll" +#line 1080 "seclang-scanner.ll" { BEGIN(LEXING_ERROR); yyless(0); } YY_BREAK case 464: YY_RULE_SETUP -#line 1092 "seclang-scanner.ll" +#line 1084 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } YY_BREAK case 465: /* rule 465 can match eol */ YY_RULE_SETUP -#line 1093 "seclang-scanner.ll" +#line 1085 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 466: YY_RULE_SETUP -#line 1097 "seclang-scanner.ll" +#line 1089 "seclang-scanner.ll" { BEGIN(TRANSACTION_FROM_OPERATOR_PARAMETERS_TO_ACTIONS); } YY_BREAK case 467: /* rule 467 can match eol */ YY_RULE_SETUP -#line 1098 "seclang-scanner.ll" +#line 1090 "seclang-scanner.ll" { return p::make_FREE_TEXT_QUOTE_MACRO_EXPANSION(yytext, *driver.loc.back()); } YY_BREAK case 468: YY_RULE_SETUP -#line 1102 "seclang-scanner.ll" +#line 1094 "seclang-scanner.ll" { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); } YY_BREAK case 469: YY_RULE_SETUP -#line 1103 "seclang-scanner.ll" +#line 1095 "seclang-scanner.ll" { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } YY_BREAK case 470: YY_RULE_SETUP -#line 1108 "seclang-scanner.ll" +#line 1100 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 471: YY_RULE_SETUP -#line 1109 "seclang-scanner.ll" +#line 1101 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 472: /* rule 472 can match eol */ YY_RULE_SETUP -#line 1110 "seclang-scanner.ll" +#line 1102 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 473: /* rule 473 can match eol */ YY_RULE_SETUP -#line 1111 "seclang-scanner.ll" +#line 1103 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 474: /* rule 474 can match eol */ YY_RULE_SETUP -#line 1112 "seclang-scanner.ll" +#line 1104 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 475: /* rule 475 can match eol */ YY_RULE_SETUP -#line 1113 "seclang-scanner.ll" +#line 1105 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ENDS_WITH_DOUBLE_QUOTE); } YY_BREAK case 476: /* rule 476 can match eol */ YY_RULE_SETUP -#line 1115 "seclang-scanner.ll" +#line 1107 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } YY_BREAK case 477: /* rule 477 can match eol */ YY_RULE_SETUP -#line 1116 "seclang-scanner.ll" +#line 1108 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } YY_BREAK case 478: YY_RULE_SETUP -#line 1118 "seclang-scanner.ll" +#line 1110 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } YY_BREAK case 479: /* rule 479 can match eol */ YY_RULE_SETUP -#line 1119 "seclang-scanner.ll" +#line 1111 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } YY_BREAK case 480: /* rule 480 can match eol */ YY_RULE_SETUP -#line 1120 "seclang-scanner.ll" +#line 1112 "seclang-scanner.ll" { BEGIN(EXPECTING_ACTIONS_ONLY_ONE); } YY_BREAK case 481: YY_RULE_SETUP -#line 1125 "seclang-scanner.ll" +#line 1117 "seclang-scanner.ll" { } YY_BREAK case 482: /* rule 482 can match eol */ YY_RULE_SETUP -#line 1126 "seclang-scanner.ll" +#line 1118 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 483: /* rule 483 can match eol */ YY_RULE_SETUP -#line 1127 "seclang-scanner.ll" +#line 1119 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK @@ -7983,40 +7975,40 @@ YY_RULE_SETUP case 484: /* rule 484 can match eol */ YY_RULE_SETUP -#line 1131 "seclang-scanner.ll" +#line 1123 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 485: /* rule 485 can match eol */ YY_RULE_SETUP -#line 1132 "seclang-scanner.ll" +#line 1124 "seclang-scanner.ll" { driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 486: /* rule 486 can match eol */ YY_RULE_SETUP -#line 1133 "seclang-scanner.ll" +#line 1125 "seclang-scanner.ll" { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } YY_BREAK case 487: YY_RULE_SETUP -#line 1138 "seclang-scanner.ll" +#line 1130 "seclang-scanner.ll" { BEGIN(LEXING_ERROR); yyless(0); } YY_BREAK case 488: YY_RULE_SETUP -#line 1140 "seclang-scanner.ll" +#line 1132 "seclang-scanner.ll" { driver.error (*driver.loc.back(), "Invalid input: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } YY_BREAK case 489: YY_RULE_SETUP -#line 1141 "seclang-scanner.ll" +#line 1133 "seclang-scanner.ll" { driver.error (*driver.loc.back(), "Expecting an action, got: ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } YY_BREAK case 490: YY_RULE_SETUP -#line 1142 "seclang-scanner.ll" +#line 1134 "seclang-scanner.ll" { driver.error (*driver.loc.back(), "Expecting a variable, got: : ", yytext); throw p::syntax_error(*driver.loc.back(), ""); } YY_BREAK case YY_STATE_EOF(INITIAL): @@ -8055,7 +8047,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED): case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_COLLECTION_ELEM): case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_OPERATION): case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): -#line 1145 "seclang-scanner.ll" +#line 1137 "seclang-scanner.ll" { if (driver.ref.size() > 1) { driver.ref.pop_back(); @@ -8079,7 +8071,7 @@ case YY_STATE_EOF(SETVAR_ACTION_QUOTED_WAITING_CONTENT): YY_BREAK case 491: YY_RULE_SETUP -#line 1167 "seclang-scanner.ll" +#line 1159 "seclang-scanner.ll" { std::string err; const char *file = strchr(yytext, ' ') + 1; @@ -8108,7 +8100,7 @@ YY_RULE_SETUP YY_BREAK case 492: YY_RULE_SETUP -#line 1193 "seclang-scanner.ll" +#line 1185 "seclang-scanner.ll" { std::string err; const char *file = strchr(yytext, ' ') + 1; @@ -8140,7 +8132,7 @@ YY_RULE_SETUP case 493: /* rule 493 can match eol */ YY_RULE_SETUP -#line 1221 "seclang-scanner.ll" +#line 1213 "seclang-scanner.ll" { HttpsClient c; std::string key; @@ -8178,10 +8170,10 @@ YY_RULE_SETUP YY_BREAK case 494: YY_RULE_SETUP -#line 1257 "seclang-scanner.ll" +#line 1249 "seclang-scanner.ll" ECHO; YY_BREAK -#line 8184 "seclang-scanner.cc" +#line 8176 "seclang-scanner.cc" case YY_END_OF_BUFFER: { @@ -9286,7 +9278,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 1257 "seclang-scanner.ll" +#line 1249 "seclang-scanner.ll" namespace modsecurity { diff --git a/src/rule.cc b/src/rule.cc index 75bffc0b..3329fb13 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -32,7 +32,6 @@ #include "src/utils/string.h" #include "modsecurity/rules.h" #include "modsecurity/rule_message.h" -#include "src/macro_expansion.h" #include "src/actions/msg.h" #include "src/actions/log_data.h" #include "src/actions/severity.h" diff --git a/src/rule_script.h b/src/rule_script.h index d1409fd9..9b446632 100644 --- a/src/rule_script.h +++ b/src/rule_script.h @@ -28,7 +28,6 @@ #include "src/utils/string.h" #include "modsecurity/rules.h" #include "modsecurity/rule_message.h" -#include "src/macro_expansion.h" #include "src/actions/msg.h" #include "src/actions/log_data.h" #include "src/actions/severity.h"