From 5aa184757e4fb5c2fc141c41aed2fccc0c96ce7e Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Sat, 6 Nov 2021 22:00:14 +0100
Subject: Make unit test not crash on import

---
 gerbonara/gerber/gerber_statements.py | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'gerbonara/gerber/gerber_statements.py')

diff --git a/gerbonara/gerber/gerber_statements.py b/gerbonara/gerber/gerber_statements.py
index 22766f8..9296d1b 100644
--- a/gerbonara/gerber/gerber_statements.py
+++ b/gerbonara/gerber/gerber_statements.py
@@ -25,7 +25,7 @@ from .utils import (parse_gerber_value, write_gerber_value, decimal_string,
 
 from .am_statements import *
 from .am_read import read_macro
-from .am_eval import eval_macro
+from .am_primitive import eval_macro
 from .primitives import AMGroup
 
 
@@ -418,32 +418,11 @@ class AMParamStmt(ParamStmt):
         self.name = name
         self.macro = macro
         self.units = units
-        self.primitives = list(AMParamStmt._parse_primitives(self.instructions))
+        self.primitives = list(eval_macro(self.instructions))
 
     def read(self, macro):
         return read_macro(macro)
 
-    @classmethod
-    def _parse_primitives(kls, instructions):
-        classes = {
-             0: AMCommentPrimitive,
-             1: AMCirclePrimitive,
-             2: AMVectorLinePrimitive,
-            20: AMVectorLinePrimitive,
-            21: AMCenterLinePrimitive,
-             4: AMOutlinePrimitive,
-             5: AMPolygonPrimitive,
-             6: AMMoirePrimitive,
-             7: AMThermalPrimitive,
-        }
-
-        for code, modifiers in eval_macro(instructions):
-            if code < 0:
-                yield AMVariableDef(-code, modifiers[0])
-            else:
-                primitive = classes[code]
-                yield primitive.from_modifiers(code, modifiers)
-
     @classmethod
     def circle(cls, name, units):
         return cls('AM', name, '1,1,$1,0,0,0*1,0,$2,0,0,0', units)
-- 
cgit