[incremental] Remove redundant flag from AST state

IN_CONSTRUCTION was unnecessary, can test the construction counter directly
instead. Renamed the construction counter to disableDeps, replaced uses of
IN_CONSTRUCTION by disableDeps.

src/template/incremental/ASTChange.tt

@@ -28,24 +28,24 @@
 ASTNode.incHookSetParent = [[
 $if (IncrementalEnabled)
 $if (IncrementalLevelParam)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   getParent_handler.notifyDependencies();
 }
 $endif
 $if (IncrementalLevelAttr)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   getParent_handler.notifyDependencies();
 }
 $endif
 $if (IncrementalLevelNode)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (parent != null) {
     parent.handler.flushRegion();
   }
 }
 $endif
 $if (IncrementalLevelRegion)
-if (!state().IN_CONSTRUCTION && !(state().IN_COMPUTATION > 0)) {
+if (state().disableDeps == 0 && !(state().IN_COMPUTATION > 0)) {
   if (parent != null) {
     parent.handler().flushRegion();
   }
@@ -65,7 +65,7 @@ ASTNode.incHookSetChild1 = [[
 $if(IncrementalEnabled)
 
 $if(IncrementalLevelParam)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children != null && i < children.length && children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -86,7 +86,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelAttr)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children != null && i < children.length && children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -94,7 +94,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelNode)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children != null && i < children.length && children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -107,7 +107,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelRegion)
-if (!state().IN_CONSTRUCTION && !(state().IN_COMPUTATION > 0)) {
+if (state().disableDeps == 0 && !(state().IN_COMPUTATION > 0)) {
   if (children != null && i < children.length && children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -170,7 +170,7 @@ ASTNode.incHookInsertChild1 = [[
 $if(IncrementalEnabled)
 
 $if(IncrementalLevelParam)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   numChildren_handler.notifyDependencies();
   if (children != null && i <= numChildren) {
     for (int k = i; k < children.length; k++) {
@@ -182,7 +182,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelAttr)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   numChildren_handler.notifyDependencies();
   if (children != null && i <= numChildren) {
     getChild_handler.flushRegion();
@@ -190,7 +190,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelNode)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   for (int k = i; k < children.length; k++) {
     $ASTNode child = children[i];
     if (child != null) {
@@ -200,7 +200,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelRegion)
-if (!state().IN_CONSTRUCTION && !(state().IN_COMPUTATION > 0)) {
+if (state().disableDeps == 0 && !(state().IN_COMPUTATION > 0)) {
   for (int k = i; k < children.length; k++) {
     $ASTNode child = children[i];
     if (child != null) {
@@ -244,7 +244,7 @@ ASTNode.incHookRemoveChild1 = [[
 $if(IncrementalEnabled)
 
 $if(IncrementalLevelParam)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -257,7 +257,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelAttr)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -265,7 +265,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelNode)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   if (children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -279,7 +279,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelRegion)
-if (!state().IN_CONSTRUCTION && !(state().IN_COMPUTATION > 0)) {
+if (state().disableDeps == 0 && !(state().IN_COMPUTATION > 0)) {
   if (children[i] != null) {
     children[i].inc_notifyForRemove();
   }
@@ -322,7 +322,7 @@ TokenComponent.incHookSetToken = [[
 $if(IncrementalEnabled)
 
 $if(IncrementalLevelParam)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   $if(#isNTA)
   if (get$(Id)_computed) {
     get$(Id)_computed = false;
@@ -337,7 +337,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelAttr)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   $if(#isNTA)
   if (get$(Id)_computed) {
     get$(Id)_computed = false;
@@ -352,7 +352,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelNode)
-if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
+if (state().disableDeps == 0 && !state().IN_ATTR_STORE_EVAL) {
   $if(#isNTA)
   if (get$(Id)_computed) {
     get$(Id)_computed = false;
@@ -371,7 +371,7 @@ if (!state().IN_CONSTRUCTION && !state().IN_ATTR_STORE_EVAL) {
 $endif
 
 $if(IncrementalLevelRegion)
-if (!state().IN_CONSTRUCTION && !(state().IN_COMPUTATION > 0)) {
+if (state().disableDeps == 0 && !(state().IN_COMPUTATION > 0)) {
   $if(#isNTA)
   if (get$(Id)_computed) {
     get$(Id)_computed = false;

src/template/incremental/State.tt

@@ -77,19 +77,14 @@ $endif
     exitAttrStoreEval(handler);
   }
 
-  public boolean IN_CONSTRUCTION = false;
-
-  private int inc_constructionCount = 0;
+  public int disableDeps = 0;
 
   public void enterConstruction() {
-    IN_CONSTRUCTION = true;
-    inc_constructionCount++;
+    disableDeps++;
   }
 
   public void exitConstruction() {
-    inc_constructionCount--;
-    if (inc_constructionCount == 0)
-    IN_CONSTRUCTION = false;
+    disableDeps--;
   }
 
   protected void pushHandler(java.util.Stack stack, $ASTNode$$DepGraphNode handler) {