update to latest binaryen

.depend

@@ -2342,7 +2342,7 @@ asmcomp/asmlink.cmo : \
     utils/misc.cmi \
     parsing/location.cmi \
     utils/load_path.cmi \
-    wasm/link_wast.cmi \
+    wasm/link_wat.cmi \
     asmcomp/emitaux.cmi \
     asmcomp/emit.cmi \
     utils/consistbl.cmi \
@@ -2361,7 +2361,7 @@ asmcomp/asmlink.cmx : \
     utils/misc.cmx \
     parsing/location.cmx \
     utils/load_path.cmx \
-    wasm/link_wast.cmx \
+    wasm/link_wat.cmx \
     asmcomp/emitaux.cmx \
     asmcomp/emit.cmx \
     utils/consistbl.cmx \
@@ -3874,12 +3874,12 @@ wasm/block_repr.cmx : \
     wasm/block_repr.cmi
 wasm/block_repr.cmi : \
     wasm/wmodule.cmo
-wasm/emit_wast.cmo : \
+wasm/emit_wat.cmo : \
     wasm/wtype.cmo \
     wasm/wstate.cmo \
     wasm/wmodule.cmo \
     wasm/wident.cmo \
-    wasm/wast.cmo \
+    wasm/wat.cmo \
     wasm/wasm_closure_offsets.cmi \
     middle_end/variable.cmi \
     middle_end/flambda/base_types/var_within_closure.cmi \
@@ -3905,13 +3905,13 @@ wasm/emit_wast.cmo : \
     middle_end/clambda_primitives.cmi \
     wasm/block_repr.cmi \
     middle_end/flambda/allocated_const.cmi \
-    wasm/emit_wast.cmi
-wasm/emit_wast.cmx : \
+    wasm/emit_wat.cmi
+wasm/emit_wat.cmx : \
     wasm/wtype.cmx \
     wasm/wstate.cmx \
     wasm/wmodule.cmx \
     wasm/wident.cmx \
-    wasm/wast.cmx \
+    wasm/wat.cmx \
     wasm/wasm_closure_offsets.cmx \
     middle_end/variable.cmx \
     middle_end/flambda/base_types/var_within_closure.cmx \
@@ -3937,26 +3937,26 @@ wasm/emit_wast.cmx : \
     middle_end/clambda_primitives.cmx \
     wasm/block_repr.cmx \
     middle_end/flambda/allocated_const.cmx \
-    wasm/emit_wast.cmi
-wasm/emit_wast.cmi : \
-    wasm/wast.cmo \
+    wasm/emit_wat.cmi
+wasm/emit_wat.cmi : \
+    wasm/wat.cmo \
     middle_end/flambda/flambda.cmi
-wasm/link_wast.cmo : \
+wasm/link_wat.cmo : \
     wasm/wstate.cmo \
-    wasm/wast.cmo \
+    wasm/wat.cmo \
     utils/misc.cmi \
-    wasm/emit_wast.cmi \
+    wasm/emit_wat.cmi \
     utils/config.cmi \
-    wasm/link_wast.cmi
-wasm/link_wast.cmx : \
+    wasm/link_wat.cmi
+wasm/link_wat.cmx : \
     wasm/wstate.cmx \
-    wasm/wast.cmx \
+    wasm/wat.cmx \
     utils/misc.cmx \
-    wasm/emit_wast.cmx \
+    wasm/emit_wat.cmx \
     utils/config.cmx \
-    wasm/link_wast.cmi
-wasm/link_wast.cmi : \
-    wasm/wast.cmo
+    wasm/link_wat.cmi
+wasm/link_wat.cmi : \
+    wasm/wat.cmo
 wasm/wasm_closure_offsets.cmo : \
     middle_end/variable.cmi \
     middle_end/flambda/base_types/var_within_closure.cmi \
@@ -3983,12 +3983,12 @@ wasm/wasm_closure_offsets.cmi : \
     middle_end/flambda/flambda.cmi \
     middle_end/compilation_unit.cmi \
     middle_end/flambda/base_types/closure_id.cmi
-wasm/wast.cmo : \
+wasm/wat.cmo : \
     wasm/wtype.cmo \
     wasm/wstate.cmo \
     wasm/wident.cmo \
     wasm/wexpr.cmo
-wasm/wast.cmx : \
+wasm/wat.cmx : \
     wasm/wtype.cmx \
     wasm/wstate.cmx \
     wasm/wident.cmx \
