Mercurial Hosting > luan

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace java() with require "java"
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 20 Mar 2019 17:03:29 -0600
parents e0cf0d108a77
children 56fb5cd8228d
comparison
equal deleted inserted replaced
1352:1604d7f36f3a 1353:8d95711f6615
31 } catch(IllegalAccessException e) { 31 } catch(IllegalAccessException e) {
32 throw new RuntimeException(e); 32 throw new RuntimeException(e);
33 } catch(InvocationTargetException e) { 33 } catch(InvocationTargetException e) {
34 throw new RuntimeException(e); 34 throw new RuntimeException(e);
35 } 35 }
36 closure.upValues[0].o = JavaLuan.javaFn(luan); 36 closure.upValues[0].o = PackageLuan.requireFn(luan);
37 closure.upValues[1].o = PackageLuan.requireFn(luan);
38 if( env != null ) { 37 if( env != null ) {
39 closure.upValues[2].o = env; 38 closure.upValues[1].o = env;
40 env.closure = closure; 39 env.closure = closure;
41 } 40 }
42 return closure; 41 return closure;
43 } 42 }
44 43
55 return cls; 54 return cls;
56 } 55 }
57 56
58 private static Class getClass(String sourceText,String sourceName,LuanTable env) throws LuanException { 57 private static Class getClass(String sourceText,String sourceName,LuanTable env) throws LuanException {
59 LuanParser parser = new LuanParser(sourceText,sourceName); 58 LuanParser parser = new LuanParser(sourceText,sourceName);
60 parser.addVar( "java" );
61 parser.addVar( "require" ); 59 parser.addVar( "require" );
62 if( env != null ) parser.addVar( "_ENV" ); 60 if( env != null ) parser.addVar( "_ENV" );
63 try { 61 try {
64 return parser.RequiredModule(); 62 return parser.RequiredModule();
65 } catch(ParseException e) { 63 } catch(ParseException e) {
68 } 66 }
69 } 67 }
70 68
71 public static String toJava(String sourceText,String sourceName) throws LuanException { 69 public static String toJava(String sourceText,String sourceName) throws LuanException {
72 LuanParser parser = new LuanParser(sourceText,sourceName); 70 LuanParser parser = new LuanParser(sourceText,sourceName);
73 parser.addVar( "java" );
74 parser.addVar( "require" ); 71 parser.addVar( "require" );
75 try { 72 try {
76 return parser.RequiredModuleSource(); 73 return parser.RequiredModuleSource();
77 } catch(ParseException e) { 74 } catch(ParseException e) {
78 throw new LuanException( e.getFancyMessage() ); 75 throw new LuanException( e.getFancyMessage() );