Skip to content

Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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
eiriktsarpalis merged 12 commits into from
Oct 7, 2022
Merged

Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. #74955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b529db2
Use Span.SequenceEqual instead if manual loop over char array.
Trayan-Zapryanov Sep 1, 2022
819264f
Remove StrEqual.
Trayan-Zapryanov Sep 1, 2022
5178fba
Remove not needed brackets + fix tests
Trayan-Zapryanov Sep 2, 2022
8d24c68
Use switch expression for "verison", "encoding" and "standalone"
Trayan-Zapryanov Sep 2, 2022
7832c0c
Use ranges + one more switch expression
Trayan-Zapryanov Sep 2, 2022
b2ad01f
Remove StartsWith helper method from ParsingState
Trayan-Zapryanov Sep 2, 2022
3825ebc
Merge branch 'dotnet:main' into improve_xmlconvert_strequal
TrayanZapryanov Sep 17, 2022
2c42cfa
Merge branch 'dotnet:main' into improve_xmlconvert_strequal
TrayanZapryanov Sep 19, 2022
6120eb6
Address range feedback
Trayan-Zapryanov Sep 21, 2022
cee2156
Add test for XmlTextReader.ReadChars
Trayan-Zapryanov Sep 21, 2022
bf0b523
Fix test
Trayan-Zapryanov Sep 22, 2022
1bdf1e6
Merge branch 'dotnet:main' into improve_xmlconvert_strequal
TrayanZapryanov Sep 26, 2022
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
75 changes: 37 additions & 38 deletions src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
}
}

