Skip to content

Add valueOr for PBOption #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nitely merged 3 commits into from
Apr 20, 2026
Merged

Add valueOr for PBOption #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
599f307
Add `PBOption` get with default param
nitely Apr 20, 2026
6442da9
use a template
nitely Apr 20, 2026
48c116e
get -> valueOr
nitely Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions protobuf_serialization/types.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ template mget*(opt: var PBOption): untyped =
opt.some = true
opt.value

template valueOr*(opt: PBOption, def: untyped): untyped =
if opt.some:
opt.value
else:
def

func pbSome*[T: PBOption](optType: typedesc[T], value: auto): T {.inline.} =
T(
some: true,
Expand Down
29 changes: 29 additions & 0 deletions tests/test_protobuf2_semantics.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,32 @@ suite "Test Encoding of Protobuf 2 Semantics":
pbNone("").isNone
PBOption[""]() == pbNone("")
PBOption[default(Required)]() == pbNone(default(Required))

test "PBOptional valueOr":
check:
pbNone(1'u32).valueOr(if true: 123 else: 456) == 123'u32
pbNone(1'i32).valueOr(123) == 123'i32
pbNone(1'u32).valueOr(123) == 123'u32
pbNone(1'i32).valueOr(123) == 123'i32
pbSome(1'i64).valueOr(123'i64) == 1'i64
pbNone(0'i64).valueOr(123'i64) == 123'i64
pbSome(1'i32).valueOr(123'i32) == 1'i32
pbNone(0'i32).valueOr(123'i32) == 123'i32
pbSome(1'u64).valueOr(123'u64) == 1'u64
pbNone(0'u64).valueOr(123'u64) == 123'u64
pbSome(1'u32).valueOr(123'u32) == 1'u32
pbNone(0'u32).valueOr(123'u32) == 123'u32
pbSome(1'f64).valueOr(123'f64) == 1'f64
pbNone(0'f64).valueOr(123'f64) == 123'f64
pbSome(1'f32).valueOr(123'f32) == 1'f32
pbNone(0'f32).valueOr(123'f32) == 123'f32
pbSome(true).valueOr(false) == true
pbSome(false).valueOr(true) == false
pbNone(false).valueOr(true) == true
pbNone(true).valueOr(false) == false
pbSome("abc").valueOr("def") == "abc"
pbNone("").valueOr("def") == "def"
pbSome(@[1'u8]).valueOr(@[123'u8]) == @[1'u8]
pbNone(default(seq[byte])).valueOr(@[123'u8]) == @[123'u8]
pbSome(Required(b: 1)).valueOr(Required(b: 123)) == Required(b: 1)
pbNone(default(Required)).valueOr(Required(b: 123)) == Required(b: 123)
Loading