From 435368ccd9b98d62683b3f5971aa82a36092d92f Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Tue, 9 Oct 2007 04:09:00 +0000
Subject: [PATCH] Fix metatable processing on luaGetTable

---
 src/main/java/lua/value/LTable.java |   9 ++++-----
 src/test/java/lua/LuaJTest.java     |   4 ++++
 src/test/res/simplemetatables.lua   |  14 ++++++++++++++
 src/test/res/simplemetatables.luac  | Bin 0 -> 583 bytes
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 src/test/res/simplemetatables.lua
 create mode 100644 src/test/res/simplemetatables.luac

diff --git a/src/main/java/lua/value/LTable.java b/src/main/java/lua/value/LTable.java
index 574dc55a..302fc556 100644
--- a/src/main/java/lua/value/LTable.java
+++ b/src/main/java/lua/value/LTable.java
@@ -223,11 +223,10 @@ public class LTable extends LValue {
 	}
 	
 	public void luaSetTable(VM vm, LValue table, LValue key, LValue val) {
-		if ( !containsKey( key ) && m_metatable != null ) {
-			super.luaSetTable( vm, table, key, val );
-		} else {
-			put(key, val);
-		}
+		if ( (!containsKey( key )) && m_metatable != null && m_metatable.containsKey(TM_NEWINDEX) )
+			m_metatable.get(TM_NEWINDEX).luaSetTable( vm, table, key, val );
+		else
+			put(key,val);
 	}
 	
 	/**
diff --git a/src/test/java/lua/LuaJTest.java b/src/test/java/lua/LuaJTest.java
index 74e1a9d2..520b9445 100644
--- a/src/test/java/lua/LuaJTest.java
+++ b/src/test/java/lua/LuaJTest.java
@@ -80,6 +80,10 @@ public class LuaJTest extends TestCase {
 		runTest( "setlist" );
 	}
 	
+	public void testSimpleMetatables() throws IOException, InterruptedException {
+		runTest( "simplemetatables" );
+	}
+	
 	public void testStrLib() throws IOException, InterruptedException {
 		runTest( "strlib" );
 	}
diff --git a/src/test/res/simplemetatables.lua b/src/test/res/simplemetatables.lua
new file mode 100644
index 00000000..0a9c05e1
--- /dev/null
+++ b/src/test/res/simplemetatables.lua
@@ -0,0 +1,14 @@
+-- The purpose of this test case is to check
+-- that certain simple metatable operations work properly
+t = { b='bbb' }
+t.__index = t
+u = {}
+setmetatable( u, t )
+u.c = 'ccc'
+
+print( 't.a', t.a )
+print( 'u.a', u.a )
+print( 't.b', t.b )
+print( 'u.b', u.b )
+print( 't.c', t.c )
+print( 'u.c', u.c )
diff --git a/src/test/res/simplemetatables.luac b/src/test/res/simplemetatables.luac
new file mode 100644
index 0000000000000000000000000000000000000000..29ab16588fb99c547d024ef26d07c1f1642160a5
GIT binary patch
literal 583
zcmZvZO-{ow5QWEyL!0s=R%}4rfSh51#EuOosGQV`NNH6OTViR1;9NNxZ)%r@sFq&*
z{LQnSOzvO3c_XE@UeX;A@z8Dez1>=8oN0PHRJ}Lg$C2evuq!4i!x$Fu1@r=y96nc=
z7o@0Q1*Yg5>jw_1fG@}TtDuZ(&JO%1JgZm(8-*$Q$0(0E=2MP^Ava|q<wAYRjVYJd
zBL%v}yXXuL7pI1_#;R#xmN4sex7*l{SoEZ?!3OL8IuQ$P+|{-)7f9^iyB!XclU!wD
z29vD4tYabF<*Q^|mCo@nGNh^bM6&HDX|PDHn@XB5D$huM#9WtPb6tVWB_BT54cIvW
GAI2|Ej6BN#

literal 0
HcmV?d00001