Fix uninterpreted functions in keys of Maps and Sets (#2323)

* Prelude.Kore: Export NFData

* Kore.Step.Function.Memo: Rename Key to CacheKey

* From: Add into

* Add instance From [a] (Seq a)

* Add Kore.Internal.Key

* InternalBytes: Rename fields for uniformity

* test: make golden

Co-authored-by: ttuegel <ttuegel@users.noreply.github.com>
Co-authored-by: ana-pantilie <45069775+ana-pantilie@users.noreply.github.com>

Author: ttuegel

kore/kore.cabal

@@ -4,7 +4,7 @@ cabal-version: 2.2
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 3a3209955e7db4f112e2b2c2ab073b1d479448d68f21f84c4a14ce8f5f2293d9
+-- hash: 1eb807e1a58c0a657f51fd08934c8a7e171988a07bcd9e0e4c098055595b6ac4
 
 name:           kore
 version:        0.38.0.0
@@ -183,6 +183,7 @@ library
       Kore.Internal.InternalMap
       Kore.Internal.InternalSet
       Kore.Internal.InternalString
+      Kore.Internal.Key
       Kore.Internal.MultiAnd
       Kore.Internal.MultiOr
       Kore.Internal.NormalizedAc
@@ -962,6 +963,7 @@ test-suite kore-test
       Test.Kore.IndexedModule.SortGraph
       Test.Kore.Internal.ApplicationSorts
       Test.Kore.Internal.Condition
+      Test.Kore.Internal.Key
       Test.Kore.Internal.MultiAnd
       Test.Kore.Internal.OrCondition
       Test.Kore.Internal.OrPattern

kore/src/Data/Sup.hs

@@ -13,9 +13,6 @@ module Data.Sup
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import Data.Data
     ( Data
     )

kore/src/From.hs

@@ -6,8 +6,13 @@ License     : NCSA
 
 module From
     ( From (..)
+    , into
     ) where
 
+import Data.Sequence
+    ( Seq
+    )
+import qualified Data.Sequence as Seq
 import Data.Void
 
 {- | Convert type @from@ into @to@.
@@ -43,8 +48,17 @@ let b = let a :: A = _ in from @_ @B a
 class From from to where
     from :: from -> to
 
+{- | @into@ is 'from' with the type parameters in reverse order.
+ -}
+into :: forall to from. From from to => from -> to
+into = from @from @to
+
 {- | This instance implements the principle /ex falso quodlibet/.
  -}
 instance From Void any where
     from = absurd
     {-# INLINE from #-}
+
+instance From [a] (Seq a) where
+    from = Seq.fromList
+    {-# INLINE from #-}

kore/src/Kore/Attribute/Attributes.hs

@@ -17,9 +17,6 @@ module Kore.Attribute.Attributes
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import Data.Default
     ( Default (..)
     )

kore/src/Kore/Attribute/Axiom.hs

@@ -37,9 +37,6 @@ module Kore.Attribute.Axiom
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import qualified Control.Lens as Lens
 import qualified Control.Monad as Monad
 import Data.Default

kore/src/Kore/Attribute/Null.hs

@@ -21,9 +21,6 @@ module Kore.Attribute.Null
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import Data.Default
 import qualified Generics.SOP as SOP
 import qualified GHC.Generics as GHC

kore/src/Kore/Attribute/Parser.hs

@@ -68,9 +68,6 @@ module Kore.Attribute.Parser
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import Control.Lens
     ( Getter
     , Iso'

kore/src/Kore/Attribute/Pattern.hs

@@ -28,9 +28,6 @@ module Kore.Attribute.Pattern
 
 import Prelude.Kore
 
-import Control.DeepSeq
-    ( NFData
-    )
 import qualified Control.Lens as Lens
 import Data.Generics.Product
 import qualified Generics.SOP as SOP

kore/src/Kore/Attribute/Pattern/ConstructorLike.hs

@@ -15,7 +15,6 @@ module Kore.Attribute.Pattern.ConstructorLike
 
 import Prelude.Kore
 
-import Control.DeepSeq
 import qualified Generics.SOP as SOP
 import qualified GHC.Generics as GHC
 

kore/src/Kore/Attribute/Pattern/Created.hs

@@ -11,7 +11,6 @@ module Kore.Attribute.Pattern.Created
 
 import Prelude.Kore
 
-import Control.DeepSeq
 import qualified Generics.SOP as SOP
 import qualified GHC.Generics as GHC
 import GHC.Stack