Mercurial Hosting > luan
diff src/luan/lib/PackageLib.java @ 161:d310ebf4d6e7
add javaSearcher
git-svn-id: https://luan-java.googlecode.com/svn/trunk@162 21e917c8-12df-6dd8-5cb6-c86387c605b9
author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
---|---|
date | Thu, 19 Jun 2014 10:44:20 +0000 |
parents | 2e92f0a6fcac |
children | 01e9707a2fb0 |
line wrap: on
line diff
--- a/src/luan/lib/PackageLib.java Thu Jun 19 07:02:16 2014 +0000 +++ b/src/luan/lib/PackageLib.java Thu Jun 19 10:44:20 2014 +0000 @@ -15,6 +15,8 @@ public final class PackageLib { + private static final String jpath = "luan.lib.?Lib.LOADER"; + public static final LuanFunction LOADER = new LuanFunction() { @Override public Object call(LuanState luan,Object[] args) { LuanTable module = new LuanTable(); @@ -22,16 +24,19 @@ module.put("loaded",luan.loaded()); module.put("preload",luan.preload()); module.put("path","?.luan;java:luan/modules/?.luan"); + module.put("jpath",jpath); try { add( global, "require", LuanState.class, String.class ); - add( module, "get_loader", String.class ); + add( module, "load_lib", String.class ); add( module, "search_path", String.class, String.class ); + add( module, "search", LuanState.class, String.class ); } catch(NoSuchMethodException e) { throw new RuntimeException(e); } LuanTable searchers = luan.searchers(); searchers.add(preloadSearcher); searchers.add(fileSearcher); + searchers.add(javaSearcher); module.put("searchers",searchers); return module; } @@ -45,37 +50,47 @@ LuanTable loaded = luan.loaded(); Object mod = loaded.get(modName); if( mod == null ) { - List<Object> list = null; - String searchFor = modName; - LuanTable searchers = (LuanTable)luan.get("Package.searchers"); - if( searchers == null ) { - list = Collections.<Object>singletonList(preloadSearcher); + Object[] a = search(luan,modName); + if( a == null ) + throw luan.exception( "module '"+modName+"' not found" ); + LuanFunction loader = (LuanFunction)a[0]; + a[0] = modName; + mod = Luan.first(luan.call(loader,"<require \""+modName+"\">",a)); + if( mod != null ) { + loaded.put(modName,mod); } else { - list = searchers.asList(); + mod = loaded.get(modName); + if( mod==null ) + loaded.put(modName,true); } - for( Object s : list ) { - LuanFunction searcher = (LuanFunction)s; - Object[] a = Luan.array(luan.call(searcher,"<searcher>",new Object[]{searchFor})); - if( a.length >= 1 && a[0] instanceof LuanFunction ) { - LuanFunction loader = (LuanFunction)a[0]; - a[0] = modName; - mod = Luan.first(luan.call(loader,"<require \""+modName+"\">",a)); - if( mod != null ) { - loaded.put(modName,mod); - } else { - mod = loaded.get(modName); - if( mod==null ) - loaded.put(modName,true); - } - break; - } - } - if( mod == null ) - throw luan.exception( "module '"+modName+"' not found" ); } return mod; } + public static Object[] search(LuanState luan,String modName) throws LuanException { + List<Object> list = null; + LuanTable searchers = (LuanTable)luan.get("Package.searchers"); + if( searchers == null ) { + list = Collections.<Object>singletonList(javaSearcher); + } else { + list = searchers.asList(); + } + for( Object s : list ) { + LuanFunction searcher = (LuanFunction)s; + Object[] a = Luan.array(luan.call(searcher,"<searcher>",new Object[]{modName})); + if( a.length >= 1 && a[0] instanceof LuanFunction ) + return a; + } + return null; + } + + public static final LuanFunction preloadSearcher = new LuanFunction() { + @Override public Object call(LuanState luan,Object[] args) { + String modName = (String)args[0]; + return luan.preload().get(modName); + } + }; + public static String search_path(String name,String path) { for( String s : path.split(";") ) { String file = s.replaceAll("\\?",name); @@ -104,16 +119,45 @@ } }; - public static final LuanFunction preloadSearcher = new LuanFunction() { - @Override public Object call(LuanState luan,Object[] args) { + + public static final LuanFunction javaLoader = new LuanFunction() { + @Override public Object call(LuanState luan,Object[] args) throws LuanException { + try { + String objName = (String)args[1]; + LuanFunction fn = load_lib(objName); + return fn.call(luan,args); + } catch(ClassNotFoundException e) { + throw new RuntimeException(e); + } catch(NoSuchFieldException e) { + throw new RuntimeException(e); + } catch(IllegalAccessException e) { + throw new RuntimeException(e); + } + } + }; + + public static final LuanFunction javaSearcher = new LuanFunction() { + @Override public Object[] call(LuanState luan,Object[] args) { String modName = (String)args[0]; - return luan.preload().get(modName); + String path = (String)luan.get("Package.jpath"); + if( path==null ) + path = jpath; + for( String s : path.split(";") ) { + String objName = s.replaceAll("\\?",modName); + try { + load_lib(objName); // throws exception if not found + return new Object[]{javaLoader,objName}; + } catch(ClassNotFoundException e) { + } catch(NoSuchFieldException e) { + } catch(IllegalAccessException e) { + } + } + return LuanFunction.NOTHING; } }; - - public static LuanFunction get_loader(String path) + public static LuanFunction load_lib(String path) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException { int i = path.lastIndexOf('.');