Skip to content

Commit ea81a24

Browse files
hyperupcallhyperupcall
committed
refactor: Remove 'pass' in '--pass-by-<value|ref>'
1 parent dd4afd8 commit ea81a24

10 files changed

+93
-93
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ declare -A yankee_object=()
2727
declare -A xray_object=([whiskey]=victor)
2828
declare -a foxtrot_array=(omicron pi rho sigma)
2929

30-
bobject set-object --pass-by-ref root_object '.zulu' zulu_object
31-
bobject set-object --pass-by-ref root_object '.zulu.yankee' yankee_object
32-
bobject set-object --pass-by-ref root_object '.zulu.yankee.xray' xray_object
33-
bobject set-array --pass-by-ref root_object '.zulu.yankee.xray.foxtrot' foxtrot_array
30+
bobject set-object --by-ref root_object '.zulu' zulu_object
31+
bobject set-object --by-ref root_object '.zulu.yankee' yankee_object
32+
bobject set-object --by-ref root_object '.zulu.yankee.xray' xray_object
33+
bobject set-array --by-ref root_object '.zulu.yankee.xray.foxtrot' foxtrot_array
3434

3535
bobject get-object root_object '.zulu.yankee.xray'
3636
assert [ "${REPLY[whiskey]}" = victor ]

‎pkg/lib/traverse-set.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ bash_object.traverse-set() {
1010
local -a args=()
1111

1212
for arg; do case "$arg" in
13-
--pass-by-ref) flag_pass_by_what='by-ref'; shift ;;
14-
--pass-by-value) flag_pass_by_what='by-value'; shift ;;
13+
--by-ref) flag_pass_by_what='by-ref'; shift ;;
14+
--by-value) flag_pass_by_what='by-value'; shift ;;
1515
--) shift; break ;;
1616
*) args+=("$arg") ;;
1717
esac done
1818

1919
if [ -z "$flag_pass_by_what" ]; then
20-
bash_object.util.die 'ERROR_ARGUMENTS_INVALID' "Must pass either the '--pass-by-ref' or '--pass-by-value' flag"
20+
bash_object.util.die 'ERROR_ARGUMENTS_INVALID' "Must pass either the '--by-ref' or '--by-value' flag"
2121
return
2222
fi
2323

‎tests/e2e.bats

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ load './util/init.sh'
3535
for subcmd in "${subcmds[@]}"; do
3636
declare -A OBJECT=()
3737

38-
run bobject "$subcmd" --pass-by-ref 'OBJECT' '.zulu.yankee' 'xray' 'invalid'
38+
run bobject "$subcmd" --by-ref 'OBJECT' '.zulu.yankee' 'xray' 'invalid'
3939

4040
assert_failure
4141
assert_line -p "Expected '4' arguments, but received '5'"
@@ -48,7 +48,7 @@ load './util/init.sh'
4848
for subcmd in "${subcmds[@]}"; do
4949
declare -A OBJECT=()
5050

51-
run bobject "$subcmd" --pass-by-ref 'OBJECT' '.zulu'
51+
run bobject "$subcmd" --by-ref 'OBJECT' '.zulu'
5252

5353
assert_failure
5454
assert_line -p "Expected '4' arguments, but received '3'"
@@ -60,8 +60,8 @@ load './util/init.sh'
6060
declare -A subobj=()
6161
str='MEOW'
6262

63-
bobject set-object --pass-by-ref 'OBJECT' '.zulu' subobj
64-
bobject set-string --pass-by-ref 'OBJECT' '.zulu.yankee' str
63+
bobject set-object --by-ref 'OBJECT' '.zulu' subobj
64+
bobject set-string --by-ref 'OBJECT' '.zulu.yankee' str
6565
bobject get-string 'OBJECT' '.zulu.yankee'
6666

6767
assert [ "$REPLY" = 'MEOW' ]
@@ -72,8 +72,8 @@ load './util/init.sh'
7272
declare -A subobj=()
7373
str='MEOW'
7474

75-
bobject set-object --pass-by-ref 'OBJECT' '.zulu' subobj
76-
bobject set-string --pass-by-ref 'OBJECT' '.["zulu"].["yankee"]' str
75+
bobject set-object --by-ref 'OBJECT' '.zulu' subobj
76+
bobject set-string --by-ref 'OBJECT' '.["zulu"].["yankee"]' str
7777
bobject get-string 'OBJECT' '.["zulu"].["yankee"]'
7878

7979
assert [ "$REPLY" = 'MEOW' ]
@@ -86,10 +86,10 @@ load './util/init.sh'
8686
declare -A xray_object=([whiskey]=victor)
8787
declare -a foxtrot_array=(omicron pi rho sigma)
8888

