diff src/luan/lib/PackageLib.java @ 130:0594c132888b

cleanup git-svn-id: https://luan-java.googlecode.com/svn/trunk@131 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Tue, 10 Jun 2014 02:43:40 +0000
parents f0a4abe58593
children 3119326260ea
line wrap: on
line diff
--- a/src/luan/lib/PackageLib.java	Mon Jun 09 09:16:16 2014 +0000
+++ b/src/luan/lib/PackageLib.java	Tue Jun 10 02:43:40 2014 +0000
@@ -55,11 +55,11 @@
 				searchers = new LuanTable(Collections.<Object>singletonList(preloadSearcher));
 			for( Object s : searchers.asList() ) {
 				LuanFunction searcher = (LuanFunction)s;
-				Object[] a = Luan.array(luan.JAVA.call(searcher,"<searcher>",new Object[]{modName}));
+				Object[] a = Luan.array(luan.call(searcher,"<searcher>",new Object[]{modName}));
 				if( a.length >= 1 && a[0] instanceof LuanFunction ) {
 					LuanFunction loader = (LuanFunction)a[0];
 					a[0] = modName;
-					mod = Luan.first(luan.JAVA.call(loader,"<require \""+modName+"\">",a));
+					mod = Luan.first(luan.call(loader,"<require \""+modName+"\">",a));
 					if( mod != null ) {
 						loaded.put(modName,mod);
 					} else {
@@ -71,7 +71,7 @@
 				}
 			}
 			if( mod == null )
-				throw luan.JAVA.exception( "module '"+modName+"' not found" );
+				throw luan.exception( "module '"+modName+"' not found" );
 		}
 		return mod;
 	}
@@ -122,7 +122,7 @@
 				LuanFunction fn = BasicLib.load(luan,src,urlStr,false,false);
 				return fn.call(luan,args);
 			} catch(IOException e) {
-				throw luan.JAVA.exception(e);
+				throw luan.exception(e);
 			}
 		}
 	};