Code cleanup (#304)

Code cleanup and some fixes

Author: Bykiev

src/Parlot/Compilation/CompilationContext.cs

@@ -12,12 +12,8 @@ public class CompilationContext
 {
     private int _number;
 
-    public CompilationContext()
-    {
-    }
-
     /// <summary>
-    /// Gets the expression containing the the <see cref="ParseContext"/> instance for the parser.
+    /// Gets the expression containing the <see cref="ParseContext"/> instance for the parser.
     /// </summary>
     public ParameterExpression ParseContext { get; } = Expression.Parameter(typeof(ParseContext));
 
@@ -27,12 +23,12 @@ public CompilationContext()
     public int NextNumber => _number++;
 
     /// <summary>
-    /// Gets the list of global variables to add the the final list of statements.
+    /// Gets the list of global variables to add the final list of statements.
     /// </summary>
     public List<ParameterExpression> GlobalVariables { get; } = new();
 
     /// <summary>
-    /// Gets the list of global expressions to add the the final list of statements.
+    /// Gets the list of global expressions to add the final list of statements.
     /// </summary>
     public List<Expression> GlobalExpressions { get; } = new();
 

src/Parlot/Compilation/CompilationResult.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
@@ -9,7 +9,7 @@ namespace Parlot.Compilation;
 /// to parse the expected input.
 /// The convention is that these statements are returned in the <see cref="Body"/> property, and any variable that needs to be declared in the block
 /// that the <see cref="Body"/> is used in are set in the <see cref="Variables"/> list.
-/// The <see cref="Success"/> property represents the variable that contains the success of the statements once executed, and if <code>true</code> then 
+/// The <see cref="Success"/> property represents the variable that contains the success of the statements once executed, and if <code>true</code> then
 /// the <see cref="Value"/> property contains the result.
 /// </summary>
 public class CompilationResult

src/Parlot/Compilation/CompiledParser.cs

@@ -6,14 +6,11 @@ namespace Parlot.Compilation;
 /// <summary>
 /// Marker interface to detect a Parser has already been compiled.
 /// </summary>
-public interface ICompiledParser
-{
-
-}
+public interface ICompiledParser;
 
 /// <summary>
 /// An instance of this class encapsulates the result of a compiled parser
-/// in order to expose is as as standard parser contract.
+/// in order to expose is as standard parser contract.
 /// </summary>
 /// <remarks>
 /// This class is used in <see cref="Parser{T}.Compile"/>.

src/Parlot/Cursor.cs

@@ -110,7 +110,7 @@ public void Advance(int count)
         {
             Current = NullChar;
             Offset = _textLength;
-            _column += 1;
+            _column++;
         }
     }
 

src/Parlot/Fluent/Deferred.cs

@@ -12,6 +12,8 @@ namespace Parlot.Fluent;
 
 public sealed class Deferred<T> : Parser<T>, ICompilable, ISeekable
 {
+
+    private readonly object _lockObject = new();
     private Parser<T>? _parser;
 
     public Parser<T>? Parser
@@ -175,7 +177,7 @@ public override string ToString()
     {
         // Handle recursion
 
-        lock (this)
+        lock (_lockObject)
         {
             if (!_toString)
             {

src/Parlot/Fluent/Identifier.cs

@@ -27,7 +27,7 @@ public override bool Parse(ParseContext context, ref ParseResult<TextSpan> resul
 
         var first = context.Scanner.Cursor.Current;
 
-        if (Character.IsIdentifierStart(first) || _extraStart != null && _extraStart(first))
+        if (Character.IsIdentifierStart(first) || (_extraStart != null && _extraStart(first)))
         {
             var start = context.Scanner.Cursor.Offset;
 

src/Parlot/Fluent/LeftAssociative.cs

@@ -108,10 +108,7 @@ public CompilationResult Compile(CompilationContext context)
             var (op, factory) = _operators[i];
             var opCompileResult = op.Build(context);
 
-            foreach (var variable in opCompileResult.Variables)
-            {
-                allOperatorVariables.Add(variable);
-            }
+            allOperatorVariables.AddRange(opCompileResult.Variables);
 
             var factoryConst = Expression.Constant(factory);
 
@@ -291,10 +288,7 @@ public CompilationResult Compile(CompilationContext context)
             var (op, factory) = _operators[i];
             var opCompileResult = op.Build(context);
 
-            foreach (var variable in opCompileResult.Variables)
-            {
-                allOperatorVariables.Add(variable);
-            }
+            allOperatorVariables.AddRange(opCompileResult.Variables);
 
             var factoryConst = Expression.Constant(factory);
 

src/Parlot/Fluent/NumberLiteralBase.cs

@@ -34,7 +34,7 @@ public abstract class NumberLiteralBase<T> : Parser<T>, ICompilable, ISeekable
 
     public abstract bool TryParseNumber(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out T value);
 
-    public NumberLiteralBase(NumberOptions numberOptions = NumberOptions.Number, char decimalSeparator = NumberLiterals.DefaultDecimalSeparator, char groupSeparator = NumberLiterals.DefaultGroupSeparator, MethodInfo? tryParseMethodInfo = null)
+    protected NumberLiteralBase(NumberOptions numberOptions = NumberOptions.Number, char decimalSeparator = NumberLiterals.DefaultDecimalSeparator, char groupSeparator = NumberLiterals.DefaultGroupSeparator, MethodInfo? tryParseMethodInfo = null)
     {
         _decimalSeparator = decimalSeparator;
         _groupSeparator = groupSeparator;

src/Parlot/Fluent/NumberOptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Parlot.Fluent;
 
@@ -8,7 +8,7 @@ public enum NumberOptions
     /// <summary>
     /// Indicates that no style elements, such as leading sign, thousands
     /// separators, decimal separator or exponent, can be present in the parsed string.
-    /// The string to be parsed must consist of integral decimal digits only.        
+    /// The string to be parsed must consist of integral decimal digits only.
     /// </summary>
     None = 0,
 
@@ -18,6 +18,12 @@ public enum NumberOptions
     /// </summary>
     AllowLeadingSign = 1,
 
+    /// <summary>
+    /// Indicates that the <see cref="AllowLeadingSign"/>
+    /// style is used. This is a composite number style.
+    /// </summary>
+    Integer = AllowLeadingSign,
+
     /// <summary>
     /// Indicates that the numeric string can have a decimal separator. By default it uses dot (.) as the separator.
     /// </summary>
@@ -29,6 +35,12 @@ public enum NumberOptions
     /// </summary>
     AllowGroupSeparators = 4,
 
+    /// <summary>
+    /// Indicates that the <see cref="AllowLeadingSign"/>, <see cref="AllowDecimalSeparator"/>, <see cref="AllowGroupSeparators"/>
+    /// styles are used. This is a composite number style.
+    /// </summary>
+    Number = AllowLeadingSign | AllowDecimalSeparator | AllowGroupSeparators,
+
     /// <summary>
     /// Indicates that the numeric string can be in exponential notation. It
     /// allows the parsed string to contain an exponent that begins with the "E"
@@ -37,18 +49,6 @@ public enum NumberOptions
     /// </summary>
     AllowExponent = 8,
 
-    /// <summary>
-    /// Indicates that the <see cref="AllowLeadingSign"/>
-    /// style is used. This is a composite number style.
-    /// </summary>
-    Integer = AllowLeadingSign,
-
-    /// <summary>
-    /// Indicates that the <see cref="AllowLeadingSign"/>, <see cref="AllowDecimalSeparator"/>, <see cref="AllowGroupSeparators"/>
-    /// styles are used. This is a composite number style.
-    /// </summary>
-    Number = AllowLeadingSign | AllowDecimalSeparator | AllowGroupSeparators,
-
     /// <summary>
     /// Indicates that the <see cref="AllowLeadingSign"/>, <see cref="AllowDecimalSeparator"/>, <see cref="AllowExponent"/>
     /// styles are used. This is a composite number style.

src/Parlot/Fluent/OneOf.cs

@@ -151,7 +151,7 @@ static void AddUniqueSingle(List<Parser<T>> target, Parser<T> item)
             lookupTable?.Remove(OtherSeekableChar);
             var expectedChars = string.Join(",", lookupTable?.Keys.ToArray() ?? []);
 
-            if (lookupTable != null && lookupTable.Count > 0)
+            if (lookupTable?.Count > 0)
             {
                 _map = new CharMap<List<Parser<T>>>(lookupTable);