parser clean up

Author: bfarmer67

src/Hyperbee.ExpressionScript/System/Parsers/ListOfOneParser.cs

@@ -0,0 +1,12 @@
+using Parlot.Fluent;
+using static Parlot.Fluent.Parsers;
+
+namespace Hyperbee.XS.System.Parsers;
+
+internal static partial class XsParsers
+{
+    public static Parser<IReadOnlyList<T>> ListOfOne<T>( Parser<T> parser )
+    {
+        return OneOf( parser ).Then<IReadOnlyList<T>>( x => new List<T> { x } );
+    }
+}

src/Hyperbee.ExpressionScript/Parsers/TypeIdentifierParser.cs renamed to src/Hyperbee.ExpressionScript/System/Parsers/TypeIdentifierParser.cs

@@ -1,9 +1,8 @@
 using System.Linq.Expressions;
-using Hyperbee.XS.System;
 using Parlot;
 using Parlot.Fluent;
 
-namespace Hyperbee.XS.Parsers;
+namespace Hyperbee.XS.System.Parsers;
 
 internal class TypeIdentifierParser : Parser<Expression>
 {
@@ -68,4 +67,3 @@ public static Parser<Expression> TypeIdentifier( TypeResolver resolver )
         return new TypeIdentifierParser( resolver );
     }
 }
-

src/Hyperbee.ExpressionScript/Parsers/ValueIdentifierParser.cs renamed to src/Hyperbee.ExpressionScript/System/Parsers/ValueIdentifierParser.cs

@@ -3,7 +3,7 @@
 using Parlot;
 using Parlot.Fluent;
 
-namespace Hyperbee.XS.Parsers;
+namespace Hyperbee.XS.System.Parsers;
 
 internal class ValueIdentifierParser : Parser<Expression>
 {

src/Hyperbee.ExpressionScript/Parsers/WhitespaceOrNewLineOrCommentParser.cs renamed to src/Hyperbee.ExpressionScript/System/Parsers/WhitespaceOrNewLineOrCommentParser.cs

@@ -1,7 +1,7 @@
 using Parlot;
 using Parlot.Fluent;
 
-namespace Hyperbee.XS.Parsers;
+namespace Hyperbee.XS.System.Parsers;
 
 internal class WhitespaceOrNewLineOrCommentParser : Parser<TextSpan>
 {

src/Hyperbee.ExpressionScript/Parsers/ZeroOrManyUntilParser.cs renamed to src/Hyperbee.ExpressionScript/System/Parsers/ZeroOrManyUntilParser.cs

@@ -1,7 +1,7 @@
 using Parlot;
 using Parlot.Fluent;
 
-namespace Hyperbee.XS.Parsers;
+namespace Hyperbee.XS.System.Parsers;
 
 internal class ZeroOrManyUntilParser<T, U> : Parser<IReadOnlyList<T>>
 {

src/Hyperbee.ExpressionScript/XsParser.cs

@@ -1,8 +1,8 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Hyperbee.XS.Parsers;
 using Hyperbee.XS.System;
+using Hyperbee.XS.System.Parsers;
 using Parlot;
 using Parlot.Fluent;
 using static System.Linq.Expressions.Expression;
@@ -352,11 +352,6 @@ private static Parser<IReadOnlyList<Expression>> Arguments( Parser<Expression> e
             .Then( arguments => arguments ?? Array.Empty<Expression>() );
     }
 
-    static Parser<IReadOnlyList<Expression>> ListOfOne( Parser<Expression> expression )
-    {
-        return OneOf( expression ).Then<IReadOnlyList<Expression>>( x => new List<Expression> { x } );
-    }
-
     // Variable Parsers
 
     private Parser<Expression> AssignmentParser( Parser<Expression> expression )
@@ -663,7 +658,7 @@ private Parser<Expression> LambdaParser( Parser<Expression> expression, Deferred
             .AndSkip( Terms.Text( "=>" ) )
             .And(
                 OneOf(
-                    ListOfOne( expression ),
+                    XsParsers.ListOfOne( expression ),
                     Between(
                         Terms.Char( '{' ),
                         ZeroOrMany( statement ),