From cdb068071c0d2b8eaa9fc7cec2ab5761339637fd Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Tue, 26 Feb 2019 19:17:31 +0100
Subject: [PATCH] use different names for local and global resolve attributes
---
src/main/jastadd/Backend.jadd | 6 +++---
src/test/jastadd/resolver/MyRefResolver.jadd | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/jastadd/Backend.jadd b/src/main/jastadd/Backend.jadd
index db6e1bc..569d61b 100644
--- a/src/main/jastadd/Backend.jadd
+++ b/src/main/jastadd/Backend.jadd
@@ -656,7 +656,7 @@ aspect NameResolutionHelper {
String superType = this.getSuper().getID();
sb.append(ind(1) + "// context-independent name resolution\n");
- sb.append(ind(1) + "syn " + superType + " ASTNode.resolve" + superType + "ByToken(String id) {\n");
+ sb.append(ind(1) + "syn " + superType + " ASTNode.globallyResolve" + superType + "ByToken(String id) {\n");
sb.append(ind(2) + "// perform context independent name resolution here using the id\n");
sb.append(ind(2) + "throw new RuntimeException(\"Context-independent name resolution for "+ superType + " not implemented.\");\n");
sb.append(ind(1) + "}\n");
@@ -690,7 +690,7 @@ aspect NameResolutionHelper {
sb.append(ind(1) + "// context-dependent name resolution\n");
sb.append(ind(1) + "syn " + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id, int position) {\n");
sb.append(ind(2) + "// default to context-independent name resolution\n");
- sb.append(ind(2) + "return resolve" + ofTypeDecl() + "ByToken(id);\n");
+ sb.append(ind(2) + "return globallyResolve" + ofTypeDecl() + "ByToken(id);\n");
sb.append(ind(1) + "}\n");
}
@@ -703,7 +703,7 @@ aspect NameResolutionHelper {
sb.append(ind(1) + "// context-dependent name resolution\n");
sb.append(ind(1) + "syn " + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id) {\n");
sb.append(ind(2) + "// default to context-independent name resolution\n");
- sb.append(ind(2) + "return resolve" + ofTypeDecl() + "ByToken(id);\n");
+ sb.append(ind(2) + "return globallyResolve" + ofTypeDecl() + "ByToken(id);\n");
sb.append(ind(1) + "}\n");
}
diff --git a/src/test/jastadd/resolver/MyRefResolver.jadd b/src/test/jastadd/resolver/MyRefResolver.jadd
index e45c5a9..fa585c9 100644
--- a/src/test/jastadd/resolver/MyRefResolver.jadd
+++ b/src/test/jastadd/resolver/MyRefResolver.jadd
@@ -1,19 +1,19 @@
aspect MyRewrites {
// context-independent name resolution
- refine RefResolverStubs eq ASTNode.resolveNamedElementByToken(String id) {
+ refine RefResolverStubs eq ASTNode.globallyResolveNamedElementByToken(String id) {
System.out.println("resolving " + id + " to " + root().findNamedElement(id));
return root().findNamedElement(id);
}
// context-independent name resolution
- refine RefResolverStubs eq ASTNode.resolveAByToken(String id) {
+ refine RefResolverStubs eq ASTNode.globallyResolveAByToken(String id) {
System.out.println("resolving " + id + " to " + root().findNamedElement(id));
return root().findA(id);
}
// context-independent name resolution
- refine RefResolverStubs eq ASTNode.resolveBByToken(String id) {
+ refine RefResolverStubs eq ASTNode.globallyResolveBByToken(String id) {
System.out.println("resolving " + id + " to " + root().findNamedElement(id));
return root().findB(id);
}
--
GitLab