diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wasm-s-parser.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index a48f4bd9e..0271370dd 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -237,6 +237,7 @@ public: functionCounter = 0; for (unsigned i = 1; i < module.size(); i++) { preParseFunctionType(*module[i]); + preParseImports(*module[i]); } functionCounter = 0; for (unsigned i = 1; i < module.size(); i++) { @@ -278,12 +279,17 @@ private: functionTypes[name] = none; } + void preParseImports(Element& curr) { + IString id = curr[0]->str(); + if (id == IMPORT) parseImport(curr); + } + void parseModuleElement(Element& curr) { IString id = curr[0]->str(); if (id == FUNC) return parseFunction(curr); if (id == MEMORY) return parseMemory(curr); if (id == EXPORT) return parseExport(curr); - if (id == IMPORT) return parseImport(curr); + if (id == IMPORT) return; // already done if (id == TABLE) return parseTable(curr); if (id == TYPE) return; // already done std::cerr << "bad module element " << id.str << '\n'; @@ -889,7 +895,9 @@ private: } auto ret = allocator.alloc<Break>(); ret->name = FAKE_RETURN; - ret->value = parseExpression(s[1]); + if (s.size() >= 2) { + ret->value = parseExpression(s[1]); + } return ret; } |