Correct LHS error reporting + correct Tokenizer.Reset + get rid of Tokenizer.MoveTo

Author: adams85

src/Acornima.Extras/Jsx/JsxTokenizer.cs

@@ -33,7 +33,7 @@ public JsxTokenizer(string input, SourceType sourceType, string? sourceFile, Jsx
     public JsxTokenizer(string input, int start, int length, SourceType sourceType, string? sourceFile, JsxTokenizerOptions options)
         : this(options)
     {
-        Reset(input, start, length, sourceType, sourceFile);
+        _tokenizer.ResetInternal(input, start, length, sourceType, sourceFile, trackRegExpContext: true);
     }
 
     bool IExtension.SupportsMinimalContextTracking => false;

src/Acornima/Parser.LVal.cs

@@ -209,9 +209,7 @@ private NodeList<Node> ToAssignableProperties(in NodeList<Node> properties, bool
             && last is RestElement restElement && restElement.Argument.Type != NodeType.Identifier)
         {
             // Unexpected(restElement.Argument.Start); // original acornjs error reporting
-            _tokenizer.MoveTo(restElement.Argument.Start, expressionAllowed: false);
-            Next(ignoreEscapeSequenceInKeyword: true);
-            Unexpected();
+            Raise(restElement.Argument.Start, InvalidDestructuringTarget);
         }
 
         return NodeList.From(ref bindingList);
@@ -640,13 +638,7 @@ private void CheckLocalExport(Identifier id)
     [DoesNotReturn]
     private void HandleLeftHandSideError(Node node, bool isBinding, LeftHandSideKind lhsKind)
     {
-        if (isBinding)
-        {
-            _tokenizer.MoveTo(node.Start, expressionAllowed: false);
-            Next(ignoreEscapeSequenceInKeyword: true);
-            Unexpected();
-        }
-        else
+        if (!isBinding)
         {
             switch (lhsKind)
             {
@@ -665,12 +657,10 @@ private void HandleLeftHandSideError(Node node, bool isBinding, LeftHandSideKind
                 case LeftHandSideKind.ForInOf:
                     Raise(node.Start, InvalidLhsInFor);
                     break;
-
-                default:
-                    Raise(node.Start, InvalidDestructuringTarget);
-                    break;
             }
         }
+
+        Raise(node.Start, InvalidDestructuringTarget);
     }
 
     private enum LeftHandSideKind : byte

src/Acornima/Parser.State.cs

@@ -52,8 +52,6 @@ public partial class Parser
     internal void Reset(string input, int start, int length, SourceType sourceType, string? sourceFile, bool strict)
     {
         _tokenizer.ResetInternal(input, start, length, sourceType, sourceFile, trackRegExpContext: _options.OnToken is not null);
-        _tokenizer._stringPool = default;
-        _tokenizerOptions._errorHandler.Reset();
 
         _inModule = _tokenizer._inModule;
         _strict = _tokenizer._strict || strict;

src/Acornima/Tokenizer.State.cs

@@ -72,11 +72,7 @@ public void Reset(string input, int start, SourceType sourceType = SourceType.Sc
         => Reset(input ?? ThrowArgumentNullException<string>(nameof(input)), start, input.Length - start, sourceType, sourceFile);
 
     public void Reset(string input, int start, int length, SourceType sourceType = SourceType.Script, string? sourceFile = null)
-    {
-        ResetInternal(input, start, length, sourceType, sourceFile, trackRegExpContext: true);
-        _stringPool = default;
-        _options._errorHandler.Reset();
-    }
+        => ResetInternal(input, start, length, sourceType, sourceFile, _trackRegExpContext);
 
     internal void ResetInternal(string input, int start, int length, SourceType sourceType, string? sourceFile, bool trackRegExpContext)
     {
@@ -122,6 +118,9 @@ internal void ResetInternal(string input, int start, int length, SourceType sour
         _inModule = _strict = sourceType == SourceType.Module;
 
         _sb = _sb is not null ? _sb.Clear() : new StringBuilder();
+        _stringPool = default;
+
+        _options._errorHandler.Reset();
     }
 
     internal void ReleaseLargeBuffers()
@@ -165,10 +164,4 @@ internal void ReleaseStringBuilder(ref StringBuilder? sb)
         _sb = sb;
         sb = null;
     }
-
-    internal void MoveTo(int position, bool expressionAllowed)
-    {
-        ResetInternal(_input, position, _endPosition - position, _sourceType, _sourceFile, _trackRegExpContext);
-        _expressionAllowed = _trackRegExpContext && expressionAllowed;
-    }
 }

src/Acornima/Tokenizer.cs

@@ -40,7 +40,7 @@ public Tokenizer(string input, SourceType sourceType, string? sourceFile, Tokeni
     public Tokenizer(string input, int start, int length, SourceType sourceType, string? sourceFile, TokenizerOptions options)
         : this(options, extension: null)
     {
-        Reset(input, start, length, sourceType, sourceFile);
+        ResetInternal(input, start, length, sourceType, sourceFile, trackRegExpContext: true);
     }
 
     public string Input => _input;