diff --git a/src/jastadd/incremental/IncrementalDebug.jadd b/src/jastadd/incremental/IncrementalDebug.jadd index 47d5801ae453d14542ecdf5c96a10c9bae07ad16..8ee030ef27fd7c355b2989220fe25b008782f2fa 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 a10cbe761a391d1f8deedaae643148976c0bd52c..bdb17a577119d5070d4a350a6eaa4fc5dd140089 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