Revert "Replace ++ with Semigroup in Prelude"

paf31 · paf31 · commit f8da0b9a2642 · 2014-03-19T20:58:24.000-07:00
This reverts commit d9a1d43.
diff --git a/examples/passing/Operators.purs b/examples/passing/Operators.purs
@@ -4,7 +4,6 @@ module Main where
   import Control.Monad.Eff
   import Debug.Trace
 
-  bar :: String -> String -> String
   bar = \s1 s2 -> s1 ++ s2
 
   test1 :: forall n. (Num n) => n -> n -> (n -> n -> n) -> n
@@ -27,6 +26,8 @@ module Main where
 
   test6 = ((\x -> x) `k` 2) 3
 
+  (<>) = \s1 s2 -> s1 ++ s2
+
   test7 = "Hello" <> "World!"
 
   (@@) :: forall a b. (a -> b) -> a -> b
diff --git a/prelude/prelude.purs b/prelude/prelude.purs
@@ -325,25 +325,13 @@ module Prelude where
     (||) = boolOr
     not = boolNot
 
-  infixr 6 <>
-
-  class Semigroup s where
-    (<>) :: s -> s -> s
-
   infixr 5 ++
 
-  (++) :: forall s. (Semigroup s) => s -> s -> s
-  (++) = (<>)
-
-  foreign import concatString
-    "function concatString(s1) {\
-    \  return function(s2) {\
-    \    return s1 + s2;\
-    \  };\
-    \}" :: String -> String -> String
-
-  instance semigroupString :: Semigroup String where
-    (<>) = concatString 
+  foreign import (++) "function $plus$plus(s1) {\
+                      \  return function(s2) {\
+                      \    return s1 + s2;\
+                      \  };\
+                      \}" :: String -> String -> String
 
 module Data.Eq where
 
diff --git a/src/Language/PureScript/Constants.hs b/src/Language/PureScript/Constants.hs
@@ -29,9 +29,6 @@ module Language.PureScript.Constants where
 (++) :: String
 (++) = "++"
 
-(<>) :: String
-(<>) = "<>"
-
 (>>=) :: String
 (>>=) = ">>="
 
@@ -149,9 +146,6 @@ pokeSTArray = "pokeSTArray"
 monadEffDictionary :: String
 monadEffDictionary = "monadEff"
 
-semigroupString :: String
-semigroupString = "semigroupString"
-
 numNumber :: String
 numNumber = "numNumber"
 
diff --git a/src/Language/PureScript/Optimizer.hs b/src/Language/PureScript/Optimizer.hs
@@ -64,6 +64,7 @@ optimize opts | optionsNoOptimizations opts = id
   , inlineOperator (C.$) $ \f x -> JSApp f [x]
   , inlineOperator (C.#) $ \x f -> JSApp f [x]
   , inlineOperator (C.!!) $ flip JSIndexer
+  , inlineOperator (C.++) $ JSBinary Add
   , inlineCommonOperators ]
 
 untilFixedPoint :: (Eq a) => (a -> a) -> a -> a
diff --git a/src/Language/PureScript/Optimizer/Inliner.hs b/src/Language/PureScript/Optimizer/Inliner.hs
@@ -83,10 +83,7 @@ inlineOperator op f = everywhere (mkT convert)
 
 inlineCommonOperators :: JS -> JS
 inlineCommonOperators = applyAll
-  [ binary C.semigroupString (C.++) Add
-  , binary C.semigroupString (C.<>) Add
-
-  , binary C.numNumber (C.+) Add
+  [ binary C.numNumber (C.+) Add
   , binary C.numNumber (C.-) Subtract
   , binary C.numNumber (C.*) Multiply
   , binary C.numNumber (C./) Divide
