http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/Main.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/Main.java b/src/main/org/codehaus/groovy/antlr/Main.java index 241f8e4..ae3bb5f 100644 --- a/src/main/org/codehaus/groovy/antlr/Main.java +++ b/src/main/org/codehaus/groovy/antlr/Main.java @@ -18,19 +18,18 @@ */ package org.codehaus.groovy.antlr; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.FileReader; - -import org.codehaus.groovy.antlr.parser.GroovyLexer; -import org.codehaus.groovy.antlr.parser.GroovyRecognizer; - import antlr.ASTFactory; import antlr.CommonAST; import antlr.Token; import antlr.collections.AST; import antlr.debug.misc.ASTFrame; +import org.codehaus.groovy.antlr.parser.GroovyLexer; +import org.codehaus.groovy.antlr.parser.GroovyRecognizer; + +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.FileReader; class Main {
http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/SourceBuffer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/SourceBuffer.java b/src/main/org/codehaus/groovy/antlr/SourceBuffer.java index 1d7f38b..6b45e50 100644 --- a/src/main/org/codehaus/groovy/antlr/SourceBuffer.java +++ b/src/main/org/codehaus/groovy/antlr/SourceBuffer.java @@ -18,8 +18,8 @@ */ package org.codehaus.groovy.antlr; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * A simple buffer that provides line/col access to chunks of source code http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java b/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java index 538d02e..aef7e7a 100644 --- a/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java +++ b/src/main/org/codehaus/groovy/antlr/UnicodeEscapingReader.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.antlr; -import java.io.IOException; -import java.io.Reader; - import antlr.CharScanner; import antlr.Token; import antlr.TokenStreamException; +import java.io.IOException; +import java.io.Reader; + /** * Translates GLS-defined unicode escapes into characters. Throws an exception * in the event of an invalid unicode escape being detected. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java b/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java index 59d52f8..d7384e0 100644 --- a/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java +++ b/src/main/org/codehaus/groovy/antlr/java/Java2GroovyMain.java @@ -22,6 +22,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; + import java.util.Arrays; public class Java2GroovyMain { http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java b/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java index 78bd0f8..6c5c1e2 100644 --- a/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java +++ b/src/main/org/codehaus/groovy/antlr/java/PreJava2GroovyConverter.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.antlr.java; -import java.util.Stack; - import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.treewalker.VisitorAdapter; +import java.util.Stack; + /** This class mutates the Java AST, whilst it is still a Java AST, in readiness for conversion to Groovy, yippee-ky-a ! */ public class PreJava2GroovyConverter extends VisitorAdapter{ private final Stack stack; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java b/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java index 28700ee..305e397 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/CompositeVisitor.java @@ -18,10 +18,13 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.util.*; - import org.codehaus.groovy.antlr.GroovySourceAST; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + /** * A composite of many visitors. Any call to a method from Visitor * will invoke each visitor in turn, and reverse the invocation http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java b/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java index c173be7..6f17dfe 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/FlatNodeListTraversal.java @@ -18,13 +18,12 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.util.Iterator; -import java.util.List; - +import antlr.collections.AST; import org.codehaus.groovy.antlr.AntlrASTProcessor; import org.codehaus.groovy.antlr.GroovySourceAST; -import antlr.collections.AST; +import java.util.Iterator; +import java.util.List; /** * A simple iterator over an ordered (flat) List of the nodes of the AST. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java index c68cf9e..d9e985f 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinter.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.io.PrintStream; -import java.util.Stack; - import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.parser.GroovyTokenTypes; +import java.io.PrintStream; +import java.util.Stack; + /** * A visitor that prints a html tags of each node to the supplied PrintStream * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java index 3358bea..5c9659b 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/NodeCollector.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.antlr.treewalker; +import org.codehaus.groovy.antlr.GroovySourceAST; + import java.util.ArrayList; import java.util.List; -import org.codehaus.groovy.antlr.GroovySourceAST; - /** * A simple antlr AST visitor that collects all nodes into a List. * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java index d9e44b1..2710f4d 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/NodePrinter.java @@ -18,10 +18,10 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.io.PrintStream; - import org.codehaus.groovy.antlr.GroovySourceAST; +import java.io.PrintStream; + /** * A simple antlr AST visitor that outputs the tokenName of each node in a pseudo xml style. * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java b/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java index d65f055..ce2a236 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/SourceCodeTraversal.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.util.ArrayList; -import java.util.Collections; - import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.parser.GroovyTokenTypes; +import java.util.ArrayList; +import java.util.Collections; + /** * A treewalker for the antlr generated AST that attempts to visit the * AST nodes in the order needed to generate valid groovy source code. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java b/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java index 818e179..3db3565 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/SourcePrinter.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.io.PrintStream; -import java.util.Stack; - import antlr.collections.AST; import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.parser.GroovyTokenTypes; +import java.io.PrintStream; +import java.util.Stack; + /** * An antlr AST visitor that prints groovy source code for each visited node * to the supplied PrintStream. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java b/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java index b105ae4..dcae1a8 100644 --- a/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java +++ b/src/main/org/codehaus/groovy/antlr/treewalker/TraversalHelper.java @@ -18,14 +18,13 @@ */ package org.codehaus.groovy.antlr.treewalker; -import java.util.List; -import java.util.ArrayList; - -import org.codehaus.groovy.antlr.GroovySourceAST; +import antlr.collections.AST; import org.codehaus.groovy.antlr.AntlrASTProcessor; +import org.codehaus.groovy.antlr.GroovySourceAST; import org.codehaus.groovy.antlr.parser.GroovyTokenTypes; -import antlr.collections.AST; +import java.util.ArrayList; +import java.util.List; /** * Helper Class for Antlr AST traversal and visitation. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/AnnotatedNode.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/AnnotatedNode.java b/src/main/org/codehaus/groovy/ast/AnnotatedNode.java index b8cd47c..ab5f2eb 100644 --- a/src/main/org/codehaus/groovy/ast/AnnotatedNode.java +++ b/src/main/org/codehaus/groovy/ast/AnnotatedNode.java @@ -18,7 +18,9 @@ */ package org.codehaus.groovy.ast; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * Base class for any AST node which is capable of being annotated http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java b/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java index be271a4..06ef44d 100644 --- a/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java +++ b/src/main/org/codehaus/groovy/ast/ClassCodeExpressionTransformer.java @@ -18,10 +18,9 @@ */ package org.codehaus.groovy.ast; -import java.util.List; -import java.util.Map; - -import org.codehaus.groovy.ast.expr.*; +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.stmt.AssertStatement; import org.codehaus.groovy.ast.stmt.CaseStatement; import org.codehaus.groovy.ast.stmt.DoWhileStatement; @@ -35,6 +34,9 @@ import org.codehaus.groovy.ast.stmt.SynchronizedStatement; import org.codehaus.groovy.ast.stmt.ThrowStatement; import org.codehaus.groovy.ast.stmt.WhileStatement; +import java.util.List; +import java.util.Map; + /** * Visitor to transform expressions in a whole class. * Transformed Expressions are usually not visited. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java b/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java index bfabea9..378d2be 100644 --- a/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java +++ b/src/main/org/codehaus/groovy/ast/ClassCodeVisitorSupport.java @@ -18,9 +18,6 @@ */ package org.codehaus.groovy.ast; -import java.util.List; -import java.util.Map; - import org.codehaus.groovy.ast.expr.DeclarationExpression; import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.stmt.AssertStatement; @@ -45,6 +42,9 @@ import org.codehaus.groovy.control.messages.SyntaxErrorMessage; import org.codehaus.groovy.syntax.SyntaxException; import org.codehaus.groovy.transform.ErrorCollecting; +import java.util.List; +import java.util.Map; + public abstract class ClassCodeVisitorSupport extends CodeVisitorSupport implements ErrorCollecting, GroovyClassVisitor { public void visitClass(ClassNode node) { http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/ClassHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/ClassHelper.java b/src/main/org/codehaus/groovy/ast/ClassHelper.java index 6fc6a22..60eaa47 100644 --- a/src/main/org/codehaus/groovy/ast/ClassHelper.java +++ b/src/main/org/codehaus/groovy/ast/ClassHelper.java @@ -18,8 +18,16 @@ */ package org.codehaus.groovy.ast; -import groovy.lang.*; - +import groovy.lang.Binding; +import groovy.lang.Closure; +import groovy.lang.GString; +import groovy.lang.GroovyInterceptable; +import groovy.lang.GroovyObject; +import groovy.lang.GroovyObjectSupport; +import groovy.lang.MetaClass; +import groovy.lang.Range; +import groovy.lang.Reference; +import groovy.lang.Script; import org.codehaus.groovy.runtime.GeneratedClosure; import org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport; import org.codehaus.groovy.transform.trait.Traits; @@ -30,14 +38,14 @@ import org.objectweb.asm.Opcodes; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; +import java.lang.ref.SoftReference; +import java.lang.reflect.Modifier; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import java.lang.ref.SoftReference; -import java.lang.reflect.Modifier; /** * This class is a Helper for ClassNode and classes handling ClassNodes. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java b/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java index 25f5ea2..523475e 100644 --- a/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java +++ b/src/main/org/codehaus/groovy/ast/CodeVisitorSupport.java @@ -18,8 +18,59 @@ */ package org.codehaus.groovy.ast; -import org.codehaus.groovy.ast.expr.*; -import org.codehaus.groovy.ast.stmt.*; +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 java.util.List; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/CompileUnit.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/CompileUnit.java b/src/main/org/codehaus/groovy/ast/CompileUnit.java index 674d94c..ea0722c 100644 --- a/src/main/org/codehaus/groovy/ast/CompileUnit.java +++ b/src/main/org/codehaus/groovy/ast/CompileUnit.java @@ -19,6 +19,10 @@ package org.codehaus.groovy.ast; import groovy.lang.GroovyClassLoader; +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.SourceUnit; +import org.codehaus.groovy.control.messages.SyntaxErrorMessage; +import org.codehaus.groovy.syntax.SyntaxException; import java.security.CodeSource; import java.util.ArrayList; @@ -28,11 +32,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.SourceUnit; -import org.codehaus.groovy.control.messages.SyntaxErrorMessage; -import org.codehaus.groovy.syntax.SyntaxException; - /** * Represents the entire contents of a compilation step which consists of one or more * {@link ModuleNode} instances. There's one instance of this that's shared by all modules and http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/FieldNode.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/FieldNode.java b/src/main/org/codehaus/groovy/ast/FieldNode.java index c791346..cd7ef80 100644 --- a/src/main/org/codehaus/groovy/ast/FieldNode.java +++ b/src/main/org/codehaus/groovy/ast/FieldNode.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.ast; -import java.lang.reflect.Field; - import org.codehaus.groovy.ast.expr.Expression; import org.objectweb.asm.Opcodes; +import java.lang.reflect.Field; + /** * Represents a field (member variable) * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/GenericsType.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/GenericsType.java b/src/main/org/codehaus/groovy/ast/GenericsType.java index c1be654..55d0bb0 100644 --- a/src/main/org/codehaus/groovy/ast/GenericsType.java +++ b/src/main/org/codehaus/groovy/ast/GenericsType.java @@ -18,8 +18,6 @@ */ package org.codehaus.groovy.ast; -import static org.codehaus.groovy.ast.ClassHelper.GROOVY_OBJECT_TYPE; - import org.codehaus.groovy.ast.tools.GenericsUtils; import org.codehaus.groovy.ast.tools.WideningCategories; @@ -28,6 +26,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import static org.codehaus.groovy.ast.ClassHelper.GROOVY_OBJECT_TYPE; + /** * This class is used to describe generic type signatures for ClassNodes. * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java b/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java index baa7fc9..12787c0 100644 --- a/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java +++ b/src/main/org/codehaus/groovy/ast/GroovyCodeVisitor.java @@ -18,8 +18,56 @@ */ package org.codehaus.groovy.ast; -import org.codehaus.groovy.ast.expr.*; -import org.codehaus.groovy.ast.stmt.*; +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.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.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.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; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java b/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java index 21bccce..9060401 100644 --- a/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java +++ b/src/main/org/codehaus/groovy/ast/MixinASTTransformation.java @@ -29,10 +29,7 @@ import org.codehaus.groovy.transform.AbstractASTTransformation; import org.codehaus.groovy.transform.GroovyASTTransformation; import static org.codehaus.groovy.ast.ClassHelper.make; -import static org.codehaus.groovy.ast.tools.GeneralUtils.callX; -import static org.codehaus.groovy.ast.tools.GeneralUtils.classX; -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.*; /** * @deprecated static mixins have been deprecated in favour of traits (trait keyword). http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/Parameter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/Parameter.java b/src/main/org/codehaus/groovy/ast/Parameter.java index a49b34a..e3bb2bc 100644 --- a/src/main/org/codehaus/groovy/ast/Parameter.java +++ b/src/main/org/codehaus/groovy/ast/Parameter.java @@ -18,7 +18,7 @@ */ package org.codehaus.groovy.ast; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.Expression; /** http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/TransformingCodeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/TransformingCodeVisitor.java b/src/main/org/codehaus/groovy/ast/TransformingCodeVisitor.java index 53f02fd..f3d6dbe 100644 --- a/src/main/org/codehaus/groovy/ast/TransformingCodeVisitor.java +++ b/src/main/org/codehaus/groovy/ast/TransformingCodeVisitor.java @@ -18,7 +18,38 @@ */ package org.codehaus.groovy.ast; -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.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.DeclarationExpression; +import org.codehaus.groovy.ast.expr.ElvisOperatorExpression; +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.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; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy b/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy index 57151cc..06d027b 100644 --- a/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy +++ b/src/main/org/codehaus/groovy/ast/builder/AstBuilder.groovy @@ -19,8 +19,8 @@ package org.codehaus.groovy.ast.builder import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.ast.stmt.BlockStatement +import org.codehaus.groovy.control.CompilePhase /** * The AstBuilder provides several ways to build an abstract syntax tree (AST) of Groovy code. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java b/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java index 1695db4..6882498 100644 --- a/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java +++ b/src/main/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java @@ -18,8 +18,17 @@ */ package org.codehaus.groovy.ast.builder; -import org.codehaus.groovy.ast.*; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +import org.codehaus.groovy.ast.ImportNode; +import org.codehaus.groovy.ast.MethodCallTransformation; +import org.codehaus.groovy.ast.MethodInvocationTrap; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +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.MethodCallExpression; +import org.codehaus.groovy.ast.expr.TupleExpression; import org.codehaus.groovy.control.CompilePhase; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.io.ReaderSource; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy b/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy index 6ce1906..e36e33e 100644 --- a/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy +++ b/src/main/org/codehaus/groovy/ast/builder/AstSpecificationCompiler.groovy @@ -18,78 +18,12 @@ */ package org.codehaus.groovy.ast.builder -import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.ast.AnnotationNode -import org.codehaus.groovy.ast.ClassNode -import org.codehaus.groovy.ast.ConstructorNode -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.MixinNode -import org.codehaus.groovy.ast.Parameter -import org.codehaus.groovy.ast.PropertyNode -import org.codehaus.groovy.ast.VariableScope -import org.codehaus.groovy.ast.expr.AnnotationConstantExpression -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.NamedArgumentListExpression -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.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.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.ast.* +import org.codehaus.groovy.ast.expr.* +import org.codehaus.groovy.ast.stmt.* import org.codehaus.groovy.runtime.MethodClosure import org.codehaus.groovy.syntax.Token import org.codehaus.groovy.syntax.Types -import org.codehaus.groovy.ast.stmt.Statement -import org.codehaus.groovy.ast.ClassHelper /** * Handles parsing the properties from the closure into values that can be referenced. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy b/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy index ce1fc10..497c125 100644 --- a/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy +++ b/src/main/org/codehaus/groovy/ast/builder/AstStringCompiler.groovy @@ -20,9 +20,9 @@ package org.codehaus.groovy.ast.builder import groovy.transform.PackageScope import org.codehaus.groovy.ast.ASTNode -import org.codehaus.groovy.control.CompilePhase -import org.codehaus.groovy.control.CompilationUnit import org.codehaus.groovy.ast.ModuleNode +import org.codehaus.groovy.control.CompilationUnit +import org.codehaus.groovy.control.CompilePhase import org.codehaus.groovy.control.CompilerConfiguration /** http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/decompiled/Annotations.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/decompiled/Annotations.java b/src/main/org/codehaus/groovy/ast/decompiled/Annotations.java index 15c0a22..2974d00 100644 --- a/src/main/org/codehaus/groovy/ast/decompiled/Annotations.java +++ b/src/main/org/codehaus/groovy/ast/decompiled/Annotations.java @@ -20,9 +20,13 @@ package org.codehaus.groovy.ast.decompiled; import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.AnnotationConstantExpression; +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.ListExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; import org.codehaus.groovy.vmplugin.VMPluginFactory; -import org.codehaus.groovy.vmplugin.v5.Java5; import org.objectweb.asm.Type; import java.lang.reflect.Array; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java b/src/main/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java index e17847a..df7ca54 100644 --- a/src/main/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java +++ b/src/main/org/codehaus/groovy/ast/decompiled/AsmDecompiler.java @@ -18,14 +18,24 @@ */ package org.codehaus.groovy.ast.decompiled; -import org.objectweb.asm.*; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.lang.ref.SoftReference; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * A utility class responsible for decompiling JVM class files and producing {@link ClassStub} objects reflecting their structure. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/decompiled/ClassStub.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/decompiled/ClassStub.java b/src/main/org/codehaus/groovy/ast/decompiled/ClassStub.java index aaadf04..364b69d 100644 --- a/src/main/org/codehaus/groovy/ast/decompiled/ClassStub.java +++ b/src/main/org/codehaus/groovy/ast/decompiled/ClassStub.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.ast.decompiled; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * @author Peter Gromov http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java b/src/main/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java index b0a54db..18cc79f 100644 --- a/src/main/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java +++ b/src/main/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java @@ -18,7 +18,14 @@ */ package org.codehaus.groovy.ast.decompiled; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.AnnotationNode; +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.MethodNode; +import org.codehaus.groovy.ast.MixinNode; import org.codehaus.groovy.classgen.Verifier; import java.lang.reflect.Modifier; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/decompiled/MemberSignatureParser.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/decompiled/MemberSignatureParser.java b/src/main/org/codehaus/groovy/ast/decompiled/MemberSignatureParser.java index ecda06d..6627c85 100644 --- a/src/main/org/codehaus/groovy/ast/decompiled/MemberSignatureParser.java +++ b/src/main/org/codehaus/groovy/ast/decompiled/MemberSignatureParser.java @@ -18,7 +18,13 @@ */ package org.codehaus.groovy.ast.decompiled; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AnnotationNode; +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.MethodNode; +import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.stmt.ReturnStatement; import org.objectweb.asm.Type; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java b/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java index d3e0ede..bb4d78f 100644 --- a/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/AnnotationConstantExpression.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.Map; - import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.Map; + /** * Represents an annotation "constant" that may appear in annotation attributes * (mainly used as a marker). http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java index feb00f0..de835b7 100644 --- a/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/ArgumentListExpression.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.List; - import org.codehaus.groovy.ast.GroovyCodeVisitor; import org.codehaus.groovy.ast.Parameter; +import java.util.List; + /** * Represents one or more arguments being passed into a method * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java b/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java index 4a4f9c1..a70102d 100644 --- a/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/ArrayExpression.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.Collections; -import java.util.List; - import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.Collections; +import java.util.List; + /** * Represents an array object construction either using a fixed size * or an initializer expression http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java b/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java index c016ae6..802a6ee 100644 --- a/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/ClosureExpression.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.ast.expr; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AstToTextHelper; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +import org.codehaus.groovy.ast.Parameter; +import org.codehaus.groovy.ast.VariableScope; import org.codehaus.groovy.ast.stmt.Statement; import org.codehaus.groovy.runtime.InvokerHelper; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java index 8f87640..ecbd333 100644 --- a/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/ClosureListExpression.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.GroovyCodeVisitor; import org.codehaus.groovy.ast.VariableScope; +import java.util.ArrayList; +import java.util.List; + /** * This class represents a list of expressions used to * create closures. Example: http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/Expression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/Expression.java b/src/main/org/codehaus/groovy/ast/expr/Expression.java index 1109528..166f58f 100644 --- a/src/main/org/codehaus/groovy/ast/expr/Expression.java +++ b/src/main/org/codehaus/groovy/ast/expr/Expression.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.ArrayList; -import java.util.List; - +import org.codehaus.groovy.GroovyBugError; +import org.codehaus.groovy.ast.AnnotatedNode; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; -import org.codehaus.groovy.ast.AnnotatedNode; -import org.codehaus.groovy.GroovyBugError; + +import java.util.ArrayList; +import java.util.List; /** * Represents a base class for expressions which evaluate as an object http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java b/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java index 9685179..7ccf355 100644 --- a/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/GStringExpression.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.ArrayList; +import java.util.List; + /** * Represents a String expression which contains embedded values inside * it such as "hello there ${user} how are you" which is expanded lazily http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/ListExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/ListExpression.java b/src/main/org/codehaus/groovy/ast/expr/ListExpression.java index afaad65..94ab0d2 100644 --- a/src/main/org/codehaus/groovy/ast/expr/ListExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/ListExpression.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.ArrayList; +import java.util.List; + /** * Represents a list expression [1, 2, 3] which creates a mutable List * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/MapExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/MapExpression.java b/src/main/org/codehaus/groovy/ast/expr/MapExpression.java index 1f0755b..0effc80 100644 --- a/src/main/org/codehaus/groovy/ast/expr/MapExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/MapExpression.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.ArrayList; +import java.util.List; + /** * Represents a map expression [1 : 2, "a" : "b", x : y] which creates a mutable Map * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java b/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java index c3e7535..089d930 100644 --- a/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/MethodCallExpression.java @@ -18,7 +18,11 @@ */ package org.codehaus.groovy.ast.expr; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +import org.codehaus.groovy.ast.MethodNode; /** * A method call on an object or class http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java b/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java index 71d4af9..f4d2422 100644 --- a/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/MethodPointerExpression.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.ast.expr; import groovy.lang.Closure; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.GroovyCodeVisitor; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java b/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java index 722c4ee..679b250 100644 --- a/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/StaticMethodCallExpression.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.ast.expr; import groovy.lang.MetaMethod; - import org.codehaus.groovy.ast.ASTNode; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.GroovyCodeVisitor; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java b/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java index 5fc080b..113706a 100644 --- a/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java +++ b/src/main/org/codehaus/groovy/ast/expr/TupleExpression.java @@ -18,10 +18,14 @@ */ package org.codehaus.groovy.ast.expr; -import java.util.*; - import org.codehaus.groovy.ast.GroovyCodeVisitor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + /** * Represents a tuple expression {1, 2, 3} which creates an immutable List * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java b/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java index 94952df..5013726 100644 --- a/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java +++ b/src/main/org/codehaus/groovy/ast/stmt/BlockStatement.java @@ -18,13 +18,13 @@ */ package org.codehaus.groovy.ast.stmt; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +import org.codehaus.groovy.ast.VariableScope; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.codehaus.groovy.ast.GroovyCodeVisitor; -import org.codehaus.groovy.ast.VariableScope; - /** * A list of statements and a scope. * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java b/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java index 2f19adc..bad0194 100644 --- a/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java +++ b/src/main/org/codehaus/groovy/ast/stmt/SwitchStatement.java @@ -18,12 +18,12 @@ */ package org.codehaus.groovy.ast.stmt; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.GroovyCodeVisitor; import org.codehaus.groovy.ast.expr.Expression; +import java.util.ArrayList; +import java.util.List; + /** * Represents a switch (object) { case value: ... case [1, 2, 3]: ... default: ... } statement in Groovy. * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java b/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java index e8dea4e..172e403 100644 --- a/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java +++ b/src/main/org/codehaus/groovy/ast/stmt/TryCatchStatement.java @@ -18,11 +18,11 @@ */ package org.codehaus.groovy.ast.stmt; +import org.codehaus.groovy.ast.GroovyCodeVisitor; + import java.util.ArrayList; import java.util.List; -import org.codehaus.groovy.ast.GroovyCodeVisitor; - /** * Represents a try { ... } catch () finally {} statement in Groovy * http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java b/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java index 6f89b60..ff89b7a 100644 --- a/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java +++ b/src/main/org/codehaus/groovy/ast/tools/WideningCategories.java @@ -18,14 +18,25 @@ */ package org.codehaus.groovy.ast.tools; -import static org.codehaus.groovy.ast.ClassHelper.*; - 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 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.HashMap; +import java.util.HashSet; +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.ClassHelper.*; /** * This class provides helper methods to determine the type from a widening http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java b/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java index 63296cb..e514b59 100644 --- a/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java +++ b/src/main/org/codehaus/groovy/classgen/AnnotationVisitor.java @@ -18,11 +18,6 @@ */ package org.codehaus.groovy.classgen; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.List; -import java.util.Map; - import org.codehaus.groovy.ast.ASTNode; import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassHelper; @@ -44,6 +39,11 @@ import org.codehaus.groovy.control.messages.SyntaxErrorMessage; import org.codehaus.groovy.syntax.SyntaxException; import org.codehaus.groovy.vmplugin.VMPluginFactory; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.List; +import java.util.Map; + /** * An Annotation visitor responsible for: * <ul> http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java b/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java index 476253a..7c056ef 100644 --- a/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java +++ b/src/main/org/codehaus/groovy/classgen/ClassCompletionVerifier.java @@ -18,13 +18,18 @@ */ package org.codehaus.groovy.classgen; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; - import org.apache.groovy.ast.tools.ClassNodeUtils; -import org.codehaus.groovy.ast.*; +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.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.PropertyNode; +import org.codehaus.groovy.ast.Variable; import org.codehaus.groovy.ast.expr.BinaryExpression; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.DeclarationExpression; @@ -42,6 +47,11 @@ import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.syntax.Types; import org.codehaus.groovy.transform.trait.Traits; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; + import static java.lang.reflect.Modifier.*; import static org.codehaus.groovy.ast.ClassHelper.VOID_TYPE; import static org.objectweb.asm.Opcodes.*; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java b/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java index c8415a9..15ade40 100644 --- a/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java +++ b/src/main/org/codehaus/groovy/classgen/DummyClassGenerator.java @@ -19,7 +19,16 @@ package org.codehaus.groovy.classgen; import groovy.lang.GroovyRuntimeException; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ASTNode; +import org.codehaus.groovy.ast.AnnotatedNode; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CompileUnit; +import org.codehaus.groovy.ast.ConstructorNode; +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.classgen.asm.BytecodeHelper; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java b/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java index fbae932..30c6fab 100644 --- a/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java +++ b/src/main/org/codehaus/groovy/classgen/EnumCompletionVisitor.java @@ -18,7 +18,14 @@ */ package org.codehaus.groovy.classgen; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.ClassCodeVisitorSupport; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CodeVisitorSupport; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.EnumConstantClassNode; +import org.codehaus.groovy.ast.InnerClassNode; +import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.expr.ArgumentListExpression; import org.codehaus.groovy.ast.expr.ConstructorCallExpression; import org.codehaus.groovy.ast.expr.Expression; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/EnumVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/EnumVisitor.java b/src/main/org/codehaus/groovy/classgen/EnumVisitor.java index a1564f0..743801f 100644 --- a/src/main/org/codehaus/groovy/classgen/EnumVisitor.java +++ b/src/main/org/codehaus/groovy/classgen/EnumVisitor.java @@ -27,7 +27,23 @@ 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.*; +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.BooleanExpression; +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.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.MethodCallExpression; +import org.codehaus.groovy.ast.expr.SpreadExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; +import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; @@ -361,7 +377,7 @@ public class EnumVisitor extends ClassCodeVisitorSupport { } args.addExpression(exp); } - if (!savedMapEntries.isEmpty()) { + if (!savedMapEntries.isEmpty()) { args.getExpressions().add(2, new MapExpression(savedMapEntries)); } } http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java b/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java index 5e13cd7..a2ecf2a 100644 --- a/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java +++ b/src/main/org/codehaus/groovy/classgen/ExtendedVerifier.java @@ -54,9 +54,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpec; -import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpecRecurse; -import static org.codehaus.groovy.ast.tools.GenericsUtils.createGenericsSpec; +import static org.codehaus.groovy.ast.tools.GenericsUtils.*; /** * A specialized Groovy AST visitor meant to perform additional verifications upon the http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java b/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java index 5b86c65..8cbe6cc 100644 --- a/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java +++ b/src/main/org/codehaus/groovy/classgen/InnerClassVisitorHelper.java @@ -25,7 +25,16 @@ import org.codehaus.groovy.ast.FieldNode; import org.codehaus.groovy.ast.InnerClassNode; import org.codehaus.groovy.ast.Parameter; import org.codehaus.groovy.ast.VariableScope; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ArgumentListExpression; +import org.codehaus.groovy.ast.expr.BinaryExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +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.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.BlockStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.ast.stmt.ReturnStatement; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/ReturnAdder.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/ReturnAdder.java b/src/main/org/codehaus/groovy/classgen/ReturnAdder.java index ab1bbfe..22f3059 100644 --- a/src/main/org/codehaus/groovy/classgen/ReturnAdder.java +++ b/src/main/org/codehaus/groovy/classgen/ReturnAdder.java @@ -23,10 +23,22 @@ import org.codehaus.groovy.ast.MethodNode; import org.codehaus.groovy.ast.VariableScope; import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.Expression; -import org.codehaus.groovy.ast.stmt.*; +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.EmptyStatement; +import org.codehaus.groovy.ast.stmt.ExpressionStatement; +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 java.util.List; import java.util.ArrayList; +import java.util.List; /** * Utility class to add return statements. http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java b/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java index 1801e5e..088a6d9 100644 --- a/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java +++ b/src/main/org/codehaus/groovy/classgen/VariableScopeVisitor.java @@ -19,8 +19,31 @@ package org.codehaus.groovy.classgen; 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.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.DynamicVariable; +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.VariableScope; +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.ConstructorCallExpression; +import org.codehaus.groovy.ast.expr.DeclarationExpression; +import org.codehaus.groovy.ast.expr.Expression; +import org.codehaus.groovy.ast.expr.FieldExpression; +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.BlockStatement; import org.codehaus.groovy.ast.stmt.CatchStatement; import org.codehaus.groovy.ast.stmt.ForStatement; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/Verifier.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/Verifier.java b/src/main/org/codehaus/groovy/classgen/Verifier.java index 77a910b..35a0bde 100644 --- a/src/main/org/codehaus/groovy/classgen/Verifier.java +++ b/src/main/org/codehaus/groovy/classgen/Verifier.java @@ -24,7 +24,21 @@ import groovy.lang.MetaClass; import groovy.transform.Generated; import org.apache.groovy.ast.tools.ClassNodeUtils; import org.codehaus.groovy.GroovyBugError; -import org.codehaus.groovy.ast.*; +import org.codehaus.groovy.ast.AnnotationNode; +import org.codehaus.groovy.ast.ClassHelper; +import org.codehaus.groovy.ast.ClassNode; +import org.codehaus.groovy.ast.CodeVisitorSupport; +import org.codehaus.groovy.ast.ConstructorNode; +import org.codehaus.groovy.ast.FieldNode; +import org.codehaus.groovy.ast.GenericsType; +import org.codehaus.groovy.ast.GroovyClassVisitor; +import org.codehaus.groovy.ast.GroovyCodeVisitor; +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.VariableScope; import org.codehaus.groovy.ast.expr.ArgumentListExpression; import org.codehaus.groovy.ast.expr.BinaryExpression; import org.codehaus.groovy.ast.expr.CastExpression; @@ -46,11 +60,11 @@ import org.codehaus.groovy.classgen.asm.BytecodeHelper; import org.codehaus.groovy.classgen.asm.MopWriter; import org.codehaus.groovy.classgen.asm.OptimizingStatementWriter.ClassNodeSkip; import org.codehaus.groovy.classgen.asm.WriterController; +import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.MetaClassHelper; import org.codehaus.groovy.syntax.RuntimeParserException; import org.codehaus.groovy.syntax.Token; import org.codehaus.groovy.syntax.Types; -import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.transform.trait.Traits; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; @@ -69,11 +83,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static java.lang.reflect.Modifier.isAbstract; -import static java.lang.reflect.Modifier.isFinal; -import static java.lang.reflect.Modifier.isPrivate; -import static java.lang.reflect.Modifier.isPublic; -import static java.lang.reflect.Modifier.isStatic; +import static java.lang.reflect.Modifier.*; import static org.apache.groovy.ast.tools.MethodNodeUtils.methodDescriptorWithoutReturnType; import static org.codehaus.groovy.ast.tools.GenericsUtils.correctToGenericsSpec; import static org.codehaus.groovy.ast.tools.GenericsUtils.createGenericsSpec; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java b/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java index 5342219..424aa7e 100644 --- a/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java +++ b/src/main/org/codehaus/groovy/classgen/VerifierCodeVisitor.java @@ -21,13 +21,13 @@ package org.codehaus.groovy.classgen; import org.codehaus.groovy.ast.ASTNode; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.CodeVisitorSupport; -import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.ast.expr.ConstructorCallExpression; 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.FieldExpression; import org.codehaus.groovy.ast.expr.VariableExpression; +import org.codehaus.groovy.ast.stmt.ForStatement; import org.codehaus.groovy.syntax.RuntimeParserException; import org.objectweb.asm.Opcodes; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java b/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java index eb774d1..bdb70df 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/AssertionWriter.java @@ -18,9 +18,6 @@ */ package org.codehaus.groovy.classgen.asm; -import java.util.ArrayList; -import java.util.List; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.expr.BinaryExpression; import org.codehaus.groovy.ast.expr.BooleanExpression; @@ -36,6 +33,9 @@ import org.codehaus.groovy.syntax.Token; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import java.util.ArrayList; +import java.util.List; + import static org.objectweb.asm.Opcodes.*; public class AssertionWriter { http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java index 271b247..f388c74 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryDoubleExpressionHelper.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.classgen.asm; -import static org.objectweb.asm.Opcodes.*; - import org.codehaus.groovy.GroovyBugError; 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/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java index 633f447..1b78431 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionHelper.java @@ -19,7 +19,6 @@ package org.codehaus.groovy.classgen.asm; import groovy.lang.GroovyRuntimeException; - import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java index 02a3ee0..ad882b5 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java @@ -18,9 +18,6 @@ */ package org.codehaus.groovy.classgen.asm; -import java.util.HashMap; -import java.util.Map; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.DynamicVariable; @@ -32,10 +29,13 @@ import org.codehaus.groovy.ast.expr.VariableExpression; import org.codehaus.groovy.classgen.AsmClassGenerator; import org.codehaus.groovy.runtime.BytecodeInterface8; +import java.util.HashMap; +import java.util.Map; + import static org.codehaus.groovy.ast.ClassHelper.*; +import static org.codehaus.groovy.ast.tools.WideningCategories.*; import static org.codehaus.groovy.syntax.TokenUtil.removeAssignment; import static org.codehaus.groovy.syntax.Types.*; -import static org.codehaus.groovy.ast.tools.WideningCategories.*; /** * This class is for internal use only! http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java index f27b7ad..1d11ee5 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionWriter.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.classgen.asm; -import static org.codehaus.groovy.syntax.Types.*; -import static org.objectweb.asm.Opcodes.*; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import static org.codehaus.groovy.syntax.Types.*; +import static org.objectweb.asm.Opcodes.*; + /** * Base class for writing primitive typed operations * @author <a href="mailto:[email protected]";>Jochen "blackdrag" Theodorou</a> http://git-wip-us.apache.org/repos/asf/groovy/blob/bbe1d061/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java index fac9cb1..a60dcfa 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryFloatExpressionHelper.java @@ -18,14 +18,14 @@ */ package org.codehaus.groovy.classgen.asm; -import static org.objectweb.asm.Opcodes.*; - import org.codehaus.groovy.GroovyBugError; 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/bbe1d061/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/bbe1d061/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/bbe1d061/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 e227394..d680731 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/bbe1d061/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 6e3cfec..5933faa 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java +++ b/src/main/org/codehaus/groovy/classgen/asm/CallSiteWriter.java @@ -18,13 +18,6 @@ */ package org.codehaus.groovy.classgen.asm; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - import org.codehaus.groovy.ast.ClassHelper; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.InterfaceHelperClassNode; @@ -38,6 +31,10 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +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/bbe1d061/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 {
