Repository: groovy Updated Branches: refs/heads/master 7ea3047fd -> 93d9fe61d
http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java b/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java index 6ab0b96..5e132bb 100644 --- a/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java @@ -49,27 +49,7 @@ import java.util.Map; import static org.codehaus.groovy.ast.ClassHelper.make; import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.block; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callThisX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.constX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.copyStatementsWithSuperAdjustment; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.equalsNullX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInstanceNonPropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getInstancePropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getSuperNonPropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.getSuperPropertyFields; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifElseS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.ifS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.params; -import static org.codehaus.groovy.ast.tools.GeneralUtils.propX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; /** * Handles generation of code for the @TupleConstructor annotation. http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java b/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java index 1e00c50..de9013a 100644 --- a/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java +++ b/src/main/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java @@ -21,15 +21,39 @@ package org.codehaus.groovy.transform.sc; import groovy.lang.Reference; import groovy.transform.CompileStatic; import groovy.transform.TypeChecked; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +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.GenericsType; +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.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ClosureListExpression; +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.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.stmt.Statement; import org.codehaus.groovy.ast.tools.GeneralUtils; import org.codehaus.groovy.classgen.GeneratorContext; -import org.codehaus.groovy.classgen.asm.*; +import org.codehaus.groovy.classgen.asm.InvocationWriter; +import org.codehaus.groovy.classgen.asm.MopWriter; +import org.codehaus.groovy.classgen.asm.TypeChooser; +import org.codehaus.groovy.classgen.asm.WriterControllerFactory; import org.codehaus.groovy.classgen.asm.sc.StaticCompilationMopWriter; import org.codehaus.groovy.classgen.asm.sc.StaticTypesTypeChooser; import org.codehaus.groovy.control.CompilationFailedException; @@ -40,14 +64,18 @@ import org.codehaus.groovy.transform.stc.StaticTypeCheckingVisitor; import org.codehaus.groovy.transform.stc.StaticTypesMarker; import org.objectweb.asm.Opcodes; -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; +import java.util.Set; import static org.codehaus.groovy.ast.tools.GenericsUtils.*; import static org.codehaus.groovy.transform.sc.StaticCompilationMetadataKeys.*; import static org.codehaus.groovy.transform.stc.StaticTypesMarker.DIRECT_METHOD_CALL_TARGET; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; -import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC; +import static org.objectweb.asm.Opcodes.*; /** * This visitor is responsible for amending the AST with static compilation metadata or transform the AST so that http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java b/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java index 1399443..ebffa5a 100644 --- a/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java +++ b/src/main/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.transform.sc; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.classgen.asm.WriterControllerFactory; import org.codehaus.groovy.classgen.asm.sc.StaticTypesWriterControllerFactoryImpl; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java b/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java index f0efd41..3ea2992 100644 --- a/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java +++ b/src/main/org/codehaus/groovy/transform/sc/transformers/BooleanExpressionTransformer.java @@ -18,8 +18,16 @@ */ package org.codehaus.groovy.transform.sc.transformers; -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.GroovyCodeVisitor; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.BooleanExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.ExpressionTransformer; +import org.codehaus.groovy.ast.expr.NotExpression; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.classgen.asm.OperandStack; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java index 15d4a6d..e17d8d4 100644 --- a/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java +++ b/src/main/org/codehaus/groovy/transform/stc/DefaultTypeCheckingExtension.java @@ -21,7 +21,12 @@ package org.codehaus.groovy.transform.stc; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.MethodNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCall; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.ReturnStatement; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java b/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java index ad2143e..9e2ed93 100644 --- a/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java +++ b/src/main/org/codehaus/groovy/transform/stc/PropertyLookupVisitor.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.transform.stc; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.PropertyNode; import org.codehaus.groovy.control.SourceUnit; import java.util.concurrent.atomic.AtomicReference; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java b/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java index 464ab46..82d008b 100644 --- a/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java +++ b/src/main/org/codehaus/groovy/transform/stc/SignatureCodecVersion1.java @@ -26,7 +26,12 @@ import org.codehaus.groovy.ast.tools.WideningCategories; import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.runtime.EncodingGroovyMethods; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.StringWriter; import static org.codehaus.groovy.ast.ClassHelper.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java index 9f9fc5f..005537b 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java @@ -20,8 +20,20 @@ package org.codehaus.groovy.transform.stc; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.Variable; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.ArrayExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.ListExpression; +import org.codehaus.groovy.ast.expr.MapExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.ReturnStatement; import org.codehaus.groovy.ast.tools.GenericsUtils; import org.codehaus.groovy.ast.tools.ParameterUtils; @@ -42,8 +54,20 @@ import org.objectweb.asm.Opcodes; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; +import java.util.UUID; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.regex.Matcher; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java index 80a0d06..3edc090 100644 --- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java +++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java @@ -43,7 +43,36 @@ 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.*; +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.BitwiseNegationExpression; +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.EmptyExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.FieldExpression; +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.MethodCall; +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.PropertyExpression; +import org.codehaus.groovy.ast.expr.RangeExpression; +import org.codehaus.groovy.ast.expr.SpreadExpression; +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.CaseStatement; import org.codehaus.groovy.ast.stmt.CatchStatement; import org.codehaus.groovy.ast.stmt.EmptyStatement; @@ -91,44 +120,14 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import static org.codehaus.groovy.ast.ClassHelper.*; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.binX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.castX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; -import static org.codehaus.groovy.ast.tools.WideningCategories.LowestUpperBoundClassNode; -import static org.codehaus.groovy.ast.tools.WideningCategories.isBigDecCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isDouble; -import static org.codehaus.groovy.ast.tools.WideningCategories.isDoubleCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isFloat; -import static org.codehaus.groovy.ast.tools.WideningCategories.isFloatingCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isIntCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isLongCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.isNumberCategory; -import static org.codehaus.groovy.ast.tools.WideningCategories.lowestUpperBound; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; +import static org.codehaus.groovy.ast.tools.WideningCategories.*; import static org.codehaus.groovy.syntax.Types.ASSIGN; -import static org.codehaus.groovy.syntax.Types.ASSIGNMENT_OPERATOR; -import static org.codehaus.groovy.syntax.Types.COMPARE_EQUAL; -import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_EQUAL; -import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_IN; -//import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF; -import static org.codehaus.groovy.syntax.Types.COMPARE_TO; -import static org.codehaus.groovy.syntax.Types.DIVIDE; -import static org.codehaus.groovy.syntax.Types.DIVIDE_EQUAL; -import static org.codehaus.groovy.syntax.Types.ELVIS_EQUAL; -import static org.codehaus.groovy.syntax.Types.EQUAL; -import static org.codehaus.groovy.syntax.Types.FIND_REGEX; -import static org.codehaus.groovy.syntax.Types.INTDIV; -import static org.codehaus.groovy.syntax.Types.INTDIV_EQUAL; -import static org.codehaus.groovy.syntax.Types.KEYWORD_IN; -import static org.codehaus.groovy.syntax.Types.KEYWORD_INSTANCEOF; -import static org.codehaus.groovy.syntax.Types.LEFT_SQUARE_BRACKET; -import static org.codehaus.groovy.syntax.Types.MINUS_MINUS; -import static org.codehaus.groovy.syntax.Types.MOD; -import static org.codehaus.groovy.syntax.Types.MOD_EQUAL; -import static org.codehaus.groovy.syntax.Types.PLUS_PLUS; +import static org.codehaus.groovy.syntax.Types.*; import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.*; +import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.isAssignment; + +//import static org.codehaus.groovy.syntax.Types.COMPARE_NOT_INSTANCEOF; /** * The main class code visitor responsible for static type checking. It will perform various inspections like checking http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java index 432f384..57fcee0 100644 --- a/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java +++ b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingContext.java @@ -21,12 +21,26 @@ package org.codehaus.groovy.transform.stc; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.Parameter; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.ErrorCollector; import org.codehaus.groovy.control.SourceUnit; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Stack; +import java.util.TreeSet; public class TypeCheckingContext { protected SourceUnit source; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java index dd1c037..a74d36e 100644 --- a/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java +++ b/src/main/org/codehaus/groovy/transform/stc/TypeCheckingExtension.java @@ -19,8 +19,21 @@ package org.codehaus.groovy.transform.stc; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.MethodNode; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.AttributeExpression; +import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.MethodCall; +import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.ReturnStatement; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy b/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy index 206b0df..828ee72 100644 --- a/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy +++ b/src/main/org/codehaus/groovy/transform/tailrec/AstHelper.groovy @@ -29,10 +29,7 @@ import org.codehaus.groovy.ast.stmt.ThrowStatement import java.lang.reflect.Modifier -import static org.codehaus.groovy.ast.tools.GeneralUtils.classX -import static org.codehaus.groovy.ast.tools.GeneralUtils.declS -import static org.codehaus.groovy.ast.tools.GeneralUtils.propX -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX +import static org.codehaus.groovy.ast.tools.GeneralUtils.* /** * Helping to create a few standard AST constructs http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy b/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy index 981f146..e7906db 100644 --- a/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy +++ b/src/main/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.groovy @@ -25,13 +25,7 @@ import org.codehaus.groovy.ast.Parameter import org.codehaus.groovy.ast.VariableScope import org.codehaus.groovy.ast.expr.BooleanExpression import org.codehaus.groovy.ast.expr.ConstantExpression -import org.codehaus.groovy.ast.stmt.BlockStatement -import org.codehaus.groovy.ast.stmt.CatchStatement -import org.codehaus.groovy.ast.stmt.ContinueStatement -import org.codehaus.groovy.ast.stmt.EmptyStatement -import org.codehaus.groovy.ast.stmt.Statement -import org.codehaus.groovy.ast.stmt.TryCatchStatement -import org.codehaus.groovy.ast.stmt.WhileStatement +import org.codehaus.groovy.ast.stmt.* /** * Wrap the body of a method in a while loop, nested in a try-catch. http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java b/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java index a713cb3..58f66b4 100644 --- a/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java +++ b/src/main/org/codehaus/groovy/transform/trait/NAryOperationRewriter.java @@ -34,7 +34,7 @@ import org.codehaus.groovy.syntax.TokenUtil; import java.util.Collection; -import static org.codehaus.groovy.syntax.Types.*; +import static org.codehaus.groovy.syntax.Types.EQUAL; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java index 5d2d772..50e80fc 100644 --- a/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java +++ b/src/main/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.transform.trait; import groovy.lang.MetaProperty; -import java.util.List; import org.codehaus.groovy.ast.ClassCodeExpressionTransformer; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; @@ -37,10 +36,9 @@ import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.syntax.Types; -import static org.objectweb.asm.Opcodes.ACC_ABSTRACT; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_STATIC; -import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC; +import java.util.List; + +import static org.objectweb.asm.Opcodes.*; /** * This transformer is used to transform calls to <code>SomeTrait.super.foo()</code> into the appropriate trait call. http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java index 4ac7753..9d3ea0c 100644 --- a/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java +++ b/src/main/org/codehaus/groovy/transform/trait/TraitASTTransformation.java @@ -69,7 +69,6 @@ import java.util.List; import java.util.Set; import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; - import static org.codehaus.groovy.transform.trait.SuperCallTraitTransformer.UNRESOLVED_HELPER_CLASS; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java b/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java index b97f480..3fa2f29 100644 --- a/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java +++ b/src/main/org/codehaus/groovy/transform/trait/TraitComposer.java @@ -24,7 +24,6 @@ import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.GenericsType; -import org.codehaus.groovy.ast.InnerClassNode; import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.PropertyNode; @@ -71,12 +70,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import static org.codehaus.groovy.ast.tools.GeneralUtils.args; -import static org.codehaus.groovy.ast.tools.GeneralUtils.assignX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS; -import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt; -import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; +import static org.codehaus.groovy.ast.tools.GeneralUtils.*; import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpecRecurse; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/util/IteratorBufferedIterator.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/IteratorBufferedIterator.java b/src/main/org/codehaus/groovy/util/IteratorBufferedIterator.java index e81bff1..101477e 100644 --- a/src/main/org/codehaus/groovy/util/IteratorBufferedIterator.java +++ b/src/main/org/codehaus/groovy/util/IteratorBufferedIterator.java @@ -18,9 +18,10 @@ */ package org.codehaus.groovy.util; -import java.util.Iterator; import groovy.util.BufferedIterator; +import java.util.Iterator; + /** * An implementation for BufferedIterator wraps Iterator. * http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/util/ListBufferedIterator.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/util/ListBufferedIterator.java b/src/main/org/codehaus/groovy/util/ListBufferedIterator.java index 5625ab2..f69c71b 100644 --- a/src/main/org/codehaus/groovy/util/ListBufferedIterator.java +++ b/src/main/org/codehaus/groovy/util/ListBufferedIterator.java @@ -18,10 +18,11 @@ */ package org.codehaus.groovy.util; +import groovy.util.BufferedIterator; + import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import groovy.util.BufferedIterator; /** * An implementation for BufferedIterator wraps ListIterator. This version http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java b/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java index d139307..449398a 100644 --- a/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java +++ b/src/main/org/codehaus/groovy/vmplugin/VMPlugin.java @@ -18,7 +18,9 @@ */ package org.codehaus.groovy.vmplugin; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CompileUnit; import java.lang.reflect.Method; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java b/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java index 7d6afe8..621bc39 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java +++ b/src/main/org/codehaus/groovy/vmplugin/v5/JUnit4Utils.java @@ -22,9 +22,9 @@ import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyRuntimeException; import org.codehaus.groovy.runtime.InvokerHelper; -import java.util.List; import java.lang.annotation.Annotation; import java.lang.reflect.Method; +import java.util.List; /** * Java 5 code for working with JUnit 4 tests. http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java b/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java index 1c1cf4c..208e815 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java +++ b/src/main/org/codehaus/groovy/vmplugin/v5/PluginDefaultGroovyMethods.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.vmplugin.v5; -import groovy.lang.IntRange; import groovy.lang.EmptyRange; -import org.codehaus.groovy.runtime.InvokerHelper; +import groovy.lang.IntRange; import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport; +import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.RangeInfo; -import java.util.Arrays; import java.lang.reflect.Method; +import java.util.Arrays; /** * This class defines new Java 5 specific groovy methods which extend the normal http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java index 8709c47..92ce658 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/IndyArrayAccess.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.vmplugin.v7; +import org.codehaus.groovy.GroovyBugError; + import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.util.HashMap; -import org.codehaus.groovy.GroovyBugError; - /** * Class for handling array access through invokedynamic using static callsite information * @author Jochen Theodorou http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java index 00747d8..4a05fd2 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/IndyGuardsFiltersAndSignatures.java @@ -26,6 +26,15 @@ import groovy.lang.MetaMethod; import groovy.lang.MetaObjectProtocol; import groovy.lang.MetaProperty; import groovy.lang.MissingMethodException; +import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; +import org.codehaus.groovy.runtime.GroovyCategorySupport; +import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +import org.codehaus.groovy.runtime.typehandling.GroovyCastException; +import org.codehaus.groovy.runtime.wrappers.Wrapper; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -37,17 +46,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; -import org.codehaus.groovy.runtime.GroovyCategorySupport; -import org.codehaus.groovy.runtime.InvokerHelper; -import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; -import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import org.codehaus.groovy.runtime.typehandling.GroovyCastException; -import org.codehaus.groovy.runtime.wrappers.Wrapper; - -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.*; +import static org.codehaus.groovy.vmplugin.v7.IndyInterface.LOOKUP; /** * This class contains guards, runtime filters and http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java index 20c3ce7..3061562 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/IndyInterface.java @@ -21,14 +21,19 @@ package org.codehaus.groovy.vmplugin.v7; import groovy.lang.GroovySystem; import groovy.lang.MetaClassRegistryChangeEvent; import groovy.lang.MetaClassRegistryChangeEventListener; +import org.codehaus.groovy.GroovyBugError; -import java.lang.invoke.*; +import java.lang.invoke.CallSite; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; +import java.lang.invoke.MethodType; +import java.lang.invoke.MutableCallSite; +import java.lang.invoke.SwitchPoint; import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.groovy.GroovyBugError; - /** * Bytecode level interface for bootstrap methods used by invokedynamic. * This class provides a logging ability by using the boolean system property http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java b/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java index 5045324..3a97b53 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/IndyMath.java @@ -18,15 +18,16 @@ */ package org.codehaus.groovy.vmplugin.v7; -import java.lang.invoke.*; -import java.math.BigDecimal; -import java.util.*; - +import groovy.lang.MetaMethod; import org.codehaus.groovy.GroovyBugError; -import groovy.lang.MetaMethod; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodType; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.*; +import static org.codehaus.groovy.vmplugin.v7.IndyInterface.LOOKUP; import static org.codehaus.groovy.vmplugin.v7.TypeHelper.*; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java b/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java index 94a79a7..0a59f71 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/Selector.java @@ -49,7 +49,7 @@ import org.codehaus.groovy.runtime.metaclass.NewInstanceMetaMethod; import org.codehaus.groovy.runtime.metaclass.NewStaticMetaMethod; import org.codehaus.groovy.runtime.metaclass.ReflectionMetaMethod; import org.codehaus.groovy.runtime.wrappers.Wrapper; -import org.codehaus.groovy.vmplugin.v7.IndyInterface.CALL_TYPES; +import org.codehaus.groovy.vmplugin.v7.IndyInterface.*; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -65,11 +65,7 @@ import java.util.Collection; import java.util.HashSet; import static org.codehaus.groovy.vmplugin.v7.IndyGuardsFiltersAndSignatures.*; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.LOG; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.LOG_ENABLED; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.LOOKUP; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.makeFallBack; -import static org.codehaus.groovy.vmplugin.v7.IndyInterface.switchPoint; +import static org.codehaus.groovy.vmplugin.v7.IndyInterface.*; public abstract class Selector { public Object[] args, originalArguments; http://git-wip-us.apache.org/repos/asf/groovy/blob/93d9fe61/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java b/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java index 4764f52..6817edd 100644 --- a/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java +++ b/src/main/org/codehaus/groovy/vmplugin/v7/TypeTransformers.java @@ -22,6 +22,12 @@ import groovy.lang.Closure; import groovy.lang.GString; import groovy.lang.GroovyObject; import groovy.util.ProxyGenerator; +import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; +import org.codehaus.groovy.runtime.ConvertedClosure; +import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +import org.codehaus.groovy.transform.trait.Traits; + import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -33,11 +39,6 @@ import java.math.BigInteger; import java.util.Collections; import java.util.List; import java.util.Map; -import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.reflection.stdclasses.CachedSAMClass; -import org.codehaus.groovy.runtime.ConvertedClosure; -import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; -import org.codehaus.groovy.transform.trait.Traits; /** * This class contains several transformers for used during method invocation.
