System.Text.RegularExpressions readonly annotation#51814

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

Closed
hrrrrustic wants to merge 1 commit into from
Closed

System.Text.RegularExpressions readonly annotation #51814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions ...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
}

/// <summary>Returns true for options allowed only at the top level</summary>
private bool IsOnlyTopOption(RegexOptions options) =>
private readonly bool IsOnlyTopOption(RegexOptions options) =>
options == RegexOptions.RightToLeft ||
options == RegexOptions.CultureInvariant ||
options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
}

/// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
private int TypeFromCode(char ch) =>
private readonly int TypeFromCode(char ch) =>
ch switch
{
'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
}

/// <summary>Looks up the slot number for a given name.</summary>
private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

/// <summary>True if the capture slot was noted</summary>
private bool IsCaptureSlot(int i)
private readonly bool IsCaptureSlot(int i)
{
if (_caps != null)
{
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
}

/// <summary>Looks up the slot number for a given name</summary>
private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

/// <summary>True if N option disabling '(' autocapture is on.</summary>
private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

/// <summary>True if I option enabling case-insensitivity is on.</summary>
private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

/// <summary>True if M option altering meaning of $ and ^ is on.</summary>
private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

/// <summary>True if S option altering meaning of . is on.</summary>
private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

/// <summary> True if X option enabling whitespace/comment mode is on.</summary>
private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

/// <summary>True if E option enabling ECMAScript behavior is on.</summary>
private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

private const byte Q = 5; // quantifier
private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
/// <summary>Returns true for those characters that begin a quantifier.</summary>
private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

private bool IsTrueQuantifier()
private readonly bool IsTrueQuantifier()
{
Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
}

/// <summary>True if the group stack is empty.</summary>
private bool EmptyStack() => _stack == null;
private readonly bool EmptyStack() => _stack == null;

/// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
}

/// <summary>Returns the current unit</summary>
private RegexNode? Unit() => _unit;
private readonly RegexNode? Unit() => _unit;

/// <summary>Sets the current unit to a single char node</summary>
private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

/// <summary>True if options stack is empty.</summary>
private bool EmptyOptionsStack() => _optionsStack.Length == 0;
private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

/// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
private void PopKeepOptions() => _optionsStack.Length--;

/// <summary>Fills in a RegexParseException</summary>
private RegexParseException MakeException(RegexParseError error, string message) =>
private readonly RegexParseException MakeException(RegexParseError error, string message) =>
new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

/// <summary>Returns the current parsing position.</summary>
private int Textpos() => _currentPos;
private readonly int Textpos() => _currentPos;

/// <summary>Zaps to a specific parsing position.</summary>
private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
private void MoveLeft() => --_currentPos;

/// <summary>Returns the char left of the current parsing position.</summary>
private char CharAt(int i) => _pattern[i];
private readonly char CharAt(int i) => _pattern[i];

/// <summary>Returns the char right of the current parsing position.</summary>
private char RightChar() => _pattern[_currentPos];
private readonly char RightChar() => _pattern[_currentPos];

/// <summary>Returns the char i chars right of the current parsing position.</summary>
private char RightChar(int i) => _pattern[_currentPos + i];
private readonly char RightChar(int i) => _pattern[_currentPos + i];

/// <summary>Number of characters to the right of the current parsing position.</summary>
private int CharsRight() => _pattern.Length - _currentPos;
private readonly int CharsRight() => _pattern.Length - _currentPos;
}
}
6 changes: 3 additions & 3 deletions .../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
/// </summary>
private void PushInt(int i) => _intStack.Append(i);

private bool IntIsEmpty() => _intStack.Length == 0;
private readonly bool IntIsEmpty() => _intStack.Length == 0;

private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
/// </summary>
private void PushFC(RegexFC fc) => _fcStack.Add(fc);

private bool FCIsEmpty() => _fcStack.Count == 0;
private readonly bool FCIsEmpty() => _fcStack.Count == 0;

private RegexFC PopFC()
{
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
return item;
}

private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

/// <summary>
/// Return rented buffers.
Expand Down
2 changes: 1 addition & 1 deletion ...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
/// for an array of capture slots. Instead of doing the hash
/// at match time, it's done at compile time, here.
/// </summary>
private int MapCapnum(int capnum) =>
private readonly int MapCapnum(int capnum) =>
capnum == -1 ? -1 :
_caps != null ? (int)_caps[capnum]! :
capnum;
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

/// <summary>Gets the number of segments added to the builder.</summary>
public int Count => _count;
public readonly int Count => _count;

/// <summary>Adds a segment to the builder.</summary>
/// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

