From c02d29e8e119d12748c90b3965f6b98633efbec2 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Fri, 23 Sep 2022 15:14:37 +0300 Subject: Add integer type --- src/Lib.hs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/Lib.hs') diff --git a/src/Lib.hs b/src/Lib.hs index 13e4234..8c2fc06 100644 --- a/src/Lib.hs +++ b/src/Lib.hs @@ -69,14 +69,18 @@ asPairs _ = throwError $ LException "Odd number of elements to pair up" parseToken :: String -> AST parseToken token - | isNumber token = ASTNumber (read token) + | isInteger token = ASTInteger (read token) + | isDouble token = ASTDouble (read token) | isString token = ASTString $ removeQuotes token | isBoolean token = ASTBoolean $ asBoolean token | otherwise = ASTSymbol token where - numberRegex = "^-?[[:digit:]]+(\\.[[:digit:]]+)?$" - isNumber :: String -> Bool - isNumber t = t =~ numberRegex + integerRegex = "^-?[[:digit:]]+$" + isInteger :: String -> Bool + isInteger t = t =~ integerRegex + doubleRegex = "^-?[[:digit:]]+(\\.[[:digit:]]+)?$" + isDouble :: String -> Bool + isDouble t = t =~ doubleRegex isString t = "\"" `L.isPrefixOf` t removeQuotes s = drop 1 s $> take (length s - 2) isBoolean t = t `elem` ["true", "false"] -- cgit v1.3