From cbc6105b5728379dc55d4de744f19ff7fe534583 Mon Sep 17 00:00:00 2001 From: disinvite Date: Sat, 2 Dec 2023 18:57:23 -0500 Subject: [PATCH] Vtable marker should identify struct --- tools/isledecomp/isledecomp/parser/util.py | 4 ++-- tools/isledecomp/tests/test_parser_util.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/isledecomp/isledecomp/parser/util.py b/tools/isledecomp/isledecomp/parser/util.py index a3e9360f..99ab1c56 100644 --- a/tools/isledecomp/isledecomp/parser/util.py +++ b/tools/isledecomp/isledecomp/parser/util.py @@ -66,11 +66,11 @@ def is_marker_exact(line: str) -> bool: 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: diff --git a/tools/isledecomp/tests/test_parser_util.py b/tools/isledecomp/tests/test_parser_util.py index 5cbe5c8b..643abf3e 100644 --- a/tools/isledecomp/tests/test_parser_util.py +++ b/tools/isledecomp/tests/test_parser_util.py @@ -100,6 +100,7 @@ def test_marker_dict_type_replace(): class_name_match_cases = [ + ("struct MxString {", "MxString"), ("class MxString {", "MxString"), ("// class MxString", "MxString"), ("class MxString : public MxCore {", "MxString"),