/// <summary>Gets a span of all segments in the builder.</summary>
/// <returns></returns>
public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

/// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
public override string ToString()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
System.Text.RegularExpressions readonly annotation#51814

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

 Closed

hrrrrustic
wants to merge
1
commit into

from

 Closed


System.Text.RegularExpressions readonly annotation
#51814
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


42 changes: 21 additions & 21 deletions
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexParser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1628,7 +1628,7 @@ private char ScanControl()
 }

 /// <summary>Returns true for options allowed only at the top level</summary>
 private bool IsOnlyTopOption(RegexOptions options) =>
 private readonly bool IsOnlyTopOption(RegexOptions options) =>
 options == RegexOptions.RightToLeft ||
 options == RegexOptions.CultureInvariant ||
 options == RegexOptions.ECMAScript;
Expand DownExpand Up@@ -1748,7 +1748,7 @@ private string ParseProperty()
 }

 /// <summary>Returns ReNode type for zero-length assertions with a \ code.</summary>
 private int TypeFromCode(char ch) =>
 private readonly int TypeFromCode(char ch) =>
 ch switch
 {
 'b' => UseOptionE() ? RegexNode.ECMABoundary : RegexNode.Boundary,
Expand DownExpand Up@@ -2021,10 +2021,10 @@ private void AssignNameSlots()
 }

 /// <summary>Looks up the slot number for a given name.</summary>
 private int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;
 private readonly int CaptureSlotFromName(string capname) => (int)_capnames![capname]!;

 /// <summary>True if the capture slot was noted</summary>
 private bool IsCaptureSlot(int i)
 private readonly bool IsCaptureSlot(int i)
 {
 if (_caps != null)
 {
Expand All@@ -2035,25 +2035,25 @@ private bool IsCaptureSlot(int i)
 }

 /// <summary>Looks up the slot number for a given name</summary>
 private bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);
 private readonly bool IsCaptureName(string capname) => _capnames != null && _capnames.ContainsKey(capname);

 /// <summary>True if N option disabling '(' autocapture is on.</summary>
 private bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;
 private readonly bool UseOptionN() => (_options & RegexOptions.ExplicitCapture) != 0;

 /// <summary>True if I option enabling case-insensitivity is on.</summary>
 private bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;
 private readonly bool UseOptionI() => (_options & RegexOptions.IgnoreCase) != 0;

 /// <summary>True if M option altering meaning of $ and ^ is on.</summary>
 private bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;
 private readonly bool UseOptionM() => (_options & RegexOptions.Multiline) != 0;

 /// <summary>True if S option altering meaning of . is on.</summary>
 private bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;
 private readonly bool UseOptionS() => (_options & RegexOptions.Singleline) != 0;

 /// <summary> True if X option enabling whitespace/comment mode is on.</summary>
 private bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;
 private readonly bool UseOptionX() => (_options & RegexOptions.IgnorePatternWhitespace) != 0;

 /// <summary>True if E option enabling ECMAScript behavior is on.</summary>
 private bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;
 private readonly bool UseOptionE() => (_options & RegexOptions.ECMAScript) != 0;

 private const byte Q = 5; // quantifier
 private const byte S = 4; // ordinary stopper
Expand DownExpand Up@@ -2081,7 +2081,7 @@ private bool IsCaptureSlot(int i)
 /// <summary>Returns true for those characters that begin a quantifier.</summary>
 private static bool IsQuantifier(char ch) => ch <= '{' && Category[ch] >= Q;

 private bool IsTrueQuantifier()
 private readonly bool IsTrueQuantifier()
 {
 Debug.Assert(CharsRight() > 0, "The current reading position must not be at the end of the pattern");

Expand DownExpand Up@@ -2185,7 +2185,7 @@ private void PopGroup()
 }

 /// <summary>True if the group stack is empty.</summary>
 private bool EmptyStack() => _stack == null;
 private readonly bool EmptyStack() => _stack == null;

 /// <summary>Start a new round for the parser state (in response to an open paren or string start)</summary>
 private void StartGroup(RegexNode openGroup)
Expand DownExpand Up@@ -2229,7 +2229,7 @@ private void AddConcatenate(bool lazy, int min, int max)
 }

 /// <summary>Returns the current unit</summary>
 private RegexNode? Unit() => _unit;
 private readonly RegexNode? Unit() => _unit;

 /// <summary>Sets the current unit to a single char node</summary>
 private void AddUnitOne(char ch)
