Skip to content

Commit 8b080d3

Browse files
akinomyogaakinomyoga
committed
fix(_comp_array_filter): move to a separate file
1 parent ff4c4e3 commit 8b080d3

File tree

2 files changed

+130
-129
lines changed

2 files changed

+130
-129
lines changed

‎bash_completion‎

Lines changed: 0 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -309,135 +309,6 @@ _comp_expand_glob()
309309
return 0
310310
}
311311

312-
# Filter the array elements with the specified condition.
313-
# @param $1 Array name (that is not "value" or other internal variable names)
314-
# @param $2 When none of the options -EFG are specified, this is used as the
315-
# command that tests the array element. The command is supposed to exit with
316-
# status 0 when the element should be preserved, and 1 when the element
317-
# should be removed. The other exit status will cancel the array filtering.
318-
# If this is an existing function name, the function is called with the value
319-
# of the array element. Otherwise, this shall be the shell command that
320-
# tests the array-element value stored in the shell variable "value".
321-
#
322-
# Options:
323-
# -E $2 is interpreted as a POSIX extended regular expression.
324-
# The default anchoring is `-m` (see below).
325-
# -F $2 is interpreted as a fixed string. The default anchoring
326-
# is `-m` (see below).
327-
# -G $2 is interpreted as a glob pattern. The default anchoring
328-
# is `-x` (see below).
329-
#
330-
# -p Combined with -EFG, it performs the prefix matching.
331-
# -s Combined with -EFG, it performs the suffix matching.
332-
# -m Combined with -EFG, it performs the middle matching.
333-
# -x Combined with -EFG, it performs the exact matching.
334-
#
335-
# -r Revert the condition, i.e., remove elements that satisfy
336-
# the original condition.
337-
# -C Array compaction is not performed.
338-
#
339-
# @return 2 with a wrong usage, 1 when any elements are removed, 0 when the set
340-
# of array elements are unchanged. [ Note: the compaction will be performed
341-
# (without the option -C) even when the set of array elements are
342-
# unchanged. ]
343-
_comp_array_filter()
344-
{
345-
local _comp_local_flags='' _comp_local_pattype='' _comp_local_anchoring=''
346-
local OPTIND=1 OPTARG='' OPTERR=0 _comp_local_opt=''
347-
while getopts 'EFGpsmxrC' _comp_local_opt "$@"; do
348-
case $_comp_local_opt in
349-
[EFG]) _comp_local_pattype=$_comp_local_opt ;;
350-
[psmx]) _comp_local_anchoring=$_comp_local_opt ;;
351-
[rC]) _comp_local_flags=$_comp_local_opt$_comp_local_flags ;;
352-
*)
353-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" 'usage error' >&2
354-
printf 'usage: %s %s\n' "$FUNCNAME" "[-EFGpsmxrC] ARRAY_NAME CONDITION" >&2
355-
return 2
356-
;;
357-
esac
358-
done
359-
360-
shift $((OPTIND - 1))
361-
if (($# != 2)); then
362-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "unexpected number of arguments: $#" >&2
363-
printf 'usage: %s %s\n' "$FUNCNAME" "[-EFGpsmxrC] ARRAY_NAME CONDITION" >&2
364-
return 2
365-
elif [[ $1 != [a-zA-Z_]*([a-zA-Z_0-9]) ]]; then
366-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "invalid array name '$1'." >&2
367-
return 2
368-
elif [[ $1 == @(_comp_local_*|OPTIND|OPTARG|OPTERR) ]]; then
369-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' is reserved for internal uses" >&2
370-
return 2
371-
elif [[ ! $_comp_local_pattype && $1 == value ]]; then
372-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' cannot be used for the predicate" >&2
373-
return 2
374-
fi
375-
# When the array is empty:
376-
eval "((\${#$1[@]}))" || return 0
377-
378-
local _comp_local_predicate='' _comp_local_pattern=$2
379-
case $_comp_local_pattype in
380-
E)
381-
case $_comp_local_anchoring in
382-
p) _comp_local_predicate='[[ $_comp_local_value =~ ^($_comp_local_pattern) ]]' ;;
383-
s) _comp_local_predicate='[[ $_comp_local_value =~ ($_comp_local_pattern)$ ]]' ;;
384-
x) _comp_local_predicate='[[ $_comp_local_value =~ ^($_comp_local_pattern)$ ]]' ;;
385-
*) _comp_local_predicate='[[ $_comp_local_value =~ $_comp_local_pattern ]]' ;;
386-
esac
387-
;;
388-
F)
389-
case $_comp_local_anchoring in
390-
p) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern"* ]]' ;;
391-
s) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern" ]]' ;;
392-
x) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern" ]]' ;;
393-
*) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern"* ]]' ;;
394-
esac
395-
;;
396-
G)
397-
case $_comp_local_anchoring in
398-
p) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern* ]]' ;;
399-
s) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern ]]' ;;
400-
m) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern* ]]' ;;
401-
*) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern ]]' ;;
402-
esac
403-
;;
404-
*)
405-
if declare -F "$2" &>/dev/null; then
406-
_comp_local_predicate="$2 \"\$_comp_local_value\""
407-
else
408-
_comp_local_predicate="local value=\$_comp_local_value; $2"
409-
fi
410-
;;
411-
esac
412-
413-
local _comp_local_unset='' _comp_local_expected_status=0
414-
[[ $_comp_local_flags == *r* ]] && _comp_local_expected_status=1
415-
416-
local _comp_local_indices _comp_local_index _comp_local_value
417-
eval "_comp_local_indices=(\"\${!$1[@]}\")"
418-
for _comp_local_index in "${_comp_local_indices[@]}"; do
419-
eval "_comp_local_value=\${$1[\$_comp_local_index]}; $_comp_local_predicate"
420-
case $? in
421-
"$_comp_local_expected_status") continue ;;
422-
[01])
423-
unset -v "$1[\$_comp_local_index]"
424-
_comp_local_unset=1
425-
;;
426-
*)
427-
printf 'bash_completion: %s: %s\n' "$FUNCNAME" \
428-
"the filter condition broken '${_comp_local_pattype:+-$_comp_local_pattype }$2'" >&2
429-
return 2
430-
;;
431-
esac
432-
done
433-
434-
# Compaction of the sparse array
435-
[[ $_comp_local_flags == *C* ]] ||
436-
eval "((\${#$1[@]})) && $1=(\"\${$1[@]}\")"
437-
438-
[[ ! $_comp_local_unset ]]
439-
}
440-
441312
# Reassemble command line words, excluding specified characters from the
442313
# list of word completion separators (COMP_WORDBREAKS).
443314
# @param $1 chars Characters out of $COMP_WORDBREAKS which should

