Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement issue #3892 Small performance increase obtainable by constructing regular expressions just once. #3893

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/iohumdrum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8443,13 +8443,13 @@ void HumdrumInput::setInstrumentAbbreviation(ELEMENT *element, const std::string

std::string name8 = name;
// Substitute b and "-flat" for Unicode flat symbol:
std::regex exp1("\\b([ABDEFG])b\\b");
std::regex exp2("\\b([A-Ga-g])-flat\\b");
static const std::regex exp1("\\b([ABDEFG])b\\b");
static const std::regex exp2("\\b([A-Ga-g])-flat\\b");
name8 = std::regex_replace(name8, exp1, "$1\xe2\x99\xad");
name8 = std::regex_replace(name8, exp2, "$1\xe2\x99\xad");
// Substitute # and "-sharp" for Unicode sharp symbol:
std::regex exp3("\\b([A-G])#\\b");
std::regex exp4("\\b([A-Ga-g])-sharp\\b");
static const std::regex exp3("\\b([A-G])#\\b");
static const std::regex exp4("\\b([A-Ga-g])-sharp\\b");
name8 = std::regex_replace(name8, exp3, "$1\xe2\x99\xaf");
name8 = std::regex_replace(name8, exp4, "$1\xe2\x99\xaf");

Expand Down
4 changes: 2 additions & 2 deletions src/iomusxml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3050,9 +3050,9 @@ void MusicXmlInput::ReadMusicXmlNote(
std::string textStr = childNode.text().as_string();

// convert verse numbers to labels
std::regex labelSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)$");
static const std::regex labelSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)$");
std::smatch labelSearchMatches;
std::regex labelPrefixSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)[\\s\\u00A0]+");
static const std::regex labelPrefixSearch("^([^[:alpha:]]*\\d[^[:alpha:]]*)[\\s\\u00A0]+");
std::smatch labelPrefixSearchMatches;
if (!textStr.empty() && std::regex_search(textStr, labelSearchMatches, labelSearch)
&& labelSearchMatches.ready() && childNode.next_sibling("elision")) {
Expand Down
2 changes: 1 addition & 1 deletion src/iopae.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ int PAEInput::getTupletFermata(const char *incipit, pae::Note *note, int index)
// std::regex_constants::ECMAScript is the default syntax, so optional.
// Previously these were extended regex syntax, but this case
// is the same in ECMAScript syntax.
std::regex exp("^([^)]*[ABCDEFG-][^)]*[ABCDEFG-][^)]*)", std::regex_constants::ECMAScript);
static const std::regex exp("^([^)]*[ABCDEFG-][^)]*[ABCDEFG-][^)]*)", std::regex_constants::ECMAScript);
bool is_tuplet = regex_search(incipit + i, exp);

if (is_tuplet) {
Expand Down
10 changes: 5 additions & 5 deletions src/vrv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,20 +235,20 @@ bool AreEqual(double dFirstVal, double dSecondVal)
bool IsValidInteger(const std::string &value)
{
// Accept "1" " 1 " "+1" "-1" "1." "1.0"
std::regex re(R"(^\s*[+-]?\d+\.?\d*\s*$)");
static const std::regex re(R"(^\s*[+-]?\d+\.?\d*\s*$)");
return std::regex_match(value, re);
}

bool IsValidDouble(const std::string &value)
{
// Accept "1.0" " 1.0 " ".0" "1." "+1.0" "-1.0"
std::regex re(R"(^\s*[+-]?(?:\d+\.?\d*|\.\d+)\s*$)");
static const std::regex re(R"(^\s*[+-]?(?:\d+\.?\d*|\.\d+)\s*$)");
return std::regex_match(value, re);
}

bool IsDigits(const std::string &value)
{
std::regex re(R"(^\d+$)");
static const std::regex re(R"(^\d+$)");
return std::regex_match(value, re);
}

Expand Down Expand Up @@ -432,8 +432,8 @@ std::string BaseEncodeInt(uint32_t value, uint8_t base)

std::string FromCamelCase(const std::string &s)
{
std::regex regExp1("(.)([A-Z][a-z]+)");
std::regex regExp2("([a-z0-9])([A-Z])");
static const std::regex regExp1("(.)([A-Z][a-z]+)");
static const std::regex regExp2("([a-z0-9])([A-Z])");

std::string result = s;
result = std::regex_replace(result, regExp1, "$1-$2");
Expand Down
Loading