GitHub/haskell-wasm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'fix' type of br_if and comment multiple table definitions in test module

Browse Source
This commit is contained in:
Ilya Rezvov
2018-04-08 20:06:25 -07:00
parent 8ef3eadc9a
commit 8cd33831a1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Language/Wasm/Validate.hs
+1 -1
View File
@@ -188,7 +188,7 @@ getInstrType (Br lbl) = do
return $ (Any : r) ==> Any return $ (Any : r) ==> Any
getInstrType (BrIf lbl) = do getInstrType (BrIf lbl) = do
r <- map Val . maybeToList <$> getLabel lbl r <- map Val . maybeToList <$> getLabel lbl
return $ (r ++ [Val I32]) ==> r return $ ([Val I32]) ==> empty
getInstrType (BrTable lbls lbl) = do getInstrType (BrTable lbls lbl) = do
r <- getLabel lbl r <- getLabel lbl
rs <- mapM getLabel lbls rs <- mapM getLabel lbls
tests/Test.hs
+1 -1
View File
@@ -34,7 +34,7 @@ compile file = do
main :: IO () main :: IO ()
main = do main = do
files <- Directory.listDirectory "tests/samples" files <- Directory.listDirectory "tests/samples"
-- let files = ["float_memory.wast"] -- let files = ["labels.wast"]
scriptTestCases <- (`mapM` files) $ \file -> do scriptTestCases <- (`mapM` files) $ \file -> do
content <- LBS.readFile $ "tests/samples/" ++ file content <- LBS.readFile $ "tests/samples/" ++ file
let Right script = Parser.parseScript <$> Lexer.scanner content let Right script = Parser.parseScript <$> Lexer.scanner content
tests/samples/import.wast
+5 -5
View File
@@ -29,11 +29,11 @@
(type $forward (func (param i32))) (type $forward (func (param i32)))
(table anyfunc (elem $print_i32 $print_f64)) (table anyfunc (elem $print_i32 $print_f64))
(table (export "my-table") anyfunc (elem $print_i32 $print_f64)) ;; (table (export "my-table") anyfunc (elem $print_i32 $print_f64))
(table (export "my-table") (export "my-table2") anyfunc (elem $print_i32 $print_f64)) ;; (table (export "my-table") (export "my-table2") anyfunc (elem $print_i32 $print_f64))
(table (import "external-mod" "external-table") 0 anyfunc) ;; (table (import "external-mod" "external-table") 0 anyfunc)
(table (export "my-table") (import "external-mod" "external-table") 0 anyfunc) ;; (table (export "my-table") (import "external-mod" "external-table") 0 anyfunc)
(table (export "my-table") (export "my-table2") (import "external-mod" "external-table") 0 anyfunc) ;; (table (export "my-table") (export "my-table2") (import "external-mod" "external-table") 0 anyfunc)
(func (export "print32") (param $i i32) (func (export "print32") (param $i i32)
(local $x f32) (local $x f32)