handle Exception like Object

gavinking · May 11, 2012 · 764e2dd · 764e2dd
1 parent 0239a17
commit 764e2dd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java b/src/com/redhat/ceylon/compiler/typechecker/analyzer/TypeVisitor.java
@@ -171,7 +171,7 @@ private String importMember(Tree.ImportMemberOrType member, Package importedPack
             member.getIdentifier().addError("imported declaration not found: " + 
                     name, 100);
         }
-        else if ("java.lang.Object".equals(d.getQualifiedNameString())) {
+        else if (isNonimportable(d)) {
             member.getIdentifier().addError("root type may not be imported");
         }
         else {
@@ -201,6 +201,12 @@ else if ("java.lang.Object".equals(d.getQualifiedNameString())) {
         return name;
     }
 
+    private boolean isNonimportable(Declaration d) {
+        String name = d.getQualifiedNameString();
+        return "java.lang.Object".equals(name) ||
+                "java.lang.Exception".equals(name);
+    }
+
     private void addImport(Tree.ImportMemberOrType member, ImportList il,
             Import i) {
         Import o = unit.getImport(i.getAlias());