fix(_comp_array_filter): change {__comp => _comp_local}_*

Author: akinomyoga

bash_completion

@@ -274,13 +274,13 @@ _upvars()
 #   unchanged. ]
 _comp_array_filter()
 {
-    local __comp_flags='' __comp_pattype='' __comp_anchoring=''
-    local OPTIND=1 OPTARG='' OPTERR=0 __comp_opt=''
-    while getopts 'EFGpsmrC' __comp_opt "$@"; do
-        case $__comp_opt in
-            [EFG]) __comp_pattype=$__comp_opt ;;
-            [psm]) __comp_anchoring=$__comp_opt ;;
-            [rC]) __comp_flags=$__comp_opt$__comp_flags ;;
+    local _comp_local_flags='' _comp_local_pattype='' _comp_local_anchoring=''
+    local OPTIND=1 OPTARG='' OPTERR=0 _comp_local_opt=''
+    while getopts 'EFGpsmrC' _comp_local_opt "$@"; do
+        case $_comp_local_opt in
+            [EFG]) _comp_local_pattype=$_comp_local_opt ;;
+            [psm]) _comp_local_anchoring=$_comp_local_opt ;;
+            [rC]) _comp_local_flags=$_comp_local_opt$_comp_local_flags ;;
             *)
                 echo "bash_completion: $FUNCNAME: usage error" >&2
                 return 2
@@ -296,58 +296,58 @@ _comp_array_filter()
     elif [[ $1 != [a-zA-Z_]*([a-zA-Z_0-9]) ]]; then
         printf 'bash_completion: %s: %s\n' "$FUNCNAME" "invalid array name '$1'." >&2
         return 2
-    elif [[ $1 == @(__comp_*|OPTIND|OPTARG|OPTERR) ]]; then
+    elif [[ $1 == @(_comp_local_*|OPTIND|OPTARG|OPTERR) ]]; then
         printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' is reserved for internal uses." >&2
         return 2
-    elif [[ ! $__comp_pattype && $1 == value ]]; then
+    elif [[ ! $_comp_local_pattype && $1 == value ]]; then
         printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' cannot be used for the predicate." >&2
         return 2
     fi
     # When the array is empty:
     eval "((\${#$1[@]}))" || return 0
 
-    local __comp_predicate='' __comp_pattern=$2
-    case $__comp_pattype in
+    local _comp_local_predicate='' _comp_local_pattern=$2
+    case $_comp_local_pattype in
         E)
-            __comp_predicate='[[ $__comp_value == $__comp_pattern ]]'
+            _comp_local_predicate='[[ $_comp_local_value =~ $_comp_local_pattern ]]'
             ;;
         F)
-            case $__comp_anchoring in
-                p) __comp_predicate='[[ $__comp_value == "$__comp_pattern"* ]]' ;;
-                s) __comp_predicate='[[ $__comp_value == *"$__comp_pattern" ]]' ;;
-                m) __comp_predicate='[[ $__comp_value == *"$__comp_pattern"* ]]' ;;
-                *) __comp_predicate='[[ $__comp_value == "$__comp_pattern" ]]' ;;
+            case $_comp_local_anchoring in
+                p) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern"* ]]' ;;
+                s) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern" ]]' ;;
+                m) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern"* ]]' ;;
+                *) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern" ]]' ;;
             esac
             ;;
         G)
-            case $__comp_anchoring in
-                p) __comp_predicate='[[ $__comp_value == $__comp_pattern* ]]' ;;
-                s) __comp_predicate='[[ $__comp_value == *$__comp_pattern ]]' ;;
-                m) __comp_predicate='[[ $__comp_value == *$__comp_pattern* ]]' ;;
-                *) __comp_predicate='[[ $__comp_value == $__comp_pattern ]]' ;;
+            case $_comp_local_anchoring in
+                p) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern* ]]' ;;
+                s) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern ]]' ;;
+                m) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern* ]]' ;;
+                *) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern ]]' ;;
             esac
             ;;
         *)
             if declare -F "$2" &>/dev/null; then
-                _comp_predicate="$2 \"\$__comp_value\""
+                _comp_local_predicate="$2 \"\$_comp_local_value\""
             else
-                _comp_predicate="local value=\$__comp_value; $2"
+                _comp_local_predicate="local value=\$_comp_local_value; $2"
             fi
             ;;
     esac
 
-    local __comp_unset='' __comp_expected_status=0
-    [[ $__comp_flags == *r* ]] && __comp_expected_status=1
+    local _comp_local_unset='' _comp_local_expected_status=0
+    [[ $_comp_local_flags == *r* ]] && _comp_local_expected_status=1
 
-    local __comp_indices __comp_index __comp_value
-    eval "__comp_indices=(\"\${!$1[@]}\")"
-    for __comp_index in "${__comp_indices[@]}"; do
-        eval "__comp_value=\${$1[\$__comp_index]}; $__comp_predicate"
+    local _comp_local_indices _comp_local_index _comp_local_value
+    eval "_comp_local_indices=(\"\${!$1[@]}\")"
+    for _comp_local_index in "${_comp_local_indices[@]}"; do
+        eval "_comp_local_value=\${$1[\$_comp_local_index]}; $_comp_local_predicate"
         case $? in
-            "$__comp_expected_status") continue ;;
+            "$_comp_local_expected_status") continue ;;
             [01])
-                unset -v "$1[\$__comp_index]"
-                __comp_unset=1
+                unset -v "$1[\$_comp_local_index]"
+                _comp_local_unset=1
                 ;;
             *)
                 printf 'bash_completion: %s: %s\n' "$FUNCNAME" "the filter condition broken." >&2
@@ -357,10 +357,10 @@ _comp_array_filter()
     done
 
     # Compaction of the sparse array
-    [[ $__comp_flags == *C* ]] ||
+    [[ $_comp_local_flags == *C* ]] ||
         eval -- "((\${#$1[@]})) && $1=(\"\${$1[@]}\")"
 
-    [[ ! $__comp_unset ]]
+    [[ ! $_comp_local_unset ]]
 }
 
 # Reassemble command line words, excluding specified characters from the