diff core/src/luan/modules/BasicLuan.java @ 299:a74559240b4f

simplify PackageLuan and remove IO loading param git-svn-id: https://luan-java.googlecode.com/svn/trunk@300 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Tue, 16 Dec 2014 06:24:49 +0000
parents 899253043270
children db37d6aee4db
line wrap: on
line diff
--- a/core/src/luan/modules/BasicLuan.java	Tue Dec 16 03:51:56 2014 +0000
+++ b/core/src/luan/modules/BasicLuan.java	Tue Dec 16 06:24:49 2014 +0000
@@ -35,10 +35,10 @@
 	public static LuanFunction load_file(LuanState luan,String fileName,LuanTable env) throws LuanException {
 		if( fileName == null )
 			fileName = "stdin:";
-		LuanFunction fn = PackageLuan.loader(luan,fileName,false,env);
-		if( fn == null )
+		String src = PackageLuan.read(luan,fileName);
+		if( src == null )
 			throw luan.exception( "file '"+fileName+"' not found" );
-		return fn;
+		return load(luan,src,fileName,env,false);
 	}
 
 	public static Object do_file(LuanState luan,String fileName) throws LuanException {