‎completions/ARRAY‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# Utility xfunc functions for array manipulations -*- shell-script -*-
2+
3+
# Filter the array elements with the specified condition.
4+
# @param $1 Array name (that is not "value" or other internal variable names)
5+
# @param $2 When none of the options -EFG are specified, this is used as the
6+
# command that tests the array element. The command is supposed to exit with
7+
# status 0 when the element should be preserved, and 1 when the element
8+
# should be removed. The other exit status will cancel the array filtering.
9+
# If this is an existing function name, the function is called with the value
10+
# of the array element. Otherwise, this shall be the shell command that
11+
# tests the array-element value stored in the shell variable "value".
12+
#
13+
# Options:
14+
# -E $2 is interpreted as a POSIX extended regular expression.
15+
# The default anchoring is `-m` (see below).
16+
# -F $2 is interpreted as a fixed string. The default anchoring
17+
# is `-m` (see below).
18+
# -G $2 is interpreted as a glob pattern. The default anchoring
19+
# is `-x` (see below).
20+
#
21+
# -p Combined with -EFG, it performs the prefix matching.
22+
# -s Combined with -EFG, it performs the suffix matching.
23+
# -m Combined with -EFG, it performs the middle matching.
24+
# -x Combined with -EFG, it performs the exact matching.
25+
#
26+
# -r Revert the condition, i.e., remove elements that satisfy
27+
# the original condition.
28+
# -C Array compaction is not performed.
29+
#
30+
# @return 2 with a wrong usage, 1 when any elements are removed, 0 when the set
31+
# of array elements are unchanged. [ Note: the compaction will be performed
32+
# (without the option -C) even when the set of array elements are
33+
# unchanged. ]
34+
_comp_xfunc_ARRAY_filter()
35+
{
36+
local _comp_local_flags='' _comp_local_pattype='' _comp_local_anchoring=''
37+
local OPTIND=1 OPTARG='' OPTERR=0 _comp_local_opt=''
38+
while getopts 'EFGpsmxrC' _comp_local_opt "$@"; do
39+
case $_comp_local_opt in
40+
[EFG]) _comp_local_pattype=$_comp_local_opt ;;
41+
[psmx]) _comp_local_anchoring=$_comp_local_opt ;;
42+
[rC]) _comp_local_flags=$_comp_local_opt$_comp_local_flags ;;
43+
*)
44+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" 'usage error' >&2
45+
printf 'usage: %s %s\n' "$FUNCNAME" "[-EFGpsmxrC] ARRAY_NAME CONDITION" >&2
46+
return 2
47+
;;
48+
esac
49+
done
50+
51+
shift $((OPTIND - 1))
52+
if (($# != 2)); then
53+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "unexpected number of arguments: $#" >&2
54+
printf 'usage: %s %s\n' "$FUNCNAME" "[-EFGpsmxrC] ARRAY_NAME CONDITION" >&2
55+
return 2
56+
elif [[ $1 != [a-zA-Z_]*([a-zA-Z_0-9]) ]]; then
57+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "invalid array name '$1'." >&2
58+
return 2
59+
elif [[ $1 == @(_comp_local_*|OPTIND|OPTARG|OPTERR) ]]; then
60+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' is reserved for internal uses" >&2
61+
return 2
62+
elif [[ ! $_comp_local_pattype && $1 == value ]]; then
63+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" "array name '$1' cannot be used for the predicate" >&2
64+
return 2
65+
fi
66+
# When the array is empty:
67+
eval "((\${#$1[@]}))" || return 0
68+
69+
local _comp_local_predicate='' _comp_local_pattern=$2
70+
case $_comp_local_pattype in
71+
E)
72+
case $_comp_local_anchoring in
73+
p) _comp_local_predicate='[[ $_comp_local_value =~ ^($_comp_local_pattern) ]]' ;;
74+
s) _comp_local_predicate='[[ $_comp_local_value =~ ($_comp_local_pattern)$ ]]' ;;
75+
x) _comp_local_predicate='[[ $_comp_local_value =~ ^($_comp_local_pattern)$ ]]' ;;
76+
*) _comp_local_predicate='[[ $_comp_local_value =~ $_comp_local_pattern ]]' ;;
77+
esac
78+
;;
79+
F)
80+
case $_comp_local_anchoring in
81+
p) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern"* ]]' ;;
82+
s) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern" ]]' ;;
83+
x) _comp_local_predicate='[[ $_comp_local_value == "$_comp_local_pattern" ]]' ;;
84+
*) _comp_local_predicate='[[ $_comp_local_value == *"$_comp_local_pattern"* ]]' ;;
85+
esac
86+
;;
87+
G)
88+
case $_comp_local_anchoring in
89+
p) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern* ]]' ;;
90+
s) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern ]]' ;;
91+
m) _comp_local_predicate='[[ $_comp_local_value == *$_comp_local_pattern* ]]' ;;
92+
*) _comp_local_predicate='[[ $_comp_local_value == $_comp_local_pattern ]]' ;;
93+
esac
94+
;;
95+
*)
96+
if declare -F "$2" &>/dev/null; then
97+
_comp_local_predicate="$2 \"\$_comp_local_value\""
98+
else
99+
_comp_local_predicate="local value=\$_comp_local_value; $2"
100+
fi
101+
;;
102+
esac
103+
104+
local _comp_local_unset='' _comp_local_expected_status=0
105+
[[ $_comp_local_flags == *r* ]] && _comp_local_expected_status=1
106+
107+
local _comp_local_indices _comp_local_index _comp_local_value
108+
eval "_comp_local_indices=(\"\${!$1[@]}\")"
109+
for _comp_local_index in "${_comp_local_indices[@]}"; do
110+
eval "_comp_local_value=\${$1[\$_comp_local_index]}; $_comp_local_predicate"
111+
case $? in
112+
"$_comp_local_expected_status") continue ;;
113+
[01])
114+
unset -v "$1[\$_comp_local_index]"
115+
_comp_local_unset=1
116+
;;
117+
*)
118+
printf 'bash_completion: %s: %s\n' "$FUNCNAME" \
119+
"the filter condition broken '${_comp_local_pattype:+-$_comp_local_pattype }$2'" >&2
120+
return 2
121+
;;
122+
esac
123+
done
124+
125+
# Compaction of the sparse array
126+
[[ $_comp_local_flags == *C* ]] ||
127+
eval "((\${#$1[@]})) && $1=(\"\${$1[@]}\")"
128+
129+
[[ ! $_comp_local_unset ]]
130+
}

0 commit comments

Comments
 (0)