From 9c24da7364d317962562b71d9a06b2eb8ce147ef Mon Sep 17 00:00:00 2001
From: gavinking <gavin@ceylon-lang.org>
Date: Sat, 9 Sep 2017 18:14:11 +0200
Subject: [PATCH] clean up imports

---
 .../analyzer/ExpressionVisitor.java           | 27 +++++++------------
 .../typechecker/analyzer/TypeVisitor.java     |  6 ++---
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java
index 0f05ee15d02..8cb7396e61b 100644
--- a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java
+++ b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/ExpressionVisitor.java
@@ -83,13 +83,6 @@
 import com.redhat.ceylon.compiler.typechecker.tree.CustomTree;
 import com.redhat.ceylon.compiler.typechecker.tree.Node;
 import com.redhat.ceylon.compiler.typechecker.tree.Tree;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.Expression;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.Pattern;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.PositionalArgument;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.Term;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.TuplePattern;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.TypeParameterList;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.VoidModifier;
 import com.redhat.ceylon.compiler.typechecker.tree.Visitor;
 import com.redhat.ceylon.model.typechecker.model.Cancellable;
 import com.redhat.ceylon.model.typechecker.model.Class;
@@ -670,13 +663,13 @@ private void destructureTuple(Type sequenceType,
     }
 
     private void destructureSequence(Type sequenceType, 
-            TuplePattern tuplePattern) {
+            Tree.TuplePattern tuplePattern) {
         List<Tree.Pattern> patterns = 
                 tuplePattern.getPatterns();
         int length = patterns.size();
         Tree.Pattern lastPattern = patterns.get(length-1);
         if (!isVariadicPattern(lastPattern)) {
-            Pattern pattern = lastPattern;
+            Tree.Pattern pattern = lastPattern;
             if (pattern==null) pattern = tuplePattern;
             pattern.addError(
                     "assigned expression is not a tuple type, so pattern must end in a variadic element: '" + 
@@ -684,7 +677,7 @@ private void destructureSequence(Type sequenceType,
                     "' is not a tuple type");
         }
         else if (/*nonempty && length>1 ||*/ length>2) {
-            Pattern pattern = patterns.get(2);
+            Tree.Pattern pattern = patterns.get(2);
             if (pattern==null) pattern = tuplePattern;
             pattern.addError(
                     "assigned expression is not a tuple type, so pattern must not have more than two elements: '" + 
@@ -693,7 +686,7 @@ else if (/*nonempty && length>1 ||*/ length>2) {
         }
         else if ((/*nonempty ||*/ length>1) && 
                 !unit.isSequenceType(sequenceType)) {
-            Pattern pattern = patterns.get(1);
+            Tree.Pattern pattern = patterns.get(1);
             if (pattern==null) pattern = tuplePattern;
             pattern.addError(
                     "assigned expression is not a nonempty sequence type, so pattern must have exactly one element: '" + 
@@ -1876,7 +1869,7 @@ && hasNullReturnValues(type,
         Type it = canonicalIntersection(refinedTypes, unit);
         if (allHaveNulls && !unit.isOptionalType(it)) {
             methodOrValue.setUncheckedNullType(true);
-            Term lhs = that.getBaseMemberExpression();
+            Tree.Term lhs = that.getBaseMemberExpression();
             //TODO: this is pretty ugly, think of something better!
             lhs.setTypeModel(unit.getOptionalType(lhs.getTypeModel()));
         }
@@ -2375,7 +2368,7 @@ public void visit(Tree.TypedDeclaration that) {
         }
     }
     
-    private static VoidModifier fakeVoid(Node that) {
+    private static Tree.VoidModifier fakeVoid(Node that) {
         return new Tree.VoidModifier(that.getToken());
     }
     
@@ -4259,7 +4252,7 @@ private void setArgumentParameters(
                 Tree.PositionalArgumentList pal = 
                         that.getPositionalArgumentList();
                 if (pal!=null) {
-                    List<PositionalArgument> args = 
+                    List<Tree.PositionalArgument> args = 
                             pal.getPositionalArguments();
                     List<Parameter> params = 
                             pl.getParameters();
@@ -4267,7 +4260,7 @@ private void setArgumentParameters(
                             i<args.size() && 
                             j<params.size();
                             i++) {
-                        PositionalArgument arg = 
+                        Tree.PositionalArgument arg = 
                                 args.get(i);
                         Parameter param = 
                                 params.get(j);
@@ -5557,7 +5550,7 @@ else if (!that.getAssigned() &&
                                 (Tree.ElementRange) eor;
                         Tree.Expression lb = er.getLowerBound();
                         Tree.Expression ub = er.getUpperBound();
-                        Expression l = er.getLength();
+                        Tree.Expression l = er.getLength();
                         if (lb!=null) {
                             checkAssignable(lb.getTypeModel(), 
                                     kt, lb, 
@@ -10464,7 +10457,7 @@ public void visit(Tree.ExtendedType that) {
     
     @Override public void visit(Tree.TypeConstraint that) {
         super.visit(that);
-        TypeParameterList typeParams = 
+        Tree.TypeParameterList typeParams = 
                 that.getTypeParameterList();
         if (typeParams!=null) {
             checkNotJvm(typeParams, 
diff --git a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java
index 60638872a63..5de1626d794 100644
--- a/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java
+++ b/typechecker/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java
@@ -32,8 +32,6 @@
 import com.redhat.ceylon.common.Backends;
 import com.redhat.ceylon.compiler.typechecker.tree.Node;
 import com.redhat.ceylon.compiler.typechecker.tree.Tree;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.StaticType;
-import com.redhat.ceylon.compiler.typechecker.tree.Tree.TypeSpecifier;
 import com.redhat.ceylon.compiler.typechecker.tree.Visitor;
 import com.redhat.ceylon.model.typechecker.model.Cancellable;
 import com.redhat.ceylon.model.typechecker.model.Class;
@@ -1025,7 +1023,7 @@ public void visit(Tree.TypeAliasDeclaration that) {
         TypeAlias ta = that.getDeclarationModel();
         ta.setExtendedType(null);
         super.visit(that);
-        TypeSpecifier typeSpecifier = 
+        Tree.TypeSpecifier typeSpecifier = 
                 that.getTypeSpecifier();
         if (typeSpecifier==null) {
             that.addError("missing aliased type");
@@ -1447,7 +1445,7 @@ else if (type.isTypeParameter()) {
                     ClassOrInterface ci = 
                             (ClassOrInterface) scope;
                     if (!ci.isAbstract()) {
-                        StaticType ct = cts.get(0);
+                        Tree.StaticType ct = cts.get(0);
                         if (ci.equals(td)) {
                             ct.addError("concrete class parameterized by self type: '" 
                                     + ci.getName()