diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-02 20:29:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 20:29:45 +0100 |
| commit | 218c258f2a5137e66e056c1cfe51db40649fb3d6 (patch) | |
| tree | 0a2c618b4b9fa8f70bffec169f19e9506d8b1d59 /modules | |
| parent | 20dd5a62cf4b639987c62c38447ff39fe1d692c8 (diff) | |
| parent | b18ff942be0dd89bda32e01cc30a41c196fc9290 (diff) | |
Merge pull request #6958 from RandomShaper/android-clang-tidy
Improve Android build (Clang + tidyness)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/regex/regex.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index a0f4b4934c..0197da46fb 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -97,6 +97,9 @@ struct RegExNode { memdelete(next); } + // For avoiding RTTI + virtual bool is_look_behind() { return false; } + virtual int test(RegExSearch& s, int pos) const { return next ? next->test(s, pos) : -1; @@ -750,6 +753,8 @@ struct RegExNodeLookBehind : public RegExNodeGroup { reset_pos = true; } + virtual bool is_look_behind() { return true; } + virtual int test(RegExSearch& s, int pos) const { if (pos < length) @@ -1089,7 +1094,7 @@ Error RegEx::compile(const String& p_pattern) { REGEX_COMPILE_FAIL("backreference not found"); for (int i = 0; i < stack.size(); ++i) - if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) + if (stack[i]->is_look_behind()) REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported"); for (int i = 0; i < group_names.size(); ++i) { @@ -1112,7 +1117,7 @@ Error RegEx::compile(const String& p_pattern) { c = d; for (int i = 0; i < stack.size(); ++i) - if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) + if (stack[i]->is_look_behind()) REGEX_COMPILE_FAIL("backreferences inside lookbehind not supported"); int ref = -1; @@ -1238,7 +1243,7 @@ Error RegEx::compile(const String& p_pattern) { break; case '|': for (int i = 0; i < stack.size(); ++i) - if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) + if (stack[i]->is_look_behind()) REGEX_COMPILE_FAIL("alternations inside lookbehind not supported"); stack[0]->add_childset(); break; @@ -1312,7 +1317,7 @@ Error RegEx::compile(const String& p_pattern) { if (min_val != max_val) for (int i = 0; i < stack.size(); ++i) - if (dynamic_cast<RegExNodeLookBehind*>(stack[i])) + if (stack[i]->is_look_behind()) REGEX_COMPILE_FAIL("variable length quantifiers inside lookbehind not supported"); RegExNodeQuantifier* quant = memnew(RegExNodeQuantifier(min_val, max_val)); |