diff src/luan/LuanState.java @ 135:3119326260ea

revert rev 125 and only preload Java git-svn-id: https://luan-java.googlecode.com/svn/trunk@136 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Wed, 11 Jun 2014 06:30:46 +0000
parents 0594c132888b
children 7e160d2f6d9c
line wrap: on
line diff
--- a/src/luan/LuanState.java	Wed Jun 11 05:24:11 2014 +0000
+++ b/src/luan/LuanState.java	Wed Jun 11 06:30:46 2014 +0000
@@ -141,17 +141,17 @@
 	public static LuanState newStandard() {
 		try {
 			LuanState luan = LuanCompiler.newLuanState();
-			BasicLib.load(luan);
-			PackageLib.load(luan);
-			MathLib.load(luan);
-			StringLib.load(luan);
-			TableLib.load(luan);
-			HtmlLib.load(luan);
-			BinaryLib.load(luan);
-			IoLib.load(luan);
-			ThreadLib.load(luan);
+			luan.load(BasicLib.NAME,BasicLib.LOADER);
+			luan.load(PackageLib.NAME,PackageLib.LOADER);
+			luan.load(MathLib.NAME,MathLib.LOADER);
+			luan.load(StringLib.NAME,StringLib.LOADER);
+			luan.load(TableLib.NAME,TableLib.LOADER);
+			luan.load(HtmlLib.NAME,HtmlLib.LOADER);
+			luan.load(BinaryLib.NAME,BinaryLib.LOADER);
+			luan.load(IoLib.NAME,IoLib.LOADER);
+			luan.load(ThreadLib.NAME,ThreadLib.LOADER);
 			BasicLib.do_java_resource(luan,"luan/lib/init.luan");
-			JavaLib.load(luan);
+			luan.preload.put(JavaLib.NAME,JavaLib.LOADER);
 			return luan;
 		} catch(LuanException e) {
 			throw new RuntimeException(e);