mirror of
https://github.com/vlang/v.git
synced 2025-09-13 14:32:26 +03:00
flag: fix tail/single bool flag error condition logic in flag_to.v
(fix #25166) (#25172)
Some checks are pending
Graphics CI / gg-regressions (push) Waiting to run
vlib modules CI / build-module-docs (push) Waiting to run
native backend CI / native-backend-windows (push) Waiting to run
native backend CI / native-backend-ubuntu (push) Waiting to run
Shy and PV CI / v-compiles-puzzle-vibes (push) Waiting to run
Sanitized CI / sanitize-undefined-clang (push) Waiting to run
Sanitized CI / sanitize-undefined-gcc (push) Waiting to run
Sanitized CI / tests-sanitize-address-clang (push) Waiting to run
Sanitized CI / sanitize-address-msvc (push) Waiting to run
Sanitized CI / sanitize-address-gcc (push) Waiting to run
Sanitized CI / sanitize-memory-clang (push) Waiting to run
sdl CI / v-compiles-sdl-examples (push) Waiting to run
Time CI / time-linux (push) Waiting to run
Time CI / time-macos (push) Waiting to run
Time CI / time-windows (push) Waiting to run
toml CI / toml-module-pass-external-test-suites (push) Waiting to run
Tools CI / tools-linux (clang) (push) Waiting to run
Tools CI / tools-linux (gcc) (push) Waiting to run
Tools CI / tools-linux (tcc) (push) Waiting to run
Tools CI / tools-macos (clang) (push) Waiting to run
Tools CI / tools-windows (gcc) (push) Waiting to run
Tools CI / tools-windows (msvc) (push) Waiting to run
Tools CI / tools-windows (tcc) (push) Waiting to run
Tools CI / tools-docker-ubuntu-musl (push) Waiting to run
vab CI / vab-compiles-v-examples (push) Waiting to run
vab CI / v-compiles-os-android (push) Waiting to run
wasm backend CI / wasm-backend (windows-2022) (push) Waiting to run
wasm backend CI / wasm-backend (ubuntu-22.04) (push) Waiting to run
Some checks are pending
Graphics CI / gg-regressions (push) Waiting to run
vlib modules CI / build-module-docs (push) Waiting to run
native backend CI / native-backend-windows (push) Waiting to run
native backend CI / native-backend-ubuntu (push) Waiting to run
Shy and PV CI / v-compiles-puzzle-vibes (push) Waiting to run
Sanitized CI / sanitize-undefined-clang (push) Waiting to run
Sanitized CI / sanitize-undefined-gcc (push) Waiting to run
Sanitized CI / tests-sanitize-address-clang (push) Waiting to run
Sanitized CI / sanitize-address-msvc (push) Waiting to run
Sanitized CI / sanitize-address-gcc (push) Waiting to run
Sanitized CI / sanitize-memory-clang (push) Waiting to run
sdl CI / v-compiles-sdl-examples (push) Waiting to run
Time CI / time-linux (push) Waiting to run
Time CI / time-macos (push) Waiting to run
Time CI / time-windows (push) Waiting to run
toml CI / toml-module-pass-external-test-suites (push) Waiting to run
Tools CI / tools-linux (clang) (push) Waiting to run
Tools CI / tools-linux (gcc) (push) Waiting to run
Tools CI / tools-linux (tcc) (push) Waiting to run
Tools CI / tools-macos (clang) (push) Waiting to run
Tools CI / tools-windows (gcc) (push) Waiting to run
Tools CI / tools-windows (msvc) (push) Waiting to run
Tools CI / tools-windows (tcc) (push) Waiting to run
Tools CI / tools-docker-ubuntu-musl (push) Waiting to run
vab CI / vab-compiles-v-examples (push) Waiting to run
vab CI / v-compiles-os-android (push) Waiting to run
wasm backend CI / wasm-backend (windows-2022) (push) Waiting to run
wasm backend CI / wasm-backend (ubuntu-22.04) (push) Waiting to run
This commit is contained in:
parent
8ec8eb604f
commit
d5d392a2e5
2 changed files with 45 additions and 1 deletions
|
@ -934,8 +934,10 @@ pub fn (fm FlagMapper) to_struct[T](defaults ?T) !T {
|
||||||
.f64()
|
.f64()
|
||||||
} $else $if field.typ is bool {
|
} $else $if field.typ is bool {
|
||||||
if arg := f.arg {
|
if arg := f.arg {
|
||||||
|
if arg != '' {
|
||||||
return error('can not assign `${arg}` to bool field `${field.name}`')
|
return error('can not assign `${arg}` to bool field `${field.name}`')
|
||||||
}
|
}
|
||||||
|
}
|
||||||
result.$(field.name) = !the_default.$(field.name)
|
result.$(field.name) = !the_default.$(field.name)
|
||||||
} $else $if field.typ is string {
|
} $else $if field.typ is string {
|
||||||
trace_dbg_println('${@FN}: assigning (string) ${struct_name}.${field.name} = ${f.arg or {
|
trace_dbg_println('${@FN}: assigning (string) ${struct_name}.${field.name} = ${f.arg or {
|
||||||
|
|
42
vlib/flag/flag_to_tail_bool_test.v
Normal file
42
vlib/flag/flag_to_tail_bool_test.v
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
import flag
|
||||||
|
|
||||||
|
const args_bool_short = ['some.exe', '-h']
|
||||||
|
const args_bool_long = ['some.exe', '-help']
|
||||||
|
|
||||||
|
struct CliOptions {
|
||||||
|
show_help bool @[long: 'help'; short: h]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_short_tail_bool() {
|
||||||
|
cli_options, unmatched := flag.to_struct[CliOptions](args_bool_short,
|
||||||
|
skip: 1
|
||||||
|
style: .v
|
||||||
|
mode: .relaxed
|
||||||
|
)!
|
||||||
|
|
||||||
|
if unmatched.len > 0 {
|
||||||
|
assert false
|
||||||
|
}
|
||||||
|
if cli_options.show_help {
|
||||||
|
assert true
|
||||||
|
} else {
|
||||||
|
assert false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn test_long_tail_bool() {
|
||||||
|
cli_options, unmatched := flag.to_struct[CliOptions](args_bool_long,
|
||||||
|
skip: 1
|
||||||
|
style: .v
|
||||||
|
mode: .relaxed
|
||||||
|
)!
|
||||||
|
|
||||||
|
if unmatched.len > 0 {
|
||||||
|
assert false
|
||||||
|
}
|
||||||
|
if cli_options.show_help {
|
||||||
|
assert true
|
||||||
|
} else {
|
||||||
|
assert false
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue