pymcnp/inp: updated DF parser

Author: BitterB0NG0

src/pymcnp/inp/data/df_1/Ic.py

@@ -33,7 +33,7 @@ def __init__(self, function: types.IntegerOrJump):
             InpError: SEMANTICS_OPTION.
         """
 
-        if function is None or function not in {10, 20, 31, 32, 33, 34, 35, 40, 99}:
+        if function is None or function.value not in {10, 20, 31, 32, 33, 34, 35, 40, 99}:
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, function)
 
         self.value: typing.Final[types.Tuple] = types.Tuple(

src/pymcnp/inp/data/df_1/Int.py

@@ -33,7 +33,7 @@ def __init__(self, units: types.IntegerOrJump):
             InpError: SEMANTICS_OPTION.
         """
 
-        if units is None or units not in {1, 2}:
+        if units is None or units.value not in {1, 2}:
             raise errors.InpError(errors.InpCode.SEMANTICS_OPTION, units)
 
         self.value: typing.Final[types.Tuple] = types.Tuple(

src/pymcnp/inp/data/df_1/Iu.py

@@ -0,0 +1,57 @@
+import re
+import typing
+import dataclasses
+
+from ._option import Df_1Option
+from ....utils import types
+from ....utils import errors
+
+
+class Lin(Df_1Option, keyword='log'):
+    """
+    Represents INP log elements.
+
+    Attributes:
+
+    """
+
+    _ATTRS = {}
+
+    _REGEX = re.compile(r'\Alog\Z')
+
+    def __init__(
+        self,
+    ):
+        """
+        Initializes ``Lin``.
+
+        Parameters:
+
+
+        Raises:
+            InpError: SEMANTICS_OPTION.
+        """
+
+        self.value: typing.Final[types.Tuple] = types.Tuple([])
+
+
+@dataclasses.dataclass
+class LinBuilder:
+    """
+    Builds ``Lin``.
+
+    Attributes:
+
+    """
+
+    def build(self):
+        """
+        Builds ``LinBuilder`` into ``Lin``.
+
+        Returns:
+            ``Lin`` for ``LinBuilder``.
+        """
+
+        return Lin()
+
+

src/pymcnp/inp/data/df_1/Lin.py

@@ -0,0 +1,57 @@
+import re
+import typing
+import dataclasses
+
+from ._option import Df_1Option
+from ....utils import types
+from ....utils import errors
+
+
+class Log(Df_1Option, keyword='log'):
+    """
+    Represents INP log elements.
+
+    Attributes:
+
+    """
+
+    _ATTRS = {}
+
+    _REGEX = re.compile(r'\Alog\Z')
+
+    def __init__(
+        self,
+    ):
+        """
+        Initializes ``Log``.
+
+        Parameters:
+
+
+        Raises:
+            InpError: SEMANTICS_OPTION.
+        """
+
+        self.value: typing.Final[types.Tuple] = types.Tuple([])
+
+
+@dataclasses.dataclass
+class LogBuilder:
+    """
+    Builds ``Log``.
+
+    Attributes:
+
+    """
+
+    def build(self):
+        """
+        Builds ``LogBuilder`` into ``Log``.
+
+        Returns:
+            ``Log`` for ``LogBuilder``.
+        """
+
+        return Log()
+
+

src/pymcnp/inp/data/df_1/Log.py

@@ -3,20 +3,26 @@
 from .Iu import Iu
 from .Fac import Fac
 from .Ic import Ic
-from .Int import Int
+from .Log import Log
+from .Lin import Lin
 from .Iu import IuBuilder
 from .Fac import FacBuilder
 from .Ic import IcBuilder
-from .Int import IntBuilder
+from .Log import LogBuilder
+from .Lin import LinBuilder
 
 __all__ = [
     'Df_1Option',
     'Iu',
     'Fac',
     'Ic',
     'Int',
+    'Log',
+    'Lin',
     'IuBuilder',
     'FacBuilder',
     'IcBuilder',
     'IntBuilder',
+    'LogBuilder',
+    'LinBuilder',
 ]

src/pymcnp/inp/data/df_1/__init__.py

@@ -14,7 +14,11 @@ class Df_1Option(Option):
     _KEYWORD = ''
     _SUBCLASSES = {}
     _REGEX = re.compile(
-        rf'fac( {types.IntegerOrJump._REGEX.pattern})|int( {types.String._REGEX.pattern})|iu( {types.IntegerOrJump._REGEX.pattern})|ic( {types.IntegerOrJump._REGEX.pattern})'
+        rf'fac( {types.IntegerOrJump._REGEX.pattern})'
+        rf'|iu( {types.IntegerOrJump._REGEX.pattern})'
+        rf'|ic( {types.IntegerOrJump._REGEX.pattern})'
+        rf'|log'
+        rf'|lin'
     )
 
     def __init_subclass__(cls, keyword: str):