WAT output: fix import/export name quoting

Author: vouillon

compiler/lib-wasm/wat_output.ml

@@ -147,6 +147,16 @@ let rec format_sexp f s =
       Format.pp_print_string f ";;";
       Format.pp_print_string f s
 
+let escape_string s =
+  let b = Buffer.create (String.length s + 2) in
+  for i = 0 to String.length s - 1 do
+    let c = s.[i] in
+    if Char.(c >= ' ' && c <= '~' && c <> '"' && c <> '\\')
+    then Buffer.add_char b c
+    else Printf.bprintf b "\\%02x" (Char.code c)
+  done;
+  Buffer.contents b
+
 let index tbl x = Atom ("$" ^ Code.Var.Hashtbl.find tbl x)
 
 let heap_type st (ty : heap_type) =
@@ -215,7 +225,7 @@ let str_type st typ =
 
 let block_type = func_type
 
-let quoted_name name = Atom ("\"" ^ name ^ "\"")
+let quoted_name name = Atom ("\"" ^ escape_string name ^ "\"")
 
 let export name =
   match name with
@@ -613,16 +623,6 @@ let import st f =
           ]
       ]
 
-let escape_string s =
-  let b = Buffer.create (String.length s + 2) in
-  for i = 0 to String.length s - 1 do
-    let c = s.[i] in
-    if Char.(c >= ' ' && c <= '~' && c <> '"' && c <> '\\')
-    then Buffer.add_char b c
-    else Printf.bprintf b "\\%02x" (Char.code c)
-  done;
-  Buffer.contents b
-
 let type_field st { name; typ; supertype; final } =
   if final && Option.is_none supertype
   then List [ Atom "type"; index st.type_names name; str_type st typ ]