Fast \bin skip in rtf parsers

Remove the ridiculous Binary state check on every single char in the loop, and just do it when we actually find a \bin keyword (which is basically never)
FenPhoenix · Sep 30, 2023 · 872e7b1 · 872e7b1
1 parent 7d4cf23
commit 872e7b1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 38 deletions.
diff --git a/AL_Common/RTFParserCommon.cs b/AL_Common/RTFParserCommon.cs
@@ -951,7 +951,6 @@ public enum RtfDestinationState
     public enum RtfInternalState
     {
         Normal,
-        Binary,
         HexEncodedChar
     }
 

diff --git a/AngelLoader/Rtf/RtfDisplayedReadmeParser.cs b/AngelLoader/Rtf/RtfDisplayedReadmeParser.cs
@@ -117,16 +117,6 @@ private RtfError ParseRtf()
 
             char ch = (char)_rtfBytes[CurrentPos++];
 
-            if (_ctx.CurrentScope.RtfInternalState == RtfInternalState.Binary)
-            {
-                if (--_binaryCharsLeftToSkip <= 0)
-                {
-                    _ctx.CurrentScope.RtfInternalState = RtfInternalState.Normal;
-                    _binaryCharsLeftToSkip = 0;
-                }
-                continue;
-            }
-
             RtfError ec;
             switch (ch)
             {
@@ -194,8 +184,8 @@ private RtfError DispatchSpecialKeyword(SpecialType specialType, int param)
             case SpecialType.Bin:
                 if (param > 0)
                 {
-                    _ctx.CurrentScope.RtfInternalState = RtfInternalState.Binary;
-                    _binaryCharsLeftToSkip = param;
+                    CurrentPos += param;
+                    if (CurrentPos >= _rtfBytes.Length) return RtfError.EndOfFile;
                 }
                 break;
             case SpecialType.SkipDest:

diff --git a/AngelLoader/Rtf/RtfDisplayedReadmeParser_Dupe.cs b/AngelLoader/Rtf/RtfDisplayedReadmeParser_Dupe.cs
@@ -15,8 +15,6 @@ public sealed partial class RtfDisplayedReadmeParser
 
     private ArrayWithLength<byte> _rtfBytes = ArrayWithLength<byte>.Empty();
 
-    private int _binaryCharsLeftToSkip;
-
     private bool _skipDestinationIfUnknown;
 
     // For whatever reason it's faster to have this
@@ -29,7 +27,6 @@ private void ResetBase()
         _ctx.Reset();
 
         _groupCount = 0;
-        _binaryCharsLeftToSkip = 0;
         _skipDestinationIfUnknown = false;
     }
 

diff --git a/FMScanner/Core/RtfToTextConverter.cs b/FMScanner/Core/RtfToTextConverter.cs
@@ -970,16 +970,6 @@ private RtfError ParseRtf()
         {
             char ch = (char)_rtfBytes[CurrentPos++];
 
-            if (_ctx.CurrentScope.RtfInternalState == RtfInternalState.Binary)
-            {
-                if (--_binaryCharsLeftToSkip <= 0)
-                {
-                    _ctx.CurrentScope.RtfInternalState = RtfInternalState.Normal;
-                    _binaryCharsLeftToSkip = 0;
-                }
-                continue;
-            }
-
             RtfError ec;
             switch (ch)
             {
@@ -1051,13 +1041,9 @@ private RtfError DispatchKeyword(int param, bool hasParam)
         // data that follows are considered one character for skipping purposes."
         if (symbol.KeywordType == KeywordType.Special && symbol.Index == (int)SpecialType.Bin && _unicodeCharsLeftToSkip > 0)
         {
-            // Hard-skip the chars here, because if we mess around with just incrementing the chars left to
-            // skip count, we don't end up skipping control char data in the binary run (which we need to).
-            for (int i = 0; i < param; i++)
-            {
-                bool success = GetNextChar(out _);
-                if (!success) return RtfError.EndOfFile;
-            }
+            CurrentPos += param;
+            if (CurrentPos >= _rtfBytes.Length) return RtfError.EndOfFile;
+
             _unicodeCharsLeftToSkip--;
             return RtfError.OK;
         }
@@ -1067,7 +1053,6 @@ private RtfError DispatchKeyword(int param, bool hasParam)
         // skippable characters."
         // But don't do it if it's a hex char, because we handle it elsewhere in that case.
         if ((symbol.KeywordType != KeywordType.Special || symbol.Index != (int)SpecialType.HexEncodedChar) &&
-            _ctx.CurrentScope.RtfInternalState != RtfInternalState.Binary &&
             _unicodeCharsLeftToSkip > 0)
         {
             if (--_unicodeCharsLeftToSkip <= 0) _unicodeCharsLeftToSkip = 0;
@@ -1114,8 +1099,8 @@ private RtfError DispatchSpecialKeyword(SpecialType specialType, int param)
             case SpecialType.Bin:
                 if (param > 0)
                 {
-                    _ctx.CurrentScope.RtfInternalState = RtfInternalState.Binary;
-                    _binaryCharsLeftToSkip = param;
+                    CurrentPos += param;
+                    if (CurrentPos >= _rtfBytes.Length) return RtfError.EndOfFile;
                 }
                 break;
             case SpecialType.HexEncodedChar:

diff --git a/FMScanner/Core/RtfToTextConverter_Dupe.cs b/FMScanner/Core/RtfToTextConverter_Dupe.cs
@@ -15,7 +15,6 @@ public sealed partial class RtfToTextConverter
 
     private ArrayWithLength<byte> _rtfBytes = ArrayWithLength<byte>.Empty();
 
-    private int _binaryCharsLeftToSkip;
     private int _unicodeCharsLeftToSkip;
 
     private bool _skipDestinationIfUnknown;
@@ -30,7 +29,6 @@ private void ResetBase()
         _ctx.Reset();
 
         _groupCount = 0;
-        _binaryCharsLeftToSkip = 0;
         _unicodeCharsLeftToSkip = 0;
         _skipDestinationIfUnknown = false;
     }