From 1fd69ed62dda3643298f2a2fb1a8e4b42687caac Mon Sep 17 00:00:00 2001
From: James Roseborough <james.roseborough@luaj.org>
Date: Wed, 5 Sep 2012 14:24:07 +0000
Subject: [PATCH] Lua 5.2 compatibility fixes.

---
 src/core/org/luaj/vm2/compiler/LexState.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/org/luaj/vm2/compiler/LexState.java b/src/core/org/luaj/vm2/compiler/LexState.java
index ba2f9240..334ddf75 100644
--- a/src/core/org/luaj/vm2/compiler/LexState.java
+++ b/src/core/org/luaj/vm2/compiler/LexState.java
@@ -357,9 +357,9 @@ public class LexState {
 		while ( s < c.length && isspace(c[s]))
 			++s;
 		// Check for negative sign
-		boolean neg = false;
+		double sgn = 1.0;
 		if (s < c.length && c[s] == '-') {
-			neg = true;
+			sgn = -1.0;
 			++s;
 		}
 		/* Check for "0x" */
@@ -372,14 +372,14 @@ public class LexState {
 		++s;
 
 		// read integer part.
-		long m = 0;
+		double m = 0;
 		int e = 0;
 		while (s < c.length && isxdigit(c[s]))
-			m = (m << 4) + hexvalue(c[s++]);
+			m = (m * 16) + hexvalue(c[s++]);
 		if (s < c.length && c[s] == '.') {
 			++s;  // skip dot
 			while (s < c.length && isxdigit(c[s])) {
-				m = (m << 4) + hexvalue(c[s++]);
+				m = (m * 16) + hexvalue(c[s++]);
 				e -= 4;  // Each fractional part shifts right by 2^4
 			}
 		}
@@ -397,7 +397,7 @@ public class LexState {
 				exp1 = -exp1;
 			e += exp1;
 		}
-		return e == 0 ? LuaValue.valueOf(m): LuaValue.valueOf(m * Math.pow(2.0, e));
+		return LuaValue.valueOf(sgn * m * Math.pow(2.0, e));
 	}
 	
 	boolean str2d(String str, SemInfo seminfo) {