global: improve the workaround of bash-4.2 declare -gA by separate …

…assignments
akinomyoga · Jul 28, 2022 · 0b7de99 · 0b7de99
1 parent b708ee2
commit 0b7de99
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ble-decode.sh b/ble-decode.sh
@@ -49,12 +49,13 @@ ble_decode_MaskFlag=0x7FC00000
 
 ble_decode_IsolatedESC=$((0x07FF))
 
-if ((_ble_bash>=40300||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
+if ((_ble_bash>=40200||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
   _ble_decode_kbd_ver=4
   _ble_decode_kbd__n=0
   builtin unset -v _ble_decode_kbd__k2c
-  if ((_ble_bash>=40300)); then
+  if ((_ble_bash>=40200)); then
     declare -gA _ble_decode_kbd__k2c
+    _ble_decode_kbd__k2c=()
   else
     declare -A _ble_decode_kbd__k2c
    fi

diff --git a/ble-syntax-lazy.sh b/ble-syntax-lazy.sh
@@ -69,11 +69,11 @@ fi
 #------------------------------------------------------------------------------
 # グローバル変数の定義 (関数内からではできないのでここで先に定義)
 
-if ((_ble_bash>=40300||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
+if ((_ble_bash>=40200||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
   builtin unset -v _ble_syntax_highlight_filetype
-  builtin unset -v _ble_syntax_highlight_lscolors_ext
-  if ((_ble_bash>=40300)); then
-    declare -gA _ble_syntax_highlight_filetype=()
+  if ((_ble_bash>=40200)); then
+    declare -gA _ble_syntax_highlight_filetype
+    _ble_syntax_highlight_filetype=()
   else
     declare -A _ble_syntax_highlight_filetype=()
   fi

diff --git a/lib/core-syntax.sh b/lib/core-syntax.sh
@@ -4543,7 +4543,7 @@ function ble-syntax/highlight/cmdtype2 {
 ##   @param[in] word
 ##     シェル展開・クォート除去を実行する前の文字列を指定します。
 ##   @var[out] type
-if ((_ble_bash>=40300||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
+if ((_ble_bash>=40200||_ble_bash>=40000&&!_ble_bash_loaded_in_function)); then
   # Note: 連想配列 _ble_syntax_highlight_filetype は ble-syntax-lazy.sh で先に定義される。
 
   _ble_syntax_highlight_filetype_version=-1