diff src/luan/modules/PackageLuan.java @ 1563:8fbcc4747091

remove LuanFunction.luan
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 09 Nov 2020 01:37:57 -0700
parents b89212fd04b5
children c922446f53aa
line wrap: on
line diff
--- a/src/luan/modules/PackageLuan.java	Sun Nov 08 16:50:59 2020 -0700
+++ b/src/luan/modules/PackageLuan.java	Mon Nov 09 01:37:57 2020 -0700
@@ -20,7 +20,7 @@
 		LuanFunction fn = (LuanFunction)luan.registry().get("Package.require");
 		if( fn == null ) {
 			try {
-				fn = new LuanJavaFunction(luan,PackageLuan.class.getMethod("require",Luan.class,String.class),null);
+				fn = new LuanJavaFunction(PackageLuan.class.getMethod("require",Luan.class,String.class),null);
 			} catch(NoSuchMethodException e) {
 				throw new RuntimeException(e);
 			}
@@ -64,7 +64,7 @@
 				}
 				LuanFunction loader = luan.load(src,modName,true);
 				mod = Luan.first(
-					loader.call(modName)
+					loader.call(luan,modName)
 				);
 				if( mod == null )
 					throw new RuntimeException();
@@ -79,7 +79,7 @@
 				} else {
 					LuanFunction loader = luan.load(src,modName,true);
 					mod = Luan.first(
-						loader.call(modName)
+						loader.call(luan,modName)
 					);
 					if( mod == null ) {
 						mod = loaded.rawGet(modName);
@@ -103,7 +103,7 @@
 		}
 		Luan.Security security = Luan.setSecurity(luan,null);
 		try {
-			return (String)Luan.first(boot.fn(luan,"read").call(uri));
+			return (String)Luan.first(boot.fn("read").call(luan,uri));
 		} catch(LuanException e) {
 			return null;
 		} finally {