DynamicJava: Class/interface members of interfaces are always static. Improved error messages for allocations (missing enclosing object, bad anonymous supertype, etc.)

dlsmith · dlsmith · commit 69317eecda32 · 2009-09-03T21:37:28.000Z
git-svn-id: file:///tmp/test-svn/trunk@5055 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java b/dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ExpressionChecker.java
@@ -871,12 +871,18 @@ private void addRuntimeCheck(Node node, Type expectedType, Type declaredActualTy
      */
     @Override public Type visit(SimpleAllocation node) {
       Type t = checkTypeName(node.getCreationType());
-      if (!ts.isConcrete(t)) { throw new ExecutionError("allocation.type", node); }
+      if (!ts.isConcrete(t)) {
+        setErrorStrings(node, ts.userRepresentation(t));
+        throw new ExecutionError("allocation.type", node);
+      }
 
       Option<Type> dynamicOuter = ts.dynamicallyEnclosingType(t);
       if (dynamicOuter.isSome()) {
         DJClass enclosingThis = enclosingThis(dynamicOuter.unwrap());
-        if (enclosingThis == null) { throw new ExecutionError("allocation.type", node); }
+        if (enclosingThis == null) {
+          setErrorStrings(node, ts.userRepresentation(t), ts.userRepresentation(dynamicOuter.unwrap()));
+          throw new ExecutionError("inner.allocation", node);
+        }
         else { setEnclosingThis(node, enclosingThis); }
       }
       
@@ -911,13 +917,17 @@ private void addRuntimeCheck(Node node, Type expectedType, Type declaredActualTy
     @Override public Type visit(AnonymousAllocation node) {
       Type t = checkTypeName(node.getCreationType());
       if (!ts.isExtendable(t) && !ts.isImplementable(t)) {
-        throw new ExecutionError("allocation.type", node);
+        setErrorStrings(node, ts.userRepresentation(t));
+        throw new ExecutionError("invalid.supertype", node);
       }
       
       Option<Type> dynamicOuter = ts.dynamicallyEnclosingType(t);
       if (dynamicOuter.isSome()) {
         DJClass enclosingThis = enclosingThis(dynamicOuter.unwrap());
-        if (enclosingThis == null) { throw new ExecutionError("allocation.type", node); }
+        if (enclosingThis == null) {
+          setErrorStrings(node, ts.userRepresentation(t), ts.userRepresentation(dynamicOuter.unwrap()));
+          throw new ExecutionError("inner.allocation", node);
+        }
         else { setEnclosingThis(node, enclosingThis); }
       }
       
@@ -993,6 +1003,7 @@ private DJClass enclosingThis(Type expected) {
           throw new ExecutionError("static.inner.allocation", node);
         }
         if (!ts.isConcrete(t)) {
+          setErrorStrings(node, ts.userRepresentation(t));
           throw new ExecutionError("allocation.type", node);
         }
         
@@ -1049,7 +1060,8 @@ private DJClass enclosingThis(Type expected) {
           throw new ExecutionError("static.inner.allocation", node);
         }
         if (!ts.isExtendable(t)) {
-          throw new ExecutionError("allocation.type", node);
+          setErrorStrings(node, ts.userRepresentation(t));
+          throw new ExecutionError("invalid.supertype", node);
         }
         setSuperType(node, t);
         
diff --git a/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/TreeClass.java b/dynamicjava/src/edu/rice/cs/dynamicjava/symbol/TreeClass.java
@@ -191,7 +191,10 @@ public String declaredName() {
   
   public boolean isInterface() { return _ast instanceof InterfaceDeclaration; }
   
-  public boolean isStatic() { return _ast instanceof EnumDeclaration || _mods.isStatic(); }
+  public boolean isStatic() {
+    if (_declaring == null) { return false; }
+    else { return _declaring.isInterface() || _ast instanceof EnumDeclaration || _mods.isStatic(); }
+  }
   public boolean isAbstract() { return _mods.isAbstract(); }
   public boolean isFinal() { return _mods.isFinal(); }
   public Access accessibility() { return extractAccessibility(_mods); }
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/resources/messages.properties b/dynamicjava/src/koala/dynamicjava/interpreter/resources/messages.properties
@@ -159,8 +159,9 @@ abstract.method.body       = The abstract method '%0' must not have a body
 # Used by ClassInfoCompiler
 addition.type              = Bad type in addition
 
-# Used by TypeChecker
-allocation.type            = Bad type in allocation
+allocation.type            = Cannot construct a %0: a concrete class is required
+inner.allocation           = Cannot construct a %0: an enclosing object of type %1 is required
+static.inner.allocation    = Class '%0' is a static member of type %1
 
 
 # Used by TypeChecker
@@ -215,7 +216,11 @@ duplicate.switch.case      = 'switch' contains multiple blocks for the same case
 
 illegal.private.access     = Illegal access of private member '%0'
 illegal.package.access     = Illegal access of package-private member '%0'
-illegal.protected.access    = Illegal access of protected member '%0'
+illegal.protected.access   = Illegal access of protected member '%0'
+
+invalid.superclass         = Type %0 is not a valid superclass
+invalid.superinterface     = Type %0 is not a valid superinterface
+invalid.supertype          = Type %0 is not a valid supertype
 
 # Used by ClassInfoCompiler, TypeChecker
 increment.type             = Bad type in increment expression
@@ -308,8 +313,6 @@ selector.type              = Bad 'switch' selector type: %0
 # Used by ClassInfoCompiler, TypeChecker
 shift.expression.type      = Bad type in shift expression
 
-static.inner.allocation    = Class '%0' is a static member of type %1
-
 # Used by TypeChecker
 super.undefined            = 'super' is undefined in this context
 
