Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools

changeset 729:05a325c7d5c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
farray.sh: change token prefixes again
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 07 Oct 2024 12:44:00 +0200
parents 858f4208d9cb
children 8f1583faf9ea
files share/local-bsdtools/farray.sh tests/farray-alist.t tests/farray-array.t
diffstat 3 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/share/local-bsdtools/farray.sh	Mon Oct 07 12:36:18 2024 +0200
+++ b/share/local-bsdtools/farray.sh	Mon Oct 07 12:44:00 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_
--- a/tests/farray-alist.t	Mon Oct 07 12:36:18 2024 +0200
+++ b/tests/farray-alist.t	Mon Oct 07 12:44:00 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_release_object "$LIST"
   $ check_no_alist_artifacts
   $ (_farr_release_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)
   [1]
   $ LIST=''
   $ _farr_release_object "$LIST"
--- a/tests/farray-array.t	Mon Oct 07 12:36:18 2024 +0200
+++ b/tests/farray-array.t	Mon Oct 07 12:44:00 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
@@ -1147,7 +1147,7 @@
   $ _farr_release_object "$TEST"
   $ check_no_array_artifacts
   $ (_farr_release_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_release_object "$TEST"