Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5207: Refactor compiler to use final fields and simplify initialization 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5207@1522972 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2013-09-13 15:22:41 +00:00
parent 01b002b510
commit 699651904d
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java
View File

@ -20,7 +20,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -136,10 +136,10 @@ public class JavascriptCompiler {
private static final int MAX_SOURCE_LENGTH = 16384;
private ClassWriter classWriter;
private final String sourceText;
private final Map<String, Integer> externalsMap = new LinkedHashMap<String, Integer>();
private final ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
private MethodVisitor methodVisitor;
private Map<String, Integer> externalsMap;
private List<String> externalsList;
/**
* Compiles the given expression.
@ -149,7 +149,7 @@ public class JavascriptCompiler {
* @throws ParseException on failure to compile
*/
public static Expression compile(String sourceText) throws ParseException {
return new JavascriptCompiler().compileExpression(sourceText);
return new JavascriptCompiler(sourceText).compileExpression();
}
/**
@ -166,7 +166,11 @@ public class JavascriptCompiler {
/**
* Constructs a compiler for expressions.
*/
private JavascriptCompiler() {
private JavascriptCompiler(String sourceText) {
if (sourceText == null) {
throw new NullPointerException();
}
this.sourceText = sourceText;
}
/**
@ -176,31 +180,24 @@ public class JavascriptCompiler {
* @return A new compiled expression
* @throws ParseException on failure to compile
*/
private Expression compileExpression(String sourceText) throws ParseException {
if (sourceText == null) {
throw new NullPointerException();
}
private Expression compileExpression() throws ParseException {
try {
externalsMap = new HashMap<String, Integer>();
externalsList = new ArrayList<String>();
Tree antlrTree = getAntlrComputedExpressionTree();
Tree antlrTree = getAntlrComputedExpressionTree(sourceText);
beginCompile(sourceText);
beginCompile();
recursiveCompile(antlrTree, ComputedType.DOUBLE);
endCompile();
Class<? extends Expression> evaluatorClass = new Loader(getClass().getClassLoader())
.define(COMPILED_EXPRESSION_CLASS, classWriter.toByteArray());
Constructor<? extends Expression> constructor = evaluatorClass.getConstructor(String.class, String[].class);
return constructor.newInstance(sourceText, externalsList.toArray(new String[externalsList.size()]));
return constructor.newInstance(sourceText, externalsMap.keySet().toArray(new String[externalsMap.size()]));
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException exception) {
throw new IllegalStateException("An internal error occurred attempting to compile the expression (" + sourceText + ").", exception);
}
}
private void beginCompile(String sourceText) {
classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
private void beginCompile() {
classWriter.visit(CLASSFILE_VERSION, ACC_PUBLIC + ACC_SUPER + ACC_FINAL, COMPILED_EXPRESSION_INTERNAL,
null, EXPRESSION_INTERNAL, null);
String clippedSourceText = (sourceText.length() <= MAX_SOURCE_LENGTH) ? sourceText : (sourceText.substring(0, MAX_SOURCE_LENGTH - 3) + "...");
@ -246,8 +243,7 @@ public class JavascriptCompiler {
if (externalsMap.containsKey(text)) {
index = externalsMap.get(text);
} else {
index = externalsList.size();
externalsList.add(text);
index = externalsMap.size();
externalsMap.put(text, index);
}
@ -625,8 +621,8 @@ public class JavascriptCompiler {
classWriter.visitEnd();
}
private static Tree getAntlrComputedExpressionTree(String expression) throws ParseException {
CharStream input = new ANTLRStringStream(expression);
private Tree getAntlrComputedExpressionTree() throws ParseException {
CharStream input = new ANTLRStringStream(sourceText);
JavascriptLexer lexer = new JavascriptLexer(input);
CommonTokenStream tokens = new CommonTokenStream(lexer);
JavascriptParser parser = new JavascriptParser(tokens);