diff core/src/luan/modules/BasicLuan.java @ 574:6cc2f047019b

remove LuanState.call()
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 13 Jul 2015 12:31:53 -0600
parents f1601a4ce1aa
children 7c3ad6db8ac3
line wrap: on
line diff
--- a/core/src/luan/modules/BasicLuan.java	Sun Jul 12 23:04:47 2015 -0600
+++ b/core/src/luan/modules/BasicLuan.java	Mon Jul 13 12:31:53 2015 -0600
@@ -204,20 +204,20 @@
 			finallyFn = (LuanFunction)obj;
 		}
 		try {
-			return luan.call(tryFn);
+			return tryFn.call(luan);
 		} catch(LuanException e) {
 			if( catchFn == null )
 				throw e;
-			return luan.call(catchFn,new Object[]{e.table()});
+			return catchFn.call(luan,new Object[]{e.table()});
 		} finally {
 			if( finallyFn != null )
-				luan.call(finallyFn);
+				finallyFn.call(luan);
 		}
 	}
 
 	@LuanMethod public static Object[] pcall(LuanState luan,LuanFunction f,Object... args) {
 		try {
-			Object[] r = Luan.array(luan.call(f,args));
+			Object[] r = Luan.array(f.call(luan,args));
 			Object[] rtn = new Object[r.length+1];
 			rtn[0] = true;
 			for( int i=0; i<r.length; i++ ) {