if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
{
goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
int nameEndPos = ParseName();

NodeData? attr = null;
switch (_ps.chars[_ps.charPos])
switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
{
case 'v':
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
case "version":
if (xmlDeclState == 0)
{
if (!isTextDecl)
{
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
break;
}
goto default;
case 'e':
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
(xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
case "encoding":
if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
{
if (!isTextDecl)
{
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
break;
}
goto default;
case 's':
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
(xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
case "standalone":
if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
{
attr = AddAttributeNoChecks("standalone", 1);
xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
// version
case 0:
// VersionNum ::= '1.0' (XML Fourth Edition and earlier)
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
{
if (!isTextDecl)
{
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
xmlDeclState = 2;
break;
case 2:
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
{
_standalone = true;
}
else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
{
_standalone = false;
}
else
switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
{
Debug.Assert(!isTextDecl);
Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
case "yes":
_standalone = true;
break;
case "no":
_standalone = false;
break;
default:
Debug.Assert(!isTextDecl);
Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
break;
}
if (!isTextDecl)
{
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
{
goto ReadData;
}
if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
if (chars.AsSpan(pos).StartsWith("CDATA["))
{
_ps.charPos = pos + 6;
ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
{
goto ReadData;
}
if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
if (chars.AsSpan(pos).StartsWith("CDATA["))
{
_ps.charPos = pos + 6;
ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
{
int startPos = _ps.charPos;
int prefixLen = colonPos - startPos;
if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
{
_curNode.SetNamedNode(XmlNodeType.Element,
_nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
char[] chars = _ps.chars;
if (startTagNode.prefix.Length == 0)
{
if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.
{
ThrowTagMismatch(startTagNode);
}
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
else
{
int colonPos = _ps.charPos + prefLen;
if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
chars[colonPos] != ':' ||
!XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
!chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
{
ThrowTagMismatch(startTagNode);
}
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
}
}

if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
{
ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
}
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
}
}
// check 'PUBLIC'
if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
{
ThrowUnexpectedToken("PUBLIC");
}
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
}
}
// check 'SYSTEM'
if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
{
ThrowUnexpectedToken("SYSTEM");
}
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
_attrNeedNamespaceLookup = true;
int startPos = _ps.charPos;
int prefixLen = colonPos - startPos;
if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
{
return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
_lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
case IncrementalReadState.PI:
if (ParsePIValue(out startPos, out pos))
{
Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
_ps.charPos -= 2;
_incReadState = IncrementalReadState.Text;
}
goto Append;
case IncrementalReadState.Comment:
if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
{
Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
_ps.charPos -= 3;
_incReadState = IncrementalReadState.Text;
}
goto Append;
case IncrementalReadState.CDATA:
if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
{
Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
_ps.charPos -= 3;
_incReadState = IncrementalReadState.Text;
}
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
{
goto ReadData;
}
if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
{
pos += 9;
_incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

// ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
int endPos = ParseQName(true, 2, out _);
if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
string checkName = _curNode.GetNameWPrefix(_nameTable);
if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
(_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
{
if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

// ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
int endPos = ParseQName(true, 1, out _);
if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&

@krwqkrwqSep 26, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?

(_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
{
_incReadDepth++;
Expand Down
Loading
, '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" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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('^' + ".*" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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('^' + ".*" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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('^' + ".*" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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('^' + ".*" + '
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading

, '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); }
})();
})();
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead. by TrayanZapryanov · Pull Request #74955 · dotnet/runtime · GitHub
Skip to content
Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.#74955

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

eiriktsarpalis
merged 12 commits into

from

Oct 7, 2022
 Merged


Remove XmlConvert.StrEqual and use Span<char>.StartsWith() instead.
#74955
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b529db2

Use Span.SequenceEqual instead if manual loop over char array.


Trayan-Zapryanov Sep 1, 2022
819264f

Remove StrEqual.


Trayan-Zapryanov Sep 1, 2022
5178fba

Remove not needed brackets + fix tests


Trayan-Zapryanov Sep 2, 2022
8d24c68

Use switch expression for "verison", "encoding" and "standalone"


Trayan-Zapryanov Sep 2, 2022
7832c0c

Use ranges + one more switch expression


Trayan-Zapryanov Sep 2, 2022
b2ad01f

Remove StartsWith helper method from ParsingState


Trayan-Zapryanov Sep 2, 2022
3825ebc

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 17, 2022
2c42cfa

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 19, 2022
6120eb6

Address range feedback


Trayan-Zapryanov Sep 21, 2022
cee2156

Add test for XmlTextReader.ReadChars


Trayan-Zapryanov Sep 21, 2022
bf0b523

Fix test


Trayan-Zapryanov Sep 22, 2022
1bdf1e6

Merge branch 'dotnet:main' into improve_xmlconvert_strequal


TrayanZapryanov Sep 26, 2022

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


75 changes: 37 additions & 38 deletions
src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3643,7 +3643,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 5, XmlDeclarationBeginning) ||
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith(XmlDeclarationBeginning) ||
 XmlCharType.IsNameSingleChar(_ps.chars![_ps.charPos + 5]))
 {
 goto NoXmlDecl;
Expand DownExpand Up@@ -3741,10 +3741,10 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 int nameEndPos = ParseName();

 NodeData? attr = null;
 switch (_ps.chars[_ps.charPos])
 switch (_ps.chars.AsSpan(_ps.charPos, nameEndPos - _ps.charPos))
 {
 case 'v':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "version") && xmlDeclState == 0)
 case "version":
 if (xmlDeclState == 0)
 {
 if (!isTextDecl)
 {
Expand All@@ -3753,9 +3753,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 'e':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "encoding") &&
 (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0)))
 case "encoding":
 if (xmlDeclState == 1 || (isTextDecl && xmlDeclState == 0))
 {
 if (!isTextDecl)
 {
Expand All@@ -3765,9 +3764,8 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 break;
 }
 goto default;
 case 's':
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, nameEndPos - _ps.charPos, "standalone") &&
 (xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 case "standalone":
 if ((xmlDeclState == 1 || xmlDeclState == 2) && !isTextDecl)
 {
 attr = AddAttributeNoChecks("standalone", 1);
 xmlDeclState = 2;
Expand DownExpand Up@@ -3835,7 +3833,7 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 // version
 case 0:
 // VersionNum ::= '1.0' (XML Fourth Edition and earlier)
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "1.0"))
 if (_ps.chars.AsSpan(_ps.charPos).StartsWith("1.0"))
 {
 if (!isTextDecl)
 {
Expand All@@ -3861,18 +3859,18 @@ private bool ParseXmlDeclaration(bool isTextDecl)
 xmlDeclState = 2;
 break;
 case 2:
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "yes"))
 {
 _standalone = true;
 }
 else if (XmlConvert.StrEqual(_ps.chars, _ps.charPos, pos - _ps.charPos, "no"))
 {
 _standalone = false;
 }
 else
 switch (_ps.chars.AsSpan(_ps.charPos, pos - _ps.charPos))
 {
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 case "yes":
 _standalone = true;
 break;
 case "no":
 _standalone = false;
 break;
 default:
 Debug.Assert(!isTextDecl);
 Throw(SR.Xml_InvalidXmlDecl, _ps.LineNo, _ps.LinePos - 1);
 break;
 }
 if (!isTextDecl)
 {
Expand DownExpand Up@@ -3997,7 +3995,7 @@ private bool ParseDocumentContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4217,7 +4215,7 @@ private bool ParseElementContent()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos, 6, "CDATA["))
 if (chars.AsSpan(pos).StartsWith("CDATA["))
 {
 _ps.charPos = pos + 6;
 ParseCData();
Expand DownExpand Up@@ -4424,7 +4422,7 @@ private void ParseElement()
 {
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && chars.AsSpan(startPos).StartsWith(_lastPrefix))
 {
 _curNode.SetNamedNode(XmlNodeType.Element,
 _nameTable.Add(chars, colonPos + 1, pos - colonPos - 1),
Expand DownExpand Up@@ -4600,7 +4598,7 @@ private void ParseEndElement()
 char[] chars = _ps.chars;
 if (startTagNode.prefix.Length == 0)
 {
 if (!XmlConvert.StrEqual(chars, _ps.charPos, locLen, startTagNode.localName))
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.localName))
Comment thread
krwq marked this conversation as resolved.

 {
 ThrowTagMismatch(startTagNode);
 }
Expand All@@ -4609,9 +4607,9 @@ private void ParseEndElement()
 else
 {
 int colonPos = _ps.charPos + prefLen;
 if (!XmlConvert.StrEqual(chars, _ps.charPos, prefLen, startTagNode.prefix) ||
 if (!chars.AsSpan(_ps.charPos).StartsWith(startTagNode.prefix) ||
 chars[colonPos] != ':' ||
 !XmlConvert.StrEqual(chars, colonPos + 1, locLen, startTagNode.localName))
 !chars.AsSpan(colonPos + 1).StartsWith(startTagNode.localName))
 {
 ThrowTagMismatch(startTagNode);
 }
Expand DownExpand Up@@ -6732,7 +6730,7 @@ private bool ParseDoctypeDecl()
 }
 }

 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 7, "DOCTYPE"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("DOCTYPE"))
 {
 ThrowUnexpectedToken((!_rootElementParsed && _dtdInfo == null) ? "DOCTYPE" : "<!--");
 }
Expand DownExpand Up@@ -6814,7 +6812,7 @@ private void SkipDtd()
 }
 }
 // check 'PUBLIC'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "PUBLIC"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("PUBLIC"))
 {
 ThrowUnexpectedToken("PUBLIC");
 }
Expand DownExpand Up@@ -6851,7 +6849,7 @@ private void SkipDtd()
 }
 }
 // check 'SYSTEM'
 if (!XmlConvert.StrEqual(_ps.chars, _ps.charPos, 6, "SYSTEM"))
 if (!_ps.chars.AsSpan(_ps.charPos).StartsWith("SYSTEM"))
 {
 ThrowUnexpectedToken("SYSTEM");
 }
Expand DownExpand Up@@ -7725,7 +7723,7 @@ private NodeData AddAttribute(int endNamePos, int colonPos)
 _attrNeedNamespaceLookup = true;
 int startPos = _ps.charPos;
 int prefixLen = colonPos - startPos;
 if (prefixLen == _lastPrefix.Length && XmlConvert.StrEqual(_ps.chars, startPos, prefixLen, _lastPrefix))
 if (prefixLen == _lastPrefix.Length && _ps.chars.AsSpan(_ps.charPos).StartsWith(_lastPrefix))
 {
 return AddAttribute(_nameTable.Add(_ps.chars, colonPos + 1, endNamePos - colonPos - 1),
 _lastPrefix,
Expand DownExpand Up@@ -8274,23 +8272,23 @@ private int IncrementalRead()
 case IncrementalReadState.PI:
 if (ParsePIValue(out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 2, 2, "?>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 2).StartsWith("?>"));
 _ps.charPos -= 2;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.Comment:
 if (ParseCDataOrComment(XmlNodeType.Comment, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "-->"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("-->"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
 goto Append;
 case IncrementalReadState.CDATA:
 if (ParseCDataOrComment(XmlNodeType.CDATA, out startPos, out pos))
 {
 Debug.Assert(XmlConvert.StrEqual(_ps.chars, _ps.charPos - 3, 3, "]]>"));
 Debug.Assert(_ps.chars.AsSpan(_ps.charPos - 3).StartsWith("]]>"));
 _ps.charPos -= 3;
 _incReadState = IncrementalReadState.Text;
 }
Expand DownExpand Up@@ -8410,7 +8408,7 @@ private int IncrementalRead()
 {
 goto ReadData;
 }
 if (XmlConvert.StrEqual(chars, pos + 2, 7, "[CDATA["))
 if (chars.AsSpan(pos + 2).StartsWith("[CDATA["))
 {
 pos += 9;
 _incReadState = IncrementalReadState.CDATA;
Expand All@@ -8429,7 +8427,8 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 2, out _);
 if (XmlConvert.StrEqual(chars, _ps.charPos + 2, endPos - _ps.charPos - 2, _curNode.GetNameWPrefix(_nameTable)) &&
 string checkName = _curNode.GetNameWPrefix(_nameTable);
 if ((endPos - _ps.charPos - 2) == checkName.Length && chars.AsSpan(_ps.charPos + 2).StartsWith(checkName) &&
 (_ps.chars[endPos] == '>' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 if (--_incReadDepth > 0)
Expand DownExpand Up@@ -8468,7 +8467,7 @@ private int IncrementalRead()

 // ParseQName can flush the buffer, so we need to update the startPos, pos and chars after calling it
 int endPos = ParseQName(true, 1, out _);
 if (XmlConvert.StrEqual(_ps.chars, _ps.charPos + 1, endPos - _ps.charPos - 1, _curNode.localName) &&
 if (endPos - _ps.charPos - 1 == _curNode.localName.Length && _ps.chars.AsSpan(_ps.charPos + 1).StartsWith(_curNode.localName) &&
@krwqkrwqSep 26, 2022

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not slice exact length (endPos - _ps.charPos - 1) and check with equals rather than doing check separately?
 (_ps.chars[endPos] == '>' || _ps.chars[endPos] == '/' || XmlCharType.IsWhiteSpace(_ps.chars[endPos])))
 {
 _incReadDepth++;
Expand Down
Loading