Merge pull request Wasm-DSL#22 from dhil/wasmfx-fr-merge

Merge with WebAssembly/function-references

Author: dhil

Diff for: interpreter/dune-project

@@ -7,9 +7,7 @@
 (implicit_transitive_deps false)
 
 (license Apache-2.0)
-
-(source
-  (github WebAssembly/spec))
+(source (github WebAssembly/spec))
 
 (authors "Andreas Rossberg <[email protected]")
 (maintainers "Andreas Rossberg <[email protected]")
@@ -20,4 +18,6 @@
   (tags (wasm webassembly spec interpreter))
   (depends
     (ocaml (>= 4.12))
-    (menhir (>= 20220210))))
+    (menhir (>= 20220210))
+  )
+)

Diff for: interpreter/text/parser.mly

@@ -375,8 +375,8 @@ val_type :
   | ref_type { fun c -> RefT ($1 c) }
 
 val_type_list :
-  | /* empty */ { 0l, fun c -> [] }
-  | val_type val_type_list { I32.add (fst $2) 1l, fun c -> $1 c :: snd $2 c }
+  | list(val_type)
+    { Lib.List32.length $1, fun c -> List.map (fun f -> f c) $1 }
 
 global_type :
   | val_type { fun c -> GlobalT (Cons, $1 c) }