Move wildcard_string_to_regex() from IfcParse to IfcGeom as it's not really related to parsing IFC at all.

This commit is contained in:
Stinkfist0
2016-05-31 14:04:44 +03:00
parent aa03da20a8
commit c644ffbe5e
3 changed files with 17 additions and 26 deletions
-16
View File
@@ -111,22 +111,6 @@ bool IfcUtil::valid_binary_string(const std::string& s) {
return true;
}
#ifndef IFCPARSE_NO_REGEX
boost::regex IfcUtil::wildcard_string_to_regex(std::string str)
{
// Escape all non-"*?" regex special chars
std::string special_chars = "\\^.$|()[]+/";
foreach(char c, special_chars) {
std::string char_str(1, c);
boost::replace_all(str, char_str, "\\"+ char_str);
}
// Convert "*?" to their regex equivalents
boost::replace_all(str, "?", ".");
boost::replace_all(str, "*", ".*");
return boost::regex(str);
}
#endif
void IfcUtil::sanitate_material_name(std::string &str)
{
// Spaces in material names have been observed to cause problems with obj and dae importers.
-8
View File
@@ -36,9 +36,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/dynamic_bitset.hpp>
#ifndef IFCPARSE_NO_REGEX //allow builds without boost.regex
#include <boost/regex.hpp>
#endif
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
@@ -119,11 +116,6 @@ namespace IfcUtil {
};
IfcParse_EXPORT bool valid_binary_string(const std::string& s);
#ifndef IFCPARSE_NO_REGEX
IfcParse_EXPORT boost::regex wildcard_string_to_regex(std::string str);
#endif
/// Replaces spaces and potentially other problem causing characters with underscores.
IfcParse_EXPORT void sanitate_material_name(std::string &str);
IfcParse_EXPORT void escape_xml(std::string &str);