Cosmetic changes that needed by the idris-grin front end.

Author: andorp

grin/src/Grin/ExtendedSyntax/Syntax.hs

@@ -87,7 +87,6 @@ data CPat
 -- * Binding pattern
 data BPat
   = VarPat { _bPatVar :: Name }
-  -- TODO: swap the fields so that it is consistent with the concrete syntax
   | AsPat  { _bPatTag    :: Tag
            , _bPatFields :: [Name]
            , _bPatVar    :: Name

grin/src/Reducer/LLVM/PrimOps.hs

@@ -74,6 +74,7 @@ codeGenPrimOp name [opA, opB] = pure $ case name of
   "_prim_bool_ne"   -> I cgBool $ ICmp {iPredicate=I.NE,  operand0=opA, operand1=opB, metadata=[]}
 
   _ -> error $ "unknown primop: " ++ show name
+codeGenPrimOp name ops = error $ "Non supported primitive opts argument combination:" ++ show (name, ops)
 
 codeGenFFI :: Grin.External -> [Operand] -> CG Result
 codeGenFFI e ops = do

grin/src/Transformations/ExtendedSyntax/Names.hs

@@ -14,7 +14,7 @@ import qualified Data.Foldable
 import Text.Printf
 
 import Control.Monad
-import Control.Monad.State
+import Control.Monad.State.Strict
 
 import Grin.ExtendedSyntax.Grin
 import Transformations.ExtendedSyntax.Util
@@ -27,6 +27,12 @@ data NameEnv
   , nameSet   :: Set Name
   }
 
+instance Semigroup NameEnv where
+  (NameEnv np1 ns1) <> (NameEnv np2 ns2) = NameEnv (np1 <> np2) (ns1 <> ns2)
+
+instance Monoid NameEnv where
+  mempty = NameEnv mempty mempty
+
 type NameM = State NameEnv
 
 mkNameEnv :: Exp -> NameEnv
@@ -73,6 +79,9 @@ data ExpChanges
 evalNameM :: Exp -> NameM a -> (a, ExpChanges)
 evalNameM e m = second (boolTF NoChange NewNames . Map.null . namePool) $ runState m (mkNameEnv e)
 
+runEvalNameM :: NameM a -> a
+runEvalNameM m = evalState m mempty
+
 -- refresh names
 
 type FreshM = StateT (Map Name Name) NameM