From 14108aee878dc16e30ebdd3a1f4716f1e1f64ccc Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Thu, 14 Jun 2007 04:09:57 +0000
Subject: [PATCH] Fix upvalues that allow closures to work properly.

---
 src/main/java/lua/io/Closure.java |  2 +-
 src/main/java/lua/io/UpVal.java   | 15 +++++++++++++++
 src/test/res/compile.sh           |  2 +-
 src/test/res/test2.lua            | 21 ++++++++++++++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/lua/io/Closure.java b/src/main/java/lua/io/Closure.java
index da650e0b..64c1fd8b 100644
--- a/src/main/java/lua/io/Closure.java
+++ b/src/main/java/lua/io/Closure.java
@@ -14,7 +14,7 @@ public class Closure extends LValue {
 		this.p = p;
 		upVals = new UpVal[p.nups];
 		for ( int i=0; i<p.nups; i++ )
-			upVals[i] = new UpVal();
+			upVals[i] = new UpVal( p.upvalues[i] );
 	}
 
 
diff --git a/src/main/java/lua/io/UpVal.java b/src/main/java/lua/io/UpVal.java
index 059394f8..b04e2708 100644
--- a/src/main/java/lua/io/UpVal.java
+++ b/src/main/java/lua/io/UpVal.java
@@ -1,5 +1,20 @@
 package lua.io;
 
+import lua.value.LNil;
+import lua.value.LString;
+import lua.value.LValue;
+
 public class UpVal {
 
+	private LString name;
+	public LValue value;
+	
+	public UpVal( LString string ) {
+		this.name = string;
+	}
+		
+	public String toString() {
+		return "up("+name+")";
+	}
+
 }
diff --git a/src/test/res/compile.sh b/src/test/res/compile.sh
index de48a029..4a25c1b7 100644
--- a/src/test/res/compile.sh
+++ b/src/test/res/compile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 LUA_HOME=/cygdrive/c/programs/lua5.1
 TESTS="test1 test2 test3 test4 test5"
-TESTS="test3"
+TESTS="test2"
 for x in $TESTS
 do
     echo compiling $x
diff --git a/src/test/res/test2.lua b/src/test/res/test2.lua
index 0c3c68da..171e02bd 100644
--- a/src/test/res/test2.lua
+++ b/src/test/res/test2.lua
@@ -1,10 +1,29 @@
+
 function sum(a,b,c,d)          -- "sum" method
-  return a+b+c+d   -- return sum
+	local d = d or 0
+	return a+b+c+d   -- return sum
 end
 print( sum( 1, 2, 3, 4 ) )
 print( sum( 5, 6, 7 ) )
 print( sum( 9, 10, 11, 12, 13, 14 ) )
 print( sum( sum(1,2,3,4), sum(5,6,7), sum(9,10,11,12,13,14), 15 ) )
 
+function myfunc(x)
+	return x*x;
+end
 
+print( myfunc(0.1) )
+
+do
+  local oldMyfunc = myfunc
+  local k = 55
+  myfunc = function (x)
+    local a = k + oldMyfunc(x)
+    k = k + 5
+    return a
+  end
+end
+
+print( myfunc(0.1) )
+print( myfunc(0.1) )