Refactor printing code so that printing Expressions always works (#3450)

This avoids needing to add include wasm-printing if a file doesn't already have it.
To achieve that, add the std::ostream hooks in wasm.h, and also use them
when possible, removing the need for the special WasmPrinter object.

Also stop printing in "full" (print types on each line) in error messages by default. The
user can still get that, as always, using BINARYEN_PRINT_FULL=1 in the env.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
index b294c953c..f110faf56 100644
--- a/src/wasm/wasm-validator.cpp
+++ b/src/wasm/wasm-validator.cpp
@@ -25,7 +25,6 @@
 #include "ir/stack-utils.h"
 #include "ir/utils.h"
 #include "support/colors.h"
-#include "wasm-printing.h"
 #include "wasm-validator.h"
 #include "wasm.h"
 
@@ -41,10 +40,12 @@ inline std::ostream& printModuleComponent(T curr, std::ostream& stream) {
   return stream;
 }
 
-// Extra overload for Expressions, to print type info too
+// Extra overload for Expressions, to print their contents.
 inline std::ostream& printModuleComponent(Expression* curr,
                                           std::ostream& stream) {
-  WasmPrinter::printExpression(curr, stream, false, true) << std::endl;
+  if (curr) {
+    stream << *curr << '\n';
+  }
   return stream;
 }