Mercurial Hosting > luan
diff core/src/luan/modules/BasicLuan.java @ 296:7ea6dfdf81ba
add env param to load_file()
git-svn-id: https://luan-java.googlecode.com/svn/trunk@297 21e917c8-12df-6dd8-5cb6-c86387c605b9
| author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
|---|---|
| date | Mon, 15 Dec 2014 08:03:32 +0000 |
| parents | 9a0cc6d9b27b |
| children | 899253043270 |
line wrap: on
line diff
--- a/core/src/luan/modules/BasicLuan.java Fri Dec 12 09:45:13 2014 +0000 +++ b/core/src/luan/modules/BasicLuan.java Mon Dec 15 08:03:32 2014 +0000 @@ -37,7 +37,7 @@ add( module, "get_metatable", LuanState.class, Object.class ); add( module, "ipairs", LuanState.class, LuanTable.class ); add( module, "load", LuanState.class, String.class, String.class, LuanTable.class, Boolean.class ); - add( module, "load_file", LuanState.class, String.class ); + add( module, "load_file", LuanState.class, String.class, LuanTable.class ); add( module, "pairs", LuanState.class, LuanTable.class ); add( module, "range", LuanState.class, Double.TYPE, Double.TYPE, Double.class ); add( module, "raw_equal", Object.class, Object.class ); @@ -74,17 +74,17 @@ return LuanCompiler.compile(luan,new LuanSource(sourceName,text),env,allowExpr); } - public static LuanFunction load_file(LuanState luan,String fileName) throws LuanException { + 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); + LuanFunction fn = PackageLuan.loader(luan,fileName,false,env); if( fn == null ) throw luan.exception( "file '"+fileName+"' not found" ); return fn; } public static Object do_file(LuanState luan,String fileName) throws LuanException { - LuanFunction fn = load_file(luan,fileName); + LuanFunction fn = load_file(luan,fileName,null); return luan.call(fn); }