Merge 4f9df54 into d53356a

shellspec · Apr 2, 2020 · 2179066 · 2179066
2 parents d53356a + 4f9df54
commit 2179066
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/shellmetrics b/shellmetrics
@@ -151,7 +151,12 @@ pretty() {
   while [ "$i" -lt "$1" ] && i=$((i + 1)); do
     echo 'shellmetrics_wrapper() {'
   done
-  sed "s/\([^\$'\"()]\)\( *()\)/\1_L$MARK\2/g" \
+  sed "
+    s/\([^[:space:]\$'\"();&|<>=@!*?+]\)\( *()\)/\1_L$MARK\2/g
+    s/^[[:space:]]*function[[:space:]]\{1,\}[^[:space:]\$'\"();&|<>]\{1,\}/&_L$MARK/g
+    s/[;&|(][[:space:]]*function[[:space:]]\{1,\}[^[:space:]\$'\"();&|<>]\{1,\}/&_L$MARK/g
+    s/_L${MARK}_L${MARK}/_L${MARK}/g
+  " \
   | awk "{i++; gsub(/$MARK/,i); print}"
   while [ "$i" -gt 0 ] && i=$((i - 1)); do
     echo '}'
@@ -262,7 +267,8 @@ analyze() {
 
     case $mark in (*"f"*)
       func=${line%"()"*} && func=${func%" "} && func=${func##*[$SP]}
-      lineno=${func##*_L} && func=${func%_L*}:$lineno
+      lineno=${func##*_L}
+      [ "$lineno" != "$func" ] && func=${func%_L*}:$lineno
       push_array indent func ccn lloc
       ccn=1 lloc=0
     esac