Expand DownExpand Up@@ -2299,17 +2299,17 @@ private void AddGroup()
 private void PopOptions() => _options = (RegexOptions)_optionsStack.Pop();

 /// <summary>True if options stack is empty.</summary>
 private bool EmptyOptionsStack() => _optionsStack.Length == 0;
 private readonly bool EmptyOptionsStack() => _optionsStack.Length == 0;

 /// <summary>Pops the options stack, but keeps the current options unchanged.</summary>
 private void PopKeepOptions() => _optionsStack.Length--;

 /// <summary>Fills in a RegexParseException</summary>
 private RegexParseException MakeException(RegexParseError error, string message) =>
 private readonly RegexParseException MakeException(RegexParseError error, string message) =>
 new RegexParseException(error, _currentPos, SR.Format(SR.MakeException, _pattern, _currentPos, message));

 /// <summary>Returns the current parsing position.</summary>
 private int Textpos() => _currentPos;
 private readonly int Textpos() => _currentPos;

 /// <summary>Zaps to a specific parsing position.</summary>
 private void Textto(int pos) => _currentPos = pos;
Expand All@@ -2326,15 +2326,15 @@ private RegexParseException MakeException(RegexParseError error, string message)
 private void MoveLeft() => --_currentPos;

 /// <summary>Returns the char left of the current parsing position.</summary>
 private char CharAt(int i) => _pattern[i];
 private readonly char CharAt(int i) => _pattern[i];

 /// <summary>Returns the char right of the current parsing position.</summary>
 private char RightChar() => _pattern[_currentPos];
 private readonly char RightChar() => _pattern[_currentPos];

 /// <summary>Returns the char i chars right of the current parsing position.</summary>
 private char RightChar(int i) => _pattern[_currentPos + i];
 private readonly char RightChar(int i) => _pattern[_currentPos + i];

 /// <summary>Number of characters to the right of the current parsing position.</summary>
 private int CharsRight() => _pattern.Length - _currentPos;
 private readonly int CharsRight() => _pattern.Length - _currentPos;
 }
}

6 changes: 3 additions & 3 deletions
.../System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexPrefixAnalyzer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -381,7 +381,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushInt(int i) => _intStack.Append(i);

 private bool IntIsEmpty() => _intStack.Length == 0;
 private readonly bool IntIsEmpty() => _intStack.Length == 0;

 private int PopInt() => _intStack.Pop();

Expand All@@ -390,7 +390,7 @@ public static string AnchorDescription(int anchors)
 /// </summary>
 private void PushFC(RegexFC fc) => _fcStack.Add(fc);

 private bool FCIsEmpty() => _fcStack.Count == 0;
 private readonly bool FCIsEmpty() => _fcStack.Count == 0;

 private RegexFC PopFC()
 {
Expand All@@ -399,7 +399,7 @@ private RegexFC PopFC()
 return item;
 }

 private RegexFC TopFC() => _fcStack[_fcStack.Count - 1];
 private readonly RegexFC TopFC() => _fcStack[_fcStack.Count - 1];

 /// <summary>
 /// Return rented buffers.
Expand Down

2 changes: 1 addition & 1 deletion
...ibraries/System.Text.RegularExpressions/src/System/Text/RegularExpressions/RegexWriter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -252,7 +252,7 @@ private int StringCode(string str)
 /// for an array of capture slots. Instead of doing the hash
 /// at match time, it's done at compile time, here.
 /// </summary>
 private int MapCapnum(int capnum) =>
 private readonly int MapCapnum(int capnum) =>
 capnum == -1 ? -1 :
 _caps != null ? (int)_caps[capnum]! :
 capnum;
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Text.RegularExpressions/src/System/Text/SegmentStringBuilder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,7 @@ internal struct SegmentStringBuilder
 public static SegmentStringBuilder Create() => new SegmentStringBuilder() { _array = Array.Empty<ReadOnlyMemory<char>>() };

 /// <summary>Gets the number of segments added to the builder.</summary>
 public int Count => _count;
 public readonly int Count => _count;

 /// <summary>Adds a segment to the builder.</summary>
 /// <param name="segment">The segment.</param>
Expand DownExpand Up@@ -60,7 +60,7 @@ private void GrowAndAdd(ReadOnlyMemory<char> segment)

 /// <summary>Gets a span of all segments in the builder.</summary>
 /// <returns></returns>
 public Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);
 public readonly Span<ReadOnlyMemory<char>> AsSpan() => new Span<ReadOnlyMemory<char>>(_array, 0, _count);

 /// <summary>Creates a string from all the segments in the builder and then disposes of the builder.</summary>
 public override string ToString()
Expand Down