diff src/luan/impl/LuanCompiler.java @ 1353:8d95711f6615

replace java() with require "java"
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 20 Mar 2019 17:03:29 -0600
parents e0cf0d108a77
children 56fb5cd8228d
line wrap: on
line diff
--- a/src/luan/impl/LuanCompiler.java	Sun Mar 10 18:25:51 2019 -0600
+++ b/src/luan/impl/LuanCompiler.java	Wed Mar 20 17:03:29 2019 -0600
@@ -33,10 +33,9 @@
 		} catch(InvocationTargetException e) {
 			throw new RuntimeException(e);
 		}
-		closure.upValues[0].o = JavaLuan.javaFn(luan);
-		closure.upValues[1].o = PackageLuan.requireFn(luan);
+		closure.upValues[0].o = PackageLuan.requireFn(luan);
 		if( env != null ) {
-			closure.upValues[2].o = env;
+			closure.upValues[1].o = env;
 			env.closure = closure;
 		}
 		return closure;
@@ -57,7 +56,6 @@
 
 	private static Class getClass(String sourceText,String sourceName,LuanTable env) throws LuanException {
 		LuanParser parser = new LuanParser(sourceText,sourceName);
-		parser.addVar( "java" );
 		parser.addVar( "require" );
 		if( env != null )  parser.addVar( "_ENV" );
 		try {
@@ -70,7 +68,6 @@
 
 	public static String toJava(String sourceText,String sourceName) throws LuanException {
 		LuanParser parser = new LuanParser(sourceText,sourceName);
-		parser.addVar( "java" );
 		parser.addVar( "require" );
 		try {
 			return parser.RequiredModuleSource();