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

Merge with WebAssembly/function-references
wasmfx · Jan 25, 2024 · 6c78ed3 · 6c78ed3
2 parents b585eb9 + 00b7aca
commit 6c78ed3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/interpreter/dune-project b/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 <rossberg@mpi-sws.org")
 (maintainers "Andreas Rossberg <rossberg@mpi-sws.org")
@@ -20,4 +18,6 @@
   (tags (wasm webassembly spec interpreter))
   (depends
     (ocaml (>= 4.12))
-    (menhir (>= 20220210))))
+    (menhir (>= 20220210))
+  )
+)
diff --git a/interpreter/text/parser.mly b/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) }