Skip to content

Represent every values as text #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laurenthuberdeau wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Represent every values as text #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb1e6a4
Represent every values as text
Feb 24, 2022
b2cea93
Comments
Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions core/src/Language/Avaleryar/Syntax.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeSynonymInstances #-}
{-# LANGUAGE ViewPatterns #-}

{-|

Expand Down Expand Up @@ -59,12 +61,26 @@ import GHC.Generics (Generic)
import Text.Megaparsec (SourcePos(..), pos1, unPos)
import Text.PrettyPrint.Leijen.Text
(Doc, Pretty(..), brackets, colon, dot, empty, group, hsep, line, nest, parens, punctuate, space, vsep)
import Text.Read (readMaybe)

data Value
= I Int
| T Text
| B Bool
deriving (Eq, Ord, Read, Show, Generic)
newtype Value = T Text
deriving (Eq, Ord, Read, Show, Generic)

-- COMPLETE Pragma is necessary because the exhausiveness checker doesn't work at all with pattern synonyms.
-- See https://gitlab.haskell.org/ghc/ghc/-/wikis/pattern-synonyms/complete-sigs
{-# COMPLETE I, B, T #-}
Copy link
Contributor Author

@laurenthuberdeau laurenthuberdeau Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same trick that I used when I changed the representation of IP addresses in portal-suite:
https://github.com/Simspace/portal-suite/blob/dev/common-utilities/haskell/src/SimSpace/Utils/Cidr.hs#L36-L43

Copy link
Contributor Author

@laurenthuberdeau laurenthuberdeau Feb 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this pattern is complete in a strange way because the cases are not disjoint. For example, the following code always returns "true" because T matches everything.

case I 5 of
  T _ -> "text"
  I _  -> "int"
  B _ -> "bool"

pattern I :: Int -> Value
pattern I i <- T (readMaybe . T.unpack -> Just i) where
I i = T . T.pack $ show i

pattern B :: Bool -> Value
pattern B b <- T (textToBool -> Just b) where
B b = T (if b then "#t" else "#f")

textToBool :: Text -> Maybe Bool
textToBool "#t" = Just True
textToBool "#f" = Just False
textToBool _ = Nothing

instance NFData Value
instance Hashable Value
Expand All @@ -73,8 +89,6 @@ instance IsString Value where
fromString = T . fromString

instance Pretty Value where
pretty (I n) = pretty n
pretty (B b) = if b then "#t" else "#f"
pretty (T t) = if T.any isSpace t
then pretty (show t) -- want the quotes/escaping
else pretty t -- display as a symbol
Expand Down Expand Up @@ -267,7 +281,6 @@ instance Valuable Value where
instance Valuable Text where
toValue = T
fromValue (T a) = Just a
fromValue _ = Nothing

instance Valuable Int where
toValue = I
Expand Down