diff --git a/packages/wasm-parser/src/decoder.js b/packages/wasm-parser/src/decoder.js index bf0242bc6..0fa2811a6 100644 --- a/packages/wasm-parser/src/decoder.js +++ b/packages/wasm-parser/src/decoder.js @@ -1101,23 +1101,21 @@ export function decode(ab: ArrayBuffer, opts: DecoderOpts): Program { return t.globalType(type, globalType); } - // function parseNameModule() { - // const lenu32 = readVaruint32(); - // eatBytes(lenu32.nextIndex); - - // console.log("len", lenu32); + function parseNameModule() { + const lenu32 = readVaruint32(); + eatBytes(lenu32.nextIndex); - // const strlen = lenu32.value; + const strlen = lenu32.value; - // dump([strlen], "string length"); + dump([strlen], "string length"); - // const bytes = readBytes(strlen); - // eatBytes(strlen); + const bytes = readBytes(strlen); + eatBytes(strlen); - // const value = utf8.decode(bytes); + const value = utf8.decode(bytes); - // return [t.moduleNameMetadata(value)]; - // } + return [t.moduleNameMetadata(value)]; + } // this section contains an array of function names and indices function parseNameSectionFunctions() { @@ -1189,16 +1187,10 @@ export function decode(ab: ArrayBuffer, opts: DecoderOpts): Program { eatBytes(subSectionSizeInBytesu32.nextIndex); switch (sectionTypeByte.value) { - // case 0: { - // TODO(sven): re-enable that - // Current status: it seems that when we decode the module's name - // no name_payload_len is used. - // - // See https://github.com/WebAssembly/design/blob/master/BinaryEncoding.md#name-section - // - // nameMetadata.push(...parseNameModule()); - // break; - // } + case 0: { + nameMetadata.push(...parseNameModule()); + break; + } case 1: { nameMetadata.push(...parseNameSectionFunctions()); break; diff --git a/packages/wasm-parser/test/fixtures/module/name/actual.wat-failure b/packages/wasm-parser/test/fixtures/module/name/actual.wat similarity index 100% rename from packages/wasm-parser/test/fixtures/module/name/actual.wat-failure rename to packages/wasm-parser/test/fixtures/module/name/actual.wat diff --git a/packages/wasm-parser/test/index.js b/packages/wasm-parser/test/index.js index 3c495986a..a100f9b04 100644 --- a/packages/wasm-parser/test/index.js +++ b/packages/wasm-parser/test/index.js @@ -31,8 +31,14 @@ function stripMetadata(ast) { delete node.loc; }, + // wasm doesn't have comments BlockComment(path) { path.remove(); + }, + + // wasm doesn't have comments + LeadingComment(path) { + path.remove(); } });