LTS Haskell 18.18

.github/workflows/test.yml

@@ -130,7 +130,7 @@ jobs:
     name: 'Cabal'
     runs-on: ubuntu-latest
     env:
-      ghc_version: "8.10.4"
+      ghc_version: "8.10.7"
     steps:
       - name: Install prerequisites
         run: |

default.nix

@@ -95,8 +95,9 @@ let
       };
 
       # Change the compiler when updating our own resolver.
-      compiler-nix-name = "ghc8104";
-      index-state = "2021-02-09T00:00:00Z";
+      compiler-nix-name = "ghc8107";
+      ghcVersion = "8.10.7";
+      index-state = "2021-12-03T00:00:00Z";
     };
 
 in default

kore/kore.cabal

@@ -116,7 +116,7 @@ common library
   build-depends: aeson >=1.4
   build-depends: bytestring >=0.10
   build-depends: clock >=0.8
-  build-depends: co-log >=0.3
+  build-depends: co-log >=0.4
   build-depends: comonad >=5.0
   build-depends: containers >=0.5.8
   build-depends: cryptonite >=0.25

kore/src/Kore/Builtin/AssociativeCommutative.hs

@@ -1358,9 +1358,9 @@ unifyEqualsElementLists
             return (result, [])
       where
         unifyWithPermutations ::
-            -- | First structure elements
+            -- First structure elements
             [ConcreteOrWithVariable normalized variable] ->
