Get wasm2asm building again (#1107)

* Get wasm2asm building again

Updates CMakeLists.txt to have wasm2asm built by default, updates
wasm2asm.h to account for recent interface changes, and restores
JSPrinter functionality.

* Implement splice for array values

* Clean up wasm2asm testing

* Print semicolons after statements in blocks

* Cleanups and semicolons for condition arms

* Prettify semicolon emission

3 files changed, 57 insertions, 2 deletions

diff --git a/scripts/test/shared.py b/scripts/test/shared.py
index b71545965..f94f22fe8 100644
--- a/scripts/test/shared.py
+++ b/scripts/test/shared.py
@@ -155,6 +155,7 @@ WASM_OPT = [os.path.join(options.binaryen_bin, 'wasm-opt')]
 WASM_AS = [os.path.join(options.binaryen_bin, 'wasm-as')]
 WASM_DIS = [os.path.join(options.binaryen_bin, 'wasm-dis')]
 ASM2WASM = [os.path.join(options.binaryen_bin, 'asm2wasm')]
+WASM2ASM = [os.path.join(options.binaryen_bin, 'wasm2asm')]
 WASM_CTOR_EVAL = [os.path.join(options.binaryen_bin, 'wasm-ctor-eval')]
 WASM_SHELL = [os.path.join(options.binaryen_bin, 'wasm-shell')]
 WASM_MERGE = [os.path.join(options.binaryen_bin, 'wasm-merge')]
diff --git a/scripts/test/support.py b/scripts/test/support.py
index 5d791d155..97dd3d1c4 100755
--- a/scripts/test/support.py
+++ b/scripts/test/support.py
@@ -147,7 +147,8 @@ def split_wast(wast):
   return ret
 
 
-def run_command(cmd, expected_status=0, stderr=None, expected_err=None):
+def run_command(cmd, expected_status=0, stderr=None,
+                expected_err=None, err_contains=False):
   if expected_err is not None:
     assert stderr == subprocess.PIPE or stderr is None,\
         "Can't redirect stderr if using expected_err"
@@ -157,7 +158,9 @@ def run_command(cmd, expected_status=0, stderr=None, expected_err=None):
   out, err = proc.communicate()
   if proc.returncode != expected_status:
     raise Exception(('run_command failed', err))
-  if expected_err is not None and err != expected_err:
+  err_correct = expected_err is None or \
+      (expected_err in err if err_contains else expected_err == err)
+  if not err_correct:
     raise Exception(('run_command unexpected stderr',
                      "expected '%s', actual '%s'" % (expected_err, err)))
   return out
diff --git a/scripts/test/wasm2asm.py b/scripts/test/wasm2asm.py
new file mode 100755
index 000000000..4f9c2ab3a
--- /dev/null
+++ b/scripts/test/wasm2asm.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python2
+
+import os
+
+from support import run_command
+from shared import (WASM2ASM, MOZJS, NODEJS, fail_if_not_identical, tests)
+
+
+def test_wasm2asm():
+  print '\n[ checking wasm2asm testcases... ]\n'
+
+  # tests with i64s, invokes, etc.
+  blacklist = ['atomics.wast', 'address.wast']
+  spec_tests = [os.path.join('spec', t) for t in
+                sorted(os.listdir(os.path.join('test', 'spec')))]
+  for wasm in tests + spec_tests:
+    if not wasm.endswith('.wast') or os.path.basename(wasm) in blacklist:
+      continue
+
+    asm = os.path.basename(wasm).replace('.wast', '.2asm.js')
+    expected_file = os.path.join('test', asm)
+    if not os.path.exists(expected_file):
+      continue
+
+    print '..', wasm
+
+    cmd = WASM2ASM + [os.path.join('test', wasm)]
+    out = run_command(cmd)
+
+    # verify output
+    expected = open(expected_file).read()
+    fail_if_not_identical(out, expected)
+
+    open('a.2asm.js', 'w').write(out)
+
+    if NODEJS:
+      # verify asm.js is valid js
+      out = run_command([NODEJS, 'a.2asm.js'])
+      fail_if_not_identical(out, '')
+
+    if MOZJS:
+      # verify asm.js validates
+      # check only subset of err because mozjs emits timing info
+      out = run_command([MOZJS, '-w', 'a.2asm.js'],
+                        expected_err='Successfully compiled asm.js code',
+                        err_contains=True)
+      fail_if_not_identical(out, '')
+
+
+if __name__ == "__main__":
+  test_wasm2asm()