--- a/src/luan/lib/PackageLib.java	Mon Feb 25 03:53:54 2013 +0000
+++ b/src/luan/lib/PackageLib.java	Wed Feb 27 08:03:51 2013 +0000
@@ -4,10 +4,12 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.Collections;
 import luan.Luan;
 import luan.LuanState;
 import luan.LuanTable;
 import luan.LuanFunction;
+import luan.LuanLoader;
 import luan.LuanJavaFunction;
 import luan.LuanElement;
 import luan.LuanException;
@@ -17,22 +19,23 @@
 
 	public static final String NAME = "package";
 
-	public static final LuanFunction LOADER = new LuanFunction() {
-		public Object[] call(LuanState luan,Object[] args) throws LuanException {
-			LuanTable global = luan.global();
+	public static final LuanLoader LOADER = new LuanLoader() {
+		@Override protected void load(LuanState luan) {
 			LuanTable module = new LuanTable();
+			LuanTable global = new LuanTable();
+			module.put( LuanState._G, global );
 			module.put("loaded",luan.loaded());
 			module.put("preload",luan.preload());
-//			module.put("path","?.lua");
+			module.put("path","?.lua");
 			try {
 				add( global, "require", LuanState.class, String.class );
-				add( module, "module", LuanState.class, String.class );
+				add( global, "module", LuanState.class, String.class );
 				add( module, "search_path", String.class, String.class );
 			} catch(NoSuchMethodException e) {
 				throw new RuntimeException(e);
 			}
 			module.put("searchers",new LuanTable(Arrays.<Object>asList(preloadSearcher,fileSearcher,javaFileSearcher)));
-			return new Object[]{module};
+			luan.loaded().put(NAME,module);
 		}
 	};
 
@@ -40,32 +43,39 @@
 		t.put( method, new LuanJavaFunction(PackageLib.class.getMethod(method,parameterTypes),null) );
 	}
 
-	public static void require(LuanState luan,String modName) throws LuanException {
-		Object mod = module(luan,modName);
-		if( mod instanceof LuanTable )
-			luan.global().put(modName,mod);
+	public static void module(LuanState luan,String modName) throws LuanException {
+		LuanTable module = new LuanTable();
+		luan.currentEnvironment().put(modName,module);
+		luan.loaded().put(modName,module);
 	}
 
-	public static Object module(LuanState luan,String modName) throws LuanException {
-		Object mod = luan.loaded().get(modName);
+	public static void require(LuanState luan,String modName) throws LuanException {
+		require(luan,modName,luan.currentEnvironment());
+	}
+
+	public static void require(LuanState luan,String modName,LuanTable env) throws LuanException {
+		LuanTable mod = (LuanTable)luan.loaded().get(modName);
 		if( mod == null ) {
 			LuanTable searchers = (LuanTable)luan.get("package.searchers");
+			if( searchers == null )
+				searchers = new LuanTable(Collections.<Object>singletonList(preloadSearcher));
 			for( Object s : searchers.asList() ) {
 				LuanFunction searcher = (LuanFunction)s;
-				Object[] a = luan.call(searcher,LuanElement.JAVA,"searcher",modName);
+				Object[] a = luan.call(searcher,LuanElement.JAVA,"<searcher>",modName);
 				if( a.length >= 1 && a[0] instanceof LuanFunction ) {
 					LuanFunction loader = (LuanFunction)a[0];
-					Object extra = a.length >= 2 ? a[1] : null;
-					mod = Luan.first(luan.call(loader,LuanElement.JAVA,"loader",modName,extra));
-					if( mod == null )
-						mod = true;
-					luan.loaded().put(modName,mod);
+					luan.call(loader,LuanElement.JAVA,"<loader>");
+					mod = (LuanTable)luan.loaded().get(modName);
+					if( mod==null )
+						throw new LuanException( luan, LuanElement.JAVA, "module '"+modName+"' didn't define its module" );
+					break;
 				}
 			}
 			if( mod == null )
 				throw new LuanException( luan, LuanElement.JAVA, "module '"+modName+"' not found" );
 		}
-		return mod;
+		if( env != null )
+			env.put(modName,mod);
 	}
 
 	public static String search_path(String name,String path) {
@@ -77,12 +87,16 @@
 		return null;
 	}
 
-	private static final LuanFunction fileLoader = new LuanFunction() {
-		public Object[] call(LuanState luan,Object[] args) throws LuanException {
-			String modName = (String)args[0];
-			String fileName = (String)args[1];
-			LuanFunction fn = BasicLib.load_file(luan,fileName);
-			return luan.call(fn,LuanElement.JAVA,modName,args);
+	private static final class FileLoader extends LuanLoader {
+		private final String fileName;
+
+		FileLoader(String fileName) {
+			this.fileName = fileName;
+		}
+
+		@Override protected void load(LuanState luan) throws LuanException {
+			LuanFunction fn = BasicLib.load_file(luan,fileName,null);
+			fn.call(luan,EMPTY);
 		}
 	};
 
@@ -91,9 +105,9 @@
 			String modName = (String)args[0];
 			String path = (String)luan.get("package.path");
 			if( path==null )
-				return LuanFunction.EMPTY_RTN;
+				return LuanFunction.EMPTY;
 			String file = search_path(modName,path);
-			return file==null ? LuanFunction.EMPTY_RTN : new Object[]{fileLoader,file};
+			return file==null ? LuanFunction.EMPTY : new Object[]{new FileLoader(file)};
 		}
 	};
 
@@ -108,14 +122,18 @@
 
 
 
-	private static final LuanFunction javaFileLoader = new LuanFunction() {
-		public Object[] call(LuanState luan,Object[] args) throws LuanException {
+	private static final class JavaFileLoader extends LuanLoader {
+		private final URL url;
+
+		JavaFileLoader(URL url) {
+			this.url = url;
+		}
+
+		@Override protected void load(LuanState luan) throws LuanException {
 			try {
-				String modName = (String)args[0];
-				URL url = (URL)args[1];
 				String src = Utils.read(url);
-				LuanFunction fn = BasicLib.load(luan,src,url.toString());
-				return luan.call(fn,LuanElement.JAVA,modName,args);
+				LuanFunction fn = BasicLib.load(luan,src,url.toString(),null);
+				fn.call(luan,EMPTY);
 			} catch(IOException e) {
 				throw new LuanException(luan,LuanElement.JAVA,e);
 			}
@@ -127,15 +145,15 @@
 			String modName = (String)args[0];
 			String path = (String)luan.get("package.jpath");
 			if( path==null )
-				return LuanFunction.EMPTY_RTN;
+				return LuanFunction.EMPTY;
 			for( String s : path.split(";") ) {
 				String file = s.replaceAll("\\?",modName);
 				URL url = ClassLoader.getSystemResource(file);
 				if( url != null ) {
-					return new Object[]{javaFileLoader,url};
+					return new Object[]{new JavaFileLoader(url)};
 				}
 			}
-			return LuanFunction.EMPTY_RTN;
+			return LuanFunction.EMPTY;
 		}
 	};