diff --git a/makesure.awk b/makesure.awk index 31561af..cb6540c 100755 --- a/makesure.awk +++ b/makesure.awk @@ -321,7 +321,7 @@ function registerDependsOn(goalName, i,dep,x,y) { x = goalName SUBSEP DependenciesCnt[goalName] - 1 y = x SUBSEP DependencyArgsCnt[x]++ DependencyArgs[y] = $i - DependencyArgsType[y] = Quotes[i] ? "str" : "var" + DependencyArgsType[y] = "u" == Quotes[i] ? "var" : "str" } } else registerDependency(goalName, dep) diff --git a/tests/27_parameterized_goals.tush b/tests/27_parameterized_goals.tush index a4a5f42..1359783 100644 --- a/tests/27_parameterized_goals.tush +++ b/tests/27_parameterized_goals.tush @@ -207,15 +207,15 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/27_parameterized_goals_10_errors.sh -l @ nothing allowed after goal name: @ tests/27_parameterized_goals_10_errors.sh:43: @goal a7 b7 c7 @params D # wrong goal name / @params in wrong pos @ @param name should match /^[A-Z_][A-Z0-9_]*$/: 'a': -@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A-B _A %& # wrong param names +@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A.B _A @@ # wrong param names @ @param name should match /^[A-Z_][A-Z0-9_]*$/: 'hello': -@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A-B _A %& # wrong param names +@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A.B _A @@ # wrong param names @ @param name should match /^[A-Z_][A-Z0-9_]*$/: '1A': -@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A-B _A %& # wrong param names -@ @param name should match /^[A-Z_][A-Z0-9_]*$/: 'A-B': -@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A-B _A %& # wrong param names -@ @param name should match /^[A-Z_][A-Z0-9_]*$/: '%&': -@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A-B _A %& # wrong param names +@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A.B _A @@ # wrong param names +@ @param name should match /^[A-Z_][A-Z0-9_]*$/: 'A.B': +@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A.B _A @@ # wrong param names +@ @param name should match /^[A-Z_][A-Z0-9_]*$/: '@@': +@ tests/27_parameterized_goals_10_errors.sh:46: @goal g @params a hello 1A A.B _A @@ # wrong param names @ Goal 'a' has unknown dependency 'unknown1': @ tests/27_parameterized_goals_10_errors.sh:10: @depends_on unknown1 # err unknown dep @ Goal 'a' has unknown dependency 'unknown2': diff --git a/tests/27_parameterized_goals_10_errors.sh b/tests/27_parameterized_goals_10_errors.sh index 638ca6f..32ad45c 100644 --- a/tests/27_parameterized_goals_10_errors.sh +++ b/tests/27_parameterized_goals_10_errors.sh @@ -43,5 +43,5 @@ @goal a7 b7 c7 @params D # wrong goal name / @params in wrong pos echo "" -@goal g @params a hello 1A A-B _A %& # wrong param names +@goal g @params a hello 1A A.B _A @@ # wrong param names @goal g1 @params GOOD _GOOD_ GOOD_123 GOOD123 _1 _ ___