Skip to content

Commit

Permalink
not tailrec
Browse files Browse the repository at this point in the history
  • Loading branch information
0x53A committed Apr 28, 2017
1 parent 4bab73c commit 2fa007c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Paket.Core/PackageResolver.fs
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate

//printfn "--step-- %A-%A-%A-%A" stage stackpack compatibleVersions flags

let inline fuseConflicts currentConflict priorConflictSteps =
let fuseConflicts currentConflict priorConflictSteps =
match currentConflict, priorConflictSteps with
| currentConflict, (lastConflict,lastStep,lastRequirement,lastCompatibleVersions,lastFlags)::priorConflictSteps ->
let continueConflict =
Expand All @@ -679,7 +679,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
// { currentConflict with VersionsToExplore = lastConflict.VersionsToExplore }
// step (Inner((continueConflict,lastStep,lastRequirement),priorConflictSteps)) stackpack lastCompatibleVersions lastFlags

//let x =
let x =
match stage with
| Step((currentConflict,currentStep,_currentRequirement), priorConflictSteps) ->
if Set.isEmpty currentStep.OpenRequirements then
Expand Down Expand Up @@ -831,7 +831,7 @@ let Resolve (getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrate
Environment.NewLine currentRequirement Environment.NewLine nextStep.OpenRequirements
step (Step((currentConflict,nextStep,currentRequirement), (currentConflict,currentStep,currentRequirement,compatibleVersions,flags)::priorConflictSteps)) stackpack currentConflict.VersionsToExplore flags

//x
x


let startingStep = {
Expand Down

0 comments on commit 2fa007c

Please sign in to comment.