Skip to content

Commit 86fb6c2

Browse files
committed
bump fourmolu and accept reformatting
1 parent 6e84f60 commit 86fb6c2

File tree

9 files changed

+19
-17
lines changed

9 files changed

+19
-17
lines changed

booster/library/Booster/Builtin/LIST.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ listGetHook [KList _ heads mbRest, intArg] =
4444
if i < headLen
4545
then pure $ Just $ heads !! i -- positive index in range
4646
else -- headLen <= i
47-
case mbRest of
48-
Nothing ->
49-
-- index too large
50-
pure Nothing -- actually #Bottom
51-
Just _ ->
52-
pure Nothing
47+
case mbRest of
48+
Nothing ->
49+
-- index too large
50+
pure Nothing -- actually #Bottom
51+
Just _ ->
52+
pure Nothing
5353
| otherwise -> -- i < 0, negative index, consider rest
5454
case mbRest of
5555
Nothing

booster/library/Booster/Pattern/Implies.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ runImplies def mLlvmLibrary mSMTOptions antecedent consequent =
130130
then -- we are being conservative here for now and returning an error.
131131
-- since we have already simplified the LHS, we may want to eventually return implise, but the condition
132132
-- will contain the remainder as an equality contraint, predicating the implication on that equality being true.
133-
134133
pure . Left . RpcError.backendError . RpcError.ImplicationCheckError . RpcError.ErrorOnly . pack $
135134
"match remainder: "
136135
<> renderDefault
@@ -155,7 +154,6 @@ runImplies def mLlvmLibrary mSMTOptions antecedent consequent =
155154
(externaliseExistTerm existsR patR.term)
156155
subst
157156
else -- FIXME This is incomplete because patL.constraints are not assumed in the check.
158-
159157
ApplyEquations.evaluateConstraints def mLlvmLibrary solver mempty filteredConsequentPreds >>= \case
160158
(Right newPreds, _) ->
161159
if all (== Predicate TrueBool) newPreds

booster/library/Booster/Pattern/Match.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ matchSymbolAplications
399399
then
400400
failWith
401401
(DifferentSymbols (SymbolApplication symbol1 sorts1 args1) (SymbolApplication symbol2 sorts2 args2))
402-
else addIndeterminate (SymbolApplication symbol1 sorts1 args1) (SymbolApplication symbol2 sorts2 args2)
402+
else
403+
addIndeterminate (SymbolApplication symbol1 sorts1 args1) (SymbolApplication symbol2 sorts2 args2)
403404
| length args1 /= length args2 =
404405
failWith $
405406
ArgLengthsDiffer (SymbolApplication symbol1 sorts1 args1) (SymbolApplication symbol2 sorts2 args2)

kore/src/Kore/JsonRpc.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@ respond reqId serverState moduleName runSMT =
541541
MVar.putMVar serverState $
542542
if nameAsId
543543
then -- the module already exists, but re-adding with name because name-as-id is true
544-
545544
ServerState
546545
{ serializedModules =
547546
Map.insert (coerce name) foundSerModule serializedModules

kore/src/Kore/Log/InfoJsonRpcProcessRequest.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import Pretty (
1919
)
2020
import Pretty qualified
2121

22-
data InfoJsonRpcProcessRequest = forall a.
22+
data InfoJsonRpcProcessRequest
23+
= forall a.
2324
(Show a, Pretty a, Typeable a) =>
2425
InfoJsonRpcProcessRequest
2526
{ requestId :: Id

kore/src/Kore/Simplify/Simplify.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ It returns the result of simplifying the pattern with builtins and
456456
axioms, together with a proof certifying that it was simplified correctly
457457
(which is only a placeholder right now).
458458
-}
459-
newtype BuiltinAndAxiomSimplifier =
460-
-- TODO (thomas.tuegel): Rename me!
459+
newtype BuiltinAndAxiomSimplifier
460+
= -- TODO (thomas.tuegel): Rename me!
461461
BuiltinAndAxiomSimplifier
462462
{ runBuiltinAndAxiomSimplifier ::
463463
TermLike RewritingVariableName ->

kore/src/Kore/Syntax/Pattern.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ annotations.
9696
newtype
9797
Pattern
9898
(variable :: Type)
99-
(annotation :: Type) = Pattern
99+
(annotation :: Type)
100+
= Pattern
100101
{getPattern :: Cofree (PatternF variable) annotation}
101102
deriving stock (Show)
102103
deriving stock (GHC.Generic)

kore/src/Kore/Unification/NewUnifier.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,8 +1186,10 @@ remakeMapTerms _ AcTerm{acElements = [var]} =
11861186
mkElemVar $ fromJust $ retract var
11871187
remakeMapTerms tools AcTerm{acElements, acSort} =
11881188
if fromJust $ isMapSort tools acSort
1189-
then Ac.asInternal tools acSort $ NormalizedMap{getNormalizedMap = normalizedAc $ map mkVar acElements}
1190-
else Ac.asInternal tools acSort $ NormalizedSet{getNormalizedSet = normalizedAc $ map mkVar acElements}
1189+
then
1190+
Ac.asInternal tools acSort $ NormalizedMap{getNormalizedMap = normalizedAc $ map mkVar acElements}
1191+
else
1192+
Ac.asInternal tools acSort $ NormalizedSet{getNormalizedSet = normalizedAc $ map mkVar acElements}
11911193
where
11921194
normalizedAc opaque = NormalizedAc{elementsWithVariables = [], concreteElements = HashMap.empty, opaque}
11931195

scripts/fourmolu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -euxo pipefail
3-
expected_fourmolu_version="0.14.0.0"
3+
expected_fourmolu_version="0.15.0.0"
44
fourmolu=${FOURMOLU:-$(which fourmolu)} || { echo 'No fourmolu!' ; exit 1 ; }
55
fourmolu_version=$(${fourmolu} --version | head -n1)
66
# drop the prefix 'fourmolu ' which is 9 letters long

0 commit comments

Comments
 (0)