# HG changeset patch # User Franz Glasner # Date 1728186329 -7200 # Node ID 3adb26525b1900bf8d7352b64bc3f7d8ad9e40c1 # Parent a97ec3f07bdb389e57a489106672a67ca7737b4d farray.sh: Changed token value prefix: replace the last underscore "_" by a colon ":" diff -r a97ec3f07bdb -r 3adb26525b19 share/local-bsdtools/farray.sh --- a/share/local-bsdtools/farray.sh Sat Oct 05 21:55:55 2024 +0200 +++ b/share/local-bsdtools/farray.sh Sun Oct 06 05:45:29 2024 +0200 @@ -92,9 +92,9 @@ #: -_farr_array_token_prefix='_farr_A?_' +_farr_array_token_prefix='_farr_A?:' _farr_array_prefix=_farr_A_ -_farr_alist_token_prefix='_farr_KV??_' +_farr_alist_token_prefix='_farr_KV??:' _farr_alist_prefix=_farr_KV_ _farr_alist_key_prefix=_farr_K_ _farr_alist_value_prefix=_farr_V_ diff -r a97ec3f07bdb -r 3adb26525b19 tests/farray-alist.t --- a/tests/farray-alist.t Sat Oct 05 21:55:55 2024 +0200 +++ b/tests/farray-alist.t Sun Oct 06 05:45:29 2024 +0200 @@ -174,9 +174,9 @@ ITERATE (for each, by value) $ falist_for_each "$LIST" $'printf "EACH: %s key \\`%s\\\', value \\`%s\\\' at idx %d\\n"' # ` - EACH: _farr_KV\?\?_[a-f0-9]+ key `K1', value `V1' at idx 1 (re) - EACH: _farr_KV\?\?_[a-f0-9]+ key `K2', value `V2 2' at idx 2 (re) - EACH: _farr_KV\?\?_[a-f0-9]+ key `K3', value `" 111222333" \\'444555 ' at idx 3 (re) + EACH: _farr_KV\?\?:[a-f0-9]+ key `K1', value `V1' at idx 1 (re) + EACH: _farr_KV\?\?:[a-f0-9]+ key `K2', value `V2 2' at idx 2 (re) + EACH: _farr_KV\?\?:[a-f0-9]+ key `K3', value `" 111222333" \\'444555 ' at idx 3 (re) $ falist_clear LIST $ falist_destroy LIST @@ -423,7 +423,7 @@ $ _farr_destroy_object "$LIST" $ check_no_alist_artifacts $ (_farr_destroy_object "$LIST") - ERROR: falist `_farr_KV\?\?_([a-f0-9]+)' not created properly: no object for token `\1' (re) + ERROR: falist `_farr_KV\?\?:([a-f0-9]+)' not created properly: no object for token `\1' (re) [70] $ LIST='' $ _farr_destroy_object "$LIST" diff -r a97ec3f07bdb -r 3adb26525b19 tests/farray-array.t --- a/tests/farray-array.t Sat Oct 05 21:55:55 2024 +0200 +++ b/tests/farray-array.t Sun Oct 06 05:45:29 2024 +0200 @@ -971,12 +971,12 @@ ITERATE (for each, by value) $ farray_for_each "$TEST" $'printf "EACH: %s at idx %d: value is \\`%s\\\'\\n"' - EACH: _farr_A\?_[a-f0-9]+ at idx 1: value is `0' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 2: value is `1' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 3: value is `2' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 4: value is `3 4 5' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 5: value is `" 667788" \\'910 ' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 6: value is `11' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 1: value is `0' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 2: value is `1' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 3: value is `2' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 4: value is `3 4 5' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 5: value is `" 667788" \\'910 ' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 6: value is `11' (re) REVERSE ITERATE (for each, by name) @@ -991,12 +991,12 @@ ITERATE (for each, by value) $ farray_reversed_for_each "$TEST" $'printf "EACH: %s at idx %d: value is \\`%s\\\'\\n"' - EACH: _farr_A\?_[a-f0-9]+ at idx 6: value is `11' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 5: value is `" 667788" \\'910 ' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 4: value is `3 4 5' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 3: value is `2' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 2: value is `1' (re) - EACH: _farr_A\?_[a-f0-9]+ at idx 1: value is `0' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 6: value is `11' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 5: value is `" 667788" \\'910 ' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 4: value is `3 4 5' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 3: value is `2' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 2: value is `1' (re) + EACH: _farr_A\?:[a-f0-9]+ at idx 1: value is `0' (re) $ farray_destroy TEST $ check_no_array_artifacts @@ -1089,7 +1089,7 @@ $ farray_create DUP $ (farray_create DUP) - ERROR: object `DUP' already created \(value `_farr_A\?_[a-f0-9]+'\) (re) + ERROR: object `DUP' already created \(value `_farr_A\?:[a-f0-9]+'\) (re) [70] $ check_no_array_artifacts @@ -1146,7 +1146,7 @@ $ _farr_destroy_object "$TEST" $ check_no_array_artifacts $ (_farr_destroy_object "$TEST") - ERROR: farray `_farr_A\?_([a-f0-9]+)' not created properly: no storage for token `\1' (re) + ERROR: farray `_farr_A\?:([a-f0-9]+)' not created properly: no storage for token `\1' (re) [1] $ TEST='' $ _farr_destroy_object "$TEST"