From 062ad8b0831c16dcd8fa7a0686fa93dabf89a43c Mon Sep 17 00:00:00 2001 From: Ayman Nadeem Date: Wed, 12 Dec 2018 15:55:56 -0500 Subject: [PATCH] remove symbol --- src/Control/Abstract/Value.hs | 2 -- src/Data/Abstract/Value/Abstract.hs | 1 - src/Data/Abstract/Value/Concrete.hs | 1 - src/Data/Abstract/Value/Type.hs | 1 - src/Data/Syntax/Literal.hs | 2 +- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Control/Abstract/Value.hs b/src/Control/Abstract/Value.hs index aceb41ee0..ec967796e 100644 --- a/src/Control/Abstract/Value.hs +++ b/src/Control/Abstract/Value.hs @@ -253,8 +253,6 @@ runString = raiseHandler $ runStringC . interpret class Show value => AbstractIntro value where -- | Construct a self-evaluating symbol value. -- TODO: Should these be interned in some table to provide stronger uniqueness guarantees? - symbol :: Text -> value - -- | Construct an abstract regex value. regex :: Text -> value diff --git a/src/Data/Abstract/Value/Abstract.hs b/src/Data/Abstract/Value/Abstract.hs index 3ae9ec482..8b7640f4b 100644 --- a/src/Data/Abstract/Value/Abstract.hs +++ b/src/Data/Abstract/Value/Abstract.hs @@ -100,7 +100,6 @@ instance AbstractHole Abstract where instance AbstractIntro Abstract where integer _ = Abstract float _ = Abstract - symbol _ = Abstract regex _ = Abstract rational _ = Abstract hash _ = Abstract diff --git a/src/Data/Abstract/Value/Concrete.hs b/src/Data/Abstract/Value/Concrete.hs index 542fef645..750eaf1f9 100644 --- a/src/Data/Abstract/Value/Concrete.hs +++ b/src/Data/Abstract/Value/Concrete.hs @@ -183,7 +183,6 @@ instance AbstractHole (Value term address) where instance (Show address, Show term) => AbstractIntro (Value term address) where integer = Integer . Number.Integer float = Float . Number.Decimal - symbol = Symbol rational = Rational . Number.Ratio regex = Regex diff --git a/src/Data/Abstract/Value/Type.hs b/src/Data/Abstract/Value/Type.hs index 017101457..0f7e044c3 100644 --- a/src/Data/Abstract/Value/Type.hs +++ b/src/Data/Abstract/Value/Type.hs @@ -346,7 +346,6 @@ instance AbstractHole Type where instance AbstractIntro Type where integer _ = Int float _ = Float - symbol _ = Symbol regex _ = Regex rational _ = Rational hash = Hash diff --git a/src/Data/Syntax/Literal.hs b/src/Data/Syntax/Literal.hs index 5d24f6ddc..73991a932 100644 --- a/src/Data/Syntax/Literal.hs +++ b/src/Data/Syntax/Literal.hs @@ -215,7 +215,7 @@ instance Ord1 SymbolElement where liftCompare = genericLiftCompare instance Show1 SymbolElement where liftShowsPrec = genericLiftShowsPrec instance Evaluatable SymbolElement where - eval _ _ (SymbolElement s) = pure (symbol s) + eval _ _ (SymbolElement s) = string s instance Tokenize SymbolElement where tokenize = yield . Run . symbolContent