Code format: fix compilation suggestions (#363)

Author: metoule

src/DynamicExpresso.Core/Detector.cs

@@ -58,16 +58,16 @@ public IdentifiersInfo DetectIdentifiers(string expression, DetectorOptions opti
 					if (withtype != identifier)
 					{
 						var typeName = types[t].Value;
-						if (_settings.KnownTypes.TryGetValue(typeName, out ReferenceType knownType))
+						if (_settings.KnownTypes.TryGetValue(typeName, out var knownType))
 							type = knownType.Type;
 
 						t++;
 					}
 
 					// there might be several lambda parameters with the same name
 					//  -> in that case, we ignore the detected type
-					if (lambdaParameters.TryGetValue(identifier, out Identifier already) &&
-					    already.Expression.Type != type)
+					if (lambdaParameters.TryGetValue(identifier, out var already) &&
+						already.Expression.Type != type)
 						type = typeof(object);
 
 					var defaultValue = type.IsValueType ? Activator.CreateInstance(type) : null;
@@ -96,11 +96,11 @@ public IdentifiersInfo DetectIdentifiers(string expression, DetectorOptions opti
 						continue;
 				}
 
-				if (_settings.Identifiers.TryGetValue(identifier, out Identifier knownIdentifier))
+				if (_settings.Identifiers.TryGetValue(identifier, out var knownIdentifier))
 					knownIdentifiers.Add(knownIdentifier);
-				else if (lambdaParameters.TryGetValue(identifier, out Identifier knownLambdaParam))
+				else if (lambdaParameters.TryGetValue(identifier, out var knownLambdaParam))
 					knownIdentifiers.Add(knownLambdaParam);
-				else if (_settings.KnownTypes.TryGetValue(identifier, out ReferenceType knownType))
+				else if (_settings.KnownTypes.TryGetValue(identifier, out var knownType))
 					knownTypes.Add(knownType);
 				else
 					unknownIdentifiers.Add(identifier);

src/DynamicExpresso.Core/LanguageConstants.cs

@@ -1,6 +1,6 @@
-using DynamicExpresso.Parsing;
 using System;
 using System.Linq.Expressions;
+using DynamicExpresso.Parsing;
 
 namespace DynamicExpresso
 {
@@ -9,25 +9,25 @@ public static class LanguageConstants
 		public const string This = "this";
 
 		public static readonly ReferenceType[] PrimitiveTypes = {
-            new ReferenceType(typeof(object)),
-            new ReferenceType(typeof(bool)),
-            new ReferenceType(typeof(char)),
-            new ReferenceType(typeof(string)),
-            new ReferenceType(typeof(sbyte)),
-            new ReferenceType(typeof(byte)),
-            new ReferenceType(typeof(short)),
-            new ReferenceType(typeof(ushort)),
-            new ReferenceType(typeof(int)),
-            new ReferenceType(typeof(uint)),
-            new ReferenceType(typeof(long)),
-            new ReferenceType(typeof(ulong)),
-            new ReferenceType(typeof(float)),
-            new ReferenceType(typeof(double)),
-            new ReferenceType(typeof(decimal)),
-            new ReferenceType(typeof(DateTime)),
-            new ReferenceType(typeof(TimeSpan)),
-            new ReferenceType(typeof(Guid))
-        };
+			new ReferenceType(typeof(object)),
+			new ReferenceType(typeof(bool)),
+			new ReferenceType(typeof(char)),
+			new ReferenceType(typeof(string)),
+			new ReferenceType(typeof(sbyte)),
+			new ReferenceType(typeof(byte)),
+			new ReferenceType(typeof(short)),
+			new ReferenceType(typeof(ushort)),
+			new ReferenceType(typeof(int)),
+			new ReferenceType(typeof(uint)),
+			new ReferenceType(typeof(long)),
+			new ReferenceType(typeof(ulong)),
+			new ReferenceType(typeof(float)),
+			new ReferenceType(typeof(double)),
+			new ReferenceType(typeof(decimal)),
+			new ReferenceType(typeof(DateTime)),
+			new ReferenceType(typeof(TimeSpan)),
+			new ReferenceType(typeof(Guid))
+		};
 
 		/// <summary>
 		/// Primitive types alias (string, int, ...)
@@ -54,10 +54,10 @@ public static class LanguageConstants
 		/// Common .NET Types (Math, Convert, Enumerable)
 		/// </summary>
 		public static readonly ReferenceType[] CommonTypes = {
-            new ReferenceType(typeof(Math)),
-            new ReferenceType(typeof(Convert)),
-            new ReferenceType(typeof(System.Linq.Enumerable))
-        };
+			new ReferenceType(typeof(Math)),
+			new ReferenceType(typeof(Convert)),
+			new ReferenceType(typeof(System.Linq.Enumerable))
+		};
 
 		/// <summary>
 		/// true, false, null

src/DynamicExpresso.Core/ParserArguments.cs

@@ -1,11 +1,11 @@
-using DynamicExpresso.Parsing;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using DynamicExpresso.Exceptions;
 using System.Text.RegularExpressions;
+using DynamicExpresso.Exceptions;
+using DynamicExpresso.Parsing;
 
 namespace DynamicExpresso
 {
@@ -18,8 +18,8 @@ internal class ParserArguments
 		private readonly HashSet<Identifier> _usedIdentifiers = new HashSet<Identifier>();
 
 		public ParserArguments(
-			string expressionText, 
-			ParserSettings settings, 
+			string expressionText,
+			ParserSettings settings,
 			Type expressionReturnType,
 			IEnumerable<Parameter> declaredParameters
 		)
@@ -42,7 +42,7 @@ IEnumerable<Parameter> declaredParameters
 			}
 		}
 
-		public ParserSettings Settings { get; private set;}
+		public ParserSettings Settings { get; private set; }
 		public string ExpressionText { get; private set; }
 		public Type ExpressionReturnType { get; private set; }
 		public IEnumerable<Parameter> DeclaredParameters { get { return _declaredParameters.Values; } }
@@ -64,8 +64,7 @@ public IEnumerable<Identifier> UsedIdentifiers
 
 		public bool TryGetKnownType(string name, out Type type)
 		{
-			ReferenceType reference;
-			if (Settings.KnownTypes.TryGetValue(name, out reference))
+			if (Settings.KnownTypes.TryGetValue(name, out var reference))
 			{
 				_usedTypes.Add(reference);
 				type = reference.Type;
@@ -87,8 +86,7 @@ internal bool HasKnownGenericTypeDefinition(string name)
 
 		public bool TryGetIdentifier(string name, out Expression expression)
 		{
-			Identifier identifier;
-			if (Settings.Identifiers.TryGetValue(name, out identifier))
+			if (Settings.Identifiers.TryGetValue(name, out var identifier))
 			{
 				_usedIdentifiers.Add(identifier);
 				expression = identifier.Expression;
@@ -104,11 +102,10 @@ public bool TryGetIdentifier(string name, out Expression expression)
 		/// </summary>
 		public bool TryGetParameters(string name, out ParameterExpression expression)
 		{
-			Parameter parameter;
-			if (_declaredParameters.TryGetValue(name, out parameter))
+			if (_declaredParameters.TryGetValue(name, out var parameter))
 			{
 				_usedParameters.Add(parameter);
-				expression = parameter.Expression; 
+				expression = parameter.Expression;
 				return true;
 			}