utils/_object: updated metaclasses

Author: BitterB0NG0

scripts/inp_code.py

@@ -300,22 +300,7 @@ class {CAMEL(element.name, "Option")}(Option):
     Represents generic INP {element.name} options.
     """
 
-    _KEYWORD = ""
-    _SUBCLASSES = {{}}
-    _REGEX = re.compile(
-        rf"{r'|'.join(GET_REGEX(option) for option in sorted(element.options, reverse=True, key=lambda scheme: len(scheme.mnemonic)))}"
-    )
-
-    def __init_subclass__(cls, keyword: str):
-        cls._KEYWORD: typing.Final[str] = keyword
-
-        if keyword not in cls._SUBCLASSES:
-            cls._SUBCLASSES[keyword] = [cls]
-        else:
-            cls._SUBCLASSES[keyword] += [cls]
-
-    def __class_getitem__(cls, keyword: str):
-        return cls._SUBCLASSES[keyword]
+    pass
 '''[1:]
 
 
@@ -336,7 +321,7 @@ def ELEMENT(element, parent_name, depth):
 from {"." * depth}utils import _visualization
 
 
-class {CAMEL(element.name)}({f"{CAMEL(parent_name, 'Option')}, keyword='{element.mnemonic}'" if parent_name else "Card"}):
+class {CAMEL(element.name)}({CAMEL(parent_name, 'Option')}):
     """
     Represents INP {element.name.split('_')[0]}{f" variation #{element.name.split('_')[1]}"if len(element.name.split('_')) - 1 else ""} elements.
 

scripts/inp_data.py

@@ -2654,7 +2654,7 @@ def draw(self):
                 ElementScheme(
                     name='vol',
                     mnemonic='vol',
-                    regex='vol( no)?((?: {types.RealOrJump._REGEX.pattern})+?)',
+                    regex='vol(?: (no))?((?: {types.RealOrJump._REGEX.pattern})+?)',
                     attributes=[
                         AttributeScheme(
                             name='no',
@@ -7841,7 +7841,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                 ElementScheme(
                     name='fu',
                     mnemonic='fu',
-                    regex='fu(\\d+)((?: {types.RealOrJump._REGEX.pattern})+?)( nt)?( c)?',
+                    regex='fu(\\d+)((?: {types.RealOrJump._REGEX.pattern})+?)(?: (nt))?(?: (c))?',
                     attributes=[
                         AttributeScheme(
                             name='suffix',
@@ -8234,6 +8234,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='geom',
                             mnemonic='geom',
+                            regex='geom(?: (xyz|rec|rzt|cyl))',
                             attributes=[
                                 AttributeScheme(
                                     name='geometry',
@@ -9979,6 +9980,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='file',
                             mnemonic='file',
+                            regex='file(?: (asc|bin|aov|bov))',
                             attributes=[
                                 AttributeScheme(
                                     name='setting',
@@ -10015,6 +10017,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='write',
                             mnemonic='write',
+                            regex='write(?: (pos|all))',
                             attributes=[
                                 AttributeScheme(
                                     name='setting',
@@ -10027,6 +10030,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='conic',
                             mnemonic='conic',
+                            regex='setting(?: (col|lin))',
                             attributes=[
                                 AttributeScheme(
                                     name='setting',
@@ -10156,7 +10160,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='file',
                             mnemonic='file',
-                            regex='file( all|none)?',
+                            regex='file (?: (all|none))?',
                             attributes=[
                                 AttributeScheme(
                                     name='aa',
@@ -10351,7 +10355,7 @@ def from_formula(number: int, formulas: dict[str, float], atomic_or_weight: bool
                         ElementScheme(
                             name='reset',
                             mnemonic='reset',
-                            regex='reset( all|coplot)?',
+                            regex='reset(?: (all|coplot))?',
                             attributes=[
                                 AttributeScheme(
                                     name='aa',

src/pymcnp/Inp.py

@@ -12,7 +12,7 @@
 from .utils import _visualization
 
 
-class Inp(_object.McnpFile_):
+class Inp(_object.McnpFile):
     """
     Represents INP files.
 

src/pymcnp/Meshtal.py

@@ -6,7 +6,7 @@
 from .utils import _object
 
 
-class Meshtal(_object.McnpFile_):
+class Meshtal(_object.McnpFile):
     """
     Represents MESTHAL files.
 

src/pymcnp/Outp.py

@@ -5,7 +5,7 @@
 from .utils import _object
 
 
-class Outp(_object.McnpFile_):
+class Outp(_object.McnpFile):
     """
     Represents OUTP files.
 

src/pymcnp/Ptrac.py

@@ -6,7 +6,7 @@
 from .utils import _object
 
 
-class Ptrac(_object.McnpFile_):
+class Ptrac(_object.McnpFile):
     """
     Represents PTRAC files.
 

src/pymcnp/inp/Comment.py

@@ -5,6 +5,7 @@
 
 from ._card import Card
 from ..utils import types
+from ..utils import _parser
 
 
 class Comment(Card):
@@ -32,6 +33,16 @@ def __init__(self, text: types.String):
 
         self.text: typing.Final[types.String] = text
 
+    def to_mcnp(self):
+        """
+        Generates INP from ``Data``.
+
+        Returns:
+            INP data card.
+        """
+
+        return _parser.postprocess_continuation_line(f'c {self.text}')
+
 
 @dataclasses.dataclass
 class CommentBuilder:

src/pymcnp/inp/_card.py

@@ -5,7 +5,7 @@
 from ..utils import _parser
 
 
-class Card(_object.McnpElement_):
+class Card(_object.McnpNonterminal):
     """
     Represents generic INP cards.
     """

src/pymcnp/inp/_option.py

@@ -5,7 +5,7 @@
 from ..utils import _parser
 
 
-class Option(_object.McnpElement_):
+class Option(_object.McnpNonterminal):
     """
     Represents generic INP cards.
     """
@@ -30,11 +30,11 @@ def from_mcnp(cls, source: str):
 
         source, comments = _parser.preprocess_inp(source)
 
-        for subcls in sorted(
-            sum(cls._SUBCLASSES.values(), []), reverse=True, key=lambda val: len(val._KEYWORD)
-        ):
+        subclasses = cls.__subclasses__() or [cls]
+
+        for subclass in subclasses:
             try:
-                if (tokens := subcls._REGEX.match(source)) and tokens[0] == source:
+                if (tokens := subclass._REGEX.match(source)) and tokens[0] == source:
                     break
                 else:
                     continue
@@ -44,15 +44,15 @@ def from_mcnp(cls, source: str):
             raise errors.InpError(errors.InpCode.SYNTAX_OPTION, source)
 
         attrs = {}
-        for i, (name, attr) in enumerate(subcls._ATTRS.items()):
+        for i, (name, attr) in enumerate(subclass._ATTRS.items()):
             if isinstance(attr, types.GenericAlias):
                 attrs[name] = (
                     attr.from_mcnp(tokens[i + 1], attr.__args__[0]) if tokens[i + 1] else None
                 )
             else:
                 attrs[name] = attr.from_mcnp(tokens[i + 1]) if tokens[i + 1] else None
 
-        return subcls(**attrs)
+        return subclass(**attrs)
 
     def to_mcnp(self):
         """

src/pymcnp/inp/cell/Bflcl.py

@@ -8,7 +8,7 @@
 from ...utils import errors
 
 
-class Bflcl(CellOption, keyword='bflcl'):
+class Bflcl(CellOption):
     """
     Represents INP bflcl elements.