diff core/src/luan/modules/PackageLuan.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/PackageLuan.java	Sun Jul 12 23:04:47 2015 -0600
+++ b/core/src/luan/modules/PackageLuan.java	Mon Jul 13 12:31:53 2015 -0600
@@ -51,7 +51,7 @@
 					return null;
 				LuanFunction loader = BasicLuan.load(luan,src,modName,null,false);
 				mod = Luan.first(
-					luan.call(loader,"<require \""+modName+"\">",new Object[]{modName})
+					loader.call(luan,new Object[]{modName})
 				);
 				if( mod == null ) {
 					mod = loaded.rawGet(modName);
@@ -70,11 +70,11 @@
 		if( t == null )
 			return null;
 		LuanFunction existsFn = (LuanFunction)t.get(luan.JAVA,"exists");
-		boolean exists = (Boolean)Luan.first(luan.call(existsFn));
+		boolean exists = (Boolean)Luan.first(existsFn.call(luan));
 		if( !exists )
 			return null;
 		LuanFunction reader = (LuanFunction)t.get(luan.JAVA,"read_text");
-		return (String)Luan.first(luan.call(reader));
+		return (String)Luan.first(reader.call(luan));
 	}
 
 }