Merge pull request purescript#2560 from purescript/phil/2136

paf31 · web-flow · commit f2656f600e9d · 2017-01-13T09:37:02.000-08:00
Fix inlining for negateInt
diff --git a/examples/passing/2136.purs b/examples/passing/2136.purs
@@ -0,0 +1,9 @@
+module Main where
+
+import Prelude
+import Control.Monad.Eff.Console (log)
+
+main = 
+  if (negate (bottom :: Int) > top)
+    then log "Fail"
+    else log "Done"
diff --git a/src/Language/PureScript/CodeGen/JS/Optimizer/Inliner.hs b/src/Language/PureScript/CodeGen/JS/Optimizer/Inliner.hs
@@ -86,6 +86,8 @@ inlineCommonValues = everywhereOnJS convert
     | isDict' [semiringNumber, semiringInt] dict && isFn fnOne fn = JSNumericLiteral ss (Left 1)
     | isDict boundedBoolean dict && isFn fnBottom fn = JSBooleanLiteral ss False
     | isDict boundedBoolean dict && isFn fnTop fn = JSBooleanLiteral ss True
+  convert (JSApp ss (JSApp _ fn [dict]) [x])
+    | isDict ringInt dict && isFn fnNegate fn = JSBinary ss BitwiseOr (JSUnary ss Negate x) (JSNumericLiteral ss (Left 0))
   convert (JSApp ss (JSApp _ (JSApp _ fn [dict]) [x]) [y])
     | isDict semiringInt dict && isFn fnAdd fn = intOp ss Add x y
     | isDict semiringInt dict && isFn fnMultiply fn = intOp ss Multiply x y
@@ -100,6 +102,7 @@ inlineCommonValues = everywhereOnJS convert
   fnDivide = (C.dataEuclideanRing, C.div)
   fnMultiply = (C.dataSemiring, C.mul)
   fnSubtract = (C.dataRing, C.sub)
+  fnNegate = (C.dataRing, C.negate)
   intOp ss op x y = JSBinary ss BitwiseOr (JSBinary ss op x y) (JSNumericLiteral ss (Left 0))
 
 inlineCommonOperators :: JS -> JS
@@ -109,8 +112,6 @@ inlineCommonOperators = applyAll $
 
   , binary ringNumber opSub Subtract
   , unary  ringNumber opNegate Negate
-  , binary ringInt opSub Subtract
-  , unary  ringInt opNegate Negate
 
   , binary euclideanRingNumber opDiv Divide
   , binary euclideanRingInt opMod Modulus
