diff src/luan/lib/PackageLib.java @ 124:f537ff5e511d

minor cleanup git-svn-id: https://luan-java.googlecode.com/svn/trunk@125 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 06 Jun 2014 03:41:04 +0000
parents d7be9b3abf1a
children 0cd559a16758
line wrap: on
line diff
--- a/src/luan/lib/PackageLib.java	Fri Jun 06 01:14:18 2014 +0000
+++ b/src/luan/lib/PackageLib.java	Fri Jun 06 03:41:04 2014 +0000
@@ -16,7 +16,9 @@
 
 public final class PackageLib {
 
-	public static final String NAME = "Package";
+	public static void load(LuanState luan) throws LuanException {
+		luan.load("Package",LOADER);
+	}
 
 	public static final LuanFunction LOADER = new LuanFunction() {
 		@Override public Object call(LuanState luan,Object[] args) {
@@ -26,7 +28,7 @@
 			module.put("preload",luan.preload());
 			module.put("path","?.luan");
 			try {
-				global.put("require",require);
+				add( global, "require", LuanState.class, String.class );
 				add( module, "search_path", String.class, String.class );
 			} catch(NoSuchMethodException e) {
 				throw new RuntimeException(e);
@@ -40,15 +42,6 @@
 		}
 	};
 
-	public static final LuanFunction require;
-	static {
-		try {
-			require = new LuanJavaFunction(PackageLib.class.getMethod("require", LuanState.class, String.class),null);
-		} catch(NoSuchMethodException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	private static void add(LuanTable t,String method,Class<?>... parameterTypes) throws NoSuchMethodException {
 		t.put( method, new LuanJavaFunction(PackageLib.class.getMethod(method,parameterTypes),null) );
 	}