bits: Allow both | and , separatos when parsing

shramov · Dec 23, 2024 · b5626f7 · b5626f7
1 parent ed2effd
commit b5626f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/python/test/test_yaml.py b/python/test/test_yaml.py
@@ -107,6 +107,8 @@ def test_enum():
     ('uint16', 'A', 0x3),
     ('int32', 'A |B', 0x3),
     ('int64', 'A | 0x2', 0x3),
+    ('int32', 'A ,B', 0x3),
+    ('int32', 'A | C , B', 0x7),
 ])
 def test_bits(t, s, v):
     scheme = f'''yamls://

diff --git a/src/tll/conv/bits.h b/src/tll/conv/bits.h
@@ -32,7 +32,7 @@ struct parse<T, typename std::enable_if<std::is_base_of_v<tll::util::Bits<typena
 	{
 		T t;
 		const auto desc = T::bits_descriptor();
-		for (auto v : tll::split<'|'>(s)) {
+		for (auto v : tll::split<'|', ','>(s)) {
 			v = tll::util::strip(v);
 			auto r = tll::conv::select(v, desc);
 			if (r) {

diff --git a/src/tll/scheme/encoder.h b/src/tll/scheme/encoder.h
@@ -179,7 +179,7 @@ int ConfigEncoder::_fill_numeric(T * ptr, const tll::scheme::Field * field, std:
 	if constexpr (!std::is_same_v<T, double>) {
 		if (field->sub_type == field->Bits) {
 			*ptr = 0;
-			for (auto v : tll::split<'|'>(s)) {
+			for (auto v : tll::split<'|', ','>(s)) {
 				v = tll::util::strip(v);
 
 				auto b = field->type_bits->values;