Mercurial Hosting > luan
diff src/luan/lib/JavaLib.java @ 112:f5af13062b10
fix previous rev
git-svn-id: https://luan-java.googlecode.com/svn/trunk@113 21e917c8-12df-6dd8-5cb6-c86387c605b9
author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
---|---|
date | Fri, 23 May 2014 22:52:39 +0000 |
parents | 3c404a296995 |
children | f1bf2890d80f |
line wrap: on
line diff
--- a/src/luan/lib/JavaLib.java Fri May 23 20:40:05 2014 +0000 +++ b/src/luan/lib/JavaLib.java Fri May 23 22:52:39 2014 +0000 @@ -30,7 +30,7 @@ public static final String NAME = "Java"; public static final LuanFunction LOADER = new LuanFunction() { - @Override public Object[] call(LuanState luan,Object[] args) { + @Override public Object call(LuanState luan,Object[] args) { luan.addMetatableGetter(mg); LuanTable module = new LuanTable(); LuanTable global = luan.global(); @@ -41,22 +41,22 @@ throw new RuntimeException(e); } luan.searchers().add(javaSearcher); - return new Object[]{module}; + return module; } }; public static final LuanFunction javaSearcher = new LuanFunction() { - @Override public Object[] call(LuanState luan,Object[] args) throws LuanException { + @Override public Object call(LuanState luan,Object[] args) throws LuanException { String modName = (String)args[0]; final Static s = JavaLib.getClass(luan,modName); if( s==null ) - return LuanFunction.EMPTY; + return null; LuanFunction loader = new LuanFunction() { - @Override public Object[] call(LuanState luan,Object[] args) { - return new Object[]{s}; + @Override public Object call(LuanState luan,Object[] args) { + return s; } }; - return new Object[]{loader}; + return loader; } }; @@ -368,7 +368,7 @@ } } - @Override public Object[] call(LuanState luan,Object[] args) throws LuanException { + @Override public Object call(LuanState luan,Object[] args) throws LuanException { for( LuanJavaFunction fn : fnMap.get(args.length) ) { try { return fn.rawCall(luan,args);