From f40a38ccae695e83119fe8314586615ba64e56f4 Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Mon, 10 Sep 2012 02:45:20 +0000
Subject: [PATCH] Remove env constructors.

---
 src/core/org/luaj/vm2/compiler/LexState.java    | 7 ++++---
 src/core/org/luaj/vm2/lib/OneArgFunction.java   | 9 +--------
 src/core/org/luaj/vm2/lib/ThreeArgFunction.java | 7 -------
 src/core/org/luaj/vm2/lib/TwoArgFunction.java   | 7 -------
 src/core/org/luaj/vm2/lib/VarArgFunction.java   | 4 ----
 src/core/org/luaj/vm2/lib/ZeroArgFunction.java  | 7 -------
 6 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/core/org/luaj/vm2/compiler/LexState.java b/src/core/org/luaj/vm2/compiler/LexState.java
index 334ddf75..26cb6216 100644
--- a/src/core/org/luaj/vm2/compiler/LexState.java
+++ b/src/core/org/luaj/vm2/compiler/LexState.java
@@ -25,14 +25,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Hashtable;
 
-import org.luaj.vm2.LuaInteger;
 import org.luaj.vm2.LocVars;
 import org.luaj.vm2.Lua;
 import org.luaj.vm2.LuaError;
-import org.luaj.vm2.Prototype;
+import org.luaj.vm2.LuaInteger;
 import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.Prototype;
 import org.luaj.vm2.compiler.FuncState.BlockCnt;
+import org.luaj.vm2.lib.MathLib;
 
 
 public class LexState {
@@ -397,7 +398,7 @@ public class LexState {
 				exp1 = -exp1;
 			e += exp1;
 		}
-		return LuaValue.valueOf(sgn * m * Math.pow(2.0, e));
+		return LuaValue.valueOf(sgn * m * MathLib.dpow_d(2.0, e));
 	}
 	
 	boolean str2d(String str, SemInfo seminfo) {
diff --git a/src/core/org/luaj/vm2/lib/OneArgFunction.java b/src/core/org/luaj/vm2/lib/OneArgFunction.java
index e175fd33..3db6a321 100644
--- a/src/core/org/luaj/vm2/lib/OneArgFunction.java
+++ b/src/core/org/luaj/vm2/lib/OneArgFunction.java
@@ -53,14 +53,7 @@ abstract public class OneArgFunction extends LibFunction {
 	/** Default constructor */
 	public OneArgFunction() {
 	}
-	
-	/** Constructor with specific environment
-	 * @param env The environment to apply during constructon.
-	 */
-	public OneArgFunction( LuaValue env ) {
-		throw new UnsupportedOperationException("Cannot supply env to constructor");
-	}
-	
+		
 	public final LuaValue call() {
 		return call(NIL);
 	}
diff --git a/src/core/org/luaj/vm2/lib/ThreeArgFunction.java b/src/core/org/luaj/vm2/lib/ThreeArgFunction.java
index 9135c650..68ceb243 100644
--- a/src/core/org/luaj/vm2/lib/ThreeArgFunction.java
+++ b/src/core/org/luaj/vm2/lib/ThreeArgFunction.java
@@ -54,13 +54,6 @@ abstract public class ThreeArgFunction extends LibFunction {
 	public ThreeArgFunction() {
 	}
 	
-	/** Constructor with specific environment
-	 * @param env The environment to apply during constructon.
-	 */
-	public ThreeArgFunction( LuaValue env ) {
-		throw new UnsupportedOperationException("Cannot supply env to constructor");
-	}
-	
 	public final LuaValue call() {
 		return call(NIL, NIL, NIL);
 	}
diff --git a/src/core/org/luaj/vm2/lib/TwoArgFunction.java b/src/core/org/luaj/vm2/lib/TwoArgFunction.java
index 9b10069d..8a97f6fb 100644
--- a/src/core/org/luaj/vm2/lib/TwoArgFunction.java
+++ b/src/core/org/luaj/vm2/lib/TwoArgFunction.java
@@ -54,13 +54,6 @@ abstract public class TwoArgFunction extends LibFunction {
 	public TwoArgFunction() {
 	}
 	
-	/** Constructor with specific environment
-	 * @param env The environment to apply during constructon.
-	 */
-	public TwoArgFunction( LuaValue env ) {
-		throw new UnsupportedOperationException("Cannot supply env to constructor");
-	}
-	
 	public final LuaValue call() {
 		return call(NIL, NIL);
 	}
diff --git a/src/core/org/luaj/vm2/lib/VarArgFunction.java b/src/core/org/luaj/vm2/lib/VarArgFunction.java
index 1ceb5389..60e98424 100644
--- a/src/core/org/luaj/vm2/lib/VarArgFunction.java
+++ b/src/core/org/luaj/vm2/lib/VarArgFunction.java
@@ -49,10 +49,6 @@ abstract public class VarArgFunction extends LibFunction {
 	public VarArgFunction() {
 	}
 	
-	public VarArgFunction( LuaValue env ) {
-		throw new UnsupportedOperationException("Cannot supply env to constructor");
-	}
-	
 	public LuaValue call() {
 		return invoke(NONE).arg1();
 	}
diff --git a/src/core/org/luaj/vm2/lib/ZeroArgFunction.java b/src/core/org/luaj/vm2/lib/ZeroArgFunction.java
index e0158c97..06169d74 100644
--- a/src/core/org/luaj/vm2/lib/ZeroArgFunction.java
+++ b/src/core/org/luaj/vm2/lib/ZeroArgFunction.java
@@ -52,13 +52,6 @@ abstract public class ZeroArgFunction extends LibFunction {
 	public ZeroArgFunction() {
 	}
 	
-	/** Constructor with specific environment
-	 * @param env The environment to apply during constructon.
-	 */
-	public ZeroArgFunction( LuaValue env ) {
-		throw new UnsupportedOperationException("Cannot supply env to constructor");
-	}
-	
 	public LuaValue call(LuaValue arg) {
 		return call();
 	}