You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2020/03/12 17:04:36 UTC
[groovy] branch binary-compat created (now 69b75e3)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch binary-compat
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 69b75e3 Restore binary compatibility in TypeChecingContext
This branch includes the following new commits:
new 69b75e3 Restore binary compatibility in TypeChecingContext
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: Restore binary compatibility in TypeChecingContext
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch binary-compat
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 69b75e3dfb229d2476a10f6da5751c36c1fa5d05
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Mar 12 12:00:13 2020 -0500
Restore binary compatibility in TypeChecingContext
---
.../transform/stc/StaticTypeCheckingVisitor.java | 7 ++--
.../groovy/transform/stc/TypeCheckingContext.java | 38 +++++++++++-----------
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 34adbaf..ca9f616 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -348,10 +348,13 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
protected DefaultTypeCheckingExtension extension;
protected TypeCheckingContext typeCheckingContext;
- public StaticTypeCheckingVisitor(final SourceUnit sourceUnit, final ClassNode classNode) {
- this.typeCheckingContext = new TypeCheckingContext(sourceUnit);
+ public StaticTypeCheckingVisitor(final SourceUnit source, final ClassNode classNode) {
+ this.typeCheckingContext = new TypeCheckingContext(this);
this.typeCheckingContext.pushEnclosingClassNode(classNode);
this.typeCheckingContext.pushTemporaryTypeInfo();
+ this.typeCheckingContext.pushErrorCollector(
+ source.getErrorCollector());
+ this.typeCheckingContext.source = source;
this.extension = new DefaultTypeCheckingExtension(this);
this.extension.addHandler(new EnumTypeCheckingExtension(this));
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java b/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
index a941ff8..19a12f5 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/TypeCheckingContext.java
@@ -49,17 +49,17 @@ import java.util.TreeSet;
public class TypeCheckingContext {
- private final SourceUnit source;
+ public TypeCheckingContext(final StaticTypeCheckingVisitor visitor) {
+ this.visitor = visitor;
+ }
- public TypeCheckingContext(final SourceUnit source) {
+ /*public TypeCheckingContext(final SourceUnit source) {
this.source = source;
pushErrorCollector(source.getErrorCollector());
- }
+ }*/
- @Deprecated
- public TypeCheckingContext(final StaticTypeCheckingVisitor visitor) {
- this.source = null;
- }
+ protected final StaticTypeCheckingVisitor visitor;
+ protected SourceUnit source;
public SourceUnit getSource() {
return source;
@@ -67,7 +67,7 @@ public class TypeCheckingContext {
//--------------------------------------------------------------------------
- private CompilationUnit compilationUnit;
+ protected CompilationUnit compilationUnit;
public CompilationUnit getCompilationUnit() {
return compilationUnit;
@@ -79,7 +79,7 @@ public class TypeCheckingContext {
//--------------------------------------------------------------------------
- private final LinkedList<ErrorCollector> errorCollectors = new LinkedList<>();
+ protected final LinkedList<ErrorCollector> errorCollectors = new LinkedList<>();
public ErrorCollector pushErrorCollector() {
CompilerConfiguration config = Optional.ofNullable(getErrorCollector())
@@ -115,7 +115,7 @@ public class TypeCheckingContext {
* Stores information which is only valid in the "if" branch of an if-then-else statement. This is used when the if
* condition expression makes use of an instanceof check
*/
- protected final Stack<Map<Object, List<ClassNode>>> temporaryIfBranchTypeInformation = new Stack<>();
+ protected Stack<Map<Object, List<ClassNode>>> temporaryIfBranchTypeInformation = new Stack<>();
public void pushTemporaryTypeInfo() {
Map<Object, List<ClassNode>> potentialTypes = new HashMap<>();
@@ -160,7 +160,7 @@ public class TypeCheckingContext {
* }
* // Here var1 instance of Runnable
*/
- protected final Map<BlockStatement, Map<VariableExpression, List<ClassNode>>> blockStatements2Types = new IdentityHashMap<>();
+ protected final IdentityHashMap<BlockStatement, Map<VariableExpression, List<ClassNode>>> blockStatements2Types = new IdentityHashMap<>();
protected Set<MethodNode> alreadyVisitedMethods = new HashSet<>();
@@ -169,7 +169,7 @@ public class TypeCheckingContext {
* example, for closure shared variables, we need a first pass to collect every type which is assigned to a closure
* shared variable, then a second pass to ensure that every method call on such a variable is made on a LUB.
*/
- protected final Set<SecondPassExpression> secondPassExpressions = new LinkedHashSet<>();
+ protected final LinkedHashSet<SecondPassExpression> secondPassExpressions = new LinkedHashSet<>();
/**
* A map used to store every type used in closure shared variable assignments. In a second pass, we will compute the
@@ -177,7 +177,7 @@ public class TypeCheckingContext {
*/
protected final Map<VariableExpression, List<ClassNode>> closureSharedVariablesAssignmentTypes = new HashMap<>();
- protected final Map<Parameter, ClassNode> controlStructureVariables = new HashMap<>();
+ protected Map<Parameter, ClassNode> controlStructureVariables = new HashMap<>();
// this map is used to ensure that two errors are not reported on the same line/column
protected final Set<Long> reportedErrors = new TreeSet<>();
@@ -185,14 +185,14 @@ public class TypeCheckingContext {
//--------------------------------------------------------------------------
// TODO: replace with general node stack and filters
- private final LinkedList<ClassNode> enclosingClassNodes = new LinkedList<>();
- private final LinkedList<MethodNode> enclosingMethods = new LinkedList<>();
- private final LinkedList<Expression> enclosingMethodCalls = new LinkedList<>();
+ protected final LinkedList<ClassNode> enclosingClassNodes = new LinkedList<>();
+ protected final LinkedList<MethodNode> enclosingMethods = new LinkedList<>();
+ protected final LinkedList<Expression> enclosingMethodCalls = new LinkedList<>();
protected final LinkedList<BlockStatement> enclosingBlocks = new LinkedList<>();
- private final LinkedList<SwitchStatement> switchStatements = new LinkedList<>();
- private final LinkedList<EnclosingClosure> enclosingClosures = new LinkedList<>();
+ protected final LinkedList<SwitchStatement> switchStatements = new LinkedList<>();
+ protected final LinkedList<EnclosingClosure> enclosingClosures = new LinkedList<>();
// stores the current binary expression. This is used when assignments are made with a null object, for type inference
- private final LinkedList<BinaryExpression> enclosingBinaryExpressions = new LinkedList<>();
+ protected final LinkedList<BinaryExpression> enclosingBinaryExpressions = new LinkedList<>();
/**
* Pushes a binary expression into the binary expression stack.