🔥 the Semigroup instance for Core.

Author: robrix

semantic-core/src/Analysis/Eval.hs

@@ -97,11 +97,12 @@ prog3 = fromBody $ lams' [foo, bar, quux]
   where (foo, bar, quux) = ("foo", "bar", "quux")
 
 prog4 :: File (Core User)
-prog4 = fromBody
-  $  let' foo .= Core.bool True
-  <> Core.if' (pure foo)
+prog4 = fromBody $ block
+  [ let' foo .= Core.bool True
+  , Core.if' (pure foo)
     (Core.bool True)
     (Core.bool False)
+  ]
   where foo = "foo"
 
 prog5 :: File (Core User)

semantic-core/src/Data/Core.hs

@@ -57,9 +57,6 @@ data Core a
   | Core (CoreF Core a)
   deriving (Eq, Foldable, Functor, Ord, Show, Traversable)
 
-instance Semigroup (Core a) where
-  a <> b = Core (a :>> b)
-
 instance Applicative Core where
   pure = Var
   (<*>) = ap

semantic-core/src/Data/Core/Parser.hs

@@ -13,7 +13,6 @@ import qualified Data.Char as Char
 import           Data.Core (Core, Edge(..))
 import qualified Data.Core as Core
 import           Data.Name
-import           Data.Semigroup
 import           Data.String
 import qualified Text.Parser.Token as Token
 import qualified Text.Parser.Token.Highlight as Highlight
@@ -65,7 +64,7 @@ atom = choice
   ]
 
 comp :: (TokenParsing m, Monad m) => m (Core User)
-comp = braces (sconcat <$> sepEndByNonEmpty expr semi) <?> "compound statement"
+comp = braces (Core.block <$> sepEndByNonEmpty expr semi) <?> "compound statement"
 
 ifthenelse :: (TokenParsing m, Monad m) => m (Core User)
 ifthenelse = Core.if'