Merge pull request #63 from tiagocoutinho/codegen

Code generation fixes

Author: tiagocoutinho

linuxpy/codegen/base.py

@@ -140,6 +140,7 @@ def decode_macro_value(value, context, name_map):
     value = value.replace("*/", "")
     value = value.replace("/*", "#")
     value = value.replace("struct ", "")
+    value = value.replace("union ", "")
     value = value.replace("(1U", "(1")
     value = value.strip()
     for dtype in "ui":
@@ -218,12 +219,12 @@ def find_xml_base_type(etree, context, type_id):
 def get_structs(header_filename, xml_filename, decode_name):
     etree = xml.etree.ElementTree.parse(xml_filename)
     header_tag = etree.find(f"File[@name='{header_filename}']")
-    structs = {}
+    struct_map = {}
+    structs = []
     if header_tag is None:
         return structs
     header_id = header_tag.get("id")
-    nodes = etree.findall(f"Struct[@file='{header_id}']")
-    nodes += etree.findall(f"Union[@file='{header_id}']")
+    nodes = [node for node in etree.findall(f"*[@file='{header_id}']") if node.tag in {"Union", "Struct"}]
     for node in nodes:
         members = node.get("members")
         if members is not None:
@@ -233,23 +234,28 @@ def get_structs(header_filename, xml_filename, decode_name):
             member_ids = []
         fields = (etree.find(f"*[@id='{member_id}']") for member_id in member_ids)
         fields = [field for field in fields if field.tag not in {"Union", "Struct", "Unimplemented"}]
-        pack = int(node.get("align")) == 8
+        align = node.get("align")
+        if align is None:
+            pack = False
+        else:
+            pack = int(align) == 8
         name = node.get("name")
         if name:
             name = decode_name(name)
         struct = CStruct(node, name, fields, pack)
-        structs[struct.id] = struct
-    for struct in structs.values():
+        struct_map[struct.id] = struct
+        structs.append(struct)
+    for struct in structs:
         if struct.context_id != "_1":
-            parent = structs.get(struct.context_id)
+            parent = struct_map.get(struct.context_id)
             if parent:
                 parent.children[struct.id] = struct
                 struct.parent = parent
             else:
                 logging.error("Could not find parent")
         if not struct.name and struct.parent:
             struct.name = f"M{len(struct.parent.children)}"
-    for struct in structs.values():
+    for struct in structs:
         for node in struct.node_members:
             name = node.get("name")
             base = find_xml_base_type(etree, struct, node.get("type"))
@@ -295,8 +301,11 @@ def get_enums(header_filename, xml_filename, enums, decode_name):
             continue
         py_name = cname_to_pyname(decode_name(cname))
         prefix = cname.upper() + "_"
-        raw_names = [child.get("name") for child in node]
-        common_prefix = os.path.commonprefix(raw_names)
+        if len(node) > 1:
+            raw_names = [child.get("name") for child in node]
+            common_prefix = os.path.commonprefix(raw_names)
+        else:
+            common_prefix = ""
         values = []
         for child in node:
             name = child.get("name")
@@ -347,8 +356,7 @@ def run(name, headers, template, macro_enums, output=None, decode_struct_name=nu
         xml_filename = os.path.join(temp_dir, base_header + ".xml")
         cmd = f"castxml --castxml-output=1.0.0 -o {xml_filename} {header}"
         assert os.system(cmd) == 0
-        new_structs = get_structs(header, xml_filename, decode_name=decode_struct_name)
-        structs += list(new_structs.values())
+        structs += get_structs(header, xml_filename, decode_name=decode_struct_name)
 
         get_enums(header, xml_filename, macro_enums, decode_name=decode_enum_name)
 

linuxpy/codegen/cli.py

@@ -3,6 +3,8 @@
 from .gpio import main as gpio_main
 from .input import main as input_run
 from .magic import main as magic_run
+from .midi import main as midi_run
+from .network import main as network_run
 from .usbfs import main as usbfs_run
 from .usbids import main as usbids_main
 from .video import main as video_main
@@ -12,11 +14,13 @@ def main():
     logging.basicConfig(level="INFO")
 
     gpio_main()
-    magic_run()
     input_run()
-    video_main()
+    magic_run()
+    midi_run()
+    network_run()
     usbfs_run()
     usbids_main()
+    video_main()
 
 
 if __name__ == "__main__":