Chg: Version Add

Author: neolithos

NeoLua.NuGet/common.targets

@@ -14,7 +14,7 @@
 		<AssemblyVersion>5.3.0.0</AssemblyVersion>
 		<FileVersion>1.3.14.0</FileVersion>
 
-		<VersionAdd>beta.0</VersionAdd>
+		<VersionAdd>beta.1</VersionAdd>
 		<SimpleVersionPattern>^(\d+)\.(\d+)\.(\d+)</SimpleVersionPattern>
 		<SimpleVersion>$([System.Text.RegularExpressions.Regex]::Match($(FileVersion), $(SimpleVersionPattern)))</SimpleVersion>
 

NeoLua.Test/Functions.cs

@@ -364,42 +364,45 @@ public void TestFunctions62()
 		public void TestForwardDeclaration()
 		{
 			TestCode(
-			@"local f
-			function f()
-				return 'Hello'
-			end
+				@"local f
+function f()
+	return 'Hello'
+end
 
-			return f()",
-			"Hello");
+return f()",
+				"Hello"
+			);
 		}
 		[TestMethod]
 		public void TestDoubleLocalFunction()
 		{
 			TestCode(
-			@"local function f()
-				return 'Hello'
-			end
-			local function f()
-				return 'World'
-			end
-			return f()",
-			"World");
+				@"local function f()
+	return 'Hello'
+end
+local function f()
+	return 'World'
+end
+return f()",
+				"World"
+			);
 		}
 
 		[TestMethod]
 		public void TestLocalMutualRecursiveFunction()
 		{
 			TestCode(
-			@"
-			local f1, f2
-			function f2()
-				return f1()
-			end
-			function f1()
-				return 'Hello'
-			end
-			return _G['f2'] == nil",
-			true);
+				@"
+local f1, f2
+function f2()
+	return f1()
+end
+function f1()
+	return 'Hello'
+end
+return _G['f2'] == nil",
+				true
+			);
 		}
 
 		[TestMethod]

NeoLua/Parser.cs

@@ -99,8 +99,7 @@ private void RegisterVariableOrConst(string name, Expression expr)
 			public virtual Expression LookupExpression(string name, bool isLocalOnly = false)
 			{
 				// Lookup the current scope
-				Expression p;
-				if (scopeVariables != null && scopeVariables.TryGetValue(name, out p))
+				if (scopeVariables != null && scopeVariables.TryGetValue(name, out var p))
 					return p;
 
 				return parent != null && !isLocalOnly ? // lookup the parent scope
@@ -2181,17 +2180,16 @@ private static void ParseFunction(Scope scope, ILuaLexer code, bool isLocal)
 			{
 				var t = FetchToken(LuaToken.Identifier, code);
 
-				ParameterExpression funcVar = scope.LookupExpression(t.Value) as ParameterExpression;
+				var funcVar = scope.LookupExpression(t.Value) as ParameterExpression;
 				Expression exprFunction;
 				if (funcVar == null)
 				{
 					exprFunction = ParseLamdaDefinition(scope, code, t.Value, false,
-					typeDelegate => funcVar = scope.RegisterVariable(typeDelegate, t.Value));
+						typeDelegate => funcVar = scope.RegisterVariable(typeDelegate, t.Value)
+					);
 				}
 				else
-				{
 					exprFunction = ParseLamdaDefinition(scope, code, t.Value, false, null);
-				}
 
 				scope.AddExpression(Expression.Assign(funcVar, exprFunction));
 			}
@@ -2211,7 +2209,7 @@ private static void ParseFunction(Scope scope, ILuaLexer code, bool isLocal)
 					memberName = FetchToken(LuaToken.Identifier, code).Value;
 				}
 				// add a method to the table. methods get a hidden parameter and will bo marked
-				bool lMethodMember = false;
+				var isMemberMethod = false;
 				if (code.Current.Typ == LuaToken.Colon)
 				{
 					code.Next();
@@ -2220,7 +2218,7 @@ private static void ParseFunction(Scope scope, ILuaLexer code, bool isLocal)
 					assignee = ParseFunctionAddChain(scope, tCurrent, assignee, memberName);
 					// fetch the method name
 					memberName = FetchToken(LuaToken.Identifier, code).Value;
-					lMethodMember = true;
+					isMemberMethod = true;
 				}
 				else
 				{
@@ -2239,7 +2237,7 @@ private static void ParseFunction(Scope scope, ILuaLexer code, bool isLocal)
 				}
 
 				// generate lambda
-				scope.AddExpression(MemberSetExpression(scope.Runtime, tCurrent, assignee, memberName, lMethodMember, ParseLamdaDefinition(scope, code, memberName, lMethodMember, null)));
+				scope.AddExpression(MemberSetExpression(scope.Runtime, tCurrent, assignee, memberName, isMemberMethod, ParseLamdaDefinition(scope, code, memberName, isMemberMethod, null)));
 			}
 		} // proc ParseLamdaDefinition