[commit: ghc] wip/gadtpm: literals: more expressive term oracle (07ebe60)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/07ebe600304bd8817b644277ad4768ebee38e144/ghc

>---------------------------------------------------------------

commit 07ebe600304bd8817b644277ad4768ebee38e144
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Nov 29 00:27:42 2015 +0100

    literals: more expressive term oracle


>---------------------------------------------------------------

07ebe600304bd8817b644277ad4768ebee38e144
 compiler/deSugar/TmOracle.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index f218b36..75aa649 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -114,7 +114,7 @@ solveComplexEq solver_state@(standby, (unhandled, env)) eq@(e1, e2) = case eq of
 -- | Extend the substitution and solve the (possibly updated) constraints.
 extendSubstAndSolve :: Id -> PmExpr -> TmState -> Maybe TmState
 extendSubstAndSolve x e (standby, (unhandled, env))
-  = foldlM solveComplexEq new_incr_state changed
+  = foldlM solveComplexEq new_incr_state (map simplifyComplexEq changed)
   where
     -- Apply the substitution to the worklist and partition them to the ones
     -- that had some progress and the rest. Then, recurse over the ones that