isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Vtable marker should identify struct

Browse Source
This commit is contained in:
disinvite 2023-12-02 18:57:23 -05:00
parent cbeb4168e0
commit cbc6105b57
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/isledecomp/isledecomp/parser/util.py
View File

@ -66,11 +66,11 @@ def is_marker_exact(line: str) -> bool:
template_class_decl_regex = re.compile( template_class_decl_regex = re.compile(
r"\s*(?:\/\/)?\s*class (\w+)<([\w]+)\s*(\*+)?\s*>" r"\s*(?:\/\/)?\s*(?:class|struct) (\w+)<([\w]+)\s*(\*+)?\s*>"
) )
class_decl_regex = re.compile(r"\s*(?:\/\/)?\s*class (\w+)") class_decl_regex = re.compile(r"\s*(?:\/\/)?\s*(?:class|struct) (\w+)")
def get_class_name(line: str) -> str | None: def get_class_name(line: str) -> str | None:

1
tools/isledecomp/tests/test_parser_util.py
View File

@ -100,6 +100,7 @@ def test_marker_dict_type_replace():
class_name_match_cases = [ class_name_match_cases = [
("struct MxString {", "MxString"),
("class MxString {", "MxString"), ("class MxString {", "MxString"),
("// class MxString", "MxString"), ("// class MxString", "MxString"),
("class MxString : public MxCore {", "MxString"), ("class MxString : public MxCore {", "MxString"),