types: added macrobody facets

Author: BitterB0NG0

src/pymcnp/utils/types.py

@@ -983,7 +983,7 @@ class Geometry(_object.McnpNonterminal):
         infix: Geometry infix formula.
     """
 
-    _REGEX = re.compile(r'\A((?:).+)\Z')
+    _REGEX = re.compile(r'\A(.+)\Z')
 
     def __init__(self, infix: String):
         """
@@ -1008,6 +1008,10 @@ def __init__(self, infix: String):
         temp = re.sub(r'\+-', '-', temp)
         temp = re.sub(r'(\d)\(', r'\1*(', temp)
 
+        for number in re.split(r'[*#:+ ()-]+', temp):
+            if number and not re.match(r'\d+(?:[.][1-8])?', number):
+                raise errors.McnpError(errors.McnpCode.SEMANTICS_TYPE, infix)
+
         try:
             eval(temp)
         except SyntaxError:

tests/inp/test_card.py

@@ -25,15 +25,15 @@ class Test_FromMcnp(_utils._Test_FromMcnp):
             '2 3 -3.7 -1 IMP:N=2 IMP:P=4',
             #'3 LIKE 2 BUT IMP:N=10 TRCL=1',
             '10 16 -4.2 1 -2 3 IMP:N=4 IMP:P=8 EXT:N=-0.4',
-            #'3 0 -1.2 -1.1 1.4 -1.5 -1.6 99',
-            #'4 0 1.1 -2001.1 -5.3 -5.5 -5.6 -5.4',
+            '3 0 -1.2 -1.1 1.4 -1.5 -1.6 99',
+            '4 0 1.1 -2001.1 -5.3 -5.5 -5.6 -5.4',
             '5 0 -5',
             '1 0 -1',
             #'2 like 1 but trcl = (2 0 0)',
-            #'9 0 (-5.1:1.3:2001.1:-99:5.5:5.6) #5',
-            #'3 0 5.1 -1.1 -5.3 -5.5 -5.6 99',
-            #'3 0 5.1 -1.1 1.4 -5.5 -5.6 -5.4',
-            #'3 0 -1.2 -1.1 -5.3 -5.5 -5.6 -5.4',
+            '9 0 (-5.1:1.3:2001.1:-99:5.5:5.6) #5',
+            '3 0 5.1 -1.1 -5.3 -5.5 -5.6 99',
+            '3 0 5.1 -1.1 1.4 -5.5 -5.6 -5.4',
+            '3 0 -1.2 -1.1 -5.3 -5.5 -5.6 -5.4',
             '1 0 1 -2 3 $ cell 1',
             # 3.3
             '1 0 -17 $ rcc can',