Cleanup Methodwriter

Author: stu-elastic

modules/lang-painless/src/main/java/org/elasticsearch/painless/MethodWriter.java

@@ -104,18 +104,15 @@
 public final class MethodWriter extends GeneratorAdapter {
     private final BitSet statements;
     private final CompilerSettings settings;
-    private final ScriptClassInfo scriptClassInfo;
 
     private final Deque<List<Type>> stringConcatArgs =
         (INDY_STRING_CONCAT_BOOTSTRAP_HANDLE == null) ?  null : new ArrayDeque<>();
 
-    public MethodWriter(int access, Method method, ClassVisitor cw, BitSet statements, ScriptClassInfo scriptClassInfo,
-                        CompilerSettings settings) {
+    public MethodWriter(int access, Method method, ClassVisitor cw, BitSet statements, CompilerSettings settings) {
         super(Opcodes.ASM5, cw.visitMethod(access, method.getName(), method.getDescriptor(), null, null),
                 access, method.getName(), method.getDescriptor());
 
         this.statements = statements;
-        this.scriptClassInfo = scriptClassInfo;
         this.settings = settings;
     }
 

modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java

@@ -106,8 +106,6 @@ public void visitFunction(SFunction userFunctionNode, ScriptScope scriptScope) {
      * Visits an expression that is also considered a statement.
      * Checks: control flow, type validation
      *
-     * @param userExpressionNode
-     * @param semanticScope
      */
     @Override
     public void visitExpression(SExpression userExpressionNode, SemanticScope semanticScope) {
@@ -143,9 +141,7 @@ public void visitExpression(SExpression userExpressionNode, SemanticScope semant
      * Visits a return statement and casts the value to the return type if possible.
      * TODO(stu): rewrite
      * Checks: type validation
-     *
-     * @param userReturnNode
-     * @param semanticScope
+
      */
     @Override
     public void visitReturn(SReturn userReturnNode, SemanticScope semanticScope) {

modules/lang-painless/src/test/java/org/elasticsearch/painless/FactoryTests.java

@@ -295,7 +295,11 @@ public interface Factory {
         }
 
         public static final ScriptContext<FactoryTestConverterScript.Factory> CONTEXT =
-            new ScriptContext<>("test", FactoryTestScript.Factory.class);
+            new ScriptContext<>("test", FactoryTestConverterScript.Factory.class);
+
+        public long[] convertFromInt(int i) {
+            return new long[]{i};
+        }
     }
 
 
@@ -305,9 +309,12 @@ public void testConverterFactory() {
         FactoryTestConverterScript script = factory.newInstance(Collections.singletonMap("test", 2));
         assertEquals(new long[]{2}, script.execute(2));
         script = factory.newInstance(Collections.singletonMap("test", 3));
-        assertEquals(new long[]{3}, script.execute(2));
+        assertEquals(new long[]{3}, script.execute(3));
 
         factory = scriptEngine.compile("factory_test", "return test + 1;", FactoryTestConverterScript.CONTEXT, Collections.emptyMap());
         assertEquals(new long[]{1001}, script.execute(1000));
+
+        // TODO(stu): different conversion
+        // TODO(stu): return long array
     }
 }