clean up value-identifier-parser

Author: bfarmer67

src/Hyperbee.ExpressionScript/Parsers/ValueIdentifierParser.cs

@@ -1,16 +1,17 @@
 using System.Linq.Expressions;
+using Hyperbee.Collections;
 using Parlot;
 using Parlot.Fluent;
 
 namespace Hyperbee.XS.Parsers;
 
 internal class ValueIdentifierParser : Parser<Expression>
 {
-    private readonly ParseScope _scope;
+    private readonly LinkedDictionary<string, ParameterExpression> _variables;
 
-    public ValueIdentifierParser( ParseScope scope )
+    public ValueIdentifierParser( LinkedDictionary<string, ParameterExpression> variables )
     {
-        _scope = scope;
+        _variables = variables;
     }
 
     public override bool Parse( ParseContext context, ref ParseResult<Expression> result )
@@ -25,7 +26,7 @@ public override bool Parse( ParseContext context, ref ParseResult<Expression> re
 
         if ( scanner.ReadIdentifier( out var identifier ) )
         {
-            if ( _scope.TryLookupVariable( identifier.ToString(), out var variable ) )
+            if ( _variables.TryGetValue( identifier.ToString(), out var variable ) )
             {
                 result.Set( start.Offset, cursor.Position.Offset, variable );
                 context.ExitParser( this );
@@ -41,9 +42,9 @@ public override bool Parse( ParseContext context, ref ParseResult<Expression> re
 
 internal static partial class XsParsers
 {
-    public static Parser<Expression> ValueIdentifier( ParseScope scope )
+    public static Parser<Expression> ValueIdentifier( LinkedDictionary<string, ParameterExpression> variables )
     {
-        return new ValueIdentifierParser( scope );
+        return new ValueIdentifierParser( variables );
     }
 }
 

src/Hyperbee.ExpressionScript/XsParser.cs

@@ -232,7 +232,7 @@ private Parser<Expression> ExpressionParser( Deferred<Expression> statement )
 
         // Identifiers
 
-        var valueIdentifier = XsParsers.ValueIdentifier( Scope );
+        var valueIdentifier = XsParsers.ValueIdentifier( Scope.Variables );
         var typeIdentifier = XsParsers.TypeIdentifier( Resolver );
 
         var identifier = OneOf(