Fix: NextKey (#94)

Author: neolithos

NeoLua.Test/Runtime.cs

@@ -190,7 +190,7 @@ public void TestRuntimeLua12()
 		[TestMethod]
 		public void TestRuntimeLua14()
 		{
-			using (Lua l = new Lua())
+			using (var l = new Lua())
 			{
 				var g = l.CreateEnvironment();
 				l.PrintExpressionTree = Console.Out;
@@ -480,6 +480,19 @@ public void RegexComplex01()
 				Assert.AreEqual(43, r[2][5]);
 			}
 		}
+
+		[TestMethod]
+		public void LuaNextLoop()
+		{
+			TestCode(Lines("local t = { a = 1 , b = 2 , c = 3 };",
+				"local r = {};",
+				"for k, v in next, t, nil do",
+				"   table.insert(r, k ..'='..v);",
+				"end;",
+				"return table.unpack(r)"),
+				"a=1", "b=2", "c=3"
+			);
+		}
 	}
  } //class Runtime 
 

NeoLua/LuaTable.cs

@@ -3392,6 +3392,13 @@ object NextHashKey(int startIndex)
 				return entryIndex == -1 ? null : entries[entryIndex].key;
 			} // func NextHashKey
 
+			object NextHashKey2(int currrentIndex)
+			{
+				if (currrentIndex < 0 || currrentIndex == entries.Length - 1)
+					return null;
+				return NextHashKey(currrentIndex + 1);
+			} // func NextHashKey2
+
 			switch (next)
 			{
 				case null:
@@ -3415,11 +3422,10 @@ object NextHashKey(int startIndex)
 					}
 					else
 						goto default;
+				case string memberName:
+					return NextHashKey2(FindKey(next, GetMemberHashCode(memberName), compareString));
 				default:
-					var currentEntryIndex = FindKey(next, next.GetHashCode() & 0x7FFFFFFF, comparerObject);
-					if (currentEntryIndex < 0 || currentEntryIndex == entries.Length - 1)
-						return null;
-					return NextHashKey(currentEntryIndex + 1);
+					return NextHashKey2(FindKey(next, next.GetHashCode() & 0x7FFFFFFF, comparerObject));
 			}
 		} // func NextKey