Compare commits

...

2 Commits

2 changed files with 10 additions and 5 deletions

View File

@ -6,9 +6,11 @@ from typing import Any
class Datatype(Enum):
NONE = auto()
NULL = auto()
COMMENT = auto()
STRING = auto()
INTEGER = auto()
FLOAT = auto()
COMPLEX = auto()
@dataclass
@ -22,8 +24,9 @@ NONE_TYPE = Variable(None, Datatype.NONE, None)
VAR_MATCH = {
r"null": Datatype.NULL,
r"\/\/.+": Datatype.COMMENT,
r"\".+\"": Datatype.STRING,
r"\d+\.\d{0,}": Datatype.FLOAT,
r"\d+": Datatype.INTEGER,
# r".+": Datatype.NONE,
r"-?\d+\.?\d{0,}?\+\d+\.?\d{0,}?i": Datatype.COMPLEX,
r"-?\d+\.\d{0,}": Datatype.FLOAT,
r"-?\d+": Datatype.INTEGER,
}

View File

@ -27,11 +27,13 @@ class Pyne:
for row, line in enumerate(f.readlines(), 1):
for var in datatypes.VAR_MATCH:
regex = re.compile(var)
res = regex.match(line)
res = regex.match(line[:-1])
if res:
objects.append(
PyneObject(
datatypes.Variable(None, datatypes.VAR_MATCH[var], line)
datatypes.Variable(
None, datatypes.VAR_MATCH[var], line[:-1]
)
)
)
break