89-
bobject set-object --pass-by-ref root_object '.zulu' zulu_object
90-
bobject set-object --pass-by-ref root_object '.zulu.yankee' yankee_object
91-
bobject set-object --pass-by-ref root_object '.zulu.yankee.xray' xray_object
92-
bobject set-array --pass-by-ref root_object '.zulu.yankee.xray.foxtrot' foxtrot_array
89+
bobject set-object --by-ref root_object '.zulu' zulu_object
90+
bobject set-object --by-ref root_object '.zulu.yankee' yankee_object
91+
bobject set-object --by-ref root_object '.zulu.yankee.xray' xray_object
92+
bobject set-array --by-ref root_object '.zulu.yankee.xray.foxtrot' foxtrot_array
9393

9494
bobject get-object root_object '.zulu.yankee.xray'
9595
assert [ "${REPLY[whiskey]}" = victor ]

‎tests/error-circular-reference.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ load './util/init.sh'
5353
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
5454
declare -A obj=()
5555

56-
run bobject set-object OBJECT --pass-by-ref '.my_key.nested' obj
56+
run bobject set-object OBJECT --by-ref '.my_key.nested' obj
5757

5858
assert_failure
5959
assert_line -p "ERROR_SELF_REFERENCE"
@@ -65,7 +65,7 @@ load './util/init.sh'
6565
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
6666
declare -A obj=()
6767

68-
run bobject set-object OBJECT --pass-by-ref '.my_key.nested.gone' obj
68+
run bobject set-object OBJECT --by-ref '.my_key.nested.gone' obj
6969

7070
assert_failure
7171
assert_line -p "ERROR_SELF_REFERENCE"
@@ -77,7 +77,7 @@ load './util/init.sh'
7777
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
7878
declare -a arr=()
7979

80-
run bobject set-array OBJECT --pass-by-ref '.my_key.nested' arr
80+
run bobject set-array OBJECT --by-ref '.my_key.nested' arr
8181

8282
assert_failure
8383
assert_line -p "ERROR_SELF_REFERENCE"
@@ -89,7 +89,7 @@ load './util/init.sh'
8989
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
9090
declare -a arr=()
9191

92-
run bobject set-array OBJECT --pass-by-ref '.my_key.nested.gone' arr
92+
run bobject set-array OBJECT --by-ref '.my_key.nested.gone' arr
9393

9494
assert_failure
9595
assert_line -p "ERROR_SELF_REFERENCE"

‎tests/set-array.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load './util/init.sh'
66
declare -a arr=(omicron pi rho)
77
declare -A OBJECT=()
88

9-
bobject set-array --pass-by-ref 'OBJECT' '.arr' arr
9+
bobject set-array --by-ref 'OBJECT' '.arr' arr
1010

