From ea7769aa9f7875e6b78ae6c673fc2ebddf996680 Mon Sep 17 00:00:00 2001
From: Ilya Rezvov <ilya.rezvov@revjet.com>
Date: Thu, 4 Mar 2021 22:04:56 -0800
Subject: [PATCH] more grammar fixes

---
 src/Language/Wasm/Validate.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Language/Wasm/Validate.hs b/src/Language/Wasm/Validate.hs
index 01e43f4..1279fc6 100644
--- a/src/Language/Wasm/Validate.hs
+++ b/src/Language/Wasm/Validate.hs
@@ -182,6 +182,7 @@ checkMemoryInstr size memarg = do
     isMemArgValid size memarg
     Ctx { mems } <- ask 
     if length mems < 1 then throwError (MemoryIndexOutOfRange 0) else return ()
+<<<<<<< HEAD
 
 getBlockType :: BlockType -> Checker Arrow
 getBlockType (Inline Nothing) = return $ empty ==> empty
@@ -196,6 +197,8 @@ getResultType (Inline (Just valType)) = return [valType]
 getResultType (TypeIndex typeIdx) = do
     Ctx { types } <- ask
     maybeToEither TypeIndexOutOfRange $ results <$> types !? typeIdx
+=======
+>>>>>>> 40291c3 (more grammar fixes)
 
 getInstrType :: Instruction Natural -> Checker Arrow
 getInstrType Unreachable = return $ Any ==> Any