diff src/luan/lib/BasicLib.java @ 143:fcb81fa2df0d

handle urls and java resources as files git-svn-id: https://luan-java.googlecode.com/svn/trunk@144 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 13 Jun 2014 19:04:05 +0000
parents 05f8c21160ef
children f99fd64291b3
line wrap: on
line diff
--- a/src/luan/lib/BasicLib.java	Fri Jun 13 17:05:31 2014 +0000
+++ b/src/luan/lib/BasicLib.java	Fri Jun 13 19:04:05 2014 +0000
@@ -50,9 +50,6 @@
 				add( global, "to_string", LuanState.class, Object.class );
 				add( global, "type", Object.class );
 				global.put( "_VERSION", Luan.version );
-				add( module, "do_java_resource", LuanState.class, String.class );
-				add( module, "load_java_resource", LuanState.class, String.class );
-//				add( module, "new_luan" );
 				add( module, "values", new Object[0].getClass() );
 			} catch(NoSuchMethodException e) {
 				throw new RuntimeException(e);
@@ -82,32 +79,18 @@
 
 	public static LuanFunction load_file(LuanState luan,String fileName) throws LuanException {
 		try {
-			String src = fileName==null ? Utils.readAll(new InputStreamReader(System.in)) : new IoLib.LuanFile(fileName).read_text();
+			String src = fileName==null ? Utils.readAll(new InputStreamReader(System.in)) : IoLib.luanIo(luan,fileName).read_text();
 			return load(luan,src,fileName,false,false);
 		} catch(IOException e) {
 			throw luan.exception(e);
 		}
 	}
 
-	public static LuanFunction load_java_resource(LuanState luan,String path) throws LuanException {
-		try {
-			String src = new IoLib.LuanUrl(IoLib.java_resource_to_url(path)).read_text();
-			return load(luan,src,path,false,false);
-		} catch(IOException e) {
-			throw luan.exception(e);
-		}
-	}
-
 	public static Object do_file(LuanState luan,String fileName) throws LuanException {
 		LuanFunction fn = load_file(luan,fileName);
 		return luan.call(fn);
 	}
 
-	public static Object do_java_resource(LuanState luan,String path) throws LuanException {
-		LuanFunction fn = load_java_resource(luan,path);
-		return luan.call(fn);
-	}
-
 	private static LuanFunction pairs(final Iterator<Map.Entry<Object,Object>> iter) {
 		return new LuanFunction() {
 			@Override public Object[] call(LuanState luan,Object[] args) {
@@ -240,9 +223,5 @@
 			}
 		};
 	}
-/*
-	public static LuanTable new_luan() {
-		return LuanState.newStandard().global();
-	}
-*/
+
 }