consolidate regex into single-source-of-truth versions of each

Author: evnp

runfile.sh

@@ -10,6 +10,26 @@ function version() {
   head -n 3 < "$0" | tail -1 | cut -c3-
 }
 
+function task_re() {
+  printf '%s' '([[:alnum:]_-][[:alnum:] _-]+):([[:alnum:] _-]*)?(#(.*))?'
+}
+
+function subtask_re() {
+  [[ -z "${RUNFILE_SKIP_SUBTASKS:-}" ]] && printf '%s' '\2'
+}
+
+function trap_re() {
+  printf '%s' '(EXIT|HUP|INT|QUIT|ABRT|KILL|ALRM|TERM)'
+}
+
+function runfile_variable_re() {
+  printf '%s' '^[[:space:]]*[A-Z]+ :*= '
+}
+
+function run_arg_re() {
+  printf '%s' '-([hvrmena]|-(help|version|runfile|makefile|edit|new|alias|eject|verbose|compact|compat|noconfirm|noedit))'
+}
+
 function usage() {
 cat <<EOF
 
@@ -166,12 +186,11 @@ function print-makefile() {
   sed -E "s!\tmake --makefile ${makefile} !\tmake !" "$@"
 }
 
-function print-runfile-commands() { local task_re
-  task_re='([[:alnum:]_-][[:alnum:] _-]+):[[:alnum:] _-]*(#(.*))?'
+function print-runfile-commands() {
   # Print current Runfile commands:
   echo
-  grep -E "^${task_re}$" "$( smartcase-file runfile )" \
-  | sed -Ee "s/^${task_re}$/\1 · \3/g" -e 's/  / /g' -e 's/^/  /g'
+  grep -E "^$( task_re )$" "$( smartcase-file runfile )" \
+  | sed -Ee "s/^$( task_re )$/\1 · \4/g" -e 's/  / /g' -e 's/^/  /g'
   echo
   # Print Runfile command aliases if any are currently available:
   awk 'NR==FNR{a[$0]=1;next}a[$0]' <( bash -ic 'alias' ) <( print-runfile-aliases ) \
@@ -180,10 +199,9 @@ function print-runfile-commands() { local task_re
 }
 
 function print-runfile-aliases() {
-  task_re='([[:alnum:]_-][[:alnum:] _-]+):[[:alnum:] _-]*(#(.*))?'
   echo '# Runfile Aliases'
-  grep -E "^${task_re}$" "$( smartcase-file runfile )" \
-  | sed -E "s/.*(^| )${task_re}$/\2/g" \
+  grep -E "^$( task_re )$" "$( smartcase-file runfile )" \
+  | sed -E "s/.*(^| )$( task_re )$/\2/g" \
   | awk '!_[substr($1,1,1)]++' `# unique on first char of each command` \
   | sed -E "s/(.)(.*)/alias ${RUNFILE_ALIASES_PREFIX:-r}\1='run \1\2'/"
   echo '# END Runfile Aliases'
@@ -408,12 +426,9 @@ function run() ( set -euo pipefail
   local makefile='' buffer='' task='' baseindent=''
   local arg='' make_args=() named_args=() pos_args=() pos_arg_idx=0
 
-  local runfile_variables='' runfile_variable_re='' run_arg_re=''
-  local task_re='' trap_re=''
+  local runfile_variables=''
   local trap_sig='' runfile_grep_filter_args=()
 
-  run_arg_re='-([hvrmena]|-(help|version|runfile|makefile|edit|new|alias|eject|verbose|compact|compat|noconfirm|noedit))'
-
   [[ "$*" == '' ]] && print-runfile-commands && exit 0
 
   for action in help version runfile makefile edit new alias eject v r m e n a e
@@ -485,11 +500,11 @@ function run() ( set -euo pipefail
       make_args+=( "${arg/make-}" )
     elif [[ "${arg}" =~ ^[[:alnum:]_-]+\= ]]
     then
-      if ! [[ "${arg}" =~ ^${run_arg_re}\= ]]
+      if ! [[ "${arg}" =~ ^$( run_arg_re )\= ]]
       then
         named_args+=( "${arg}" )
       fi
-    elif ! [[ "${arg}" =~ ^${run_arg_re}$ ]]
+    elif ! [[ "${arg}" =~ ^$( run_arg_re )$ ]]
     then
       if [[ -z "${task}" ]]
       then
@@ -509,37 +524,26 @@ function run() ( set -euo pipefail
     fi
   done
 
-  task_re='([[:alnum:]_-][[:alnum:] _-]+):([[:alnum:] _-]+)?(#.*)?'
-  trap_re='(EXIT|HUP|INT|QUIT|ABRT|KILL|ALRM|TERM)'
-
   if [[ "${RUNFILE_TRAP:-}" == '*' ]]
   then
-    runfile_grep_filter_args=( -E "^(${task_re}|\s*${trap_re} .*)$" )
+    runfile_grep_filter_args=( -E "^($( task_re )|\s*$( trap_re ) .*)$" )
   elif [[ -n "${RUNFILE_TRAP:-}" ]]
   then
-    runfile_grep_filter_args=( -E "^(${task_re}|\s*${RUNFILE_TRAP} .*)$" )
-  else
-    runfile_grep_filter_args=( -Ev "^\s*${trap_re} .*$" )
-  fi
-
-  if [[ -n "${RUNFILE_SKIP_SUBTASKS:-}" ]]
-  then
-    subtask_re=''
+    runfile_grep_filter_args=( -E "^($( task_re )|\s*${RUNFILE_TRAP} .*)$" )
   else
-    subtask_re='\2'
+    runfile_grep_filter_args=( -Ev "^\s*$( trap_re ) .*$" )
   fi
 
-  runfile_variable_re='^[[:space:]]*[A-Z]+ :*= '
   runfile_variables="$( \
-    grep -E "${runfile_variable_re}" "$( smartcase-file runfile )" || true
+    grep -E "$( runfile_variable_re )" "$( smartcase-file runfile )" || true
   )"
   if [[ -n "${runfile_variables}" ]]
   then
     runfile_variables="${runfile_variables}"$'\n\n'
   fi
 
   baseindent="$( \
-    grep -Eoz "^${task_re}[^\n]*\n[[:space:]]*" "$( smartcase-file runfile )" \
+    grep -Eoz "^$( task_re )[^\n]*\n[[:space:]]*" "$( smartcase-file runfile )" \
     | head -2 | tail -1
   )"
 
@@ -551,7 +555,7 @@ SHELL = ${SHELL:-bash}
 
 ${runfile_variables}$(
   grep "${runfile_grep_filter_args[@]}" "$( smartcase-file runfile )" \
-  | grep -Ev "${runfile_variable_re}" \
+  | grep -Ev "$( runfile_variable_re )" \
   | sed -E \
       -e "s/[[:space:]]*\$//" \
         `# trim any trailing whitespace from lines` \
@@ -563,8 +567,8 @@ ${runfile_variables}$(
         `# prefix every line with TAB` \
       -e "s!^\t\$!!" \
         `# remove TAB from blank lines` \
-      -e "s!^\t${task_re}(.*)\$!\n.PHONY: \1\n\1:${subtask_re}\3!" \
-        `# remove TAB-prefix from lines that match task pattern` \
+      -e "s!^\t$( task_re )\$!\n.PHONY: \1\n\1:$( subtask_re )\3!" \
+        `# add PHONY declarations; remove TAB-prefix from task lines` \
       `# Improve Make's default handling of multiline statements (if, for, while):` \
       -e "s!^\t\t(.*;[[:space:]]*[^\\]?)\$!\t\t\1 \\\\!" \
       -e "s!^\t\t(.*[^\\])\$!\t\t\1; \\\\!" \
@@ -672,7 +676,7 @@ EOF
       )
       do
         # First ensure trap_sig is valid:
-        if [[ "${trap_sig}" =~ ^${trap_re}$ ]]
+        if [[ "${trap_sig}" =~ ^$( trap_re )$ ]]
         then
           # shellcheck disable=SC2064
           # "Use single quotes, otherwise this expands now rather than when signalled."