From 55215f56de93ac232db8d648df1b73b374351aa7 Mon Sep 17 00:00:00 2001
From: Ilya Rezvov <ilya.rezvov@revjet.com>
Date: Sat, 24 Feb 2018 21:08:18 -0800
Subject: [PATCH] pass more tests

---
 src/Language/Wasm/Parser.y    | 13 ++++++++++---
 src/Language/Wasm/Validate.hs | 15 +++++++++------
 tests/Test.hs                 |  3 ++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Language/Wasm/Parser.y b/src/Language/Wasm/Parser.y
index 396b7a4..4270abe 100644
--- a/src/Language/Wasm/Parser.y
+++ b/src/Language/Wasm/Parser.y
@@ -790,12 +790,19 @@ signature_locals_body1 :: { Function }
     | 'param' ident valtype ')' signature_locals_body {
         prependFuncParams [ParamType (Just $2) $3] $5
     }
-    | 'result' list(valtype) ')' locals_body {
-        prependFuncResults $2 $ emptyFunction { locals = fst $4, body = snd $4 }
+    | result_locals_body1 { $1 }
+
+result_locals_body :: { Function }
+    : ')' { emptyFunction }
+    | '(' result_locals_body1 { $2 }
+
+result_locals_body1 :: { Function }
+    : 'result' list(valtype) ')' result_locals_body {
+        prependFuncResults $2 $4
     }
     | locals_body1 {
         emptyFunction { locals = fst $1, body = snd $1 }
-    } 
+    }
 
 locals_body :: { ([LocalType], [Instruction]) }
     : ')' { ([], []) }
diff --git a/src/Language/Wasm/Validate.hs b/src/Language/Wasm/Validate.hs
index efaa2fd..a783542 100644
--- a/src/Language/Wasm/Validate.hs
+++ b/src/Language/Wasm/Validate.hs
@@ -20,6 +20,8 @@ import Control.Monad.State.Lazy (StateT, evalStateT, get, put)
 import Control.Monad.Reader (ReaderT, runReaderT, withReaderT, ask)
 import Control.Monad.Except (Except, runExcept, throwError)
 
+import Debug.Trace as Debug
+
 data ValidationResult =
     DuplicatedExportNames [String]
     | InvalidTableType
@@ -328,13 +330,13 @@ replace x y (v:r) = (if x == v then y else v) : replace x y r
 
 unify :: Arrow -> Arrow -> Checker Arrow
 unify (f `Arrow` []) (f' `Arrow` t') =
-    return $ (f ++ f') `Arrow` t'
+    return $ (reverse f' ++ f) `Arrow` t'
 unify (f `Arrow` t) ([] `Arrow` t') =
     return $ f `Arrow` (t' ++ t)
 unify (f `Arrow` (Val v':t)) ((Val v:f') `Arrow` t') =
     if v == v'
     then unify (f `Arrow` t) (f' `Arrow` t')
-    else throwError TypeMismatch
+    else Debug.trace ("type err " ++ show  v' ++ " - " ++ show v) $ throwError TypeMismatch
 unify (f `Arrow` (Var r:t)) ((Val v:f') `Arrow` t') =
     let subst = replace (Var r) (Val v) in
     unify (subst f `Arrow` subst t) (f' `Arrow` t')
@@ -344,11 +346,12 @@ unify (f `Arrow` (Val v:t)) ((Var r:f') `Arrow` t') =
 unify (f `Arrow` (Var r:t)) ((Var r':f') `Arrow` t') =
     let subst = replace (Var r') (Var r) in
     unify (f `Arrow` t) (subst f' `Arrow` subst t')
-unify (f `Arrow` (Any:t)) (f' `Arrow` t') =
+unify (f `Arrow` (Any:_)) (_ `Arrow` t') =
     return $ f `Arrow` t'
-unify (f `Arrow` t) ((Any:f') `Arrow` t') =
+unify (f `Arrow` _) ((Any:_) `Arrow` t') =
     return $ f `Arrow` t'
 
+unify' :: Arrow -> Arrow -> Checker Arrow
 unify' (f `Arrow` t) (f' `Arrow` t') = unify (reverse f `Arrow` reverse t) (reverse f' `Arrow` reverse t')
 
 getExpressionType :: [Instruction] -> Checker Arrow
@@ -381,12 +384,12 @@ ctxFromModule locals labels returns Module {types, functions, tables, mems, glob
 
 isFunctionValid :: Function -> Validator
 isFunctionValid Function {funcType, locals, body} mod@Module {types} =
-    let ft@(FuncType params results) = types !! fromIntegral funcType in
+    let FuncType params results = types !! fromIntegral funcType in
     let r = safeHead results in
     let ctx = ctxFromModule (params ++ locals) [r] r mod in
     case runChecker ctx $ getExpressionType body of
         Left err -> err
-        Right arr -> if arr == asArrow ft then Valid else TypeMismatch
+        Right arr -> if arr == (empty ==> results) then Valid else TypeMismatch
 
 functionsShouldBeValid :: Validator
 functionsShouldBeValid mod@Module {functions} =
diff --git a/tests/Test.hs b/tests/Test.hs
index 1644dfe..7356770 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -31,7 +31,8 @@ compile file = do
 main :: IO ()
 main = do
   files <- Directory.listDirectory "tests/samples"
-  compile "fact.wast"
+  -- let files = ["endianess.wast"]
+  -- compile "fact.wast"
   syntaxTestCases <- (`mapM` files) $ \file -> do
     content <- LBS.readFile $ "tests/samples/" ++ file
     let result = Parser.parseModule <$> Lexer.scanner content