Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
45c38b97
Commit
45c38b97
authored
Jul 04, 2016
by
Andres Löh
Browse files
Cleaning up.
parent
7b217033
Changes
1
Show whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Solver/Modular/Explore.hs
View file @
45c38b97
...
@@ -94,11 +94,6 @@ exploreLog :: EnableBackjumping -> CountConflicts -> Tree QGoalReason
...
@@ -94,11 +94,6 @@ exploreLog :: EnableBackjumping -> CountConflicts -> Tree QGoalReason
->
(
Assignment
->
ConflictMap
->
ConflictSetLog
(
Assignment
,
RevDepMap
))
->
(
Assignment
->
ConflictMap
->
ConflictSetLog
(
Assignment
,
RevDepMap
))
exploreLog
enableBj
(
CountConflicts
countConflicts
)
=
cata
go
exploreLog
enableBj
(
CountConflicts
countConflicts
)
=
cata
go
where
where
updateCM'
::
ConflictSet
QPN
->
ConflictMap
->
ConflictMap
updateCM'
|
countConflicts
=
\
c
cm
->
updateCM
c
cm
|
otherwise
=
\
_
cm
->
cm
getBestGoal'
::
P
.
PSQ
(
Goal
QPN
)
a
->
ConflictMap
->
(
Goal
QPN
,
a
)
getBestGoal'
::
P
.
PSQ
(
Goal
QPN
)
a
->
ConflictMap
->
(
Goal
QPN
,
a
)
getBestGoal'
getBestGoal'
|
countConflicts
=
\
ts
cm
->
getBestGoal
cm
ts
|
countConflicts
=
\
ts
cm
->
getBestGoal
cm
ts
...
@@ -108,7 +103,7 @@ exploreLog enableBj (CountConflicts countConflicts) = cata go
...
@@ -108,7 +103,7 @@ exploreLog enableBj (CountConflicts countConflicts) = cata go
->
(
Assignment
->
ConflictMap
->
ConflictSetLog
(
Assignment
,
RevDepMap
))
->
(
Assignment
->
ConflictMap
->
ConflictSetLog
(
Assignment
,
RevDepMap
))
go
(
FailF
c
fr
)
_
=
\
cm
->
let
failure
=
failWith
(
Failure
c
fr
)
go
(
FailF
c
fr
)
_
=
\
cm
->
let
failure
=
failWith
(
Failure
c
fr
)
in
if
countConflicts
in
if
countConflicts
then
failure
(
c
,
updateCM
'
c
cm
)
then
failure
(
c
,
updateCM
c
cm
)
else
failure
(
c
,
cm
)
else
failure
(
c
,
cm
)
go
(
DoneF
rdm
)
a
=
\
_
->
succeedWith
Success
(
a
,
rdm
)
go
(
DoneF
rdm
)
a
=
\
_
->
succeedWith
Success
(
a
,
rdm
)
go
(
PChoiceF
qpn
gr
ts
)
(
A
pa
fa
sa
)
=
go
(
PChoiceF
qpn
gr
ts
)
(
A
pa
fa
sa
)
=
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment