mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-13 06:49:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add warning if regex contains two or more wildcards

Browse Source 
* Find that replaces std::regex currently does not support two or more
wildcards in an expression
This commit is contained in:
Malin Ejdbo
2021-02-15 14:30:25 +01:00
parent ace8df0692
commit edff4b537c
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scene/scene_lua.inl
+33
View File
@@ -89,6 +89,17 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
);
return;
}
if (regex.find_first_of("*", wildPos + 1) != std::string::npos) {
LERRORC(
"applyRegularExpression",
fmt::format(
"Malformed regular expression: '{}': "
"Currently only one '*' is supported", regex
)
);
return;
}
}
// Else search for the literal string without regex
else {
@@ -468,6 +479,17 @@ int property_getProperty(lua_State* L) {
);
return 0;
}
if (regex.find_first_of("*", wildPos + 1) != std::string::npos) {
LERRORC(
"property_getProperty",
fmt::format(
"Malformed regular expression: '{}': "
"Currently only one '*' is supported", regex
)
);
return 0;
}
}
// Else search for the literal string without regex
else {
@@ -643,6 +665,17 @@ int removeSceneGraphNodesFromRegex(lua_State* L) {
);
return 0;
}
if (name.find_first_of("*", wildPos + 1) != std::string::npos) {
LERRORC(
"removeSceneGraphNodesFromRegex",
fmt::format(
"Malformed regular expression: '{}': "
"Currently only one '*' is supported", name
)
);
return 0;
}
}
// Else search for the literal string without regex
else {