blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 21:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish migrating std::regex to RE2

Browse source
This commit is contained in:
Dan Paulat 2023-12-11 07:07:34 -06:00
parent 2757c51828
commit 2bd5ec8705
4 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scwx-qt/source/scwx/qt/manager/update_manager.cpp
View file

@ -2,10 +2,10 @@
#include <scwx/util/logger.hpp>
#include <mutex>
#include <regex>
#include <boost/json.hpp>
#include <cpr/cpr.h>
#include <re2/re2.h>
namespace scwx
{
@ -61,16 +61,10 @@ std::string UpdateManager::latest_version() const
std::string
UpdateManager::Impl::GetVersionString(const std::string& releaseName)
{
static const std::regex re {"\\d+\\.\\d+\\.\\d+"};
static constexpr LazyRE2 re = {"(\\d+\\.\\d+\\.\\d+)"};
std::string versionString {};
std::smatch m;
std::regex_search(releaseName, m, re);
if (!m.empty())
{
versionString = m[0].str();
}
RE2::PartialMatch(releaseName, *re, &versionString);
return versionString;
}

10
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -23,7 +23,6 @@
#include <scwx/util/logger.hpp>
#include <scwx/util/time.hpp>
#include <regex>
#include <set>
#include <backends/imgui_impl_opengl3.h>
@ -33,6 +32,7 @@
#include <boost/uuid/random_generator.hpp>
#include <fmt/format.h>
#include <imgui.h>
#include <re2/re2.h>
#include <QApplication>
#include <QColor>
#include <QDebug>
@ -769,13 +769,13 @@ std::string MapWidgetImpl::FindMapSymbologyLayer()
const std::string layer = qlayer.toStdString();
// Draw below layers defined in map style
auto it = std::find_if(
currentStyle_->drawBelow_.cbegin(),
auto it = std::find_if(currentStyle_->drawBelow_.cbegin(),
currentStyle_->drawBelow_.cend(),
[&layer](const std::string& styleLayer) -> bool
{
std::regex re {styleLayer, std::regex_constants::icase};
return std::regex_match(layer, re);
// Perform case-insensitive matching
RE2 re {"(?i)" + styleLayer};
return RE2::FullMatch(layer, re);
});
if (it != currentStyle_->drawBelow_.cend())

7
scwx-qt/source/scwx/qt/settings/palette_settings.cpp
View file

@ -2,10 +2,9 @@
#include <scwx/qt/settings/settings_variable.hpp>
#include <scwx/qt/util/color.hpp>
#include <regex>
#include <boost/gil.hpp>
#include <fmt/format.h>
#include <re2/re2.h>
namespace scwx
{
@ -134,8 +133,8 @@ public:
bool PaletteSettings::Impl::ValidateColor(const std::string& value)
{
static const std::regex re {"#[0-9A-Za-z]{8}"};
return std::regex_match(value, re);
static constexpr LazyRE2 re = {"#[0-9A-Fa-f]{8}"};
return RE2::FullMatch(value, *re);
}
PaletteSettings::PaletteSettings() :

12
test/source/scwx/qt/map/map_provider.test.cpp
View file

@ -2,13 +2,12 @@
#include <scwx/util/environment.hpp>
#include <scwx/util/logger.hpp>
#include <regex>
#include <QCoreApplication>
#include <QMapLibreGL/QMapLibreGL>
#include <QTimer>
#include <gtest/gtest.h>
#include <re2/re2.h>
namespace scwx
{
@ -108,13 +107,14 @@ TEST_P(ByMapProviderTest, MapProviderLayers)
const std::string layer = qlayer.toStdString();
// Draw below layers defined in map style
auto it = std::find_if(
mapStyle.drawBelow_.cbegin(),
auto it =
std::find_if(mapStyle.drawBelow_.cbegin(),
mapStyle.drawBelow_.cend(),
[&layer](const std::string& styleLayer) -> bool
{
std::regex re {styleLayer, std::regex_constants::icase};
return std::regex_match(layer, re);
// Perform case insensitive matching
RE2 re {"(?i)" + styleLayer};
return RE2::FullMatch(layer, re);
});
if (it != mapStyle.drawBelow_.cend())