Skip to content

Replace string creation with static strings for Regex options conversion to string #1504

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Replace string creation with static strings for Regex options conversion to string #1504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab00270
Replace string creation with static strings for Regex options convers…
paulomorgado Oct 18, 2024
c22b878
Addressed review comments.
paulomorgado Dec 24, 2024
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
51 changes: 34 additions & 17 deletions src/MongoDB.Bson/ObjectModel/BsonRegularExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,27 @@ namespace MongoDB.Bson
/// </summary>
public class BsonRegularExpression : BsonValue, IComparable<BsonRegularExpression>, IEquatable<BsonRegularExpression>
{
// private static fields
private static readonly string[] RegexOptionStrings = new[]
{
"", // 0000
"i", // 0001
"m", // 0010
"im", // 0011
"s", // 0100
"is", // 0101
"ms", // 0110
"ims", // 0111
"x", // 1000
"ix", // 1001
"mx", // 1010
"imx", // 1011
"sx", // 1100
"isx", // 1101
"msx", // 1110
"imsx" // 1111
};

// private fields
private readonly string _pattern;
private readonly string _options;
Expand Down Expand Up @@ -80,23 +101,19 @@ public BsonRegularExpression(Regex regex)
throw new ArgumentNullException("regex");
}
_pattern = regex.ToString();
_options = "";
if ((regex.Options & RegexOptions.IgnoreCase) != 0)
{
_options += "i";
}
if ((regex.Options & RegexOptions.Multiline) != 0)
{
_options += "m";
}
if ((regex.Options & RegexOptions.Singleline) != 0)
{
_options += "s";
}
if ((regex.Options & RegexOptions.IgnorePatternWhitespace) != 0)
{
_options += "x";
}
_options = ConvertToBsonRegularExpressionOptions(regex);
}

private static string ConvertToBsonRegularExpressionOptions(Regex regex)
{
var regexOptions = regex.Options;

var index = ((regexOptions & RegexOptions.IgnoreCase) != 0 ? 1 : 0) |
((regexOptions & RegexOptions.Multiline) != 0 ? 1 : 0) << 1 |
((regexOptions & RegexOptions.Singleline) != 0 ? 1 : 0) << 2 |
((regexOptions & RegexOptions.IgnorePatternWhitespace) != 0 ? 1 : 0) << 3;

return RegexOptionStrings[index];
}

// public properties
Expand Down