With the exception of Decl.isUnboxedVoid(), move Decl and Strategy to

codegen and make them package access, since they were only used in there anyway. Move Decl.isUnboxedVoid() to Util, since it's used by the AbstractModelLoader.
alesj · May 31, 2012 · de667a4 · de667a4
1 parent 08c4a2e
commit de667a4
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 24 deletions.
diff --git a/src/com/redhat/ceylon/compiler/java/codegen/AbstractTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/AbstractTransformer.java
@@ -36,7 +36,6 @@
 import com.redhat.ceylon.compiler.java.loader.CeylonModelLoader;
 import com.redhat.ceylon.compiler.java.loader.TypeFactory;
 import com.redhat.ceylon.compiler.java.tools.CeylonLog;
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.loader.AbstractModelLoader;
 import com.redhat.ceylon.compiler.loader.ModelLoader.DeclarationType;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/AttributeDefinitionBuilder.java b/src/com/redhat/ceylon/compiler/java/codegen/AttributeDefinitionBuilder.java
@@ -20,7 +20,6 @@
 
 package com.redhat.ceylon.compiler.java.codegen;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.typechecker.model.ProducedType;
 import com.redhat.ceylon.compiler.typechecker.model.TypedDeclaration;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/BoxingDeclarationVisitor.java b/src/com/redhat/ceylon/compiler/java/codegen/BoxingDeclarationVisitor.java
@@ -22,7 +22,6 @@
 
 import java.util.List;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.typechecker.model.Class;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;
 import com.redhat.ceylon.compiler.typechecker.model.Functional;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/CeylonTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/CeylonTransformer.java
@@ -25,7 +25,6 @@
 
 import javax.tools.JavaFileObject;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.typechecker.context.PhasedUnit;
 import com.redhat.ceylon.compiler.typechecker.model.Module;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/CeylonVisitor.java b/src/com/redhat/ceylon/compiler/java/codegen/CeylonVisitor.java
@@ -20,7 +20,6 @@
 
 package com.redhat.ceylon.compiler.java.codegen;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;
 import com.redhat.ceylon.compiler.typechecker.model.Value;
 import com.redhat.ceylon.compiler.typechecker.tree.NaturalVisitor;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/ClassDefinitionBuilder.java b/src/com/redhat/ceylon/compiler/java/codegen/ClassDefinitionBuilder.java
@@ -27,8 +27,6 @@
 import static com.sun.tools.javac.code.Flags.PUBLIC;
 import static com.sun.tools.javac.code.Flags.STATIC;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
-import com.redhat.ceylon.compiler.java.util.Strategy;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.typechecker.model.Annotation;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/ClassTransformer.java
@@ -36,8 +36,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
-import com.redhat.ceylon.compiler.java.util.Strategy;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.loader.ModelResolutionException;
 import com.redhat.ceylon.compiler.typechecker.model.Class;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/CodegenUtil.java b/src/com/redhat/ceylon/compiler/java/codegen/CodegenUtil.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.EnumSet;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.typechecker.model.Class;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;
 import com.redhat.ceylon.compiler.typechecker.model.Interface;

diff --git a/...edhat/ceylon/compiler/java/util/Decl.java → ...at/ceylon/compiler/java/codegen/Decl.java b/...edhat/ceylon/compiler/java/util/Decl.java → ...at/ceylon/compiler/java/codegen/Decl.java
@@ -18,20 +18,19 @@
  * MA  02110-1301, USA.
  */
 
-package com.redhat.ceylon.compiler.java.util;
+package com.redhat.ceylon.compiler.java.codegen;
 
+import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.loader.model.FieldValue;
 import com.redhat.ceylon.compiler.loader.model.LazyClass;
 import com.redhat.ceylon.compiler.loader.model.LazyInterface;
-import com.redhat.ceylon.compiler.typechecker.model.Class;
 import com.redhat.ceylon.compiler.typechecker.model.ControlBlock;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;
 import com.redhat.ceylon.compiler.typechecker.model.Functional;
 import com.redhat.ceylon.compiler.typechecker.model.Getter;
 import com.redhat.ceylon.compiler.typechecker.model.Method;
 import com.redhat.ceylon.compiler.typechecker.model.MethodOrValue;
 import com.redhat.ceylon.compiler.typechecker.model.NamedArgumentList;
-import com.redhat.ceylon.compiler.typechecker.model.Parameter;
 import com.redhat.ceylon.compiler.typechecker.model.Scope;
 import com.redhat.ceylon.compiler.typechecker.model.Setter;
 import com.redhat.ceylon.compiler.typechecker.model.TypeDeclaration;