1111
bobject get-array 'OBJECT' '.arr'
1212
assert [ ${#REPLY[@]} -eq 3 ]

‎tests/set-errors-invalid-vobj-type.bats

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load './util/init.sh'
1212
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
1313
declare -A obj=([upsilon]=phi)
1414

15-
run bobject set-object --pass-by-ref OBJECT '.my_key' obj
15+
run bobject set-object --by-ref OBJECT '.my_key' obj
1616

1717
assert_failure
1818
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -25,7 +25,7 @@ load './util/init.sh'
2525
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_OBJECT')
2626
declare -A obj=([upsilon]=phi)
2727

28-
run bobject set-object --pass-by-ref OBJECT '.my_key.nested' obj
28+
run bobject set-object --by-ref OBJECT '.my_key.nested' obj
2929

3030
assert_failure
3131
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -38,7 +38,7 @@ load './util/init.sh'
3838
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
3939
declare -A obj=([upsilon]=phi)
4040

41-
run bobject set-object --pass-by-ref OBJECT '.["my_key"].[2]' obj
41+
run bobject set-object --by-ref OBJECT '.["my_key"].[2]' obj
4242

4343
assert_failure
4444
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -49,7 +49,7 @@ load './util/init.sh'
4949
declare -A OBJECT=([my_key]='string_value2')
5050
declare -A obj=([upsilon]=phi)
5151

52-
run bobject set-object --pass-by-ref OBJECT '.my_key' obj
52+
run bobject set-object --by-ref OBJECT '.my_key' obj
5353

5454
assert_failure
5555
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -61,7 +61,7 @@ load './util/init.sh'
6161
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
6262
declare -A obj=([upsilon]=phi)
6363

64-
run bobject set-object --pass-by-ref OBJECT '.my_key.nested' obj
64+
run bobject set-object --by-ref OBJECT '.my_key.nested' obj
6565

6666
assert_failure
6767
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -73,7 +73,7 @@ load './util/init.sh'
7373
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
7474
declare -A obj=([upsilon]=phi)
7575

76-
run bobject set-object --pass-by-ref OBJECT '.["my_key"].[2]' obj
76+
run bobject set-object --by-ref OBJECT '.["my_key"].[2]' obj
7777

7878
assert_failure
7979
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -86,7 +86,7 @@ load './util/init.sh'
8686
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
8787
declare -a arr=(upsilon phi chi psi)
8888

89-
run bobject set-array --pass-by-ref OBJECT '.my_key' arr
89+
run bobject set-array --by-ref OBJECT '.my_key' arr
9090

9191
assert_failure
9292
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -99,7 +99,7 @@ load './util/init.sh'
9999
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
100100
declare -a arr=(upsilon phi chi psi)
101101

102-
run bobject set-array --pass-by-ref OBJECT '.my_key.nested' arr
102+
run bobject set-array --by-ref OBJECT '.my_key.nested' arr
103103

104104
assert_failure
105105
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -112,7 +112,7 @@ load './util/init.sh'
112112
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
113113
declare -a arr=(upsilon phi chi psi)
114114

115-
run bobject set-array --pass-by-ref OBJECT '.["my_key"].[2]' arr
115+
run bobject set-array --by-ref OBJECT '.["my_key"].[2]' arr
116116

117117
assert_failure
118118
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -123,7 +123,7 @@ load './util/init.sh'
123123
declare -A OBJECT=([my_key]='string_value2')
124124
declare -a arr=(upsilon phi chi psi)
125125

126-
run bobject set-array --pass-by-ref OBJECT '.my_key' arr
126+
run bobject set-array --by-ref OBJECT '.my_key' arr
127127

128128
assert_failure
129129
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -135,7 +135,7 @@ load './util/init.sh'
135135
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
136136
declare -a arr=(upsilon phi chi psi)
137137

138-
run bobject set-array --pass-by-ref OBJECT '.my_key.nested' arr
138+
run bobject set-array --by-ref OBJECT '.my_key.nested' arr
139139

140140
assert_failure
141141
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -147,7 +147,7 @@ load './util/init.sh'
147147
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
148148
declare -a arr=(upsilon phi chi psi)
149149

150-
run bobject set-array --pass-by-ref OBJECT '.["my_key"].[2]' arr
150+
run bobject set-array --by-ref OBJECT '.["my_key"].[2]' arr
151151

152152
assert_failure
153153
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -160,7 +160,7 @@ load './util/init.sh'
160160
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
161161
str='psi-omega'
162162

163-
run bobject set-string --pass-by-ref OBJECT '.my_key' str
163+
run bobject set-string --by-ref OBJECT '.my_key' str
164164

165165
assert_failure
166166
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -173,7 +173,7 @@ load './util/init.sh'
173173
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_OBJECT')
174174
str='psi-omega'
175175

176-
run bobject set-string --pass-by-ref OBJECT '.my_key.nested' str
176+
run bobject set-string --by-ref OBJECT '.my_key.nested' str
177177

178178
assert_failure
179179
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -186,7 +186,7 @@ load './util/init.sh'
186186
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
187187
str='psi-omega'
188188

189-
run bobject set-string --pass-by-ref OBJECT '.["my_key"].[2]' str
189+
run bobject set-string --by-ref OBJECT '.["my_key"].[2]' str
190190

191191
assert_failure
192192
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -198,7 +198,7 @@ load './util/init.sh'
198198
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
199199
str='psi-omega'
200200

201-
run bobject set-string --pass-by-ref OBJECT '.my_key' str
201+
run bobject set-string --by-ref OBJECT '.my_key' str
202202

203203
assert_failure
204204
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -211,7 +211,7 @@ load './util/init.sh'
211211
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=object;&SUB_OBJECT')
212212
str='psi-omega'
213213

214-
run bobject set-string --pass-by-ref OBJECT '.my_key.nested' str
214+
run bobject set-string --by-ref OBJECT '.my_key.nested' str
215215

216216
assert_failure
217217
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"
@@ -224,7 +224,7 @@ load './util/init.sh'
224224
declare -A OBJECT=([my_key]=$'\x1C\x1Dtype=array;&SUB_ARRAY')
225225
str='psi-omega'
226226

227-
run bobject set-string --pass-by-ref OBJECT '.["my_key"].[2]' str
227+
run bobject set-string --by-ref OBJECT '.["my_key"].[2]' str
228228

229229
assert_failure
230230
assert_line -p "ERROR_ARGUMENTS_INCORRECT_TYPE"

0 commit comments

Comments
 (0)