@@ -4455,7 +4455,7 @@ middle_end/flambda/effect_analysis.cmx : \
 middle_end/flambda/effect_analysis.cmi : \
     middle_end/flambda/flambda.cmi
 middle_end/flambda/export_info.cmo : \
-    wasm/wast.cmo \
+    wasm/wat.cmo \
     wasm/wasm_closure_offsets.cmi \
     middle_end/variable.cmi \
     middle_end/flambda/base_types/var_within_closure.cmi \
@@ -4469,7 +4469,7 @@ middle_end/flambda/export_info.cmo : \
     middle_end/flambda/base_types/closure_id.cmi \
     middle_end/flambda/export_info.cmi
 middle_end/flambda/export_info.cmx : \
-    wasm/wast.cmx \
+    wasm/wat.cmx \
     wasm/wasm_closure_offsets.cmx \
     middle_end/variable.cmx \
     middle_end/flambda/base_types/var_within_closure.cmx \
@@ -4483,7 +4483,7 @@ middle_end/flambda/export_info.cmx : \
     middle_end/flambda/base_types/closure_id.cmx \
     middle_end/flambda/export_info.cmi
 middle_end/flambda/export_info.cmi : \
-    wasm/wast.cmo \
+    wasm/wat.cmo \
     wasm/wasm_closure_offsets.cmi \
     middle_end/variable.cmi \
     middle_end/flambda/base_types/var_within_closure.cmi \
@@ -4738,7 +4738,7 @@ middle_end/flambda/flambda_middle_end.cmo : \
     middle_end/flambda/flambda_iterators.cmi \
     middle_end/flambda/flambda_invariants.cmi \
     middle_end/flambda/flambda.cmi \
-    wasm/emit_wast.cmi \
+    wasm/emit_wat.cmi \
     lambda/debuginfo.cmi \
     middle_end/compilenv.cmi \
     middle_end/flambda/base_types/closure_id.cmi \
@@ -4774,7 +4774,7 @@ middle_end/flambda/flambda_middle_end.cmx : \
     middle_end/flambda/flambda_iterators.cmx \
     middle_end/flambda/flambda_invariants.cmx \
     middle_end/flambda/flambda.cmx \
-    wasm/emit_wast.cmx \
+    wasm/emit_wat.cmx \
     lambda/debuginfo.cmx \
     middle_end/compilenv.cmx \
     middle_end/flambda/base_types/closure_id.cmx \
@@ -4851,7 +4851,7 @@ middle_end/flambda/flambda_to_clambda.cmx : \
     middle_end/flambda/allocated_const.cmx \
     middle_end/flambda/flambda_to_clambda.cmi
 middle_end/flambda/flambda_to_clambda.cmi : \
-    wasm/wast.cmo \
+    wasm/wat.cmo \
     middle_end/symbol.cmi \
     middle_end/flambda/flambda.cmi \
     middle_end/flambda/export_info.cmi \

.gitignore

@@ -57,7 +57,7 @@ _build
 /ocamlopt.opt
 /ocamlnat
 /_opam
-/o*.wast
+/o*.wat
 /o*.wasm
 
 # specific files and patterns in sub-directories

Makefile

@@ -422,7 +422,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
 	   "$(INSTALL_COMPLIBDIR)"
 endif
 	$(INSTALL_DATA) \
