align names of mapping relations to types they refer to

scope4j/src/main/jastadd/ProgramToScopeTree.jrag

@@ -24,7 +24,7 @@ aspect ProgramToScopeTree {
     }
   }
 
-  public void ProtectedClassDeclScope.updateInheritance() {
+  public void ProtectedTypeDeclScope.updateInheritance() {
     if (getTypeDecl().isClassDecl()) {
       ClassDecl classDecl = (ClassDecl)getTypeDecl();
       if (classDecl.superclass().isClassDecl() && classDecl.superclass().compilationUnit().fromSource()) {
@@ -79,20 +79,20 @@ aspect ScopeTreeConstructors {
   }
 
   syn lazy TypeDeclScope TypeDecl.asScope() {
-    TypeDeclScope scope = new PrivateClassDeclScope();
+    TypeDeclScope scope = new PrivateTypeDeclScope();
     scope.setTypeDecl(this);
     return scope;
   }
 
   syn lazy TypeDeclScope TypeDecl.asProtectedScope() {
-    TypeDeclScope scope = new ProtectedClassDeclScope();
+    TypeDeclScope scope = new ProtectedTypeDeclScope();
     scope.setTypeDecl(this);
     scope.addElement(packageScope());
     return scope;
   }
 
   syn lazy TypeDeclScope TypeDecl.asPackageScope() {
-    TypeDeclScope scope = new PackageClassDeclScope();
+    TypeDeclScope scope = new PackageTypeDeclScope();
     scope.setTypeDecl(this);
     scope.addElement(scope());
     return scope;

scope4j/src/main/jastadd/ProgramToScopeTree.relast

@@ -2,12 +2,13 @@
 rel ScopeTree.Program -> Program;
 
 abstract JavaScope : Scope;
-TypeDeclScope : JavaScope;
+abstract TypeDeclScope : JavaScope;
 rel TypeDeclScope.typeDecl -> TypeDecl;
 
-ProtectedClassDeclScope : TypeDeclScope;
-PackageClassDeclScope : TypeDeclScope;
-PrivateClassDeclScope : TypeDeclScope;
+PublicTypeDeclScope : TypeDeclScope;
+ProtectedTypeDeclScope : TypeDeclScope;
+PackageTypeDeclScope : TypeDeclScope;
+PrivateTypeDeclScope : TypeDeclScope;
 
 BlockScope : JavaScope;
 rel BlockScope.block -> Block;