pymcnp/inp: updated suffix regex

BitterB0NG0 · BitterB0NG0 · commit b2d20b5b6073 · 2025-03-24T16:08:19.000-07:00
diff --git a/scripts/inp_code.py b/scripts/inp_code.py
@@ -165,7 +165,7 @@ class {CAMEL(element.name)}Option_(Option_):
     _KEYWORD = ""
     _SUBCLASSES = {{}}
     _REGEX = re.compile(
-        rf"{r'|'.join(f"{option.mnemonic}{r'(\S+)' if has_suffix(option) else ''}{r':(\S+)' if has_designator(option) else ''}{ATTRS_REGEX(option)}" for option in sorted(element.options, reverse=True, key=lambda scheme: len(scheme.mnemonic)))}"
+        rf"{r'|'.join(f"{option.mnemonic}{r'(\d+)' if has_suffix(option) else ''}{r':(\S+)' if has_designator(option) else ''}{ATTRS_REGEX(option)}" for option in sorted(element.options, reverse=True, key=lambda scheme: len(scheme.mnemonic)))}"
     )
 
     def __init_subclass__(cls, keyword: str):
@@ -207,7 +207,7 @@ class {CAMEL(element.name)}({f"{CAMEL(parent_name)}Option_, keyword='{element.mn
 
     _ATTRS = {{{ATTRS_DICT(element)}}}
 
-    _REGEX = re.compile(rf"{element.mnemonic}{r"(\S+)" if has_suffix(element) else ""}{r":(\S+)" if has_designator(element) else ""}{ATTRS_REGEX(element)}")
+    _REGEX = re.compile(rf"{element.mnemonic}{r"(\d+)" if has_suffix(element) else ""}{r":(\S+)" if has_designator(element) else ""}{ATTRS_REGEX(element)}")
     
     def __init__(self, {ATTRS_PARAM(element)}):
         """
diff --git a/src/pymcnp/inp/Cell.py b/src/pymcnp/inp/Cell.py
@@ -1,6 +1,5 @@
 import re
 
-import pyvista
 
 from . import cell
 from .card_ import Card_
diff --git a/src/pymcnp/inp/cell/Dxc.py b/src/pymcnp/inp/cell/Dxc.py
@@ -21,7 +21,7 @@ class Dxc(CellOption_, keyword='dxc'):
         'probability': types.Real,
     }
 
-    _REGEX = re.compile(rf'dxc(\S+):(\S+)( {types.Real._REGEX.pattern})')
+    _REGEX = re.compile(rf'dxc(\d+):(\S+)( {types.Real._REGEX.pattern})')
 
     def __init__(
         self, suffix: types.Integer, designator: types.Designator, probability: types.Real
diff --git a/src/pymcnp/inp/cell/Pd.py b/src/pymcnp/inp/cell/Pd.py
@@ -20,7 +20,7 @@ class Pd(CellOption_, keyword='pd'):
         'probability': types.Real,
     }
 
-    _REGEX = re.compile(rf'pd(\S+)( {types.Real._REGEX.pattern})')
+    _REGEX = re.compile(rf'pd(\d+)( {types.Real._REGEX.pattern})')
 
     def __init__(self, suffix: types.Integer, probability: types.Real):
         """
diff --git a/src/pymcnp/inp/cell/Tmp.py b/src/pymcnp/inp/cell/Tmp.py
@@ -20,7 +20,7 @@ class Tmp(CellOption_, keyword='tmp'):
         'temperature': types.Real,
     }
 
-    _REGEX = re.compile(rf'tmp(\S+)( {types.Real._REGEX.pattern})')
+    _REGEX = re.compile(rf'tmp(\d+)( {types.Real._REGEX.pattern})')
 
     def __init__(self, suffix: types.Integer, temperature: types.Real):
         """
diff --git a/src/pymcnp/inp/cell/Tmp_0.py b/src/pymcnp/inp/cell/Tmp_0.py
@@ -20,7 +20,7 @@ class Tmp_0(CellOption_, keyword='tmp'):
         'temperature': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'tmp(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'tmp(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, temperature: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/cell/Wwn.py b/src/pymcnp/inp/cell/Wwn.py
@@ -21,7 +21,7 @@ class Wwn(CellOption_, keyword='wwn'):
         'bound': types.Real,
     }
 
-    _REGEX = re.compile(rf'wwn(\S+):(\S+)( {types.Real._REGEX.pattern})')
+    _REGEX = re.compile(rf'wwn(\d+):(\S+)( {types.Real._REGEX.pattern})')
 
     def __init__(self, suffix: types.Integer, designator: types.Designator, bound: types.Real):
         """
diff --git a/src/pymcnp/inp/cell/option_.py b/src/pymcnp/inp/cell/option_.py
@@ -14,7 +14,7 @@ class CellOption_(Option_):
     _KEYWORD = ''
     _SUBCLASSES = {}
     _REGEX = re.compile(
-        rf'bflcl( {types.Integer._REGEX.pattern})|nonu( {types.Integer._REGEX.pattern})|trcl( {types.Integer._REGEX.pattern})|trcl( {types.Transformation._REGEX.pattern})|fill( {types.Integer._REGEX.pattern})( {types.Integer._REGEX.pattern})?|fill( {types.Integer._REGEX.pattern})( {types.Transformation._REGEX.pattern})?|fill( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})(( {types.Integer._REGEX.pattern})+)|elpt:(\S+)( {types.Real._REGEX.pattern})|cosy( {types.Integer._REGEX.pattern})|imp:(\S+)( {types.Real._REGEX.pattern})|vol( {types.Real._REGEX.pattern})|pwt( {types.Real._REGEX.pattern})|ext:(\S+)( {types.String._REGEX.pattern})|fcl:(\S+)( {types.Real._REGEX.pattern})|wwn(\S+):(\S+)( {types.Real._REGEX.pattern})|dxc(\S+):(\S+)( {types.Real._REGEX.pattern})|tmp(\S+)( {types.Real._REGEX.pattern})|lat( {types.Integer._REGEX.pattern})|tmp(\S+)(( {types.Real._REGEX.pattern})+)|tmp(( {types.Real._REGEX.pattern})+)|unc:(\S+)( {types.Integer._REGEX.pattern})|pd(\S+)( {types.Real._REGEX.pattern})|u( {types.Integer._REGEX.pattern})'
+        rf'bflcl( {types.Integer._REGEX.pattern})|nonu( {types.Integer._REGEX.pattern})|trcl( {types.Integer._REGEX.pattern})|trcl( {types.Transformation._REGEX.pattern})|fill( {types.Integer._REGEX.pattern})( {types.Integer._REGEX.pattern})?|fill( {types.Integer._REGEX.pattern})( {types.Transformation._REGEX.pattern})?|fill( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})(( {types.Integer._REGEX.pattern})+)|elpt:(\S+)( {types.Real._REGEX.pattern})|cosy( {types.Integer._REGEX.pattern})|imp:(\S+)( {types.Real._REGEX.pattern})|vol( {types.Real._REGEX.pattern})|pwt( {types.Real._REGEX.pattern})|ext:(\S+)( {types.String._REGEX.pattern})|fcl:(\S+)( {types.Real._REGEX.pattern})|wwn(\d+):(\S+)( {types.Real._REGEX.pattern})|dxc(\d+):(\S+)( {types.Real._REGEX.pattern})|tmp(\d+)( {types.Real._REGEX.pattern})|lat( {types.Integer._REGEX.pattern})|tmp(\d+)(( {types.Real._REGEX.pattern})+)|tmp(( {types.Real._REGEX.pattern})+)|unc:(\S+)( {types.Integer._REGEX.pattern})|pd(\d+)( {types.Real._REGEX.pattern})|u( {types.Integer._REGEX.pattern})'
     )
 
     def __init_subclass__(cls, keyword: str):
diff --git a/src/pymcnp/inp/data/Bfld.py b/src/pymcnp/inp/data/Bfld.py
@@ -23,7 +23,7 @@ class Bfld(DataOption_, keyword='bfld'):
     }
 
     _REGEX = re.compile(
-        rf'bfld(\S+)( {types.String._REGEX.pattern})(( ({bfld.BfldOption_._REGEX.pattern}))+)?'
+        rf'bfld(\d+)( {types.String._REGEX.pattern})(( ({bfld.BfldOption_._REGEX.pattern}))+)?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/C_0.py b/src/pymcnp/inp/data/C_0.py
@@ -23,7 +23,7 @@ class C_0(DataOption_, keyword='c'):
     }
 
     _REGEX = re.compile(
-        rf'c(\S+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
+        rf'c(\d+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/C_1.py b/src/pymcnp/inp/data/C_1.py
@@ -23,7 +23,7 @@ class C_1(DataOption_, keyword='[*]c'):
     }
 
     _REGEX = re.compile(
-        rf'[*]c(\S+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
+        rf'[*]c(\d+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Cf.py b/src/pymcnp/inp/data/Cf.py
@@ -20,7 +20,7 @@ class Cf(DataOption_, keyword='cf'):
         'numbers': types.Tuple[types.Integer],
     }
 
