dahrub
/
pyne
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dahrub:465bbe9c15a0ea48827b4493220198acdea72c70
Branches Tags
dahrub:master
...
compare: dahrub:1ee9ec318bd5a9f761f342fe4a08df98de4fa79c
Branches Tags
dahrub:master

2 Commits
465bbe9c15 ... 1ee9ec318b

Author SHA1 Message Date
Ruben Dahl 1ee9ec318b
Removed the newline in the parser. 2023-04-09 12:59:21 +02:00
Ruben Dahl 252c8292dc
Added support for comments, negative numbers and complex 2023-04-09 12:58:58 +02:00
2 changed files with 10 additions and 5 deletions
Show Stats Expand all files Collapse all files

9
datatypes.py
View File

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

6
pyne.py
View File

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