From 9a65594c5448b88190e81db07e4e34d8c025639e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20=C3=96qvist?= <jesper.oqvist@cs.lth.se>
Date: Wed, 10 Feb 2021 16:30:40 +0100
Subject: [PATCH] Fix test regression from commit 6558af9
---
src/jastadd/incremental/IncrementalDebug.jadd | 3 ++-
src/template/incremental/Debug.tt | 14 +++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/jastadd/incremental/IncrementalDebug.jadd b/src/jastadd/incremental/IncrementalDebug.jadd
index 0dbfca0b..84c90257 100644
--- a/src/jastadd/incremental/IncrementalDebug.jadd
+++ b/src/jastadd/incremental/IncrementalDebug.jadd
@@ -117,8 +117,9 @@ aspect IncrementalDebug {
StringBuffer res = new StringBuffer();
TemplateContext tt = templateContext();
for (AttrDecl attr : listOfCachedAttributes()) {
+ // TODO(joqvist): use AttrDecl as template context instead.
tt.bind("IsParameterized", attr.getNumParameter() > 0);
- tt.bind("IsCircular", attr.isCircular());
+ tt.bind("SimpleCacheCheck", attr.simpleCacheCheck());
tt.bind("PrintAsObject", attr.isPrimitive() || attr.getType().equals("String"));
tt.bind("AttrSign", attr.signature());
res.append(tt.expand("ASTDecl.dumpCachedAttributeValue"));
diff --git a/src/template/incremental/Debug.tt b/src/template/incremental/Debug.tt
index ed456dad..448ea0b5 100644
--- a/src/template/incremental/Debug.tt
+++ b/src/template/incremental/Debug.tt
@@ -139,18 +139,18 @@ if ($(AttrSign)_values != null) {
}
}
$else
-$if (IsCircular)
-if ($(AttrSign)_computed == $StateClass.NON_CYCLE || $(AttrSign)_computed == state().cycle()) {
-$else
+ $if (SimpleCacheCheck)
if ($(AttrSign)_computed) {
-$endif
-$if (PrintAsObject)
+ $else
+if ($(AttrSign)_computed == $StateClass.NON_CYCLE || $(AttrSign)_computed == state().cycle()) {
+ $endif
+ $if (PrintAsObject)
System.out.println("value(" + relativeNodeID() + ":$(AttrSign), " + $(AttrSign)_value + ")");
-$else
+ $else
Object obj = $(AttrSign)_value;
System.out.println("value(" + relativeNodeID() + ":$(AttrSign), " +
(obj instanceof $ASTNode ? (($ASTNode) obj).relativeNodeID() : obj) + ")");
-$endif
+ $endif
}
$endif
]]
--
GitLab