From 647ba7f5ba221f12a538504b99c056408f558a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20=C3=96qvist?= <jesper.oqvist@cs.lth.se>
Date: Wed, 20 Jan 2021 14:47:36 +0100
Subject: [PATCH] Simplify checkAndDumpAttributeDeps
---
src/jastadd/incremental/IncrementalDebug.jadd | 8 +---
src/template/incremental/Debug.tt | 42 +++++++++----------
2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/jastadd/incremental/IncrementalDebug.jadd b/src/jastadd/incremental/IncrementalDebug.jadd
index 47d5801a..8ee030ef 100644
--- a/src/jastadd/incremental/IncrementalDebug.jadd
+++ b/src/jastadd/incremental/IncrementalDebug.jadd
@@ -85,14 +85,10 @@ aspect IncrementalDebug {
*/
public String ASTDecl.genDumpAttributeDepsString() {
StringBuffer res = new StringBuffer();
- TemplateContext tt = templateContext();
// Add dump string for each attribute
for (AttrDecl attr : listOfCachedAttributes()) {
- tt.bind("IsParameterized", attr.isParameterized());
- tt.bind("IsNTA", attr.isHOA());
- tt.bind("AttrSign", attr.signature());
- tt.bind("IsToken", attr.isToken());
- res.append(tt.expand("ASTDecl.checkAndDumpAttributeDeps"));
+ TemplateContext tt = attr.templateContext();
+ res.append(tt.expand("AttrDecl.checkAndDumpAttributeDeps"));
}
return res.toString();
}
diff --git a/src/template/incremental/Debug.tt b/src/template/incremental/Debug.tt
index a10cbe76..bdb17a57 100644
--- a/src/template/incremental/Debug.tt
+++ b/src/template/incremental/Debug.tt
@@ -229,45 +229,45 @@ $endif
]]
# Generate code for checking an attribute handler and dumping its dependencies
-ASTDecl.checkAndDumpAttributeDeps = [[
+AttrDecl.checkAndDumpAttributeDeps = [[
$if (IncrementalLevelParam)
-$if (IsParameterized)
-for (java.util.Iterator itr = $(AttrSign)_handler.values().iterator(); itr.hasNext();) {
+$if (#isParameterized)
+for (java.util.Iterator itr = #(signature)_handler.values().iterator(); itr.hasNext();) {
$DDGNodeName handler = ($DDGNodeName)itr.next();
handler.dumpDeps();
}
$else
-if ($(AttrSign)_handler != null) {
- $(AttrSign)_handler.dumpDeps();
+if (#(signature)_handler != null) {
+ #(signature)_handler.dumpDeps();
}
$endif
-$if (IsNTA)
-$if (IsParameterized)
-if ($(AttrSign)_proxy != null) {
- $(AttrSign)_proxy.dumpDependencies();
+$if (#isHOA)
+$if (#isParameterized)
+if (#(signature)_proxy != null) {
+ #(signature)_proxy.dumpDependencies();
}
$else
-$if (!IsToken)
-if ($(AttrSign)_computed && ($(AttrSign)_value instanceof $ASTNode)) {
- $(AttrSign)_value.dumpDependencies();
+$if (!#isToken)
+if (#(signature)_computed && (#(signature)_value instanceof $ASTNode)) {
+ #(signature)_value.dumpDependencies();
}
$endif
$endif
$endif
$endif
$if (IncrementalLevelAttr)
-if ($(AttrSign)_handler != null) {
- $(AttrSign)_handler.dumpDeps();
+if (#(signature)_handler != null) {
+ #(signature)_handler.dumpDeps();
}
-$if (IsNTA)
-$if (IsParameterized)
-if ($(AttrSign)_proxy != null) {
- $(AttrSign)_proxy.dumpDependencies();
+$if (#isHOA)
+$if (#isParameterized)
+if (#(signature)_proxy != null) {
+ #(signature)_proxy.dumpDependencies();
}
$else
-$if (!IsToken)
-if ($(AttrSign)_computed && ($(AttrSign)_value instanceof $ASTNode)) {
- $(AttrSign)_value.dumpDependencies();
+$if (!#isToken)
+if (#(signature)_computed && (#(signature)_value instanceof $ASTNode)) {
+ #(signature)_value.dumpDependencies();
}
$endif
$endif
--
GitLab