Fix catch parsing (#2428)

- When a catch body is a block, call its `finalize` function with the
  correct type
- Don't create a block when there's one instruction in a catch body
- Remove `makeCatch` from gen-s-parser.py; it's not necessary
- Fix a test case that has a `catch` without `try`

1 files changed, 21 insertions, 1 deletions

diff --git a/test/exception-handling.wast.fromBinary.noDebugInfo b/test/exception-handling.wast.fromBinary.noDebugInfo
index 3ef95033c..fca25f7d5 100644
--- a/test/exception-handling.wast.fromBinary.noDebugInfo
+++ b/test/exception-handling.wast.fromBinary.noDebugInfo
@@ -44,7 +44,27 @@
     )
    )
   )
-  (unreachable)
+  (try
+   (nop)
+   (catch
+    (drop
+     (exnref.pop)
+    )
+   )
+  )
+  (try
+   (block
+    (call $1)
+    (call $2)
+   )
+   (catch
+    (drop
+     (exnref.pop)
+    )
+    (call $1)
+    (call $2)
+   )
+  )
  )
 )