From 252c8292dc707a2d071f78552a4359b2f1476f36 Mon Sep 17 00:00:00 2001 From: Ruben Dahl Date: Sun, 9 Apr 2023 12:58:58 +0200 Subject: [PATCH] Added support for comments, negative numbers and complex --- datatypes.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/datatypes.py b/datatypes.py index 4e42086..a2f17fd 100644 --- a/datatypes.py +++ b/datatypes.py @@ -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, }