From 7bee83dfcb964ffdc2243aacea2702cc63de63f2 Mon Sep 17 00:00:00 2001
From: Tom Rothamel <pytom@bishoujo.us>
Date: Sun, 16 Feb 2025 22:25:43 -0500
Subject: [PATCH] Remove node unmunging and remunging.

This is going away, in favor of storing the start and end columns in
the post-munge space, and then transforming them back when an error
happens.
---
 renpy/lexer.py  |  8 +----
 renpy/python.py | 92 -------------------------------------------------
 2 files changed, 1 insertion(+), 99 deletions(-)

diff --git a/renpy/lexer.py b/renpy/lexer.py
index 0eb80c7ec..e1a717bf9 100644
--- a/renpy/lexer.py
+++ b/renpy/lexer.py
@@ -700,11 +700,6 @@ class Lexer(object):
 
         self.subparses = subparses
 
-
-    def _unmunge_string(self, s: str) -> str:
-        prefix = munge_filename(self.filename)
-        return s.replace(prefix, "__")
-
     def advance(self):
         """
         Advances this lexer to the next line in the block. The lexer
@@ -1257,7 +1252,6 @@ class Lexer(object):
             return s
 
         pos = self.pos - len(s)
-        s = self._unmunge_string(s)
 
         return make_pyexpr(s, self.filename, self.number, self.column, self.text, pos)
 
@@ -1538,7 +1532,7 @@ class Lexer(object):
         line_holder.line = self.number
 
         self._process_python_block(self.subblock, rv, line_holder)
-        return self._unmunge_string(''.join(rv))
+        return ''.join(rv)
 
     def arguments(self):
         """
diff --git a/renpy/python.py b/renpy/python.py
index ab02f8f08..62da0dd42 100644
--- a/renpy/python.py
+++ b/renpy/python.py
@@ -424,97 +424,6 @@ class StarredVariables(ast.NodeVisitor):
 # starred assignment.
 find_starred_variables = StarredVariables().find
 
-class MungeNodes(ast.NodeTransformer):
-    """
-    This walks through the tree and munges all identifiers and strings,
-    so __names in different files don't collide, but column offsets
-    of the original code stays correct.
-    """
-
-    def __init__(self, filename: str):
-        self.prefix = renpy.lexer.munge_filename(filename)
-        self.string_munger = renpy.lexer.get_string_munger(self.prefix)
-
-    def _munge_identifier(self, id):
-        if id is None or len(id) < 3 or id[:2] != "__" or id[2] == "_":
-            return id
-
-        rest = id[2:]
-        if "__" in rest:
-            return id
-
-        return self.prefix + rest
-
-    @staticmethod
-    def _munge_attribute(attr: str):
-        def visit(self: "MungeNodes", node: ast.AST):
-            value = getattr(node, attr)
-            value = self._munge_identifier(value)
-            setattr(node, attr, value)
-            self.generic_visit(node)
-            return node
-
-        return visit
-
-    @staticmethod
-    def _munge_attribute_list(attr: str):
-        def visit(self: "MungeNodes", node: ast.AST):
-            value = getattr(node, attr)
-            value = [self._munge_identifier(i) for i in value]
-            setattr(node, attr, value)
-            self.generic_visit(node)
-            return node
-
-        return visit
-
-    def visit_Constant(self, node):
-        if isinstance(node.value, str) and "__" in node.value:
-            node.value = self.string_munger(node.value)
-
-        return node
-
-    # stmt
-    visit_FunctionDef = _munge_attribute("name")
-    visit_AsyncFunctionDef = _munge_attribute("name")
-    visit_ClassDef = _munge_attribute("name")
-
-    def visit_ImportFrom(self, node):
-        if node.module is not None:
-            node.module = ".".join(
-                self._munge_identifier(part)
-                for part in node.module.split("."))
-
-        self.generic_visit(node)
-        return node
-
-    visit_Global = _munge_attribute_list("names")
-    visit_Nonlocal = _munge_attribute_list("names")
-
-    # expr
-    visit_Attribute = _munge_attribute("attr")
-    visit_Name = _munge_attribute("id")
-
-    # Other
-    visit_ExceptHandler = _munge_attribute("name")
-    visit_arg = _munge_attribute("arg")
-    visit_keyword = _munge_attribute("arg")
-
-    def visit_alias(self, node):
-        node.name = self._munge_identifier(node.name)
-        node.asname = self._munge_identifier(node.asname)
-        self.generic_visit(node)
-        return node
-
-    # pattern
-    visit_MatchMapping = _munge_attribute("rest")
-    visit_MatchClass = _munge_attribute_list("kwd_attrs")
-    visit_MatchStar = _munge_attribute("name")
-    visit_MatchAs = _munge_attribute("name")
-
-    # type_param
-    visit_TypeVar = _munge_attribute("name")
-    visit_ParamSpec = _munge_attribute("name")
-    visit_TypeVarTuple = _munge_attribute("name")
 
 
 class FindStarredMatchPatterns(ast.NodeVisitor):
@@ -1206,7 +1115,6 @@ def py_compile(source, mode, filename='<none>', lineno=1, ast_node=False, cache=
             tree.body = tree.body[0].body
 
         tree = wrap_node.visit(tree)
-        tree = MungeNodes(filename).visit(tree)
 
         if mode == "hide":
             wrap_hide(tree)