diff src/luan/LuanJavaFunction.java @ 49:8ede219cd111

add WebShell git-svn-id: https://luan-java.googlecode.com/svn/trunk@50 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 28 Dec 2012 19:35:04 +0000
parents 64ecb7a3aad7
children 9381b23ea9e1
line wrap: on
line diff
--- a/src/luan/LuanJavaFunction.java	Fri Dec 28 03:29:12 2012 +0000
+++ b/src/luan/LuanJavaFunction.java	Fri Dec 28 19:35:04 2012 +0000
@@ -43,13 +43,13 @@
 		return method.getParameterTypes();
 	}
 
-	@Override public Object[] call(LuanState lua,Object[] args) throws LuanException {
-		args = fixArgs(lua,args);
+	@Override public Object[] call(LuanState luan,Object[] args) throws LuanException {
+		args = fixArgs(luan,args);
 		Object rtn;
 		try {
 			rtn = method.invoke(obj,args);
 		} catch(IllegalArgumentException e) {
-			checkArgs(lua,args);
+			checkArgs(luan,args);
 			throw e;
 		} catch(IllegalAccessException e) {
 			throw new RuntimeException(e);
@@ -68,7 +68,7 @@
 		return rtnConverter.convert(rtn);
 	}
 
-	private void checkArgs(LuanState lua,Object[] args) throws LuanException {
+	private void checkArgs(LuanState luan,Object[] args) throws LuanException {
 		Class<?>[] a = getParameterTypes();
 		for( int i=0; i<a.length; i++ ) {
 			if( !a[i].isInstance(args[i]) ) {
@@ -76,12 +76,12 @@
 				String expected = a[i].getName();
 				if( !takesLuaState )
 					i++;
-				throw new LuanException(lua,LuanElement.JAVA,"bad argument #"+i+" ("+expected+" expected, got "+got+")");
+				throw new LuanException(luan,LuanElement.JAVA,"bad argument #"+i+" ("+expected+" expected, got "+got+")");
 			}
 		}
 	}
 
-	private Object[] fixArgs(LuanState lua,Object[] args) {
+	private Object[] fixArgs(LuanState luan,Object[] args) {
 		int n = argConverters.length;
 		Object[] rtn;
 		int start = 0;
@@ -92,7 +92,7 @@
 				n++;
 			rtn = new Object[n];
 			if( takesLuaState ) {
-				rtn[start++] = lua;
+				rtn[start++] = luan;
 			}
 			n = argConverters.length;
 			if( varArgCls != null ) {