-            -- | Second structure elements
+            -- Second structure elements
             [ConcreteOrWithVariable normalized variable] ->
             unifier
                 ( Conditional

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

@@ -847,11 +847,11 @@ instance InternalVariable variable => Substitute (TermLike variable) where
             either extractFreeVariables (Set.singleton . variableName)
 
         renaming ::
-            -- | Original variable
+            -- Original variable
             SomeVariable variable ->
-            -- | Renamed variable
+            -- Renamed variable
             Maybe (SomeVariable variable) ->
-            -- | Substitution
+            -- Substitution
             Map
                 (SomeVariableName variable)
                 (Either (TermLike variable) (SomeVariable variable)) ->

kore/src/Kore/Repl/Interpreter.hs

@@ -1346,7 +1346,7 @@ performStepNoBranching =
         -- Loop branch
         (n, SingleResult _) -> do
             res <- runStepper
-            pure $ Left (n -1, res)
+            pure $ Left (n - 1, res)
         -- Early exit when there is a branch or there is no next.
         (n, res) -> pure $ Right (n, res)
 
@@ -1366,8 +1366,8 @@ recursiveForcedStep n node
         updateExecutionGraph graph
         case result of
             NoResult -> pure ()
-            SingleResult sr -> (recursiveForcedStep $ n -1) sr
-            BranchResult xs -> traverse_ (recursiveForcedStep (n -1)) xs
+            SingleResult sr -> (recursiveForcedStep $ n - 1) sr
+            BranchResult xs -> traverse_ (recursiveForcedStep (n - 1)) xs
 
 -- | Display a rule as a String.
 showRewriteRule ::

kore/src/Kore/Rewrite/Strategy.hs

@@ -339,7 +339,7 @@ executionHistoryStep transit prim exe@ExecutionGraph{graph} node
     nodeIsNotLeaf = Graph.outdeg graph node > 0
 
     mkChildNode ::
-        -- | Child node identifier and configuration
+        -- Child node identifier and configuration
         (config, Seq rule) ->
         ChildNode config rule
     mkChildNode (config, rules) =

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

@@ -265,9 +265,9 @@ test_substr =
     testSubstrBytes ::
         HasCallStack =>
         TestName ->
-        -- | arguments of @substrBytes@ symbol
+        -- arguments of @substrBytes@ symbol
         [TermLike RewritingVariableName] ->
-        -- | expected result
+        -- expected result
         OrPattern RewritingVariableName ->
         TestTree
     testSubstrBytes testName = testBytes testName substrBytesSymbol
@@ -589,9 +589,9 @@ int2bytesData =
     , (128, True, "\x80")
     , (-128, True, "\x80")
     , (2, True, "\x02")
-    , (- 2, True, "\xfe")
+    , (-2, True, "\xfe")
     , (16, True, "\x10")
-    , (- 16, True, "\xf0")
+    , (-16, True, "\xf0")
     , (128, True, "\x00\x80")
     , (-128, True, "\xff\x80")
     , (128, False, "\x80\x00")

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

@@ -1309,9 +1309,9 @@ test_renormalize =
     becomes ::
         HasCallStack =>
         TestName ->
-        -- | original, (possibly) de-normalized map
+        -- original, (possibly) de-normalized map
         NormalizedMap Key (TermLike RewritingVariableName) ->
-        -- | expected normalized map
+        -- expected normalized map
         NormalizedMap Key (TermLike RewritingVariableName) ->
         TestTree
     becomes name origin expect =
@@ -1333,11 +1333,11 @@ test_renormalize =
         testCase name $ assertEqual "" Nothing (Ac.renormalize origin)
 
     mkMap' ::
-        -- | abstract elements
+        -- abstract elements
         [(TermLike RewritingVariableName, TermLike RewritingVariableName)] ->
-        -- | concrete elements
+        -- concrete elements
         [(Key, TermLike RewritingVariableName)] ->
-        -- | opaque terms
+        -- opaque terms
         [NormalizedMap Key (TermLike RewritingVariableName)] ->
         NormalizedMap Key (TermLike RewritingVariableName)
     mkMap' abstract concrete opaque =

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

@@ -508,9 +508,9 @@ test_difference_symbolic =
 
     evalDifference ::
         HasCallStack =>
-        -- | expected result
+        -- expected result
         Maybe (Pattern RewritingVariableName) ->
-        -- | arguments of 'differenceSet'
+        -- arguments of 'differenceSet'
         [TermLike RewritingVariableName] ->
         Assertion
     evalDifference expect args = do

kore/test/Test/Kore/Reachability/MockAllPath.hs

@@ -170,9 +170,9 @@ test_transitionRule_ApplyClaims =
     unmodified state = run [Rule (A, B)] state `equals_` [(state, mempty)]
     derives ::
         HasCallStack =>
-        -- | rules to apply in parallel
+        -- rules to apply in parallel
         [MockRule] ->
-        -- | transitions
+        -- transitions
         [(MockClaimState, Seq MockAppliedRule)] ->
         TestTree
     derives rules = equals_ (run rules $ ClaimState.Claimed (MockClaim (A, C)))
@@ -201,9 +201,9 @@ test_transitionRule_ApplyAxioms =
     unmodified state = run [Rule (A, B)] state `equals_` [(state, mempty)]
     derives ::
         HasCallStack =>
-        -- | rules to apply in parallel
+        -- rules to apply in parallel
         [MockRule] ->
-        -- | transitions
+        -- transitions
         [(MockClaimState, Seq MockAppliedRule)] ->
         TestTree
     derives rules =
@@ -242,11 +242,11 @@ test_runStrategy =
                 (ClaimState.Claimed . MockClaim . unRule $ goal)
     disproves ::
         HasCallStack =>
-        -- | Axioms
+        -- Axioms
         [MockRule] ->
-        -- | Proof goal
+        -- Proof goal
         MockClaim ->
-        -- | Unproven goals
+        -- Unproven goals
         [MockClaim] ->
         TestTree
     disproves axioms (MockClaim goal) unproven =
@@ -256,9 +256,9 @@ test_runStrategy =
             (show axioms ++ " disproves " ++ show goal)
     proves ::
         HasCallStack =>
-        -- | Axioms
+        -- Axioms
         [MockRule] ->
-        -- | Proof goal
+        -- Proof goal
         MockClaim ->
         TestTree
     proves axioms (MockClaim goal) =

kore/test/Test/Kore/Rewrite/Rule/Simplify.hs

@@ -432,7 +432,7 @@ test_simplifyClaimRule =
     test ::
         HasCallStack =>
         TestName ->
-        -- | replacements
+        -- replacements
         [(TermLike RewritingVariableName, TermLike RewritingVariableName)] ->
         ClaimPattern ->
         [ClaimPattern] ->

kore/test/Test/Kore/Simplify/SubstitutionSimplifier.hs

@@ -218,12 +218,12 @@ test_SubstitutionSimplifier =
     test ::
         HasCallStack =>
         TestName ->
-        -- | Test input
+        -- Test input
         [ ( SomeVariable RewritingVariableName
           , TermLike RewritingVariableName
           )
         ] ->
-        -- | Expected normalized, denormalized outputs
+        -- Expected normalized, denormalized outputs
         [Normalization RewritingVariableName] ->
         TestTree
     test

kore/test/Test/Kore/Simplify/TermLike.hs

@@ -168,7 +168,7 @@ test_simplifyOnly =
         HasCallStack =>
         TestName ->
         TermLike RewritingVariableName ->
-        -- | Expected output, if simplified.
+        -- Expected output, if simplified.
         Maybe (OrPattern RewritingVariableName) ->
         TestTree
     test testName input maybeExpect =

kore/test/Test/Kore/Unification/SubstitutionNormalization.hs

@@ -338,9 +338,9 @@ test_normalize =
     test ::
         HasCallStack =>
         TestName ->
-        -- | Test input
+        -- Test input
         Map (SomeVariable VariableName) (TermLike VariableName) ->
-        -- | Expected output
+        -- Expected output
         Normalization VariableName ->
         TestTree
     test testName input normalization =
@@ -352,7 +352,7 @@ test_normalize =
     testBottom ::
         HasCallStack =>
         TestName ->
-        -- | Test input
+        -- Test input
         Map (SomeVariable VariableName) (TermLike VariableName) ->
         TestTree
     testBottom testName input =