-           wasm/*.wast \
+           wasm/*.wat \
 	   "$(INSTALL_LIBDIR)"
 	$(INSTALL_DATA) \
 	  compilerlibs/*.cma \

README.md

@@ -42,12 +42,12 @@ $ opam switch create wasocaml --repos default,wasocaml=git+https://github.com/oc
 
 ### Usage
 
-Running the compiler will produce two files: `a.out.wasm` (the Wasm binary) and `a.out.wast` (the Wast text format).
+Running the compiler will produce two files: `a.out.wasm` (the Wasm binary) and `a.out.wat` (the Wast text format).
 
 ```shell-session
 $ /usr/local/bin/ocamlopt file.ml
 $ ls
-a.out a.out.wasm a.out.wast
+a.out a.out.wasm a.out.wat
 ```
 
 For a complete example using the compiler installed as an opam switch, see [wasocaml-demo].

asmcomp/asmlink.ml

@@ -365,7 +365,7 @@ let link ~ppf_dump objfiles output_name =
                 | Some w -> Some (ui.ui_name, w))
           units_tolink
       in
-      Link_wast.link fl_export ~output:output_name;
+      Link_wat.link fl_export ~output:output_name;
     in
     Clflags.ccobjs := !Clflags.ccobjs @ !lib_ccobjs;
     Clflags.all_ccopts := !lib_ccopts @ !Clflags.all_ccopts;

compilerlibs/Makefile.compilerlibs

@@ -146,10 +146,10 @@ WASM = \
   wasm/wident.cmo \
   wasm/wexpr.cmo \
   wasm/wmodule.cmo \
-  wasm/wast.cmo \
+  wasm/wat.cmo \
   wasm/block_repr.cmo \
-  wasm/emit_wast.cmo \
-  wasm/link_wast.cmo
+  wasm/emit_wat.cmo \
+  wasm/link_wat.cmo
 WASM_CMI =
 
 COMP = \

dune

@@ -146,10 +146,10 @@
    wident
    wexpr
    wmodule
-   wast
+   wat
    block_repr
-   emit_wast
-   link_wast
+   emit_wat
+   link_wat
  )
 )
 

middle_end/flambda/export_info.ml

@@ -147,7 +147,7 @@ type t = {
   invariant_params : Variable.Set.t Variable.Map.t Set_of_closures_id.Map.t;
   recursive : Variable.Set.t Set_of_closures_id.Map.t;
   wasm_offsets : Wasm_closure_offsets.t;
-  wasm_contents : Wast.t option;
+  wasm_contents : Wat.t option;
 }
 
 type transient = {

middle_end/flambda/export_info.mli

@@ -96,7 +96,7 @@ type t = private {
      indexed by set of closures ID. *)
   recursive : Variable.Set.t Set_of_closures_id.Map.t;
   wasm_offsets : Wasm_closure_offsets.t;
-  wasm_contents : Wast.t option;
+  wasm_contents : Wat.t option;
 }
 
 type transient = private {
@@ -114,7 +114,7 @@ type transient = private {
 (** Export information for a compilation unit that exports nothing. *)
 val empty : t
 
-val empty_with_wasm : Wast.t option -> t
+val empty_with_wasm : Wat.t option -> t
 
 val opaque_transient
   : compilation_unit:Compilation_unit.t
@@ -132,7 +132,7 @@ val create
   -> invariant_params:Variable.Set.t Variable.Map.t Set_of_closures_id.Map.t
   -> recursive:Variable.Set.t Set_of_closures_id.Map.t
   -> wasm_offsets:Wasm_closure_offsets.t
-  -> wasm_contents:Wast.t option
+  -> wasm_contents:Wat.t option
   -> t
 
 val create_transient
@@ -165,7 +165,7 @@ val t_of_transient
   -> imported_offset_fv:int Var_within_closure.Map.t
   -> constant_closures:Closure_id.Set.t
   -> wasm_offsets:Wasm_closure_offsets.t
-  -> wasm_contents:Wast.t option
+  -> wasm_contents:Wat.t option
   -> t
 
 (** Union of export information.  Verifies that there are no identifier

middle_end/flambda/flambda_middle_end.ml

@@ -230,8 +230,8 @@ let lambda_to_clambda ~backend ~prefixname ~ppf_dump
   let wasm_contents =
     try
       Some (
-        Profile.record_call "emit_wast" (fun () ->
-            Emit_wast.emit ~to_file:do_wasm ~output_prefix:prefixname program))
+        Profile.record_call "emit_wat" (fun () ->
+            Emit_wat.emit ~to_file:do_wasm ~output_prefix:prefixname program))
     with Failure s ->
       Format.eprintf "No wasm generated@.%s@." s;
       None

middle_end/flambda/flambda_to_clambda.mli

@@ -37,6 +37,6 @@ type result = {
 *)
 val convert
    : ppf_dump:Format.formatter
-  -> wasm_contents:Wast.t option
+  -> wasm_contents:Wat.t option
   -> Flambda.program * Export_info.transient
   -> result

stdlib/Makefile

@@ -232,7 +232,7 @@ stdlib__%.cmo:
 
 WASMOPT=~/test/wasm/binaryen/bin/wasm-opt
 
-%.wasm: %.wast
+%.wasm: %.wat
 	$(WASMOPT) \
 	  --enable-reference-types --enable-gc --enable-tail-call --enable-exception-handling \
 	  --enable-multivalue \

wasm/block_repr.ml

@@ -64,8 +64,8 @@ module Block_struct : Block = struct
       if size <= 1 then Gen_block else Block { size = size - 1 }
     in
     Struct { sub = Some sub; fields = (* Tag *)
-                                      I8 :: (* size *)
-                                            I16 :: fields }
+                               I8 :: (* size *)
+                                 I16 :: fields }
 
   let type_decl name size : Decl.t list = [ Decl.Type (name, type_descr size) ]
 end