asn1grep: clean up output a bit

This commit is contained in:
Will Greenberg
2024-07-18 16:01:54 -07:00
parent b5262cd1b9
commit 2334148aec
+5 -5
View File
@@ -37,17 +37,17 @@ def search_type(haystack, needle):
if 'members' in haystack.__dict__: if 'members' in haystack.__dict__:
for name, member in haystack.name_to_member.items(): for name, member in haystack.name_to_member.items():
for member_result in search_type(member, needle): for member_result in search_type(member, needle):
result.append(f"{haystack.name}.{name} [{member_result}]") result.append(f"{haystack.name} ({haystack.type_name}).{name}\n {member_result}")
elif 'root_members' in haystack.__dict__: elif 'root_members' in haystack.__dict__:
for member in haystack.root_members: for member in haystack.root_members:
for member_result in search_type(member, needle): for member_result in search_type(member, needle):
result.append(f"{haystack.name} [{member_result}]") result.append(f"{haystack.name} ({haystack.type_name})\n {member_result}")
elif 'element_type' in haystack.__dict__: elif 'element_type' in haystack.__dict__:
for element_result in search_type(haystack.element_type, needle): for element_result in search_type(haystack.element_type, needle):
result.append(f"{haystack.name}[0] [{element_result}]") result.append(f"{haystack.name}[0] ({haystack.type_name})\n {element_result}")
elif 'inner' in haystack.__dict__: elif 'inner' in haystack.__dict__:
for inner_result in search_type(haystack.inner, needle): for inner_result in search_type(haystack.inner, needle):
result.append(f"{haystack.name} [{inner_result}]") result.append(inner_result)
return result return result
@@ -64,4 +64,4 @@ if __name__ == "__main__":
for haystack in terminating_types: for haystack in terminating_types:
for result in search_type(haystack.type, type_name): for result in search_type(haystack.type, type_name):
print(result) print(result + '\n')