http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java index d439316..a602d5e 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryIntExpressionHelper.java @@ -24,7 +24,8 @@ import org.codehaus.groovy.runtime.BytecodeInterface8; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; -import static org.codehaus.groovy.syntax.Types.*; +import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL; +import static org.codehaus.groovy.syntax.Types.COMPARE_TO; import static org.objectweb.asm.Opcodes.*; public class BinaryIntExpressionHelper extends BinaryExpressionWriter {
http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java index 90bb8b9..0e83565 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryLongExpressionHelper.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.classgen.asm; -import static org.objectweb.asm.Opcodes.*; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.runtime.BytecodeInterface8; import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.*; + /** * @author <a href="mailto:[email protected]";>Jochen "blackdrag" Theodorou</a> */ http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java index b9bc8e2..d9eea08 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BytecodeHelper.java @@ -18,7 +18,12 @@ */ package org.codehaus.groovy.classgen.asm; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CompileUnit; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.decompiled.DecompiledClassNode; import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java index 4983b4b..bbec7a2 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java @@ -21,13 +21,19 @@ package org.codehaus.groovy.classgen.asm; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.InterfaceHelperClassNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.runtime.callsite.CallSite; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; import static org.objectweb.asm.Opcodes.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java b/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java index 93a7fe7..a424041 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/ClosureWriter.java @@ -18,11 +18,6 @@ */ package org.codehaus.groovy.classgen.asm; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.ast.ASTNode; import org.codehaus.groovy.ast.ClassHelper; @@ -52,6 +47,11 @@ import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.Verifier; import org.objectweb.asm.MethodVisitor; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import static org.objectweb.asm.Opcodes.*; public class ClosureWriter { http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java index acd245c..33edf6f 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/InvocationWriter.java @@ -18,8 +18,26 @@ */ package org.codehaus.groovy.classgen.asm; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.ArrayExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.SpreadExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.TupleExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.tools.WideningCategories; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.asm.OptimizingStatementWriter.StatementMeta; @@ -31,7 +49,13 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.TreeMap; import static org.objectweb.asm.Opcodes.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java b/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java index d2c2bc6..bc40952 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java +++ b/src/main/org/codehaus/groovy/classgen/asm/MethodCaller.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.classgen.asm; -import java.lang.reflect.Method; - import org.codehaus.groovy.classgen.ClassGeneratorException; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; +import java.lang.reflect.Method; + /** * A helper class to invoke methods more easily in ASM * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java b/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java index 416ce07..a999d9b 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/MopWriter.java @@ -18,6 +18,12 @@ */ package org.codehaus.groovy.classgen.asm; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.objectweb.asm.MethodVisitor; + import java.lang.reflect.Modifier; import java.util.Collections; import java.util.HashMap; @@ -27,12 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.codehaus.groovy.ast.ClassHelper; -import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.ast.MethodNode; -import org.codehaus.groovy.ast.Parameter; -import org.objectweb.asm.MethodVisitor; - import static org.objectweb.asm.Opcodes.*; public class MopWriter { http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java b/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java index fa1e78b..c263228 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java +++ b/src/main/org/codehaus/groovy/classgen/asm/OperandStack.java @@ -18,13 +18,12 @@ */ package org.codehaus.groovy.classgen.asm; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Variable; import org.codehaus.groovy.ast.expr.CastExpression; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.Expression; @@ -33,6 +32,11 @@ import org.codehaus.groovy.classgen.ClassGeneratorException; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + import static org.objectweb.asm.Opcodes.*; public class OperandStack { http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java index 6ebeb11..9621e3d 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java @@ -18,13 +18,39 @@ */ package org.codehaus.groovy.classgen.asm; -import java.util.LinkedList; -import java.util.List; - -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; -import org.codehaus.groovy.ast.stmt.*; import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.VariableScope; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PostfixExpression; +import org.codehaus.groovy.ast.expr.PrefixExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.TupleExpression; +import org.codehaus.groovy.ast.expr.UnaryMinusExpression; +import org.codehaus.groovy.ast.expr.UnaryPlusExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; +import org.codehaus.groovy.ast.stmt.BlockStatement; +import org.codehaus.groovy.ast.stmt.DoWhileStatement; +import org.codehaus.groovy.ast.stmt.ExpressionStatement; +import org.codehaus.groovy.ast.stmt.ForStatement; +import org.codehaus.groovy.ast.stmt.IfStatement; +import org.codehaus.groovy.ast.stmt.ReturnStatement; +import org.codehaus.groovy.ast.stmt.Statement; +import org.codehaus.groovy.ast.stmt.WhileStatement; import org.codehaus.groovy.ast.tools.ParameterUtils; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.Verifier; @@ -34,10 +60,14 @@ import org.codehaus.groovy.syntax.Types; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; -import static org.objectweb.asm.Opcodes.*; -import static org.codehaus.groovy.classgen.asm.BinaryExpressionMultiTypeDispatcher.*; +import java.util.LinkedList; +import java.util.List; + import static org.codehaus.groovy.ast.ClassHelper.*; import static org.codehaus.groovy.ast.tools.WideningCategories.*; +import static org.codehaus.groovy.classgen.asm.BinaryExpressionMultiTypeDispatcher.typeMap; +import static org.codehaus.groovy.classgen.asm.BinaryExpressionMultiTypeDispatcher.typeMapKeyNames; +import static org.objectweb.asm.Opcodes.*; /** * A class to write out the optimized statements http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java index fa79468..0ebd9b4 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/UnaryExpressionHelper.java @@ -19,7 +19,11 @@ package org.codehaus.groovy.classgen.asm; import org.codehaus.groovy.ast.ClassHelper; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.NotExpression; +import org.codehaus.groovy.ast.expr.UnaryMinusExpression; +import org.codehaus.groovy.ast.expr.UnaryPlusExpression; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java index 963fa04..d0aac70 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/indy/IndyCallSiteWriter.java @@ -19,7 +19,8 @@ package org.codehaus.groovy.classgen.asm.indy; import org.codehaus.groovy.ast.expr.Expression; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.CallSiteWriter; +import org.codehaus.groovy.classgen.asm.WriterController; /** * Dummy class used by the indy implementation. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java b/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java index 9cd5ac3..29ca616 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/indy/InvokeDynamicWriter.java @@ -44,15 +44,8 @@ import java.lang.invoke.MethodHandles.Lookup; import java.lang.invoke.MethodType; import static org.codehaus.groovy.classgen.asm.BytecodeHelper.getTypeDescription; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES.CAST; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES.GET; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES.INIT; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES.METHOD; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.GROOVY_OBJECT; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.IMPLICIT_THIS; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.SAFE_NAVIGATION; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.SPREAD_CALL; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.THIS_CALL; +import static org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES.*; +import static org.codehaus.groovy.vmplugin.v7.IndyInterface.*; import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java index 90c3147..7a00da1 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java @@ -28,12 +28,32 @@ import org.codehaus.groovy.ast.InnerClassNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.decompiled.DecompiledClassNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.ArrayExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.ExpressionTransformer; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.TupleExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.Verifier; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.BytecodeHelper; +import org.codehaus.groovy.classgen.asm.CallSiteWriter; +import org.codehaus.groovy.classgen.asm.CompileStack; +import org.codehaus.groovy.classgen.asm.ExpressionAsVariableSlot; +import org.codehaus.groovy.classgen.asm.InvocationWriter; +import org.codehaus.groovy.classgen.asm.MethodCallerMultiAdapter; +import org.codehaus.groovy.classgen.asm.OperandStack; +import org.codehaus.groovy.classgen.asm.TypeChooser; +import org.codehaus.groovy.classgen.asm.VariableSlotLoader; +import org.codehaus.groovy.classgen.asm.WriterController; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.syntax.SyntaxException; import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys; @@ -51,9 +71,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import static org.codehaus.groovy.ast.ClassHelper.CLOSURE_TYPE; -import static org.codehaus.groovy.ast.ClassHelper.OBJECT_TYPE; -import static org.codehaus.groovy.ast.ClassHelper.getWrapper; +import static org.codehaus.groovy.ast.ClassHelper.*; import static org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys.PRIVATE_BRIDGE_METHODS; import static org.objectweb.asm.Opcodes.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java index 1339d4e..b6e64d4 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java @@ -18,13 +18,36 @@ */ package org.codehaus.groovy.classgen.asm.sc; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.PropertyNode; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.ast.tools.WideningCategories; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.BinaryExpressionMultiTypeDispatcher; +import org.codehaus.groovy.classgen.asm.BinaryExpressionWriter; +import org.codehaus.groovy.classgen.asm.BytecodeHelper; +import org.codehaus.groovy.classgen.asm.CompileStack; +import org.codehaus.groovy.classgen.asm.OperandStack; +import org.codehaus.groovy.classgen.asm.TypeChooser; +import org.codehaus.groovy.classgen.asm.VariableSlotLoader; +import org.codehaus.groovy.classgen.asm.WriterController; import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.syntax.Token; import org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java index e57bdbd..7a2ea93 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java @@ -19,11 +19,29 @@ package org.codehaus.groovy.classgen.asm.sc; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.PropertyNode; +import org.codehaus.groovy.ast.Variable; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.classgen.BytecodeExpression; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.BytecodeHelper; +import org.codehaus.groovy.classgen.asm.CallSiteWriter; +import org.codehaus.groovy.classgen.asm.CompileStack; +import org.codehaus.groovy.classgen.asm.OperandStack; +import org.codehaus.groovy.classgen.asm.TypeChooser; import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.syntax.SyntaxException; @@ -35,7 +53,11 @@ import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import static org.codehaus.groovy.ast.ClassHelper.*; import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java index dc8ff96..cbcd713 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/sc/StaticTypesUnaryExpressionHelper.java @@ -18,10 +18,13 @@ */ package org.codehaus.groovy.classgen.asm.sc; -import static org.codehaus.groovy.ast.ClassHelper.*; - import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression; +import org.codehaus.groovy.ast.expr.EmptyExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.NotExpression; +import org.codehaus.groovy.ast.expr.UnaryMinusExpression; +import org.codehaus.groovy.ast.expr.UnaryPlusExpression; import org.codehaus.groovy.classgen.BytecodeExpression; import org.codehaus.groovy.classgen.asm.TypeChooser; import org.codehaus.groovy.classgen.asm.UnaryExpressionHelper; @@ -30,6 +33,8 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; +import static org.codehaus.groovy.ast.ClassHelper.*; + /** * An unary expression helper which generates optimized bytecode depending on * the current type on top of the operand stack. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/CompilationUnit.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/CompilationUnit.java b/src/main/org/codehaus/groovy/control/CompilationUnit.java index 32f371e..64a1b43 100644 --- a/src/main/org/codehaus/groovy/control/CompilationUnit.java +++ b/src/main/org/codehaus/groovy/control/CompilationUnit.java @@ -20,11 +20,24 @@ package org.codehaus.groovy.control; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyRuntimeException; - import groovy.transform.CompilationUnitAware; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.classgen.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CompileUnit; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.classgen.AsmClassGenerator; +import org.codehaus.groovy.classgen.ClassCompletionVerifier; +import org.codehaus.groovy.classgen.EnumCompletionVisitor; +import org.codehaus.groovy.classgen.EnumVisitor; +import org.codehaus.groovy.classgen.ExtendedVerifier; +import org.codehaus.groovy.classgen.GeneratorContext; +import org.codehaus.groovy.classgen.InnerClassCompletionVisitor; +import org.codehaus.groovy.classgen.InnerClassVisitor; +import org.codehaus.groovy.classgen.VariableScopeVisitor; +import org.codehaus.groovy.classgen.Verifier; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.io.InputStreamReaderSource; import org.codehaus.groovy.control.io.ReaderSource; @@ -46,7 +59,12 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.security.CodeSource; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * The CompilationUnit collects all compilation data as it is generated by the compiler system. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/ErrorCollector.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ErrorCollector.java b/src/main/org/codehaus/groovy/control/ErrorCollector.java index 3376644..b388caa 100644 --- a/src/main/org/codehaus/groovy/control/ErrorCollector.java +++ b/src/main/org/codehaus/groovy/control/ErrorCollector.java @@ -18,11 +18,6 @@ */ package org.codehaus.groovy.control; -import java.io.PrintWriter; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - import org.codehaus.groovy.control.messages.ExceptionMessage; import org.codehaus.groovy.control.messages.LocatedMessage; import org.codehaus.groovy.control.messages.Message; @@ -31,6 +26,11 @@ import org.codehaus.groovy.control.messages.WarningMessage; import org.codehaus.groovy.syntax.CSTNode; import org.codehaus.groovy.syntax.SyntaxException; +import java.io.PrintWriter; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + /** * A base class for collecting messages and errors during processing. * Each CompilationUnit should have an ErrorCollector, and the SourceUnits http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/ParserPlugin.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ParserPlugin.java b/src/main/org/codehaus/groovy/control/ParserPlugin.java index 555632d..9b298d8 100644 --- a/src/main/org/codehaus/groovy/control/ParserPlugin.java +++ b/src/main/org/codehaus/groovy/control/ParserPlugin.java @@ -18,9 +18,9 @@ */ package org.codehaus.groovy.control; -import org.codehaus.groovy.syntax.Reduction; -import org.codehaus.groovy.syntax.ParserException; import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.syntax.ParserException; +import org.codehaus.groovy.syntax.Reduction; import java.io.Reader; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/ResolveVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/org/codehaus/groovy/control/ResolveVisitor.java index b9f5e9f..895b5db 100644 --- a/src/main/org/codehaus/groovy/control/ResolveVisitor.java +++ b/src/main/org/codehaus/groovy/control/ResolveVisitor.java @@ -18,22 +18,60 @@ */ package org.codehaus.groovy.control; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CompileUnit; +import org.codehaus.groovy.ast.DynamicVariable; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.ImportNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.PropertyNode; +import org.codehaus.groovy.ast.Variable; +import org.codehaus.groovy.ast.VariableScope; +import org.codehaus.groovy.ast.expr.AnnotationConstantExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.ListExpression; +import org.codehaus.groovy.ast.expr.MapEntryExpression; +import org.codehaus.groovy.ast.expr.MapExpression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.SpreadMapExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.CatchStatement; import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.control.ClassNodeResolver.LookupResult; import org.codehaus.groovy.syntax.Types; -import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.transform.trait.Traits; import org.objectweb.asm.Opcodes; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import static org.codehaus.groovy.ast.tools.GeneralUtils.inSamePackage; import static org.codehaus.groovy.ast.tools.GeneralUtils.isDefaultVisibility; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/StaticImportVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/StaticImportVisitor.java b/src/main/org/codehaus/groovy/control/StaticImportVisitor.java index 199b4ad..0948a6d 100644 --- a/src/main/org/codehaus/groovy/control/StaticImportVisitor.java +++ b/src/main/org/codehaus/groovy/control/StaticImportVisitor.java @@ -54,12 +54,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.apache.groovy.ast.tools.ClassNodeUtils.getPropNameForAccessor; -import static org.apache.groovy.ast.tools.ClassNodeUtils.hasPossibleStaticMethod; -import static org.apache.groovy.ast.tools.ClassNodeUtils.hasPossibleStaticProperty; -import static org.apache.groovy.ast.tools.ClassNodeUtils.hasStaticProperty; -import static org.apache.groovy.ast.tools.ClassNodeUtils.isInnerClass; -import static org.apache.groovy.ast.tools.ClassNodeUtils.isValidAccessorName; +import static org.apache.groovy.ast.tools.ClassNodeUtils.*; import static org.codehaus.groovy.runtime.MetaClassHelper.capitalize; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy b/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy index cbf992a..71fce1c 100644 --- a/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy +++ b/src/main/org/codehaus/groovy/control/customizers/ASTTransformationCustomizer.groovy @@ -18,25 +18,21 @@ */ package org.codehaus.groovy.control.customizers -import org.codehaus.groovy.ast.expr.Expression -import org.codehaus.groovy.transform.ASTTransformation -import org.codehaus.groovy.control.CompilePhase -import org.codehaus.groovy.transform.GroovyASTTransformation -import org.codehaus.groovy.control.SourceUnit -import org.codehaus.groovy.classgen.GeneratorContext -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.ast.AnnotationNode +import groovy.transform.CompilationUnitAware import org.codehaus.groovy.ast.ASTNode +import org.codehaus.groovy.ast.AnnotationNode import org.codehaus.groovy.ast.ClassHelper +import org.codehaus.groovy.ast.ClassNode +import org.codehaus.groovy.ast.expr.* +import org.codehaus.groovy.classgen.GeneratorContext +import org.codehaus.groovy.control.CompilationUnit +import org.codehaus.groovy.control.CompilePhase +import org.codehaus.groovy.control.SourceUnit +import org.codehaus.groovy.transform.ASTTransformation +import org.codehaus.groovy.transform.GroovyASTTransformation import org.codehaus.groovy.transform.GroovyASTTransformationClass + import java.lang.annotation.Annotation -import org.codehaus.groovy.ast.expr.ClosureExpression -import org.codehaus.groovy.ast.expr.ConstantExpression -import org.codehaus.groovy.ast.expr.ClassExpression -import org.codehaus.groovy.ast.Parameter -import org.codehaus.groovy.ast.expr.ListExpression -import groovy.transform.CompilationUnitAware -import org.codehaus.groovy.control.CompilationUnit /** * This customizer allows applying an AST transformation to a source unit with http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java index a1069c0..780b554 100644 --- a/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java +++ b/src/main/org/codehaus/groovy/control/customizers/ImportCustomizer.java @@ -26,7 +26,8 @@ import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; -import java.util.*; +import java.util.LinkedList; +import java.util.List; /** * This compilation customizer allows addiing various types of imports to the compilation unit. Supports adding : http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java index 79b5455..1bb302b 100644 --- a/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java +++ b/src/main/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java @@ -18,9 +18,66 @@ */ package org.codehaus.groovy.control.customizers; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; -import org.codehaus.groovy.ast.stmt.*; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CodeVisitorSupport; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +import org.codehaus.groovy.ast.ImportNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.ModuleNode; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.ArrayExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.BitwiseNegationExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.CastExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ClosureListExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.FieldExpression; +import org.codehaus.groovy.ast.expr.GStringExpression; +import org.codehaus.groovy.ast.expr.ListExpression; +import org.codehaus.groovy.ast.expr.MapEntryExpression; +import org.codehaus.groovy.ast.expr.MapExpression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.MethodPointerExpression; +import org.codehaus.groovy.ast.expr.NotExpression; +import org.codehaus.groovy.ast.expr.PostfixExpression; +import org.codehaus.groovy.ast.expr.PrefixExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.RangeExpression; +import org.codehaus.groovy.ast.expr.SpreadExpression; +import org.codehaus.groovy.ast.expr.SpreadMapExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.TernaryExpression; +import org.codehaus.groovy.ast.expr.TupleExpression; +import org.codehaus.groovy.ast.expr.UnaryMinusExpression; +import org.codehaus.groovy.ast.expr.UnaryPlusExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; +import org.codehaus.groovy.ast.stmt.AssertStatement; +import org.codehaus.groovy.ast.stmt.BlockStatement; +import org.codehaus.groovy.ast.stmt.BreakStatement; +import org.codehaus.groovy.ast.stmt.CaseStatement; +import org.codehaus.groovy.ast.stmt.CatchStatement; +import org.codehaus.groovy.ast.stmt.ContinueStatement; +import org.codehaus.groovy.ast.stmt.DoWhileStatement; +import org.codehaus.groovy.ast.stmt.EmptyStatement; +import org.codehaus.groovy.ast.stmt.ExpressionStatement; +import org.codehaus.groovy.ast.stmt.ForStatement; +import org.codehaus.groovy.ast.stmt.IfStatement; +import org.codehaus.groovy.ast.stmt.ReturnStatement; +import org.codehaus.groovy.ast.stmt.Statement; +import org.codehaus.groovy.ast.stmt.SwitchStatement; +import org.codehaus.groovy.ast.stmt.SynchronizedStatement; +import org.codehaus.groovy.ast.stmt.ThrowStatement; +import org.codehaus.groovy.ast.stmt.TryCatchStatement; +import org.codehaus.groovy.ast.stmt.WhileStatement; import org.codehaus.groovy.classgen.BytecodeExpression; import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.CompilationFailedException; @@ -28,7 +85,12 @@ import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.Token; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * This customizer allows securing source code by controlling what code constructs are allowed. For example, if you only http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy b/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy index 6a05834..4e4f5be 100644 --- a/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy +++ b/src/main/org/codehaus/groovy/control/customizers/builder/ASTTransformationCustomizerFactory.groovy @@ -19,8 +19,8 @@ package org.codehaus.groovy.control.customizers.builder -import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer import groovy.transform.CompileStatic +import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer /** * This factory generates an {@link ASTTransformationCustomizer ast transformation customizer}. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java b/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java index 706ae0b..1c1084c 100644 --- a/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/AbstractReaderSource.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.control.io; -import java.io.BufferedReader; -import java.io.IOException; - import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.Janitor; +import java.io.BufferedReader; +import java.io.IOException; + /** * For ReaderSources that can choose a parent class, a base that * provides common functionality. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/FileReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/FileReaderSource.java b/src/main/org/codehaus/groovy/control/io/FileReaderSource.java index 28dd3fa..6171f7a 100644 --- a/src/main/org/codehaus/groovy/control/io/FileReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/FileReaderSource.java @@ -18,12 +18,18 @@ */ package org.codehaus.groovy.control.io; -import java.io.*; +import org.codehaus.groovy.control.CompilerConfiguration; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.net.URI; import java.nio.charset.Charset; -import org.codehaus.groovy.control.CompilerConfiguration; - /** * A ReaderSource for source files. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java b/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java index 499b07c..d018698 100644 --- a/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/InputStreamReaderSource.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.control.io; +import org.codehaus.groovy.control.CompilerConfiguration; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.net.URI; -import org.codehaus.groovy.control.CompilerConfiguration; - /** * A ReaderSource for source strings. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/ReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/ReaderSource.java b/src/main/org/codehaus/groovy/control/io/ReaderSource.java index c73ffc1..76ddd3c 100644 --- a/src/main/org/codehaus/groovy/control/io/ReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/ReaderSource.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.control.io; +import org.codehaus.groovy.control.HasCleanup; +import org.codehaus.groovy.control.Janitor; + import java.io.IOException; import java.io.Reader; import java.net.URI; -import org.codehaus.groovy.control.HasCleanup; -import org.codehaus.groovy.control.Janitor; - /** * An interface for things that can supply (and potentially resupply) a Reader * on a source stream. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/StringReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/StringReaderSource.java b/src/main/org/codehaus/groovy/control/io/StringReaderSource.java index fe5e125..5e83de0 100644 --- a/src/main/org/codehaus/groovy/control/io/StringReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/StringReaderSource.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.control.io; +import org.codehaus.groovy.control.CompilerConfiguration; + import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; -import org.codehaus.groovy.control.CompilerConfiguration; - /** * A ReaderSource for source strings. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/io/URLReaderSource.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/io/URLReaderSource.java b/src/main/org/codehaus/groovy/control/io/URLReaderSource.java index 9ba34d4..7c92559 100644 --- a/src/main/org/codehaus/groovy/control/io/URLReaderSource.java +++ b/src/main/org/codehaus/groovy/control/io/URLReaderSource.java @@ -18,6 +18,9 @@ */ package org.codehaus.groovy.control.io; +import groovy.lang.GroovyRuntimeException; +import org.codehaus.groovy.control.CompilerConfiguration; + import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -25,9 +28,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import groovy.lang.GroovyRuntimeException; -import org.codehaus.groovy.control.CompilerConfiguration; - /** * A ReaderSource for source files hosted at a URL. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java b/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java index 34a0ee4..363b9f5 100644 --- a/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java +++ b/src/main/org/codehaus/groovy/control/messages/ExceptionMessage.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.ProcessingUnit; +import java.io.PrintWriter; + /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java b/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java index b616131..d3368ac 100644 --- a/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java +++ b/src/main/org/codehaus/groovy/control/messages/LocatedMessage.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.CSTNode; +import java.io.PrintWriter; + /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/Message.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/Message.java b/src/main/org/codehaus/groovy/control/messages/Message.java index cc0c023..0c2feab 100644 --- a/src/main/org/codehaus/groovy/control/messages/Message.java +++ b/src/main/org/codehaus/groovy/control/messages/Message.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.ProcessingUnit; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.SyntaxException; +import java.io.PrintWriter; + /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java b/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java index fadae7c..2cbc9d8 100644 --- a/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java +++ b/src/main/org/codehaus/groovy/control/messages/SimpleMessage.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.ProcessingUnit; import org.codehaus.groovy.control.SourceUnit; +import java.io.PrintWriter; + /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java b/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java index 759e3e6..be9339d 100644 --- a/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java +++ b/src/main/org/codehaus/groovy/control/messages/SyntaxErrorMessage.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.SyntaxException; +import java.io.PrintWriter; + /** * A class for error messages produced by the parser system. * http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/control/messages/WarningMessage.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/control/messages/WarningMessage.java b/src/main/org/codehaus/groovy/control/messages/WarningMessage.java index 0681ffb..969f29f 100644 --- a/src/main/org/codehaus/groovy/control/messages/WarningMessage.java +++ b/src/main/org/codehaus/groovy/control/messages/WarningMessage.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.control.messages; -import java.io.PrintWriter; - import org.codehaus.groovy.control.Janitor; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.CSTNode; +import java.io.PrintWriter; + /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java b/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java index 4ad0373..dc8194d 100644 --- a/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java +++ b/src/main/org/codehaus/groovy/reflection/AccessPermissionChecker.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.reflection; +import groovy.lang.GroovyObject; + import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.ReflectPermission; import java.security.AccessControlException; -import groovy.lang.GroovyObject; - final class AccessPermissionChecker { private static final ReflectPermission REFLECT_PERMISSION = new ReflectPermission("suppressAccessChecks"); http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/CachedClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/CachedClass.java b/src/main/org/codehaus/groovy/reflection/CachedClass.java index 9302390..c4cb542 100644 --- a/src/main/org/codehaus/groovy/reflection/CachedClass.java +++ b/src/main/org/codehaus/groovy/reflection/CachedClass.java @@ -18,13 +18,17 @@ */ package org.codehaus.groovy.reflection; -import groovy.lang.*; - +import groovy.lang.Closure; +import groovy.lang.ExpandoMetaClass; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaMethod; import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.runtime.callsite.CallSiteClassLoader; import org.codehaus.groovy.runtime.metaclass.ClosureMetaClass; -import org.codehaus.groovy.util.LazyReference; import org.codehaus.groovy.util.FastArray; +import org.codehaus.groovy.util.LazyReference; import org.codehaus.groovy.util.ReferenceBundle; import java.lang.reflect.AccessibleObject; @@ -34,7 +38,16 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; /** * @author Alex.Tkachman http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/CachedMethod.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/org/codehaus/groovy/reflection/CachedMethod.java index 64d9098..952e5b2 100644 --- a/src/main/org/codehaus/groovy/reflection/CachedMethod.java +++ b/src/main/org/codehaus/groovy/reflection/CachedMethod.java @@ -21,17 +21,21 @@ package org.codehaus.groovy.reflection; import groovy.lang.MetaClassImpl; import groovy.lang.MetaMethod; import groovy.lang.MissingMethodException; - import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.runtime.InvokerInvocationException; -import org.codehaus.groovy.runtime.callsite.*; +import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.CallSiteGenerator; +import org.codehaus.groovy.runtime.callsite.PogoMetaMethodSite; +import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +import org.codehaus.groovy.runtime.callsite.StaticMetaMethodSite; import org.codehaus.groovy.runtime.metaclass.MethodHelper; import java.lang.ref.SoftReference; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.Arrays; +import java.util.Comparator; /** * @author Alex.Tkachman http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/ClassInfo.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/ClassInfo.java b/src/main/org/codehaus/groovy/reflection/ClassInfo.java index 93d7b6b..49c5743 100644 --- a/src/main/org/codehaus/groovy/reflection/ClassInfo.java +++ b/src/main/org/codehaus/groovy/reflection/ClassInfo.java @@ -18,17 +18,44 @@ */ package org.codehaus.groovy.reflection; -import groovy.lang.*; - +import groovy.lang.Closure; +import groovy.lang.ExpandoMetaClass; +import groovy.lang.ExpandoMetaClassCreationHandle; +import groovy.lang.GroovySystem; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassRegistry; +import groovy.lang.MetaMethod; import org.codehaus.groovy.reflection.GroovyClassValue.ComputeValue; -import org.codehaus.groovy.reflection.stdclasses.*; -import org.codehaus.groovy.util.*; +import org.codehaus.groovy.reflection.stdclasses.ArrayCachedClass; +import org.codehaus.groovy.reflection.stdclasses.BigDecimalCachedClass; +import org.codehaus.groovy.reflection.stdclasses.BigIntegerCachedClass; +import org.codehaus.groovy.reflection.stdclasses.BooleanCachedClass; +import org.codehaus.groovy.reflection.stdclasses.ByteCachedClass; +import org.codehaus.groovy.reflection.stdclasses.CachedClosureClass; +import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; +import org.codehaus.groovy.reflection.stdclasses.CharacterCachedClass; +import org.codehaus.groovy.reflection.stdclasses.DoubleCachedClass; +import org.codehaus.groovy.reflection.stdclasses.FloatCachedClass; +import org.codehaus.groovy.reflection.stdclasses.IntegerCachedClass; +import org.codehaus.groovy.reflection.stdclasses.LongCachedClass; +import org.codehaus.groovy.reflection.stdclasses.NumberCachedClass; +import org.codehaus.groovy.reflection.stdclasses.ObjectCachedClass; +import org.codehaus.groovy.reflection.stdclasses.ShortCachedClass; +import org.codehaus.groovy.reflection.stdclasses.StringCachedClass; +import org.codehaus.groovy.util.Finalizable; +import org.codehaus.groovy.util.LazyReference; +import org.codehaus.groovy.util.LockableObject; +import org.codehaus.groovy.util.ManagedConcurrentLinkedQueue; +import org.codehaus.groovy.util.ManagedConcurrentMap; +import org.codehaus.groovy.util.ManagedReference; +import org.codehaus.groovy.util.ReferenceBundle; import org.codehaus.groovy.vmplugin.VMPluginFactory; import java.lang.ref.WeakReference; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.*; +import java.util.Collection; +import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java b/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java index a8781b1..ba24a6d 100644 --- a/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java +++ b/src/main/org/codehaus/groovy/reflection/ClassLoaderForClassArtifacts.java @@ -18,18 +18,17 @@ */ package org.codehaus.groovy.reflection; -import org.codehaus.groovy.runtime.callsite.GroovySunClassLoader; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaMethod; import org.codehaus.groovy.runtime.callsite.CallSite; +import org.codehaus.groovy.runtime.callsite.GroovySunClassLoader; import java.lang.ref.SoftReference; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.concurrent.atomic.AtomicInteger; import java.security.AccessController; import java.security.PrivilegedAction; - -import groovy.lang.MetaClassImpl; -import groovy.lang.MetaMethod; +import java.util.concurrent.atomic.AtomicInteger; public class ClassLoaderForClassArtifacts extends ClassLoader { public final SoftReference<Class> klazz; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java b/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java index e448b3d..1823ce9 100644 --- a/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java +++ b/src/main/org/codehaus/groovy/reflection/GeneratedMetaMethod.java @@ -21,10 +21,20 @@ package org.codehaus.groovy.reflection; import groovy.lang.GroovyRuntimeException; import groovy.lang.MetaMethod; -import java.lang.reflect.Modifier; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.Serializable; import java.lang.reflect.Constructor; -import java.io.*; -import java.util.*; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; public abstract class GeneratedMetaMethod extends MetaMethod { private final String name; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java b/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java index 50337df..e621729 100644 --- a/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java +++ b/src/main/org/codehaus/groovy/reflection/ReflectionUtils.java @@ -19,9 +19,9 @@ package org.codehaus.groovy.reflection; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.Set; -import java.util.Collections; /** * This class contains utility methods to determine which class called the http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/SunClassLoader.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/SunClassLoader.java b/src/main/org/codehaus/groovy/reflection/SunClassLoader.java index f3cb1ac..0a6a082 100644 --- a/src/main/org/codehaus/groovy/reflection/SunClassLoader.java +++ b/src/main/org/codehaus/groovy/reflection/SunClassLoader.java @@ -18,17 +18,17 @@ */ package org.codehaus.groovy.reflection; -import org.objectweb.asm.Opcodes; +import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Opcodes; -import java.util.Map; -import java.util.HashMap; import java.io.IOException; import java.io.InputStream; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.HashMap; +import java.util.Map; /** * Special class loader, which when running on Sun VM allows to generate accessor classes for any method http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java index e98f6b9..45a1c85 100644 --- a/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java +++ b/src/main/org/codehaus/groovy/reflection/stdclasses/BigDecimalCachedClass.java @@ -18,9 +18,10 @@ */ package org.codehaus.groovy.reflection.stdclasses; +import org.codehaus.groovy.reflection.ClassInfo; + import java.math.BigDecimal; import java.math.BigInteger; -import org.codehaus.groovy.reflection.ClassInfo; /** * @author Alex.Tkachman http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java index be9738f..7dcaed0 100644 --- a/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java +++ b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java @@ -19,8 +19,8 @@ package org.codehaus.groovy.reflection.stdclasses; import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.reflection.CachedMethod; +import org.codehaus.groovy.reflection.ClassInfo; public class CachedClosureClass extends CachedClass { private final Class[] parameterTypes; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java index 5988db0..6364f40 100644 --- a/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java +++ b/src/main/org/codehaus/groovy/reflection/stdclasses/CachedSAMClass.java @@ -18,6 +18,15 @@ */ package org.codehaus.groovy.reflection.stdclasses; +import groovy.lang.Closure; +import groovy.util.ProxyGenerator; +import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.ClassInfo; +import org.codehaus.groovy.reflection.ReflectionCache; +import org.codehaus.groovy.runtime.ConvertedClosure; +import org.codehaus.groovy.transform.trait.Traits; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; @@ -31,16 +40,6 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; -import groovy.lang.Closure; -import groovy.util.ProxyGenerator; - -import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.reflection.ClassInfo; -import org.codehaus.groovy.reflection.ReflectionCache; -import org.codehaus.groovy.runtime.ConvertedClosure; -import org.codehaus.groovy.transform.trait.Traits; - public class CachedSAMClass extends CachedClass { private static final int ABSTRACT_STATIC_PRIVATE = http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/ConvertedMap.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ConvertedMap.java b/src/main/org/codehaus/groovy/runtime/ConvertedMap.java index 811f269..393d55e 100644 --- a/src/main/org/codehaus/groovy/runtime/ConvertedMap.java +++ b/src/main/org/codehaus/groovy/runtime/ConvertedMap.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.runtime; +import groovy.lang.Closure; + import java.lang.reflect.Method; import java.util.Map; -import groovy.lang.Closure; - /** * This class is a general adapter to adapt a map of closures to * any Java interface. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java index e3ef111..3838fdc 100644 --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethodsSupport.java @@ -26,8 +26,40 @@ import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import java.io.Closeable; import java.io.IOException; import java.lang.reflect.Array; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Hashtable; +import java.util.IdentityHashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.PriorityQueue; +import java.util.Properties; +import java.util.Queue; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.Vector; +import java.util.WeakHashMap; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.DelayQueue; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.PriorityBlockingQueue; +import java.util.concurrent.SynchronousQueue; import java.util.logging.Logger; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java index 9e4ce31..1c85e91 100644 --- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java +++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java @@ -19,20 +19,19 @@ package org.codehaus.groovy.runtime; import groovy.lang.Closure; +import org.codehaus.groovy.reflection.ReflectionUtils; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import java.io.File; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.ResourceBundle; import java.util.Locale; +import java.util.ResourceBundle; import java.util.TimeZone; import java.util.regex.Matcher; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import org.codehaus.groovy.reflection.ReflectionUtils; - /** * This class defines all the new static groovy methods which appear on normal * JDK classes inside the Groovy environment. Static methods are used with the http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java b/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java index 3f16b16..6fb77b7 100644 --- a/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java +++ b/src/main/org/codehaus/groovy/runtime/FlushingStreamWriter.java @@ -18,9 +18,9 @@ */ package org.codehaus.groovy.runtime; -import java.io.OutputStreamWriter; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; /** * Stream writer which flushes after each write operation. http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java b/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java index bb7b7ae..19f53d2 100644 --- a/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java +++ b/src/main/org/codehaus/groovy/runtime/GroovyCategorySupport.java @@ -19,8 +19,6 @@ package org.codehaus.groovy.runtime; import groovy.lang.Closure; -import java.lang.ref.SoftReference; - import org.codehaus.groovy.reflection.CachedClass; import org.codehaus.groovy.reflection.CachedMethod; import org.codehaus.groovy.reflection.ReflectionCache; @@ -28,7 +26,14 @@ import org.codehaus.groovy.runtime.metaclass.DefaultMetaClassInfo; import org.codehaus.groovy.runtime.metaclass.NewInstanceMetaMethod; import org.codehaus.groovy.vmplugin.VMPluginFactory; -import java.util.*; +import java.lang.ref.SoftReference; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java b/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java index 0aaa633..a838c28 100644 --- a/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java +++ b/src/main/org/codehaus/groovy/runtime/HandleMetaClass.java @@ -18,7 +18,12 @@ */ package org.codehaus.groovy.runtime; -import groovy.lang.*; +import groovy.lang.DelegatingMetaClass; +import groovy.lang.ExpandoMetaClass; +import groovy.lang.GroovyObject; +import groovy.lang.MetaBeanProperty; +import groovy.lang.MetaClass; +import groovy.lang.MetaMethod; import java.lang.reflect.Method; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java b/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java index 28e8e0a..7839a59 100644 --- a/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java +++ b/src/main/org/codehaus/groovy/runtime/MetaClassHelper.java @@ -18,13 +18,17 @@ */ package org.codehaus.groovy.runtime; -import groovy.lang.*; - +import groovy.lang.Closure; +import groovy.lang.GString; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaClass; +import groovy.lang.MetaMethod; import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.util.FastArray; import org.codehaus.groovy.reflection.ParameterTypes; import org.codehaus.groovy.reflection.ReflectionCache; import org.codehaus.groovy.runtime.wrappers.Wrapper; +import org.codehaus.groovy.util.FastArray; import java.lang.reflect.Array; import java.lang.reflect.Constructor; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java index ecb4108..295cbe8 100644 --- a/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java +++ b/src/main/org/codehaus/groovy/runtime/MethodRankHelper.java @@ -20,6 +20,8 @@ package org.codehaus.groovy.runtime; import groovy.lang.MetaMethod; import groovy.lang.MetaProperty; +import org.codehaus.groovy.reflection.CachedClass; +import org.codehaus.groovy.reflection.ClassInfo; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -30,9 +32,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.codehaus.groovy.reflection.CachedClass; -import org.codehaus.groovy.reflection.ClassInfo; - /** * Utility class for MissingMethodException, MissingPropertyException etc. * This class contains methods assisting in ranking and listing probable intended http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/NullObject.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/NullObject.java b/src/main/org/codehaus/groovy/runtime/NullObject.java index c281db8..48f9170 100644 --- a/src/main/org/codehaus/groovy/runtime/NullObject.java +++ b/src/main/org/codehaus/groovy/runtime/NullObject.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.runtime; -import java.util.Collections; -import java.util.Iterator; - import groovy.lang.Closure; import groovy.lang.GroovyObjectSupport; +import java.util.Collections; +import java.util.Iterator; + public class NullObject extends GroovyObjectSupport { private static final NullObject INSTANCE = new NullObject(); http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java index 098aa0c..c869523 100644 --- a/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/ResourceGroovyMethods.java @@ -30,19 +30,39 @@ import groovy.transform.stc.FromString; import groovy.transform.stc.PickFirstResolver; import groovy.transform.stc.SimpleType; import groovy.util.CharsetToolkit; - import org.codehaus.groovy.runtime.callsite.BooleanReturningMethodInvoker; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.io.Writer; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.nio.charset.Charset; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java b/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java index 1318740..1b5493e 100644 --- a/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java +++ b/src/main/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java @@ -18,7 +18,19 @@ */ package org.codehaus.groovy.runtime; -import groovy.lang.*; +import groovy.lang.Closure; +import groovy.lang.EmptyRange; +import groovy.lang.GroovyInterceptable; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.GroovySystem; +import groovy.lang.IntRange; +import groovy.lang.MetaClass; +import groovy.lang.MissingMethodException; +import groovy.lang.MissingPropertyException; +import groovy.lang.NumberRange; +import groovy.lang.ObjectRange; +import groovy.lang.Tuple; import org.codehaus.groovy.runtime.metaclass.MissingMethodExceptionNoStack; import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java b/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java index 99becdf..0a8d4b7 100644 --- a/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java +++ b/src/main/org/codehaus/groovy/runtime/StackTraceUtils.java @@ -19,6 +19,7 @@ package org.codehaus.groovy.runtime; import groovy.lang.Closure; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; import java.io.PrintWriter; import java.util.ArrayList; @@ -28,8 +29,6 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; - /** * Originally was grails.utils.GrailsUtils, removed some grails specific stuff. * Utility methods removing internal lines from stack traces http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java index 02e7199..bad0e80 100644 --- a/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java +++ b/src/main/org/codehaus/groovy/runtime/StringGroovyMethods.java @@ -23,7 +23,6 @@ import groovy.lang.EmptyRange; import groovy.lang.GString; import groovy.lang.IntRange; import groovy.lang.Range; - import groovy.transform.stc.ClosureParams; import groovy.transform.stc.FromString; import groovy.transform.stc.PickFirstResolver; @@ -51,9 +50,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.codehaus.groovy.ast.tools.ClosureUtils.hasSingleCharacterArg; -import static org.codehaus.groovy.runtime.DefaultGroovyMethods.callClosureForLine; -import static org.codehaus.groovy.runtime.DefaultGroovyMethods.each; -import static org.codehaus.groovy.runtime.DefaultGroovyMethods.join; +import static org.codehaus.groovy.runtime.DefaultGroovyMethods.*; /** * This class defines new groovy methods which appear on String-related JDK http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java b/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java index a40543c..d85e445 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java @@ -18,8 +18,11 @@ */ package org.codehaus.groovy.runtime.callsite; -import groovy.lang.*; - +import groovy.lang.GroovyObject; +import groovy.lang.GroovyRuntimeException; +import groovy.lang.MetaClass; +import groovy.lang.MetaClassImpl; +import groovy.lang.MetaProperty; import org.codehaus.groovy.reflection.CachedClass; import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.reflection.ParameterTypes; http://git-wip-us.apache.org/repos/asf/groovy/blob/4526cc0d/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java b/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java index fa7dcc3..28d0f0a 100644 --- a/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java +++ b/src/main/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.runtime.callsite; +import groovy.lang.Closure; + import java.util.Map; import java.util.Map.Entry; -import groovy.lang.Closure; - /** * Helper class for internal use only. This allows to call a {@link Closure} and * convert the result to a boolean. It will do this by caching the possible "doCall"
