mawei/msgq
1
0
Fork 0
mirror of https://github.com/commaai/msgq.git synced 2026-06-11 23:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

list of enum

Browse Source
This commit is contained in:
Willem Melching
2020-05-26 16:04:11 -07:00
parent 72bbe7bf92
commit 714e91ce40
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cython/generator.py
View File

@@ -109,13 +109,13 @@ def gen_code(definition, node, name=None):
if isinstance(field.schema, capnp.lib.capnp._EnumSchema):
struct_type_name = field.schema.node.displayName.split(':')[-1]
struct_type_name = struct_type_name.split('.')
full_struct_name = "".join(struct_type_name)
struct_full_name = "".join(struct_type_name)
# qualified_struct_name = "::".join(struct_type_name)
# enumerants = field.schema.enumerants
if full_struct_name not in seen:
seen.append(full_struct_name)
nested_pxd += f" cdef cppclass {full_struct_name}:\n"
if struct_full_name not in seen:
seen.append(struct_full_name)
nested_pxd += f" cdef cppclass {struct_full_name}:\n"
nested_pxd += f" pass\n\n"
nested_pxd += "\n"
else:
@@ -146,13 +146,31 @@ def gen_code(definition, node, name=None):
if field_tp in ['text', 'data']:
continue
elif field_tp == 'list':
list_tp = field.proto.slot.type.list.elementType._which_str()
if list_tp in ['text', 'data', 'enum']:
if list_tp in ['text', 'data']:
continue
if list_tp == "struct":
if list_tp == "enum":
struct_type_name = field.schema.elementType.node.displayName.split(':')[-1]
struct_type_name = struct_type_name.split('.')
struct_full_name = "".join(struct_type_name)
if struct_full_name not in seen:
seen.append(struct_full_name)
nested_pxd += f" cdef cppclass {struct_full_name}:\n"
nested_pxd += f" pass\n\n"
nested_pxd += "\n"
else:
pass
pxd += 8 * " " + f"List[{struct_full_name}] get{name_cap}()\n"
pyx += 4 * " " + f"@property\n"
pyx += 4 * " " + f"def {name}(self):\n"
pyx += 8 * " " + f"return [<int>self.reader.get{name_cap}()[i] for i in range(self.reader.get{name_cap}().size())]\n\n"
elif list_tp == "struct":
struct_type_name = field.schema.elementType.node.displayName.split(':')[-1]
struct_type_name = struct_type_name.split('.')[-1]
@@ -195,7 +213,7 @@ def gen_code(definition, node, name=None):
pyx += 8 * " " + f"i.set_reader(self.reader.get{name_cap}())\n"
pyx += 8 * " " + f"return i\n\n"
elif field_tp == 'enum':
pxd += 8 * " " + f"{full_struct_name} get{name_cap}()\n"
pxd += 8 * " " + f"{struct_full_name} get{name_cap}()\n"
pyx += 4 * " " + f"@property\n"
pyx += 4 * " " + f"def {name}(self):\n"

8
cython/test/test_struct.py
View File

@@ -67,3 +67,11 @@ class TestStruct(unittest.TestCase):
enables = [c.enable for c in cs_cython.events]
self.assertEqual(enables, [True, False, True])
def test_list_of_union(self):
cs = car.CarState.new_message()
cs.errorsDEPRECATED = ["wrongGear", "doorOpen"]
b = cs.to_bytes()
cs_cython = cython_log.CarState(b)
self.assertEqual(cs_cython.errorsDEPRECATED, [car.CarEvent.EventName.wrongGear, car.CarEvent.EventName.doorOpen])