From b50587d6ad8d345a561ac724f39e0fcea547cb5c Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Sun, 30 Apr 2023 11:27:21 +0200
Subject: Fix dropped aperture macro names

---
 gerbonara/aperture_macros/parse.py | 4 ++--
 gerbonara/rs274x.py                | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'gerbonara')

diff --git a/gerbonara/aperture_macros/parse.py b/gerbonara/aperture_macros/parse.py
index d38a83d..d3658a5 100644
--- a/gerbonara/aperture_macros/parse.py
+++ b/gerbonara/aperture_macros/parse.py
@@ -63,7 +63,7 @@ class ApertureMacro:
         object.__setattr__(self, 'name', f'GNX{hash(self)&0xffffffffffffffff:016X}')
 
     @classmethod
-    def parse_macro(kls, name, body, unit):
+    def parse_macro(kls, macro_name, body, unit):
         comments = []
         variables = {}
         primitives = []
@@ -92,7 +92,7 @@ class ApertureMacro:
                 primitives.append(ap.PRIMITIVE_CLASSES[int(primitive)].from_arglist(unit, args))
 
         variables = [variables.get(i+1) for i in range(max(variables.keys(), default=0))]
-        return kls(name, tuple(primitives), tuple(variables), tuple(comments))
+        return kls(macro_name, tuple(primitives), tuple(variables), tuple(comments))
 
     def __str__(self):
         return f'<Aperture macro {self.name}, variables {str(self.variables)}, primitives {self.primitives}>'
diff --git a/gerbonara/rs274x.py b/gerbonara/rs274x.py
index 90c1783..5e05ac7 100644
--- a/gerbonara/rs274x.py
+++ b/gerbonara/rs274x.py
@@ -126,7 +126,6 @@ class GerberFile(CamFile):
             settings = FileSettings.defaults()
 
         cache = {}
-        macro_cache = {}
         macro_names = set()
         def lookup(aperture):
             nonlocal cache, settings
-- 
cgit