@@ -41,7 +40,7 @@
  * Utility functions telling you about Ceylon declarations
  * @see Strategy
  */
-public class Decl {
+class Decl {
     private Decl() {
     }
 
@@ -312,8 +311,7 @@ public static boolean isDeferredInitialization(Tree.AnyMethod def) {
     }
 
     public static boolean isUnboxedVoid(Declaration decl) {
-        return (decl instanceof Method)
-                && ((Method)decl).isDeclaredVoid();
+        return Util.isUnboxedVoid(decl);
     }
 
     public static boolean isMpl(Functional decl) {

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java b/src/com/redhat/ceylon/compiler/java/codegen/ExpressionTransformer.java
@@ -26,7 +26,6 @@
 import com.redhat.ceylon.compiler.java.codegen.Operators.AssignmentOperatorTranslation;
 import com.redhat.ceylon.compiler.java.codegen.Operators.OperatorTranslation;
 import com.redhat.ceylon.compiler.java.codegen.Operators.OptimisationStrategy;
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.loader.model.LazyMethod;
 import com.redhat.ceylon.compiler.loader.model.LazyValue;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/InvocationBuilder.java b/src/com/redhat/ceylon/compiler/java/codegen/InvocationBuilder.java
@@ -32,8 +32,6 @@
 
 import com.redhat.ceylon.compiler.java.codegen.AbstractTransformer.BoxingStrategy;
 import com.redhat.ceylon.compiler.java.codegen.ExpressionTransformer.TermTransformer;
-import com.redhat.ceylon.compiler.java.util.Decl;
-import com.redhat.ceylon.compiler.java.util.Strategy;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.typechecker.model.ClassOrInterface;
 import com.redhat.ceylon.compiler.typechecker.model.Declaration;

diff --git a/src/com/redhat/ceylon/compiler/java/codegen/MethodDefinitionBuilder.java b/src/com/redhat/ceylon/compiler/java/codegen/MethodDefinitionBuilder.java
@@ -26,7 +26,6 @@
 import static com.sun.tools.javac.code.Flags.STATIC;
 import static com.sun.tools.javac.code.TypeTags.VOID;
 
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.typechecker.model.Annotation;
 import com.redhat.ceylon.compiler.typechecker.model.FunctionalParameter;

diff --git a/...t/ceylon/compiler/java/util/Strategy.java → ...eylon/compiler/java/codegen/Strategy.java b/...t/ceylon/compiler/java/util/Strategy.java → ...eylon/compiler/java/codegen/Strategy.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package com.redhat.ceylon.compiler.java.util;
+package com.redhat.ceylon.compiler.java.codegen;
 
 import com.redhat.ceylon.compiler.typechecker.model.Class;
 import com.redhat.ceylon.compiler.typechecker.model.ClassOrInterface;
@@ -32,7 +32,7 @@
  * Utility functions telling you about code generation strategies
  * @see Decl
  */
-public class Strategy {
+class Strategy {
     private Strategy() {}
 
     public static boolean defaultParameterMethodTakesThis(Tree.Declaration decl) {

diff --git a/src/com/redhat/ceylon/compiler/java/util/Util.java b/src/com/redhat/ceylon/compiler/java/util/Util.java
@@ -428,4 +428,9 @@ public static boolean isSubPackage(String moduleName, String pkgName) {
         return pkgName.equals(moduleName)
                 || pkgName.startsWith(moduleName+".");
     }
+
+    public static boolean isUnboxedVoid(Declaration decl) {
+        return (decl instanceof Method)
+                && ((Method)decl).isDeclaredVoid();
+    }
 }
diff --git a/src/com/redhat/ceylon/compiler/loader/AbstractModelLoader.java b/src/com/redhat/ceylon/compiler/loader/AbstractModelLoader.java
@@ -35,7 +35,6 @@
 import javax.lang.model.type.TypeKind;
 
 import com.redhat.ceylon.cmr.api.ArtifactResult;
-import com.redhat.ceylon.compiler.java.util.Decl;
 import com.redhat.ceylon.compiler.java.util.Util;
 import com.redhat.ceylon.compiler.loader.mirror.AnnotatedMirror;
 import com.redhat.ceylon.compiler.loader.mirror.AnnotationMirror;
@@ -1242,7 +1241,7 @@ private void markUnboxed(TypedDeclaration decl, TypeMirror type) {
         boolean unboxed = false;
         if(type.isPrimitive() || type.getKind() == TypeKind.ARRAY
                 || sameType(type, STRING_TYPE)
-                || Decl.isUnboxedVoid(decl)) {
+                || Util.isUnboxedVoid(decl)) {
             unboxed = true;
         }
         decl.setUnboxed(unboxed);