Fix test regression from commit 6558af9d

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"));

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
 ]]