Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions linuxpy/codegen/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def find_xml_base_type(etree, context, type_id):
if node is None:
return
if node.tag == "Struct":
return node.get("name"), node.get("id")
return get_node_name(etree, node), node.get("id")
elif node.tag == "FundamentalType":
return CTYPES_MAP[node.get("name")], node.get("id")
elif node.tag == "PointerType":
Expand All @@ -216,6 +216,21 @@ def find_xml_base_type(etree, context, type_id):
type_id = node.get("type")


def get_node_name(etree, node):
name = node.get("name")
if name:
return name
node_id = node.get("id")
etype = etree.find(f"ElaboratedType[@type='{node_id}']")
if etype is None:
return None
etype_id = etype.get("id")
typedef = etree.find(f"Typedef[@type='{etype_id}']")
if typedef is None:
return None
return typedef.get("name")


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}']")
Expand All @@ -239,7 +254,7 @@ def get_structs(header_filename, xml_filename, decode_name):
pack = False
else:
pack = int(align) == 8
name = node.get("name")
name = get_node_name(etree, node)
if name:
name = decode_name(name)
struct = CStruct(node, name, fields, pack)
Expand Down
Loading