Redesign @goal_glob #34

makesure.awk

@@ -402,7 +402,7 @@ function resolveGoalsToRun(result,   i, goal_name, loop) {
 
 function isPrelude() { return "prelude"==Mode }
 function checkPreludeOnly() { if (!isPrelude()) addError("Only use " $1 " in prelude") }
-function checkGoalOnly() { if ("goal" != Mode && "goal_glob" != Mode) addError("Only use " $1 " in @goal/@goal_glob") }
+function checkGoalOnly() { if ("goal" != Mode && "goal_glob" != Mode) addError("Only use " $1 " in @goal") }
 function currentGoalName() { return isPrelude() ? "" : arrLast(GoalNames) }
 
 function realExit(code,   i) {

tests/13_errors.tush

@@ -1,8 +1,8 @@
 
 $ cd "$MYDIR"; ./makesure -f tests/13_errors.sh
-@ Only use @reached_if in @goal/@goal_glob:
+@ Only use @reached_if in @goal:
 @ tests/13_errors.sh:2: @reached_if true
-@ Only use @doc in @goal/@goal_glob:
+@ Only use @doc in @goal:
 @ tests/13_errors.sh:4: @doc Doc in prelude
 @ Option 'usupported' is not supported:
 @ tests/13_errors.sh:5: @options usupported

tests/9_prelude.tush

@@ -10,16 +10,16 @@ $ cd "$MYDIR"; ./makesure -f tests/9_prelude.sh a
 | a
 
 $ cd "$MYDIR"; ./makesure -f tests/9_prelude_doc.sh
-@ Only use @doc in @goal/@goal_glob:
+@ Only use @doc in @goal:
 @ tests/9_prelude_doc.sh:2: @doc Doc in prelude
 ? 1
 
 $ cd "$MYDIR"; ./makesure -f tests/9_prelude_depends_on.sh
-@ Only use @depends_on in @goal/@goal_glob:
+@ Only use @depends_on in @goal:
 @ tests/9_prelude_depends_on.sh:2: @depends_on g1
 ? 1
 
 $ cd "$MYDIR"; ./makesure -f tests/9_prelude_reached_if.sh
-@ Only use @reached_if in @goal/@goal_glob:
+@ Only use @reached_if in @goal:
 @ tests/9_prelude_reached_if.sh:2: @reached_if aaa
 ? 1