inp: debugged parser

Author: BitterB0NG0

docs/source/pymcnp/inp/data.md

@@ -1153,17 +1153,10 @@
 
 [bfld subpackage](data/bfld)
 
-### ``CBuilder_0`` Class
+### ``CBuilder`` Class
 
 ```{eval-rst}
-.. autoclass:: pymcnp.inp.data.CBuilder_0
-   :members:
-```
-
-### ``CBuilder_1`` Class
-
-```{eval-rst}
-.. autoclass:: pymcnp.inp.data.CBuilder_1
+.. autoclass:: pymcnp.inp.data.CBuilder
    :members:
 ```
 
@@ -1984,6 +1977,20 @@
    :members:
 ```
 
+### ``TfBuilder_0`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.TfBuilder_0
+   :members:
+```
+
+### ``TfBuilder_1`` Class
+
+```{eval-rst}
+.. autoclass:: pymcnp.inp.data.TfBuilder_1
+   :members:
+```
+
 ### ``TmBuilder`` Class
 
 ```{eval-rst}

docs/source/pymcnp/inp/data/stop.md

@@ -9,10 +9,10 @@
    :members:
 ```
 
-### ``Fk`` Class
+### ``F`` Class
 
 ```{eval-rst}
-.. autoclass:: pymcnp.inp.data.stop.Fk
+.. autoclass:: pymcnp.inp.data.stop.F
    :members:
 ```
 

scripts/inp_code.py

@@ -51,21 +51,21 @@ def _REGEX(element):
 
         if 'Tuple' in attribute.type:
             if 'Option' in attribute.type:
-                o += f'((?: (?:{{{SNAKE(element.name)}.{CAMEL(element.name, "Option")}._REGEX.pattern}}))+?)'
+                o += f'((?: (?:{{{SNAKE(element.name)}.{CAMEL(element.name, "Option")}._REGEX.pattern[2:-2]}}))+?)'
             else:
-                o += f'((?: {{{attribute.type[12:-1]}._REGEX.pattern}})+?)'
+                o += f'((?: {{{attribute.type[12:-1]}._REGEX.pattern[2:-2]}})+?)'
         else:
             if 'Option' in attribute.type:
-                o += f'( (?:{{{SNAKE(element.name)}.{CAMEL(element.name, "Option")}._REGEX.pattern}}))'
+                o += f'( (?:{{{SNAKE(element.name)}.{CAMEL(element.name, "Option")}._REGEX.pattern[2:-2]}}))'
             elif attribute.type == 'types.Boolean':
                 o += f'( {attribute.restriction})'
             else:
                 if attribute.can_quote:
-                    o += f'( \\"{{{attribute.type}._REGEX.pattern}}\\")'
+                    o += f'( \\"{{{attribute.type}._REGEX.pattern[2:-2]}}\\")'
                 elif attribute.can_paren:
-                    o += f'( {{{attribute.type}._REGEX.pattern}}| [(]{{{attribute.type}._REGEX.pattern}}[)])'
+                    o += f'( {{{attribute.type}._REGEX.pattern[2:-2]}}| [(]{{{attribute.type}._REGEX.pattern[2:-2]}}[)])'
                 else:
-                    o += f'( {{{attribute.type}._REGEX.pattern}})'
+                    o += f'( {{{attribute.type}._REGEX.pattern[2:-2]}})'
 
         if attribute.optional:
             o += '?'

scripts/inp_data.py

@@ -30,7 +30,7 @@ class Inp(_object.McnpFile):
     """
 
     _REGEX = re.compile(
-        r'((?:message:).+\n)?(.+(?:\n))([\s\S]+?(?:\n\n))([\s\S]+?(?:\n\n))([\s\S]+?(?:\n\n|\Z))([\S\s]+)?'
+        r'\A((?:message:).+\n)?(.+(?:\n))([\s\S]+?(?:\n\n))([\s\S]+?(?:\n\n))([\s\S]+?(?:\n\n|\Z))([\S\s]+)?\Z'
     )
 
     def __init__(

src/pymcnp/Inp.py

@@ -15,7 +15,9 @@ class Meshtal(_object.McnpFile):
         tallies: MESTHAL tallies.
     """
 
-    _REGEX = re.compile(rf'({meshtal.Header._REGEX.pattern})((?:{meshtal.Tally._REGEX.pattern})+)')
+    _REGEX = re.compile(
+        rf'\A({meshtal.Header._REGEX.pattern[2:-2]})((?:{meshtal.Tally._REGEX.pattern[2:-2]})+)\Z'
+    )
 
     def __init__(
         self, header: meshtal.Header, tallies: typing.Generator[meshtal.Tally, None, None]

src/pymcnp/Meshtal.py

@@ -20,9 +20,9 @@ class Outp(_object.McnpFile):
     """
 
     _REGEX = re.compile(
-        rf'({outp.Header._REGEX.pattern[2:-2]})'
+        rf'\A({outp.Header._REGEX.pattern[2:-2]})'
         r'([\s\S]*)'
-        rf'({outp.Footer._REGEX.pattern[2:-2]})'
+        rf'({outp.Footer._REGEX.pattern[2:-2]})\Z'
     )
 
     def __init__(

src/pymcnp/Outp.py

@@ -16,7 +16,8 @@ class Ptrac(_object.McnpFile):
     """
 
     _REGEX = re.compile(
-        rf'({ptrac.Header._REGEX.pattern})' rf'((?:{ptrac.History._REGEX.pattern})+)'
+        rf'\A({ptrac.Header._REGEX.pattern[2:-2]})'
+        rf'((?:{ptrac.History._REGEX.pattern[2:-2]})+)\Z'
     )
 
     def __init__(

src/pymcnp/Ptrac.py

@@ -29,7 +29,7 @@ class Cell(Card):
     }
 
     _REGEX = re.compile(
-        rf'\A(\S+)( \S+)((?<! 0) \S+|(?<= 0))( [^a-z]+)( ({cell.CellOption._REGEX.pattern}))*\Z'
+        rf'\A(\S+)( \S+)((?<! 0) \S+|(?<= 0))( [^a-z]+)( ({cell.CellOption._REGEX.pattern[2:-2]}))*\Z'
     )
 
     def __init__(

src/pymcnp/inp/Cell.py

@@ -19,7 +19,7 @@ class Data(Card):
 
     _ATTRS = {'option': data.DataOption}
 
-    _REGEX = re.compile(rf'\A({data.DataOption._REGEX.pattern})\Z')
+    _REGEX = re.compile(rf'\A({data.DataOption._REGEX.pattern[2:-2]})\Z')
 
     def __init__(self, option: data.DataOption):
         """
@@ -144,8 +144,7 @@ class DataBuilder:
         | data.EBuilder
         | data.TBuilder_0
         | data.TBuilder_1
-        | data.CBuilder_0
-        | data.CBuilder_1
+        | data.CBuilder
         | data.FqBuilder
         | data.FmBuilder
         | data.DeBuilder
@@ -160,6 +159,8 @@ class DataBuilder:
         | data.SdBuilder
         | data.FuBuilder
         | data.FtBuilder
+        | data.TfBuilder_0
+        | data.TfBuilder_1
         | data.NotrnBuilder
         | data.PertBuilder
         | data.KpertBuilder
@@ -401,10 +402,8 @@ def unbuild(ast: Data):
             option = data.TBuilder_0.unbuild(ast.option)
         elif isinstance(ast.option, data.T_1):
             option = data.TBuilder_1.unbuild(ast.option)
-        elif isinstance(ast.option, data.C_0):
-            option = data.CBuilder_0.unbuild(ast.option)
-        elif isinstance(ast.option, data.C_1):
-            option = data.CBuilder_1.unbuild(ast.option)
+        elif isinstance(ast.option, data.C):
+            option = data.CBuilder.unbuild(ast.option)
         elif isinstance(ast.option, data.Fq):
             option = data.FqBuilder.unbuild(ast.option)
         elif isinstance(ast.option, data.Fm):
@@ -431,8 +430,8 @@ def unbuild(ast: Data):
             option = data.SdBuilder.unbuild(ast.option)
         elif isinstance(ast.option, data.Fu):
             option = data.FuBuilder.unbuild(ast.option)
-        elif isinstance(ast.option, data.Ft):
-            option = data.FtBuilder.unbuild(ast.option)
+        elif isinstance(ast.option, data.Tf):
+            option = data.TfBuilder.unbuild(ast.option)
         elif isinstance(ast.option, data.Notrn):
             option = data.NotrnBuilder.unbuild(ast.option)
         elif isinstance(ast.option, data.Pert):