Parameterized goals #115

xonixx · Jan 24, 2023 · 3e00dfa · 3e00dfa
1 parent 77b4f92
commit 3e00dfa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/docs/parameterized_goals.md b/docs/parameterized_goals.md
@@ -122,6 +122,6 @@ Should work as expected. `@doc` should just copy to instantiated goals.
 - [ ] handle + test w/ `@private`
 - [ ] test w/ `@lib`
 - [ ] test w/ `@doc`
-- [ ] handle + test w/ `@reached_if`
+- [x] handle + test w/ `@reached_if`
 - [ ] test w/ `@glob` (should be covered by `@params` at pos 3 check)
 - [ ] README.md
diff --git a/makesure.awk b/makesure.awk
@@ -627,7 +627,7 @@ function renderArgs(args,   s,k) { s = ""; for (k in args) s = s k "=>" args[k]
 #
 # args: { F => "file1" }
 #
-function instantiate(goal,args,newArgs,   i,j,depArg,depArgType,dep,goalNameInstantiated,argsCnt,gi,gii) { # -> goalNameInstantiated
+function instantiate(goal,args,newArgs,   i,j,depArg,depArgType,dep,goalNameInstantiated,argsCnt,gi,gii,argsCode) { # -> goalNameInstantiated
 #  indent(IDepth++); print "instantiating " goal " { " renderArgs(args) "} ..."
 
   goalNameInstantiated = instantiateGoalName(goal, args)
@@ -638,13 +638,17 @@ function instantiate(goal,args,newArgs,   i,j,depArg,depArgType,dep,goalNameInst
     copyKey(goal,goalNameInstantiated,GoalsByName)
     copyKey(goal,goalNameInstantiated,DependenciesCnt)
     copyKey(goal,goalNameInstantiated,CodePre)
-    for (i in args) {
-      CodePre[goalNameInstantiated] = addL(CodePre[goalNameInstantiated], i "=" quoteArg(args[i]))
-    }
     copyKey(goal,goalNameInstantiated,Code)
     copyKey(goal,goalNameInstantiated,Doc)
     copyKey(goal,goalNameInstantiated,ReachedIf)
     copyKey(goal,goalNameInstantiated,GoalToLib)
+
+    for (i in args)
+      argsCode = addL(argsCode, i "=" quoteArg(args[i]))
+
+    CodePre[goalNameInstantiated] = addL(CodePre[goalNameInstantiated], argsCode)
+    if (goalNameInstantiated in ReachedIf)
+      ReachedIf[goalNameInstantiated] = argsCode "\n" ReachedIf[goalNameInstantiated]
   }
 
   for (i=0; i < DependenciesCnt[goal]; i++) {

diff --git a/tests/27_parameterized_goals.tush b/tests/27_parameterized_goals.tush
@@ -217,3 +217,10 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/27_parameterized_goals_10_errors.sh -l
 @ tests/27_parameterized_goals_10_errors.sh:9: @depends_on e @args 'arg1'       # err args for non-PG
 ? 1
 
+$ cd "$MYDIR"; ./$MAKESURE -f tests/27_parameterized_goals_11_reached_if.sh a
+|   goal 'b@hi' ...
+| W is hi
+|   goal 'b@hello' [already satisfied].
+|   goal 'b@salut' ...
+| W is salut
+|   goal 'a' [empty].
diff --git a/tests/27_parameterized_goals_11_reached_if.sh b/tests/27_parameterized_goals_11_reached_if.sh
@@ -0,0 +1,10 @@
+
+@goal a
+@depends_on b @args 'hi'
+@depends_on b @args 'hello'
+@depends_on b @args 'salut'
+
+
+@goal b @params W
+@reached_if [[ "$W" == 'hello' ]]
+  echo "W is $W"