Improve parsing algorithm to handle spaces and comments #63

xonixx · Oct 14, 2021 · 48669c0 · 48669c0
1 parent 161b293
commit 48669c0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/makesure.awk b/makesure.awk
@@ -221,6 +221,7 @@ function calcGlob(goalName, pattern,   script, file) {
   GlobCnt = 0
   GlobGoalName = goalName
   split("",GlobFiles)
+  gsub(/ /,"\\ ",pattern)
   script = MyDirScript ";for f in ./" pattern ";do test -e \"$f\" && echo \"$f\";done"
   while ((script | getline file)>0) {
     GlobCnt++

diff --git a/tests/21_parsing.tush b/tests/21_parsing.tush
@@ -4,14 +4,23 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/21_parsing_spaces.sh -la
 |   21_parsing 1.txt
 |   21_parsing 2.txt
 |   21_parsing*.txt
+|   g1@21_parsing 1.txt
+|   g1@21_parsing 2.txt
+|   g1
 |   test2
+|   test3
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/21_parsing_spaces.sh test2
 |   goal '21_parsing 2.txt' ...
 | 21_parsing 2.txt
 | 2
 |   goal 'test2' [empty].
 
+$ cd "$MYDIR"; ./$MAKESURE -f tests/21_parsing_spaces.sh test3
+|   goal 'g1@21_parsing 2.txt' ...
+| 21_parsing 2.txt
+| 2
+|   goal 'test3' [empty].
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/21_parsing_comments.sh -la
 | Available goals:

diff --git a/tests/21_parsing_spaces.sh b/tests/21_parsing_spaces.sh
@@ -4,5 +4,12 @@
   echo "$ITEM"
   cat "$ITEM"
 
+@goal g1 @glob '21_parsing ?.txt'
+  echo "$ITEM"
+  cat "$ITEM"
+
 @goal test2
-@depends_on '21_parsing 2.txt'
+@depends_on '21_parsing 2.txt'
+
+@goal test3
+@depends_on 'g1@21_parsing 2.txt'