Don't evaluate @reached_if unless the goal is required #104

xonixx · Feb 8, 2022 · 6817010 · 6817010
1 parent 731e4cf
commit 6817010
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 28 deletions.
diff --git a/makesure.awk b/makesure.awk
@@ -394,10 +394,35 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
     addLine(definesLine, MyDirScript)
     addLine(definesLine, DefinesCode)
 
+    for (i = 0; i in GoalNames; i++) {
+      goalName = GoalNames[i]
+      if (goalName in ReachedIf)
+        NodeCondition[goalName] = checkConditionReachedScript(goalName,definesLine[0],ReachedIf[goalName])
+
+      #    reachedGoals[goalName] = excludeReachedIf ? 0 :
+      #      (reachedIf = ReachedIf[goalName]) ? checkConditionReached(goalName, definesLine[0], reachedIf) : 0
+
+      depCnt = DependenciesCnt[goalName]
+      for (j=0; j < depCnt; j++) {
+        dep = Dependencies[goalName, j]
+#        if (!reachedGoals[goalName]) {
+          # we only add a dependency to this goal if it's not reached
+          #print " [not reached] " goalName " -> " dep
+          topologicalSortAddConnection(goalName, dep)
+#        } else {
+          #print " [    reached] " goalName " -> " dep
+#        }
+      }
+    }
+
+
     # first do topological sort disregarding @reached_if to catch loops
-    resolveGoalsToRun(definesLine,1,GoalNames)
+    resolveGoalsToRun(1,GoalNames)
     # now do topological sort including @reached_if to resolve goals to run
-    resolveGoalsToRun(definesLine,0,ArgGoals,resolvedGoals,reachedGoals)
+    resolveGoalsToRun(0,ArgGoals,resolvedGoals,reachedGoals)
+
+#    dbgAO("resolvedGoals",resolvedGoals)
+#    dbgA("reachedGoals",reachedGoals)
 
     for (i = 0; i in GoalNames; i++) {
       goalName = GoalNames[i]
@@ -450,28 +475,9 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
   }
 }
 
-function resolveGoalsToRun(definesLine,excludeReachedIf,requestedGoals,result,reachedGoals,   i,goalName,loop,reachedIf,depCnt,dep,j) {
+function resolveGoalsToRun(excludeReachedIf,requestedGoals,result,reachedGoals,   i,goalName,loop,reachedIf,depCnt,dep,j) {
   topologicalSortReset()
 
-  for (i = 0; i in GoalNames; i++) {
-    goalName = GoalNames[i]
-
-    reachedGoals[goalName] = excludeReachedIf ? 0 :
-      (reachedIf = ReachedIf[goalName]) ? checkConditionReached(goalName, definesLine[0], reachedIf) : 0
-
-    depCnt = DependenciesCnt[goalName]
-    for (j=0; j < depCnt; j++) {
-      dep = Dependencies[goalName, j]
-      if (!reachedGoals[goalName]) {
-        # we only add a dependency to this goal if it's not reached
-        #print " [not reached] " goalName " -> " dep
-        topologicalSortAddConnection(goalName, dep)
-      } else {
-        #print " [    reached] " goalName " -> " dep
-      }
-    }
-  }
-
   if (arrLen(requestedGoals) == 0)
     arrPush(requestedGoals, "default")
 
@@ -480,7 +486,7 @@ function resolveGoalsToRun(definesLine,excludeReachedIf,requestedGoals,result,re
     if (!(goalName in GoalsByName)) {
       die("Goal not found: " goalName)
     }
-    topologicalSortPerform(goalName, result, loop)
+    topologicalSortPerform(excludeReachedIf,reachedGoals, goalName, result, loop)
   }
 
   if (loop[0] == 1) {
@@ -516,6 +522,15 @@ function checkConditionReached(goalName, definesLine, conditionStr,    script) {
   return shellExec(script, goalName "@reached_if") == 0
 }
 
+function checkConditionReachedScript(goalName, definesLine, conditionStr,    script) {
+  script = definesLine # need this to initialize variables for check conditions
+  if (goalName in GoalToLib)
+    script = script "\n" Lib[GoalToLib[goalName]]
+  script = script "\n" conditionStr
+  #print "script: " script
+  return script
+}
+
 function shellExec(script, comment,   res) {
   if ("tracing" in Options) {
     script = ": " quoteArg(comment) "\n" script
@@ -567,8 +582,8 @@ function addCodeLineToGoal(name, line) {
 }
 
 function topologicalSortReset() {
-  split("",Slist)
-  split("",Scnt)
+#  split("",Slist)
+#  split("",Scnt)
   split("",Visited)
 }
 function topologicalSortAddConnection(from, to) {
@@ -577,15 +592,24 @@ function topologicalSortAddConnection(from, to) {
   Slist[from, ++Scnt[from]] = to # add 'to' to successors of 'from'
 }
 
-function topologicalSortPerform(node, result, loop,   i, s) {
+function topologicalSortPerform(excludeReachedIf,reachedGoals, node, result, loop,   i, s) {
   if (Visited[node] == 2)
     return
 
+  if (!excludeReachedIf) {
+    if (node in NodeCondition && shellExec(NodeCondition[node], node "@reached_if") == 0){
+      Visited[node] = 2
+      arrPush(result, node)
+      reachedGoals[node]=1
+      return
+    }
+  }
+
   Visited[node] = 1
 
   for (i = 1; i <= Scnt[node]; i++) {
     if (Visited[s = Slist[node, i]] == 0)
-      topologicalSortPerform(s, result, loop)
+      topologicalSortPerform(excludeReachedIf,reachedGoals, s, result, loop)
     else if (Visited[s] == 1) {
       loop[0] = 1
       loop[1] = s

diff --git a/tests/25_lazy_reached_if.tush b/tests/25_lazy_reached_if.tush
@@ -4,7 +4,7 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/25_lazy_reached_if_loop.sh a
 ? 1
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/25_lazy_reached_if_loop.sh b
-@ There is a loop in goal dependencies via b -> a
+@ There is a loop in goal dependencies via a -> b
 ? 1
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/25_lazy_reached_if.sh a