From c958ec21c342e6befb3bfd683b24c6abab6d80ef Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sat, 4 Jan 2020 20:26:28 +0100
Subject: [PATCH] align names of mapping relations to types they refer to
---
scope4j/src/main/jastadd/ProgramToScopeTree.jrag | 8 ++++----
scope4j/src/main/jastadd/ProgramToScopeTree.relast | 9 +++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/scope4j/src/main/jastadd/ProgramToScopeTree.jrag b/scope4j/src/main/jastadd/ProgramToScopeTree.jrag
index 1c4e4a1..26f0fba 100644
--- a/scope4j/src/main/jastadd/ProgramToScopeTree.jrag
+++ b/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;
diff --git a/scope4j/src/main/jastadd/ProgramToScopeTree.relast b/scope4j/src/main/jastadd/ProgramToScopeTree.relast
index 6d6cbf9..e799ab9 100644
--- a/scope4j/src/main/jastadd/ProgramToScopeTree.relast
+++ b/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;
--
GitLab