Mercurial Hosting > luan
comparison src/luan/lib/PackageLib.java @ 123:d7be9b3abf1a
minor - rename LuanFunction.EMPTY to NOTHING
git-svn-id: https://luan-java.googlecode.com/svn/trunk@124 21e917c8-12df-6dd8-5cb6-c86387c605b9
author | fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9> |
---|---|
date | Fri, 06 Jun 2014 01:14:18 +0000 |
parents | f5af13062b10 |
children | f537ff5e511d |
comparison
equal
deleted
inserted
replaced
122:d00f41edbbd6 | 123:d7be9b3abf1a |
---|---|
103 public static final LuanFunction fileSearcher = new LuanFunction() { | 103 public static final LuanFunction fileSearcher = new LuanFunction() { |
104 @Override public Object[] call(LuanState luan,Object[] args) { | 104 @Override public Object[] call(LuanState luan,Object[] args) { |
105 String modName = (String)args[0]; | 105 String modName = (String)args[0]; |
106 String path = (String)luan.get("Package.path"); | 106 String path = (String)luan.get("Package.path"); |
107 if( path==null ) | 107 if( path==null ) |
108 return LuanFunction.EMPTY; | 108 return LuanFunction.NOTHING; |
109 String file = search_path(modName,path); | 109 String file = search_path(modName,path); |
110 return file==null ? LuanFunction.EMPTY : new Object[]{fileLoader,file}; | 110 return file==null ? LuanFunction.NOTHING : new Object[]{fileLoader,file}; |
111 } | 111 } |
112 }; | 112 }; |
113 | 113 |
114 public static final LuanFunction preloadSearcher = new LuanFunction() { | 114 public static final LuanFunction preloadSearcher = new LuanFunction() { |
115 @Override public Object call(LuanState luan,Object[] args) { | 115 @Override public Object call(LuanState luan,Object[] args) { |
138 public static final LuanFunction javaFileSearcher = new LuanFunction() { | 138 public static final LuanFunction javaFileSearcher = new LuanFunction() { |
139 @Override public Object[] call(LuanState luan,Object[] args) { | 139 @Override public Object[] call(LuanState luan,Object[] args) { |
140 String modName = (String)args[0]; | 140 String modName = (String)args[0]; |
141 String path = (String)luan.get("Package.jpath"); | 141 String path = (String)luan.get("Package.jpath"); |
142 if( path==null ) | 142 if( path==null ) |
143 return LuanFunction.EMPTY; | 143 return LuanFunction.NOTHING; |
144 for( String s : path.split(";") ) { | 144 for( String s : path.split(";") ) { |
145 String file = s.replaceAll("\\?",modName); | 145 String file = s.replaceAll("\\?",modName); |
146 URL url = ClassLoader.getSystemResource(file); | 146 URL url = ClassLoader.getSystemResource(file); |
147 if( url != null ) { | 147 if( url != null ) { |
148 return new Object[]{javaFileLoader,url.toString()}; | 148 return new Object[]{javaFileLoader,url.toString()}; |
149 } | 149 } |
150 } | 150 } |
151 return LuanFunction.EMPTY; | 151 return LuanFunction.NOTHING; |
152 } | 152 } |
153 }; | 153 }; |
154 | 154 |
155 } | 155 } |