diff core/src/luan/LuanState.java @ 320:fed1893821bf

remove global namespace git-svn-id: https://luan-java.googlecode.com/svn/trunk@321 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 06 Feb 2015 21:54:41 +0000
parents f6db49c294a7
children 39c4ac11a58a
line wrap: on
line diff
--- a/core/src/luan/LuanState.java	Thu Feb 05 21:55:49 2015 +0000
+++ b/core/src/luan/LuanState.java	Fri Feb 06 21:54:41 2015 +0000
@@ -21,14 +21,10 @@
 	final List<StackTraceElement> stackTrace = new ArrayList<StackTraceElement>();
 
 	private LuanTableImpl registry;
-	private LuanTableImpl global;
 	private LuanTableImpl metatable;  // generic metatable
 
 	protected LuanState() {
 		registry = new LuanTableImpl();
-		global = new LuanTableImpl();
-		global.put("_G",global);
-		global.put("java",JavaLuan.javaFn);
 		metatable = newMetatable();
 	}
 
@@ -36,7 +32,6 @@
 
 	@Override public void deepenClone(LuanState clone,DeepCloner cloner) {
 		clone.registry = cloner.deepClone(registry);
-		clone.global = cloner.deepClone(global);
 		clone.metatable = cloner.deepClone(metatable);
 	}
 
@@ -47,33 +42,24 @@
 		return registry;
 	}
 
-	public final LuanTable global() {
-		return global;
-	}
-
 	public static LuanState newStandard() {
 		try {
 			LuanState luan = LuanCompiler.newLuanState();
 			PackageLuan.require(luan,"luan:Luan");
 			PackageLuan.require(luan,"luan:Io");
-//			BasicLuan.do_file(luan,"classpath:luan/init.luan");
 			return luan;
 		} catch(LuanException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	public final Object eval(String cmd) {
+	public final Object eval(String cmd) throws LuanException {
 		return eval(cmd,new LuanTableImpl());
 	}
 
-	public final Object eval(String cmd,LuanTable env) {
-		try {
-			LuanFunction fn = BasicLuan.load(this,cmd,"eval",env,true);
-			return call(fn);
-		} catch(LuanException e) {
-			throw new RuntimeException(e);
-		}
+	public final Object eval(String cmd,LuanTable env) throws LuanException {
+		LuanFunction fn = BasicLuan.load(this,cmd,"eval",env,true);
+		return call(fn);
 	}
 
 	public final LuanTable getMetatable(Object obj) {