Skip to content

Commit

Permalink
util: work around bash-3.0 bug "${scal[@]/xxx}"
Browse files Browse the repository at this point in the history
  • Loading branch information
akinomyoga committed Sep 23, 2021
1 parent 40827ef commit 7e10cf4
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion archive/getopt1.sh
Expand Up @@ -3,7 +3,7 @@

# Usage
#
# local "${ble_getopt_vars[@]/%/=}"
# local "${ble_getopt_vars[@]/%/=}" # WA #D1570 checked
# ble-getopt-begin "progname" "m:n c:n,n k:n,n" "$@"
# ble-getopt
#
Expand Down
22 changes: 11 additions & 11 deletions lib/core-complete.sh
Expand Up @@ -1782,7 +1782,7 @@ function ble/complete/source:glob {
## 補完候補のデータを一つの配列に纏めたもの。
## 要素を使用する際は以下の様に変数に展開して使う。
##
## local "${_ble_complete_cand_varnames[@]/%/=}"
## local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
## ble/complete/cand/unpack "${cand_pack[0]}"
##
## 先頭に ACTION が格納されているので
Expand Down Expand Up @@ -2457,7 +2457,7 @@ function ble/complete/menu/construct-single-entry {
fi

if [[ :$opts: != *:use_vars:* ]]; then
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "$1"
fi

Expand Down Expand Up @@ -2812,7 +2812,7 @@ function ble/complete/menu/style:desc/construct-page {
((x+=pad+${#desc_prefix}))

# 説明表示
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "$pack"
local desc="(action: $ACTION)"
ble/function#try ble/complete/action:"$ACTION"/get-desc
Expand Down Expand Up @@ -3039,7 +3039,7 @@ function ble/complete/menu/generate-candidates-from-menu {
# remaining candidates
cand_count=${#_ble_complete_menu_pack[@]}
cand_cand=() cand_word=() cand_pack=()
local pack "${_ble_complete_cand_varnames[@]/%/=}"
local pack "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
for pack in "${_ble_complete_menu_pack[@]}"; do
ble/complete/cand/unpack "$pack"
ble/array#push cand_cand "$CAND"
Expand Down Expand Up @@ -3184,7 +3184,7 @@ function ble/widget/complete {
fi

if [[ :$opts: == *:insert_all:* ]]; then
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
local pack beg=$COMP1 end=$COMP2 insert= suffix= index=0
for pack in "${cand_pack[@]}"; do
ble/complete/cand/unpack "$pack"
Expand Down Expand Up @@ -3228,7 +3228,7 @@ function ble/widget/complete {
# 一意確定の時
local ACTION=${cand_pack[0]%%:*}
if ble/is-function ble/complete/action:"$ACTION"/complete; then
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "${cand_pack[0]}"
ble/complete/action:"$ACTION"/complete
(($?==148)) && return 148
Expand Down Expand Up @@ -3299,7 +3299,7 @@ function ble/complete/menu-filter/.filter-candidates {
cand_pack=()

local iloop=0 interval=$bleopt_complete_polling_cycle
local filter_type pack "${_ble_complete_cand_varnames[@]/%/=}"
local filter_type pack "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
local comps_filter_pattern
for filter_type in head substr hsubseq subseq; do
ble/path#remove-glob comp_type '[amA]'
Expand Down Expand Up @@ -3573,7 +3573,7 @@ function ble/complete/menu-complete/select {

local x=${fields[0]} y=${fields[1]}

local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "${text::fields[4]}"
value=$INSERT

Expand Down Expand Up @@ -3760,7 +3760,7 @@ function ble/widget/menu_complete/exit {
local comps_fixed=${_ble_complete_menu0_comp[6]}

# 補完候補のロード
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "$pack"

ble/complete/action:"$ACTION"/complete
Expand Down Expand Up @@ -3985,7 +3985,7 @@ function ble/complete/auto-complete/.check-context {
local insert=$word suffix=
local ACTION=${cand_pack[0]%%:*}
if ble/is-function ble/complete/action:"$ACTION"/complete; then
local "${_ble_complete_cand_varnames[@]/%/=}"
local "${_ble_complete_cand_varnames[@]/%/=}" # WA #D1570 checked
ble/complete/cand/unpack "${cand_pack[0]}"
ble/complete/action:"$ACTION"/complete
fi
Expand Down Expand Up @@ -4866,7 +4866,7 @@ function ble/cmdinfo/complete:cd/.impl {
((ext==148||ext==0)) && return "$ext"

local is_pwd_visited= is_cdpath_generated=
"${_ble_util_set_declare[@]//NAME/visited}"
"${_ble_util_set_declare[@]//NAME/visited}" # WA #D1570 checked

# Check CDPATH first
local name names; ble/string#split names : "$CDPATH"
Expand Down
2 changes: 1 addition & 1 deletion lib/core-syntax.sh
Expand Up @@ -3810,7 +3810,7 @@ function ble/syntax:bash/is-complete {

# 構文 if..fi, etc が閉じているか?
local attrs ret
IFS= eval 'attrs="::${_ble_syntax_attr[*]/%/::}"'
IFS= eval 'attrs="::${_ble_syntax_attr[*]/%/::}"' # WA #D1570 checked
ble/string#count-string "$attrs" ":$ATTR_KEYWORD_BEGIN:"; local nbeg=$ret
ble/string#count-string "$attrs" ":$ATTR_KEYWORD_END:"; local nend=$ret
((nbeg>nend)) && return 1
Expand Down
2 changes: 1 addition & 1 deletion src/color.sh
Expand Up @@ -576,7 +576,7 @@ function ble/color/initialize-faces {

if ((${#_ble_color_faces_errors[@]})); then
if ((_ble_edit_attached)) && [[ ! $_ble_textarea_invalidated && $_ble_term_state == internal ]]; then
IFS=$'\n' eval 'local message="${_ble_color_faces_errors[@]/%/=}"'
IFS=$'\n' eval 'local message="${_ble_color_faces_errors[@]/%/=}"' # WA #D1570 checked
ble/widget/print "$message"
else
printf '%s\n' "${_ble_color_faces_errors[@]}" >&2
Expand Down
2 changes: 1 addition & 1 deletion src/edit.sh
Expand Up @@ -4305,7 +4305,7 @@ function ble-edit/undo/.check-hindex {
if [[ $_ble_edit_undo_hindex ]]; then
local uindex=${_ble_edit_undo_index:-${#_ble_edit_undo[@]}}
local q=\' Q="'\''" value
ble/util/sprintf value "'%s' " "$uindex" "${_ble_edit_undo[@]//$q/$Q}"
ble/util/sprintf value "'%s' " "$uindex" "${_ble_edit_undo[@]//$q/$Q}" # WA #D1570 checked
_ble_edit_undo_history[_ble_edit_undo_hindex]=$value
fi

Expand Down
2 changes: 1 addition & 1 deletion src/util.sh
Expand Up @@ -395,7 +395,7 @@ function ble/dense-array#fill-range {
ble/array#reserve-prototype $(($3-$2))
local _ble_script='
local -a sARR; sARR=("${_ble_array_prototype[@]::$3-$2}")
ARR=("${ARR[@]::$2}" "${sARR[@]/#/$4}" "${ARR[@]:$3}")'
ARR=("${ARR[@]::$2}" "${sARR[@]/#/$4}" "${ARR[@]:$3}")' # WA #D1570 checked
builtin eval -- "${_ble_script//ARR/$1}"
}

Expand Down

0 comments on commit 7e10cf4

Please sign in to comment.