-    _REGEX = re.compile(rf'cf(\S+)(( {types.Integer._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'cf(\d+)(( {types.Integer._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, numbers: types.Tuple[types.Integer]):
         """
diff --git a/src/pymcnp/inp/data/Cm.py b/src/pymcnp/inp/data/Cm.py
@@ -20,7 +20,7 @@ class Cm(DataOption_, keyword='cm'):
         'multipliers': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'cm(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'cm(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, multipliers: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Dd.py b/src/pymcnp/inp/data/Dd.py
@@ -20,7 +20,7 @@ class Dd(DataOption_, keyword='dd'):
         'diagnostics': types.Tuple[types.Diagnostic],
     }
 
-    _REGEX = re.compile(rf'dd(\S+)(( {types.Diagnostic._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'dd(\d+)(( {types.Diagnostic._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, diagnostics: types.Tuple[types.Diagnostic]):
         """
diff --git a/src/pymcnp/inp/data/De.py b/src/pymcnp/inp/data/De.py
@@ -22,7 +22,7 @@ class De(DataOption_, keyword='de'):
     }
 
     _REGEX = re.compile(
-        rf'de(\S+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
+        rf'de(\d+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Df_0.py b/src/pymcnp/inp/data/Df_0.py
@@ -22,7 +22,7 @@ class Df_0(DataOption_, keyword='df'):
     }
 
     _REGEX = re.compile(
-        rf'df(\S+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
+        rf'df(\d+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Df_1.py b/src/pymcnp/inp/data/Df_1.py
@@ -21,7 +21,7 @@ class Df_1(DataOption_, keyword='df'):
         'options': types.Tuple[df_1.Df_1Option_],
     }
 
-    _REGEX = re.compile(rf'df(\S+)(( ({df_1.Df_1Option_._REGEX.pattern}))+)')
+    _REGEX = re.compile(rf'df(\d+)(( ({df_1.Df_1Option_._REGEX.pattern}))+)')
 
     def __init__(self, suffix: types.Integer, options: types.Tuple[df_1.Df_1Option_]):
         """
diff --git a/src/pymcnp/inp/data/Ds_0.py b/src/pymcnp/inp/data/Ds_0.py
@@ -22,7 +22,7 @@ class Ds_0(DataOption_, keyword='ds'):
     }
 
     _REGEX = re.compile(
-        rf'ds(\S+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
+        rf'ds(\d+)( {types.String._REGEX.pattern})(( {types.Real._REGEX.pattern})+)'
     )
 
     def __init__(self, suffix: types.Integer, option: types.String, js: types.Tuple[types.Real]):
diff --git a/src/pymcnp/inp/data/Ds_1.py b/src/pymcnp/inp/data/Ds_1.py
@@ -22,7 +22,7 @@ class Ds_1(DataOption_, keyword='ds'):
     }
 
     _REGEX = re.compile(
-        rf'ds(\S+)( {types.String._REGEX.pattern})(( {types.IndependentDependent._REGEX.pattern})+)'
+        rf'ds(\d+)( {types.String._REGEX.pattern})(( {types.IndependentDependent._REGEX.pattern})+)'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Ds_2.py b/src/pymcnp/inp/data/Ds_2.py
@@ -22,7 +22,7 @@ class Ds_2(DataOption_, keyword='ds'):
     }
 
     _REGEX = re.compile(
-        rf'ds(\S+)( {types.String._REGEX.pattern})(( {types.IndependentDependent._REGEX.pattern})+)'
+        rf'ds(\d+)( {types.String._REGEX.pattern})(( {types.IndependentDependent._REGEX.pattern})+)'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Dxc.py b/src/pymcnp/inp/data/Dxc.py
@@ -21,7 +21,7 @@ class Dxc(DataOption_, keyword='dxc'):
         'probabilities': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'dxc(\S+):(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'dxc(\d+):(\S+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(
         self,
diff --git a/src/pymcnp/inp/data/E.py b/src/pymcnp/inp/data/E.py
@@ -23,7 +23,7 @@ class E(DataOption_, keyword='e'):
     }
 
     _REGEX = re.compile(
-        rf'e(\S+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
+        rf'e(\d+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Em.py b/src/pymcnp/inp/data/Em.py
@@ -20,7 +20,7 @@ class Em(DataOption_, keyword='em'):
         'multipliers': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'em(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'em(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, multipliers: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embdb.py b/src/pymcnp/inp/data/Embdb.py
@@ -20,7 +20,7 @@ class Embdb(DataOption_, keyword='embdb'):
         'bounds': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embdb(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embdb(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, bounds: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embdf.py b/src/pymcnp/inp/data/Embdf.py
@@ -20,7 +20,7 @@ class Embdf(DataOption_, keyword='embdf'):
         'multipliers': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embdf(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embdf(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, multipliers: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embeb.py b/src/pymcnp/inp/data/Embeb.py
@@ -20,7 +20,7 @@ class Embeb(DataOption_, keyword='embeb'):
         'bounds': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embeb(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embeb(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, bounds: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embee.py b/src/pymcnp/inp/data/Embee.py
@@ -21,7 +21,7 @@ class Embee(DataOption_, keyword='embee'):
         'options': types.Tuple[embee.EmbeeOption_],
     }
 
-    _REGEX = re.compile(rf'embee(\S+)(( ({embee.EmbeeOption_._REGEX.pattern}))+)?')
+    _REGEX = re.compile(rf'embee(\d+)(( ({embee.EmbeeOption_._REGEX.pattern}))+)?')
 
     def __init__(self, suffix: types.Integer, options: types.Tuple[embee.EmbeeOption_] = None):
         """
diff --git a/src/pymcnp/inp/data/Embem.py b/src/pymcnp/inp/data/Embem.py
@@ -20,7 +20,7 @@ class Embem(DataOption_, keyword='embem'):
         'multipliers': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embem(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embem(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, multipliers: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embtb.py b/src/pymcnp/inp/data/Embtb.py
@@ -20,7 +20,7 @@ class Embtb(DataOption_, keyword='embtb'):
         'bounds': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embtb(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embtb(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, bounds: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/Embtm.py b/src/pymcnp/inp/data/Embtm.py
@@ -20,7 +20,7 @@ class Embtm(DataOption_, keyword='embtm'):
         'multipliers': types.Tuple[types.Real],
     }
 
-    _REGEX = re.compile(rf'embtm(\S+)(( {types.Real._REGEX.pattern})+)')
+    _REGEX = re.compile(rf'embtm(\d+)(( {types.Real._REGEX.pattern})+)')
 
     def __init__(self, suffix: types.Integer, multipliers: types.Tuple[types.Real]):
         """
diff --git a/src/pymcnp/inp/data/F_0.py b/src/pymcnp/inp/data/F_0.py
@@ -23,7 +23,7 @@ class F_0(DataOption_, keyword='f'):
     }
 
     _REGEX = re.compile(
-        rf'f(\S+):(\S+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
+        rf'f(\d+):(\S+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/F_1.py b/src/pymcnp/inp/data/F_1.py
@@ -23,7 +23,7 @@ class F_1(DataOption_, keyword='f'):
     }
 
     _REGEX = re.compile(
-        rf'f(\S+):(\S+)(( {types.Sphere._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
+        rf'f(\d+):(\S+)(( {types.Sphere._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/F_2.py b/src/pymcnp/inp/data/F_2.py
@@ -24,7 +24,7 @@ class F_2(DataOption_, keyword='f'):
     }
 
     _REGEX = re.compile(
-        rf'f(\S+):(\S+)( {types.String._REGEX.pattern})(( {types.Ring._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
+        rf'f(\d+):(\S+)( {types.String._REGEX.pattern})(( {types.Ring._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/F_3.py b/src/pymcnp/inp/data/F_3.py
@@ -23,7 +23,7 @@ class F_3(DataOption_, keyword='f'):
     }
 
     _REGEX = re.compile(
-        rf'f(\S+):(\S+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
+        rf'f(\d+):(\S+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fc.py b/src/pymcnp/inp/data/Fc.py
@@ -20,7 +20,7 @@ class Fc(DataOption_, keyword='fc'):
         'info': types.String,
     }
 
-    _REGEX = re.compile(rf'fc(\S+)( {types.String._REGEX.pattern})')
+    _REGEX = re.compile(rf'fc(\d+)( {types.String._REGEX.pattern})')
 
     def __init__(self, suffix: types.Integer, info: types.String):
         """
diff --git a/src/pymcnp/inp/data/Fic.py b/src/pymcnp/inp/data/Fic.py
@@ -31,7 +31,7 @@ class Fic(DataOption_, keyword='fic'):
     }
 
     _REGEX = re.compile(
-        rf'fic(\S+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
+        rf'fic(\d+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fip.py b/src/pymcnp/inp/data/Fip.py
@@ -31,7 +31,7 @@ class Fip(DataOption_, keyword='fip'):
     }
 
     _REGEX = re.compile(
-        rf'fip(\S+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
+        rf'fip(\d+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fir.py b/src/pymcnp/inp/data/Fir.py
@@ -31,7 +31,7 @@ class Fir(DataOption_, keyword='fir'):
     }
 
     _REGEX = re.compile(
-        rf'fir(\S+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
+        rf'fir(\d+):(\S+)( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})( {types.Real._REGEX.pattern})'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fmesh.py b/src/pymcnp/inp/data/Fmesh.py
@@ -22,7 +22,7 @@ class Fmesh(DataOption_, keyword='fmesh'):
         'options': types.Tuple[fmesh.FmeshOption_],
     }
 
-    _REGEX = re.compile(rf'fmesh(\S+):(\S+)(( ({fmesh.FmeshOption_._REGEX.pattern}))+)?')
+    _REGEX = re.compile(rf'fmesh(\d+):(\S+)(( ({fmesh.FmeshOption_._REGEX.pattern}))+)?')
 
     def __init__(
         self,
diff --git a/src/pymcnp/inp/data/Fq.py b/src/pymcnp/inp/data/Fq.py
@@ -28,7 +28,7 @@ class Fq(DataOption_, keyword='fq'):
     }
 
     _REGEX = re.compile(
-        rf'fq(\S+)( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})'
+        rf'fq(\d+)( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})( {types.String._REGEX.pattern})'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fs.py b/src/pymcnp/inp/data/Fs.py
@@ -23,7 +23,7 @@ class Fs(DataOption_, keyword='fs'):
     }
 
     _REGEX = re.compile(
-        rf'fs(\S+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
+        rf'fs(\d+)(( {types.Integer._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Fu.py b/src/pymcnp/inp/data/Fu.py
@@ -23,7 +23,7 @@ class Fu(DataOption_, keyword='fu'):
     }
 
     _REGEX = re.compile(
-        rf'fu(\S+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
+        rf'fu(\d+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'
     )
 
     def __init__(
diff --git a/src/pymcnp/inp/data/Kpert.py b/src/pymcnp/inp/data/Kpert.py
@@ -21,7 +21,7 @@ class Kpert(DataOption_, keyword='kpert'):
         'options': types.Tuple[kpert.KpertOption_],
     }
 
-    _REGEX = re.compile(rf'kpert(\S+)(( ({kpert.KpertOption_._REGEX.pattern}))+)?')
+    _REGEX = re.compile(rf'kpert(\d+)(( ({kpert.KpertOption_._REGEX.pattern}))+)?')
 
     def __init__(self, suffix: types.Integer, options: types.Tuple[kpert.KpertOption_] = None):
         """
diff --git a/src/pymcnp/inp/data/Ksen.py b/src/pymcnp/inp/data/Ksen.py
diff --git a/src/pymcnp/inp/data/M.py b/src/pymcnp/inp/data/M.py
diff --git a/src/pymcnp/inp/data/Mt.py b/src/pymcnp/inp/data/Mt.py
diff --git a/src/pymcnp/inp/data/Mx.py b/src/pymcnp/inp/data/Mx.py
diff --git a/src/pymcnp/inp/data/Pd.py b/src/pymcnp/inp/data/Pd.py
diff --git a/src/pymcnp/inp/data/Pert.py b/src/pymcnp/inp/data/Pert.py
diff --git a/src/pymcnp/inp/data/Sb_0.py b/src/pymcnp/inp/data/Sb_0.py
diff --git a/src/pymcnp/inp/data/Sc.py b/src/pymcnp/inp/data/Sc.py
diff --git a/src/pymcnp/inp/data/Sf.py b/src/pymcnp/inp/data/Sf.py
diff --git a/src/pymcnp/inp/data/Si_0.py b/src/pymcnp/inp/data/Si_0.py
diff --git a/src/pymcnp/inp/data/Si_1.py b/src/pymcnp/inp/data/Si_1.py
diff --git a/src/pymcnp/inp/data/Sp_0.py b/src/pymcnp/inp/data/Sp_0.py
diff --git a/src/pymcnp/inp/data/T_0.py b/src/pymcnp/inp/data/T_0.py
diff --git a/src/pymcnp/inp/data/T_1.py b/src/pymcnp/inp/data/T_1.py
diff --git a/src/pymcnp/inp/data/Tm.py b/src/pymcnp/inp/data/Tm.py
diff --git a/src/pymcnp/inp/data/Tr.py b/src/pymcnp/inp/data/Tr.py
diff --git a/src/pymcnp/inp/data/Wwn.py b/src/pymcnp/inp/data/Wwn.py
diff --git a/src/pymcnp/inp/data/Xs.py b/src/pymcnp/inp/data/Xs.py
diff --git a/src/pymcnp/inp/data/option_.py b/src/pymcnp/inp/data/option_.py
diff --git a/src/pymcnp/inp/data/stop/Fk.py b/src/pymcnp/inp/data/stop/Fk.py
diff --git a/src/pymcnp/inp/data/stop/option_.py b/src/pymcnp/inp/data/stop/option_.py

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Dxc(CellOption_, keyword='dxc'):`
`21`	`21`	`'probability': types.Real,`
`22`	`22`	`}`
`23`	`23`
`24`		`- _REGEX = re.compile(rf'dxc(\S+):(\S+)( {types.Real._REGEX.pattern})')`
	`24`	`+ _REGEX = re.compile(rf'dxc(\d+):(\S+)( {types.Real._REGEX.pattern})')`
`25`	`25`
`26`	`26`	`def __init__(`
`27`	`27`	`self, suffix: types.Integer, designator: types.Designator, probability: types.Real`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Pd(CellOption_, keyword='pd'):`
`20`	`20`	`'probability': types.Real,`
`21`	`21`	`}`
`22`	`22`
`23`		`- _REGEX = re.compile(rf'pd(\S+)( {types.Real._REGEX.pattern})')`
	`23`	`+ _REGEX = re.compile(rf'pd(\d+)( {types.Real._REGEX.pattern})')`
`24`	`24`
`25`	`25`	`def __init__(self, suffix: types.Integer, probability: types.Real):`
`26`	`26`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Tmp(CellOption_, keyword='tmp'):`
`20`	`20`	`'temperature': types.Real,`
`21`	`21`	`}`
`22`	`22`
`23`		`- _REGEX = re.compile(rf'tmp(\S+)( {types.Real._REGEX.pattern})')`
	`23`	`+ _REGEX = re.compile(rf'tmp(\d+)( {types.Real._REGEX.pattern})')`
`24`	`24`
`25`	`25`	`def __init__(self, suffix: types.Integer, temperature: types.Real):`
`26`	`26`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Tmp_0(CellOption_, keyword='tmp'):`
`20`	`20`	`'temperature': types.Tuple[types.Real],`
`21`	`21`	`}`
`22`	`22`
`23`		`- _REGEX = re.compile(rf'tmp(\S+)(( {types.Real._REGEX.pattern})+)')`
	`23`	`+ _REGEX = re.compile(rf'tmp(\d+)(( {types.Real._REGEX.pattern})+)')`
`24`	`24`
`25`	`25`	`def __init__(self, suffix: types.Integer, temperature: types.Tuple[types.Real]):`
`26`	`26`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Wwn(CellOption_, keyword='wwn'):`
`21`	`21`	`'bound': types.Real,`
`22`	`22`	`}`
`23`	`23`
`24`		`- _REGEX = re.compile(rf'wwn(\S+):(\S+)( {types.Real._REGEX.pattern})')`
	`24`	`+ _REGEX = re.compile(rf'wwn(\d+):(\S+)( {types.Real._REGEX.pattern})')`
`25`	`25`
`26`	`26`	`def __init__(self, suffix: types.Integer, designator: types.Designator, bound: types.Real):`
`27`	`27`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class CellOption_(Option_):`
`14`	`14`	`_KEYWORD = ''`
`15`	`15`	`_SUBCLASSES = {}`
`16`	`16`	`_REGEX = re.compile(`
`17`		- rf'bflcl( {types.Integer._REGEX.pattern})\|nonu( {types.Integer._REGEX.pattern})\|trcl( {types.Integer._REGEX.pattern})\|trcl( {types.Transformation._REGEX.pattern})\|fill( {types.Integer._REGEX.pattern})( {types.Integer._REGEX.pattern})?\|fill( {types.Integer._REGEX.pattern})( {types.Transformation._REGEX.pattern})?\|fill( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})(( {types.Integer._REGEX.pattern})+)\|elpt:(\S+)( {types.Real._REGEX.pattern})\|cosy( {types.Integer._REGEX.pattern})\|imp:(\S+)( {types.Real._REGEX.pattern})\|vol( {types.Real._REGEX.pattern})\|pwt( {types.Real._REGEX.pattern})\|ext:(\S+)( {types.String._REGEX.pattern})\|fcl:(\S+)( {types.Real._REGEX.pattern})\|wwn(\S+):(\S+)( {types.Real._REGEX.pattern})\|dxc(\S+):(\S+)( {types.Real._REGEX.pattern})\|tmp(\S+)( {types.Real._REGEX.pattern})\|lat( {types.Integer._REGEX.pattern})\|tmp(\S+)(( {types.Real._REGEX.pattern})+)\|tmp(( {types.Real._REGEX.pattern})+)\|unc:(\S+)( {types.Integer._REGEX.pattern})\|pd(\S+)( {types.Real._REGEX.pattern})\|u( {types.Integer._REGEX.pattern})'
	`17`	+ rf'bflcl( {types.Integer._REGEX.pattern})\|nonu( {types.Integer._REGEX.pattern})\|trcl( {types.Integer._REGEX.pattern})\|trcl( {types.Transformation._REGEX.pattern})\|fill( {types.Integer._REGEX.pattern})( {types.Integer._REGEX.pattern})?\|fill( {types.Integer._REGEX.pattern})( {types.Transformation._REGEX.pattern})?\|fill( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})( {types.Index._REGEX.pattern})(( {types.Integer._REGEX.pattern})+)\|elpt:(\S+)( {types.Real._REGEX.pattern})\|cosy( {types.Integer._REGEX.pattern})\|imp:(\S+)( {types.Real._REGEX.pattern})\|vol( {types.Real._REGEX.pattern})\|pwt( {types.Real._REGEX.pattern})\|ext:(\S+)( {types.String._REGEX.pattern})\|fcl:(\S+)( {types.Real._REGEX.pattern})\|wwn(\d+):(\S+)( {types.Real._REGEX.pattern})\|dxc(\d+):(\S+)( {types.Real._REGEX.pattern})\|tmp(\d+)( {types.Real._REGEX.pattern})\|lat( {types.Integer._REGEX.pattern})\|tmp(\d+)(( {types.Real._REGEX.pattern})+)\|tmp(( {types.Real._REGEX.pattern})+)\|unc:(\S+)( {types.Integer._REGEX.pattern})\|pd(\d+)( {types.Real._REGEX.pattern})\|u( {types.Integer._REGEX.pattern})'
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`def __init_subclass__(cls, keyword: str):`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Bfld(DataOption_, keyword='bfld'):`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`_REGEX = re.compile(`
`26`		`- rf'bfld(\S+)( {types.String._REGEX.pattern})(( ({bfld.BfldOption_._REGEX.pattern}))+)?'`
	`26`	`+ rf'bfld(\d+)( {types.String._REGEX.pattern})(( ({bfld.BfldOption_._REGEX.pattern}))+)?'`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`def __init__(`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class C_0(DataOption_, keyword='c'):`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`_REGEX = re.compile(`
`26`		`- rf'c(\S+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'`
	`26`	`+ rf'c(\d+)(( {types.Real._REGEX.pattern})+)( {types.String._REGEX.pattern})?( {types.String._REGEX.pattern})?'`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`def __init__(`