InternalBytes: Rename fields for uniformity

Author: ttuegel

kore/src/Kore/Builtin/InternalBytes.hs

@@ -149,12 +149,12 @@ patternVerifierHook =
     patternVerifierWorker external =
         case externalChild of
             StringLiteral_ literal -> do
-                bytesValue <- Builtin.parseString Encoding.parse8Bit literal
+                internalBytesValue <- Builtin.parseString Encoding.parse8Bit literal
                 (return . InternalBytesF . Const)
-                    InternalBytes { bytesSort, bytesValue }
+                    InternalBytes { internalBytesSort, internalBytesValue }
             _ -> Kore.Error.koreFail "Expected literal string"
       where
-        DomainValue { domainValueSort = bytesSort } = external
+        DomainValue { domainValueSort = internalBytesSort } = external
         DomainValue { domainValueChild = externalChild } = external
 
 dotBytes :: IsString str => str
@@ -168,11 +168,11 @@ dotBytesVerifier =
     worker application = do
         unless (null arguments) (Kore.Error.koreFail "expected zero arguments")
         (return . InternalBytesF . Const)
-            InternalBytes { bytesSort, bytesValue = Encoding.encode8Bit "" }
+            InternalBytes { internalBytesSort, internalBytesValue = Encoding.encode8Bit "" }
       where
         arguments = applicationChildren application
         symbol = applicationSymbolOrAlias application
-        bytesSort = applicationSortsResult . symbolSorts $ symbol
+        internalBytesSort = applicationSortsResult . symbolSorts $ symbol
 
 matchBuiltinBytes :: Monad m => TermLike variable -> MaybeT m ByteString
 matchBuiltinBytes (InternalBytes_ _ byteString) = return byteString

kore/src/Kore/Builtin/InternalBytes/InternalBytes.hs

@@ -93,10 +93,10 @@ asTermLike
     :: InternalVariable variable
     => InternalBytes  -- ^ builtin value to render
     -> TermLike variable
-asTermLike InternalBytes { bytesSort, bytesValue }  =
+asTermLike InternalBytes { internalBytesSort, internalBytesValue }  =
     mkDomainValue DomainValue
-        { domainValueSort = bytesSort
-        , domainValueChild = mkStringLiteral $ Encoding.decode8Bit bytesValue
+        { domainValueSort = internalBytesSort
+        , domainValueChild = mkStringLiteral $ Encoding.decode8Bit internalBytesValue
         }
 
 internalize

kore/src/Kore/Internal/InternalBytes.hs

@@ -27,8 +27,8 @@ import Kore.Unparser
 
 data InternalBytes =
     InternalBytes
-        { bytesSort          :: !Sort
-        , bytesValue         :: !ByteString
+        { internalBytesSort          :: !Sort
+        , internalBytesValue         :: !ByteString
         }
     deriving (Eq, Ord, Show)
     deriving (GHC.Generic)
@@ -39,20 +39,20 @@ data InternalBytes =
 instance Unparse InternalBytes where
     unparse internalBytes@(InternalBytes _ _) =
         "\\dv"
-        <> parameters [bytesSort]
-        <> arguments [StringLiteral (Encoding.toBase16 bytesValue)]
+        <> parameters [internalBytesSort]
+        <> arguments [StringLiteral (Encoding.toBase16 internalBytesValue)]
       where
-        InternalBytes { bytesSort, bytesValue } = internalBytes
+        InternalBytes { internalBytesSort, internalBytesValue } = internalBytes
 
     unparse2 internalBytes@(InternalBytes _ _) =
         "\\dv2"
-        <> parameters2 [bytesSort]
-        <> arguments2 [StringLiteral (Encoding.toBase16 bytesValue)]
+        <> parameters2 [internalBytesSort]
+        <> arguments2 [StringLiteral (Encoding.toBase16 internalBytesValue)]
       where
-        InternalBytes { bytesSort, bytesValue } = internalBytes
+        InternalBytes { internalBytesSort, internalBytesValue } = internalBytes
 
 instance Synthetic Sort (Const InternalBytes) where
-    synthetic = bytesSort . getConst
+    synthetic = internalBytesSort . getConst
     {-# INLINE synthetic #-}
 
 instance Synthetic (FreeVariables variable) (Const InternalBytes) where

kore/src/Kore/Internal/TermLike.hs

@@ -1462,8 +1462,8 @@ mkInternalBytes
 mkInternalBytes sort value =
     updateCallStack . synthesize . InternalBytesF . Const
         $ InternalBytes
-            { bytesSort = sort
-            , bytesValue = value
+            { internalBytesSort = sort
+            , internalBytesValue = value
             }
 
 mkInternalBytes'
@@ -1900,9 +1900,9 @@ pattern Bottom_ bottomSort <-
     (Recursive.project -> _ :< BottomF Bottom { bottomSort })
 
 pattern InternalBytes_ :: Sort -> ByteString -> TermLike variable
-pattern InternalBytes_ bytesSort bytesValue <-
+pattern InternalBytes_ internalBytesSort internalBytesValue <-
     (Recursive.project -> _ :< InternalBytesF (Const InternalBytes
-        { bytesSort, bytesValue }
+        { internalBytesSort, internalBytesValue }
     ))
 
 pattern Ceil_ ceilOperandSort ceilResultSort ceilChild <-

kore/src/Kore/Internal/TermLike/TermLike.hs

@@ -793,8 +793,8 @@ instance
             EndiannessF (Const endianness) -> locationFromAst endianness
             InternalBoolF (Const InternalBool { internalBoolSort }) ->
                 locationFromAst internalBoolSort
-            InternalBytesF (Const InternalBytes { bytesSort }) ->
-                locationFromAst bytesSort
+            InternalBytesF (Const InternalBytes { internalBytesSort }) ->
+                locationFromAst internalBytesSort
             InternalIntF (Const InternalInt { internalIntSort }) ->
                 locationFromAst internalIntSort
             InternalStringF (Const InternalString { internalStringSort }) ->

kore/test/Test/Kore/Builtin/InternalBytes.hs

@@ -42,9 +42,7 @@ import qualified Data.Text as T
 import qualified Kore.Builtin.Encoding as E
 import qualified Kore.Builtin.InternalBytes as InternalBytes
 import Kore.Internal.Pattern
-import Kore.Internal.TermLike hiding
-    ( bytesSort
-    )
+import Kore.Internal.TermLike
 import qualified Pretty
 
 import Test.Kore.Builtin.Builtin