Match static function variables (#530)

* Match static function variables

* IsleApp::Tick static variables

tools/isledecomp/isledecomp/parser/error.py

@@ -47,6 +47,10 @@ class ParserError(Enum):
     # to ignore things like string literal that are not variables.
     GLOBAL_NOT_VARIABLE = 111
 
+    # WARN: A marked static variable inside a function needs to have its
+    # function marked too, and in the same module.
+    ORPHANED_STATIC_VARIABLE = 112
+
     # This code or higher is an error, not a warning
     DECOMP_ERROR_START = 200
 

tools/isledecomp/isledecomp/parser/node.py

@@ -50,6 +50,7 @@ class ParserFunction(ParserSymbol):
 @dataclass
 class ParserVariable(ParserSymbol):
     is_static: bool = False
+    parent_function: Optional[int] = None
 
 
 @dataclass

tools/isledecomp/isledecomp/parser/parser.py

@@ -13,6 +13,7 @@ from .util import (
 )
 from .marker import (
     DecompMarker,
+    MarkerCategory,
     match_marker,
     is_marker_exact,
 )
@@ -53,6 +54,9 @@ class MarkerDict:
         self.markers[key] = marker
         return False
 
+    def query(self, category: MarkerCategory, module: str) -> Optional[DecompMarker]:
+        return self.markers.get((category, module))
+
     def iter(self) -> Iterator[DecompMarker]:
         for _, marker in self.markers.items():
             yield marker
@@ -305,6 +309,23 @@ class DecompParser:
                     )
                 )
             else:
+                parent_function = None
+                is_static = self.state == ReaderState.IN_FUNC_GLOBAL
+
+                # If this is a static variable, we need to get the function
+                # where it resides so that we can match it up later with the
+                # mangled names of both variable and function from cvdump.
+                if is_static:
+                    fun_marker = self.fun_markers.query(
+                        MarkerCategory.FUNCTION, marker.module
+                    )
+
+                    if fun_marker is None:
+                        self._syntax_warning(ParserError.ORPHANED_STATIC_VARIABLE)
+                        continue
+
+                    parent_function = fun_marker.offset
+
                 self._symbols.append(
                     ParserVariable(
                         type=marker.type,
@@ -312,7 +333,8 @@ class DecompParser:
                         module=marker.module,
                         offset=marker.offset,
                         name=self.curly.get_prefix(variable_name),
-                        is_static=self.state == ReaderState.IN_FUNC_GLOBAL,
+                        is_static=is_static,
+                        parent_function=parent_function,
                     )
                 )