From ca09203416a556f0a895f6cfa32426bdd46f9824 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 13 Nov 2017 15:18:30 -0800 Subject: Update call_indirect text syntax to match spec update (#1281) Function type gets its own element rather than being a part of the call_indirect (see WebAssembly/spec#599) --- src/wasm/wasm-s-parser.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/wasm/wasm-s-parser.cpp') diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index 599eec5b8..0de3edf3f 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -1387,7 +1387,9 @@ Expression* SExpressionWasmBuilder::makeCallImport(Element& s) { Expression* SExpressionWasmBuilder::makeCallIndirect(Element& s) { if (!wasm.table.exists) throw ParseException("no table"); auto ret = allocator.alloc(); - IString type = s[1]->str(); + Element& typeElement = *s[1]; + if (typeElement[0]->str() != "type") throw ParseException("expected 'type' in call_indirect", s.line, s.col); + IString type = typeElement[1]->str(); auto* fullType = wasm.getFunctionTypeOrNull(type); if (!fullType) throw ParseException("invalid call_indirect type", s.line, s.col); ret->fullType = fullType->name; -- cgit v1.2.3