From 4fd6642be906f3564a4375a60d471b3e1b00b988 Mon Sep 17 00:00:00 2001 From: MS Date: Sat, 30 Mar 2024 11:39:34 -0400 Subject: [PATCH] parser: don't enforce variable naming convention (#761) --- tools/isledecomp/isledecomp/parser/parser.py | 7 ------- tools/isledecomp/tests/test_parser.py | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/isledecomp/isledecomp/parser/parser.py b/tools/isledecomp/isledecomp/parser/parser.py index b2534548..92e41dd3 100644 --- a/tools/isledecomp/isledecomp/parser/parser.py +++ b/tools/isledecomp/isledecomp/parser/parser.py @@ -535,13 +535,6 @@ def read_line(self, line: str): variable_name = get_synthetic_name(line) else: variable_name = get_variable_name(line) - # This is out of our control for library variables, but all of our - # variables should start with "g_". - if variable_name is not None: - # Before checking for the prefix, remove the - # namespace chain if there is one. - if not variable_name.split("::")[-1].startswith("g_"): - self._syntax_warning(ParserError.GLOBAL_MISSING_PREFIX) string_name = get_string_contents(line) diff --git a/tools/isledecomp/tests/test_parser.py b/tools/isledecomp/tests/test_parser.py index bbc3b739..e748741a 100644 --- a/tools/isledecomp/tests/test_parser.py +++ b/tools/isledecomp/tests/test_parser.py @@ -377,6 +377,7 @@ def test_unexpected_eof(parser): assert parser.alerts[0].code == ParserError.UNEXPECTED_END_OF_FILE +@pytest.mark.xfail(reason="no longer applies") def test_global_variable_prefix(parser): """Global and static variables should have the g_ prefix.""" parser.read_lines( @@ -576,6 +577,7 @@ def test_namespace_vtable(parser): assert parser.vtables[1].name == "Hello" +@pytest.mark.xfail(reason="no longer applies") def test_global_prefix_namespace(parser): """Should correctly identify namespaces before checking for the g_ prefix"""