From 96bad3dfa19a1e714bc1d94cb2ce8f31e12832fa Mon Sep 17 00:00:00 2001
From: pjuftring <uftring@hotmail.de>
Date: Sat, 19 Mar 2016 18:37:10 +0100
Subject: [PATCH 1/2] Add br_if and br_table to left-to-right.wast

This tests if br_if and br_table arguments are evaluated left-to-right.
Until #227 is solved, a small hack circumvents an "arity mismatch" error
messages.
---
 ml-proto/TestingTodo.md          |  4 ++--
 ml-proto/test/left-to-right.wast | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ml-proto/TestingTodo.md b/ml-proto/TestingTodo.md
index c0756cbed9..5e6ecbd678 100644
--- a/ml-proto/TestingTodo.md
+++ b/ml-proto/TestingTodo.md
@@ -25,8 +25,8 @@ Operator semantics:
  - ~~test that call and store operands are evaluated left-to-right too~~
  - ~~test that call and argument operands of call_indirect are evaluated left-to-right, too~~
  - ~~test that select arguments are evaluated left-to-right, too~~
- - test that br_if arguments are evaluated left-to-right, too
- - test that tableswitch arguments are evaluated left-to-right, too
+ - ~~test that br_if arguments are evaluated left-to-right, too~~
+ - ~~test that br_table arguments are evaluated left-to-right, too~~
  - ~~test that add/sub/mul/wrap/wrapping-store silently wrap on overflow~~
  - ~~test that sdiv/udiv/srem/urem trap on divide-by-zero~~
  - ~~test that sdiv traps on overflow~~
diff --git a/ml-proto/test/left-to-right.wast b/ml-proto/test/left-to-right.wast
index 030f832d0d..2e1dfdbe04 100644
--- a/ml-proto/test/left-to-right.wast
+++ b/ml-proto/test/left-to-right.wast
@@ -156,6 +156,24 @@
   (func $f64_call_indirect (result i32) (call $reset) (call_indirect $f64_T (call $f64_callee) (call $f64_right) (call $f64_another)) (call $get))
   (func $f64_select (result i32) (call $reset) (select (call $f64_left) (call $f64_right) (call $f64_bool)) (call $get))
 
+  (func $br_if (result i32)
+    (block
+      (call $reset)
+      (br_if 0 (call $i32_left) (i32.and (call $i32_right) (i32.const 0)))
+      (call $get)
+    )
+  )
+  (func $br_table (result i32)
+    (block $a
+      (call $reset)
+      (i32.eqz  ;; Remove this hack, when #227 is solved
+        (block $b
+          (br_table $a $b (call $i32_left) (call $i32_right))
+        )
+      )
+      (call $get)
+    )
+  )
 
   (export "i32_add" $i32_add)                        (export "i64_add" $i64_add)
   (export "i32_sub" $i32_sub)                        (export "i64_sub" $i64_sub)
@@ -205,6 +223,9 @@
   (export "f32_call" $f32_call)                      (export "f64_call" $f64_call)
   (export "f32_call_indirect" $f32_call_indirect)    (export "f64_call_indirect" $f64_call_indirect)
   (export "f32_select" $f32_select)                  (export "f64_select" $f64_select)
+  
+  (export "br_if" $br_if)
+  (export "br_table" $br_table)
 )
 
 (assert_return (invoke "i32_add") (i32.const 0x0102))     (assert_return (invoke "i64_add") (i32.const 0x0102))
@@ -257,3 +278,6 @@
 (assert_return (invoke "f32_call_indirect") (i32.const 0x040203))
 (assert_return (invoke "f64_call_indirect") (i32.const 0x040203))
 (assert_return (invoke "f32_select") (i32.const 0x010205))  (assert_return (invoke "f64_select") (i32.const 0x010205))
+
+(assert_return (invoke "br_if") (i32.const 0x0102))
+(assert_return (invoke "br_table") (i32.const 0x0102))

From da6e0b0fa0d68eb41b22cbb0ff04bb44d8c3d9ab Mon Sep 17 00:00:00 2001
From: pjuftring <uftring@hotmail.de>
Date: Mon, 18 Apr 2016 17:15:38 +0200
Subject: [PATCH 2/2] Remove hack

---
 ml-proto/test/left-to-right.wast | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ml-proto/test/left-to-right.wast b/ml-proto/test/left-to-right.wast
index 2e1dfdbe04..95a8b333e4 100644
--- a/ml-proto/test/left-to-right.wast
+++ b/ml-proto/test/left-to-right.wast
@@ -166,10 +166,8 @@
   (func $br_table (result i32)
     (block $a
       (call $reset)
-      (i32.eqz  ;; Remove this hack, when #227 is solved
-        (block $b
-          (br_table $a $b (call $i32_left) (call $i32_right))
-        )
+      (block $b
+        (br_table $a $b (call $i32_left) (call $i32_right))
       )
       (call $get)
     )