@webassemblyjs/wast-parser
Advanced tools
Comparing version 1.11.1 to 1.11.3
@@ -1,5 +0,15 @@ | ||
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } | ||
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } | ||
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } | ||
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } | ||
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } | ||
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } | ||
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } | ||
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } | ||
import { codeFrameFromSource } from "@webassemblyjs/helper-code-frame"; | ||
@@ -172,3 +182,3 @@ import * as t from "@webassemblyjs/ast"; | ||
if (lookaheadAndCheck(tokens.openParen, keywords.export)) { | ||
if (lookaheadAndCheck(tokens.openParen, keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -184,7 +194,7 @@ | ||
var _name = token.value; | ||
var name = token.value; | ||
eatToken(); | ||
state.registredExportedElements.push({ | ||
exportType: "Memory", | ||
name: _name, | ||
name: name, | ||
id: id | ||
@@ -207,3 +217,3 @@ }); | ||
if (token.type === tokens.keyword && token.value === 'shared') { | ||
if (token.type === tokens.keyword && token.value === "shared") { | ||
limits.shared = true; | ||
@@ -315,3 +325,3 @@ eatToken(); | ||
eatTokenOfType(tokens.closeParen); | ||
} else if (lookaheadAndCheck(tokens.openParen, keywords.export)) { | ||
} else if (lookaheadAndCheck(tokens.openParen, keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -503,5 +513,5 @@ | ||
) { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -577,4 +587,4 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in block body of type" + ", given " + tokenToString(token)); | ||
) { | ||
consequent.push(parseFuncInstr()); | ||
} else { | ||
consequent.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -596,3 +606,3 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in consequent body of type" + ", given " + tokenToString(token)); | ||
if (isKeyword(token, keywords.else)) { | ||
if (isKeyword(token, keywords["else"])) { | ||
eatToken(); // else | ||
@@ -605,4 +615,4 @@ | ||
) { | ||
alternate.push(parseFuncInstr()); | ||
} else { | ||
alternate.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -626,6 +636,6 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in alternate body of type" + ", given " + tokenToString(token)); | ||
) { | ||
testInstrs.push(parseFuncInstr()); | ||
eatTokenOfType(tokens.closeParen); | ||
continue; | ||
} | ||
testInstrs.push(parseFuncInstr()); | ||
eatTokenOfType(tokens.closeParen); | ||
continue; | ||
} | ||
@@ -676,5 +686,5 @@ throw function () { | ||
) { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -899,4 +909,3 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in loop body" + ", given " + tokenToString(token)); | ||
while (token.type !== tokens.closeParen && ( // $FlowIgnore | ||
token.type === tokens.openParen || signaturePtr < signatureLength)) { | ||
while (token.type !== tokens.closeParen && (token.type === tokens.openParen || signaturePtr < signatureLength)) { | ||
if (token.type === tokens.identifier) { | ||
@@ -931,5 +940,5 @@ args.push(t.identifier(token.value)); | ||
) { | ||
// $FlowIgnore | ||
args.push(parseFuncInstr()); | ||
} else { | ||
// $FlowIgnore | ||
args.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -1033,3 +1042,3 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in nested instruction" + ", given " + tokenToString(token)); | ||
if (token.type === tokens.name || token.type === tokens.valtype) { | ||
var _name2 = token.value; | ||
var name = token.value; | ||
var object; | ||
@@ -1039,3 +1048,3 @@ eatToken(); | ||
if (token.type === tokens.dot) { | ||
object = _name2; | ||
object = name; | ||
var name_parts = []; | ||
@@ -1054,3 +1063,3 @@ | ||
_name2 = name_parts.join('.'); | ||
name = name_parts.join("."); | ||
} | ||
@@ -1062,13 +1071,13 @@ | ||
if (typeof object === "undefined") { | ||
return t.withLoc(t.instruction(_name2), _endLoc, startLoc); | ||
return t.withLoc(t.instruction(name), _endLoc, startLoc); | ||
} else { | ||
return t.withLoc(t.objectInstruction(_name2, object, []), _endLoc, startLoc); | ||
return t.withLoc(t.objectInstruction(name, object, []), _endLoc, startLoc); | ||
} | ||
} | ||
var signature = t.signatureForOpcode(object || "", _name2); | ||
var signature = t.signatureForOpcode(object || "", name); | ||
var _parseFuncInstrArgume = parseFuncInstrArguments(signature), | ||
_args = _parseFuncInstrArgume.args, | ||
_namedArgs = _parseFuncInstrArgume.namedArgs; | ||
args = _parseFuncInstrArgume.args, | ||
namedArgs = _parseFuncInstrArgume.namedArgs; | ||
@@ -1078,5 +1087,5 @@ var endLoc = token.loc.end; | ||
if (typeof object === "undefined") { | ||
return t.withLoc(t.instruction(_name2, _args, _namedArgs), endLoc, startLoc); | ||
return t.withLoc(t.instruction(name, args, namedArgs), endLoc, startLoc); | ||
} else { | ||
return t.withLoc(t.objectInstruction(_name2, object, _args, _namedArgs), endLoc, startLoc); | ||
return t.withLoc(t.objectInstruction(name, object, args, namedArgs), endLoc, startLoc); | ||
} | ||
@@ -1128,3 +1137,3 @@ } else if (isKeyword(token, keywords.loop)) { | ||
} | ||
} else if (isKeyword(token, keywords.if)) { | ||
} else if (isKeyword(token, keywords["if"])) { | ||
eatToken(); // Keyword | ||
@@ -1199,3 +1208,3 @@ | ||
fnResult.push.apply(fnResult, _toConsumableArray(parseFuncResult())); | ||
} else if (lookaheadAndCheck(keywords.export) === true) { | ||
} else if (lookaheadAndCheck(keywords["export"]) === true) { | ||
eatToken(); | ||
@@ -1208,5 +1217,5 @@ parseFuncExport(fnName); | ||
) { | ||
// Instruction | ||
fnBody.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
fnBody.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -1382,3 +1391,3 @@ return new Error("\n" + codeFrameFromSource(source, token.loc) + "\n" + "Unexpected token in func body" + ", given " + tokenToString(token)); | ||
if (lookaheadAndCheck(tokens.openParen, keywords.export)) { | ||
if (lookaheadAndCheck(tokens.openParen, keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -1402,3 +1411,3 @@ | ||
if (lookaheadAndCheck(tokens.openParen, keywords.import)) { | ||
if (lookaheadAndCheck(tokens.openParen, keywords["import"])) { | ||
eatToken(); // ( | ||
@@ -1410,7 +1419,7 @@ | ||
eatTokenOfType(tokens.string); | ||
var _name3 = token.value; | ||
var _name = token.value; | ||
eatTokenOfType(tokens.string); | ||
importing = { | ||
module: moduleName, | ||
name: _name3, | ||
name: _name, | ||
descr: undefined | ||
@@ -1611,3 +1620,3 @@ }; | ||
if (isKeyword(token, keywords.export)) { | ||
if (isKeyword(token, keywords["export"])) { | ||
eatToken(); | ||
@@ -1653,3 +1662,3 @@ var node = parseExport(); | ||
if (isKeyword(token, keywords.import)) { | ||
if (isKeyword(token, keywords["import"])) { | ||
eatToken(); | ||
@@ -1656,0 +1665,0 @@ |
@@ -16,4 +16,4 @@ // string literal characters cannot contain control codes | ||
function decodeControlCharacter(char) { | ||
switch (char) { | ||
function decodeControlCharacter(_char) { | ||
switch (_char) { | ||
case "t": | ||
@@ -20,0 +20,0 @@ return 0x09; |
@@ -23,4 +23,4 @@ import { FSM, makeTransition } from "@webassemblyjs/helper-fsm"; | ||
function isNewLine(char) { | ||
return char.charCodeAt(0) === 10 || char.charCodeAt(0) === 13; | ||
function isNewLine(_char) { | ||
return _char.charCodeAt(0) === 10 || _char.charCodeAt(0) === 13; | ||
} | ||
@@ -65,11 +65,11 @@ | ||
result: "result", | ||
export: "export", | ||
"export": "export", | ||
loop: "loop", | ||
block: "block", | ||
if: "if", | ||
"if": "if", | ||
then: "then", | ||
else: "else", | ||
"else": "else", | ||
call: "call", | ||
call_indirect: "call_indirect", | ||
import: "import", | ||
"import": "import", | ||
memory: "memory", | ||
@@ -92,2 +92,3 @@ shared: "shared", | ||
// $FlowIgnore | ||
var numberLiteralFSM = new FSM({ | ||
@@ -135,3 +136,3 @@ START: [makeTransition(/-|\+/, "AFTER_SIGN"), makeTransition(/nan:0x/, "NAN_HEX", { | ||
var current = 0; | ||
var char = input[current]; // Used by SourceLocation | ||
var _char2 = input[current]; // Used by SourceLocation | ||
@@ -206,3 +207,3 @@ var column = 1; | ||
current += amount; | ||
char = input[current]; | ||
_char2 = input[current]; | ||
} | ||
@@ -212,3 +213,3 @@ | ||
// ;; | ||
if (char === ";" && lookahead() === ";") { | ||
if (_char2 === ";" && lookahead() === ";") { | ||
var startColumn = column; | ||
@@ -218,7 +219,7 @@ eatCharacter(2); | ||
while (!isNewLine(char)) { | ||
text += char; | ||
while (!isNewLine(_char2)) { | ||
text += _char2; | ||
eatCharacter(); | ||
if (char === undefined) { | ||
if (_char2 === undefined) { | ||
break; | ||
@@ -238,3 +239,3 @@ } | ||
if (char === "(" && lookahead() === ";") { | ||
if (_char2 === "(" && lookahead() === ";") { | ||
var _startColumn = column; | ||
@@ -245,5 +246,5 @@ eatCharacter(2); | ||
while (true) { | ||
char = input[current]; | ||
_char2 = input[current]; | ||
if (char === ";" && lookahead() === ")") { | ||
if (_char2 === ";" && lookahead() === ")") { | ||
eatCharacter(2); | ||
@@ -253,6 +254,6 @@ break; | ||
_text += char; | ||
_text += _char2; | ||
eatCharacter(); | ||
if (isNewLine(char)) { | ||
if (isNewLine(_char2)) { | ||
line++; | ||
@@ -272,4 +273,4 @@ column = 0; | ||
if (char === "(") { | ||
pushOpenParenToken(char); | ||
if (_char2 === "(") { | ||
pushOpenParenToken(_char2); | ||
eatCharacter(); | ||
@@ -279,4 +280,4 @@ continue; | ||
if (char === "=") { | ||
pushEqualToken(char); | ||
if (_char2 === "=") { | ||
pushEqualToken(_char2); | ||
eatCharacter(); | ||
@@ -286,4 +287,4 @@ continue; | ||
if (char === ")") { | ||
pushCloseParenToken(char); | ||
if (_char2 === ")") { | ||
pushCloseParenToken(_char2); | ||
eatCharacter(); | ||
@@ -293,3 +294,3 @@ continue; | ||
if (isNewLine(char)) { | ||
if (isNewLine(_char2)) { | ||
line++; | ||
@@ -301,3 +302,3 @@ eatCharacter(); | ||
if (WHITESPACE.test(char)) { | ||
if (WHITESPACE.test(_char2)) { | ||
eatCharacter(); | ||
@@ -307,3 +308,3 @@ continue; | ||
if (char === "$") { | ||
if (_char2 === "$") { | ||
var _startColumn2 = column; | ||
@@ -313,4 +314,4 @@ eatCharacter(); | ||
while (idchar.test(char)) { | ||
value += char; | ||
while (idchar.test(_char2)) { | ||
value += _char2; | ||
eatCharacter(); | ||
@@ -327,3 +328,3 @@ } | ||
if (NUMBERS.test(char) || NUMBER_KEYWORDS.test(lookahead(3, 0)) || char === "-" || char === "+") { | ||
if (NUMBERS.test(_char2) || NUMBER_KEYWORDS.test(lookahead(3, 0)) || _char2 === "-" || _char2 === "+") { | ||
var _startColumn3 = column; | ||
@@ -334,3 +335,3 @@ | ||
if (_value === "") { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -343,4 +344,4 @@ | ||
if (char && !PARENS.test(char) && !WHITESPACE.test(char)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
if (_char2 && !PARENS.test(_char2) && !WHITESPACE.test(_char2)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -351,3 +352,3 @@ | ||
if (char === '"') { | ||
if (_char2 === '"') { | ||
var _startColumn4 = column; | ||
@@ -357,8 +358,8 @@ var _value2 = ""; | ||
while (char !== '"') { | ||
if (isNewLine(char)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
while (_char2 !== '"') { | ||
if (isNewLine(_char2)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
_value2 += char; | ||
_value2 += _char2; | ||
eatCharacter(); // char | ||
@@ -377,8 +378,8 @@ } | ||
if (LETTERS.test(char)) { | ||
if (LETTERS.test(_char2)) { | ||
var _value3 = ""; | ||
var _startColumn5 = column; | ||
while (char && LETTERS.test(char)) { | ||
_value3 += char; | ||
while (_char2 && LETTERS.test(_char2)) { | ||
_value3 += _char2; | ||
eatCharacter(); | ||
@@ -391,3 +392,3 @@ } | ||
if (char === ".") { | ||
if (_char2 === ".") { | ||
var dotStartColumn = column; | ||
@@ -403,3 +404,3 @@ | ||
while (char === ".") { | ||
while (_char2 === ".") { | ||
eatCharacter(); // Eat the dot | ||
@@ -410,4 +411,4 @@ | ||
while (LETTERS.test(char)) { | ||
_value3 += char; | ||
while (LETTERS.test(_char2)) { | ||
_value3 += _char2; | ||
eatCharacter(); | ||
@@ -460,3 +461,3 @@ } | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -463,0 +464,0 @@ |
@@ -18,8 +18,20 @@ "use strict"; | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } | ||
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } | ||
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } | ||
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; } | ||
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } } | ||
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } | ||
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } | ||
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } | ||
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } | ||
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } | ||
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } | ||
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } | ||
function hasPlugin(name) { | ||
@@ -186,3 +198,3 @@ if (name !== "wast") throw new Error("unknow plugin"); | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords.export)) { | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -198,7 +210,7 @@ | ||
var _name = token.value; | ||
var name = token.value; | ||
eatToken(); | ||
state.registredExportedElements.push({ | ||
exportType: "Memory", | ||
name: _name, | ||
name: name, | ||
id: id | ||
@@ -221,3 +233,3 @@ }); | ||
if (token.type === _tokenizer.tokens.keyword && token.value === 'shared') { | ||
if (token.type === _tokenizer.tokens.keyword && token.value === "shared") { | ||
limits.shared = true; | ||
@@ -329,3 +341,3 @@ eatToken(); | ||
eatTokenOfType(_tokenizer.tokens.closeParen); | ||
} else if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords.export)) { | ||
} else if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -517,5 +529,5 @@ | ||
) { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -591,4 +603,4 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in block body of type" + ", given " + tokenToString(token)); | ||
) { | ||
consequent.push(parseFuncInstr()); | ||
} else { | ||
consequent.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -610,3 +622,3 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in consequent body of type" + ", given " + tokenToString(token)); | ||
if (isKeyword(token, _tokenizer.keywords.else)) { | ||
if (isKeyword(token, _tokenizer.keywords["else"])) { | ||
eatToken(); // else | ||
@@ -619,4 +631,4 @@ | ||
) { | ||
alternate.push(parseFuncInstr()); | ||
} else { | ||
alternate.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -640,6 +652,6 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in alternate body of type" + ", given " + tokenToString(token)); | ||
) { | ||
testInstrs.push(parseFuncInstr()); | ||
eatTokenOfType(_tokenizer.tokens.closeParen); | ||
continue; | ||
} | ||
testInstrs.push(parseFuncInstr()); | ||
eatTokenOfType(_tokenizer.tokens.closeParen); | ||
continue; | ||
} | ||
@@ -690,5 +702,5 @@ throw function () { | ||
) { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
instr.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -913,4 +925,3 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in loop body" + ", given " + tokenToString(token)); | ||
while (token.type !== _tokenizer.tokens.closeParen && ( // $FlowIgnore | ||
token.type === _tokenizer.tokens.openParen || signaturePtr < signatureLength)) { | ||
while (token.type !== _tokenizer.tokens.closeParen && (token.type === _tokenizer.tokens.openParen || signaturePtr < signatureLength)) { | ||
if (token.type === _tokenizer.tokens.identifier) { | ||
@@ -945,5 +956,5 @@ args.push(t.identifier(token.value)); | ||
) { | ||
// $FlowIgnore | ||
args.push(parseFuncInstr()); | ||
} else { | ||
// $FlowIgnore | ||
args.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -1047,3 +1058,3 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in nested instruction" + ", given " + tokenToString(token)); | ||
if (token.type === _tokenizer.tokens.name || token.type === _tokenizer.tokens.valtype) { | ||
var _name2 = token.value; | ||
var name = token.value; | ||
var object; | ||
@@ -1053,3 +1064,3 @@ eatToken(); | ||
if (token.type === _tokenizer.tokens.dot) { | ||
object = _name2; | ||
object = name; | ||
var name_parts = []; | ||
@@ -1068,3 +1079,3 @@ | ||
_name2 = name_parts.join('.'); | ||
name = name_parts.join("."); | ||
} | ||
@@ -1076,13 +1087,13 @@ | ||
if (typeof object === "undefined") { | ||
return t.withLoc(t.instruction(_name2), _endLoc, startLoc); | ||
return t.withLoc(t.instruction(name), _endLoc, startLoc); | ||
} else { | ||
return t.withLoc(t.objectInstruction(_name2, object, []), _endLoc, startLoc); | ||
return t.withLoc(t.objectInstruction(name, object, []), _endLoc, startLoc); | ||
} | ||
} | ||
var signature = t.signatureForOpcode(object || "", _name2); | ||
var signature = t.signatureForOpcode(object || "", name); | ||
var _parseFuncInstrArgume = parseFuncInstrArguments(signature), | ||
_args = _parseFuncInstrArgume.args, | ||
_namedArgs = _parseFuncInstrArgume.namedArgs; | ||
args = _parseFuncInstrArgume.args, | ||
namedArgs = _parseFuncInstrArgume.namedArgs; | ||
@@ -1092,5 +1103,5 @@ var endLoc = token.loc.end; | ||
if (typeof object === "undefined") { | ||
return t.withLoc(t.instruction(_name2, _args, _namedArgs), endLoc, startLoc); | ||
return t.withLoc(t.instruction(name, args, namedArgs), endLoc, startLoc); | ||
} else { | ||
return t.withLoc(t.objectInstruction(_name2, object, _args, _namedArgs), endLoc, startLoc); | ||
return t.withLoc(t.objectInstruction(name, object, args, namedArgs), endLoc, startLoc); | ||
} | ||
@@ -1142,3 +1153,3 @@ } else if (isKeyword(token, _tokenizer.keywords.loop)) { | ||
} | ||
} else if (isKeyword(token, _tokenizer.keywords.if)) { | ||
} else if (isKeyword(token, _tokenizer.keywords["if"])) { | ||
eatToken(); // Keyword | ||
@@ -1213,3 +1224,3 @@ | ||
fnResult.push.apply(fnResult, _toConsumableArray(parseFuncResult())); | ||
} else if (lookaheadAndCheck(_tokenizer.keywords.export) === true) { | ||
} else if (lookaheadAndCheck(_tokenizer.keywords["export"]) === true) { | ||
eatToken(); | ||
@@ -1222,5 +1233,5 @@ parseFuncExport(fnName); | ||
) { | ||
// Instruction | ||
fnBody.push(parseFuncInstr()); | ||
} else { | ||
// Instruction | ||
fnBody.push(parseFuncInstr()); | ||
} else { | ||
throw function () { | ||
@@ -1396,3 +1407,3 @@ return new Error("\n" + (0, _helperCodeFrame.codeFrameFromSource)(source, token.loc) + "\n" + "Unexpected token in func body" + ", given " + tokenToString(token)); | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords.export)) { | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords["export"])) { | ||
eatToken(); // ( | ||
@@ -1416,3 +1427,3 @@ | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords.import)) { | ||
if (lookaheadAndCheck(_tokenizer.tokens.openParen, _tokenizer.keywords["import"])) { | ||
eatToken(); // ( | ||
@@ -1424,7 +1435,7 @@ | ||
eatTokenOfType(_tokenizer.tokens.string); | ||
var _name3 = token.value; | ||
var _name = token.value; | ||
eatTokenOfType(_tokenizer.tokens.string); | ||
importing = { | ||
module: moduleName, | ||
name: _name3, | ||
name: _name, | ||
descr: undefined | ||
@@ -1625,3 +1636,3 @@ }; | ||
if (isKeyword(token, _tokenizer.keywords.export)) { | ||
if (isKeyword(token, _tokenizer.keywords["export"])) { | ||
eatToken(); | ||
@@ -1667,3 +1678,3 @@ var node = parseExport(); | ||
if (isKeyword(token, _tokenizer.keywords.import)) { | ||
if (isKeyword(token, _tokenizer.keywords["import"])) { | ||
eatToken(); | ||
@@ -1670,0 +1681,0 @@ |
"use strict"; | ||
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } | ||
Object.defineProperty(exports, "__esModule", { | ||
@@ -20,2 +22,3 @@ value: true | ||
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return; | ||
if (key in exports && exports[key] === _helperNumbers[key]) return; | ||
Object.defineProperty(exports, key, { | ||
@@ -29,4 +32,6 @@ enumerable: true, | ||
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } } | ||
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } | ||
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; } | ||
function parse(source) { | ||
@@ -33,0 +38,0 @@ var tokens = (0, _tokenizer.tokenize)(source); // We pass the source here to show code frames |
@@ -22,4 +22,4 @@ "use strict"; | ||
function decodeControlCharacter(char) { | ||
switch (char) { | ||
function decodeControlCharacter(_char) { | ||
switch (_char) { | ||
case "t": | ||
@@ -26,0 +26,0 @@ return 0x09; |
@@ -32,4 +32,4 @@ "use strict"; | ||
function isNewLine(char) { | ||
return char.charCodeAt(0) === 10 || char.charCodeAt(0) === 13; | ||
function isNewLine(_char) { | ||
return _char.charCodeAt(0) === 10 || _char.charCodeAt(0) === 13; | ||
} | ||
@@ -74,11 +74,11 @@ | ||
result: "result", | ||
export: "export", | ||
"export": "export", | ||
loop: "loop", | ||
block: "block", | ||
if: "if", | ||
"if": "if", | ||
then: "then", | ||
else: "else", | ||
"else": "else", | ||
call: "call", | ||
call_indirect: "call_indirect", | ||
import: "import", | ||
"import": "import", | ||
memory: "memory", | ||
@@ -102,2 +102,3 @@ shared: "shared", | ||
// $FlowIgnore | ||
var numberLiteralFSM = new _helperFsm.FSM({ | ||
@@ -146,3 +147,3 @@ START: [(0, _helperFsm.makeTransition)(/-|\+/, "AFTER_SIGN"), (0, _helperFsm.makeTransition)(/nan:0x/, "NAN_HEX", { | ||
var current = 0; | ||
var char = input[current]; // Used by SourceLocation | ||
var _char2 = input[current]; // Used by SourceLocation | ||
@@ -217,3 +218,3 @@ var column = 1; | ||
current += amount; | ||
char = input[current]; | ||
_char2 = input[current]; | ||
} | ||
@@ -223,3 +224,3 @@ | ||
// ;; | ||
if (char === ";" && lookahead() === ";") { | ||
if (_char2 === ";" && lookahead() === ";") { | ||
var startColumn = column; | ||
@@ -229,7 +230,7 @@ eatCharacter(2); | ||
while (!isNewLine(char)) { | ||
text += char; | ||
while (!isNewLine(_char2)) { | ||
text += _char2; | ||
eatCharacter(); | ||
if (char === undefined) { | ||
if (_char2 === undefined) { | ||
break; | ||
@@ -249,3 +250,3 @@ } | ||
if (char === "(" && lookahead() === ";") { | ||
if (_char2 === "(" && lookahead() === ";") { | ||
var _startColumn = column; | ||
@@ -256,5 +257,5 @@ eatCharacter(2); | ||
while (true) { | ||
char = input[current]; | ||
_char2 = input[current]; | ||
if (char === ";" && lookahead() === ")") { | ||
if (_char2 === ";" && lookahead() === ")") { | ||
eatCharacter(2); | ||
@@ -264,6 +265,6 @@ break; | ||
_text += char; | ||
_text += _char2; | ||
eatCharacter(); | ||
if (isNewLine(char)) { | ||
if (isNewLine(_char2)) { | ||
line++; | ||
@@ -283,4 +284,4 @@ column = 0; | ||
if (char === "(") { | ||
pushOpenParenToken(char); | ||
if (_char2 === "(") { | ||
pushOpenParenToken(_char2); | ||
eatCharacter(); | ||
@@ -290,4 +291,4 @@ continue; | ||
if (char === "=") { | ||
pushEqualToken(char); | ||
if (_char2 === "=") { | ||
pushEqualToken(_char2); | ||
eatCharacter(); | ||
@@ -297,4 +298,4 @@ continue; | ||
if (char === ")") { | ||
pushCloseParenToken(char); | ||
if (_char2 === ")") { | ||
pushCloseParenToken(_char2); | ||
eatCharacter(); | ||
@@ -304,3 +305,3 @@ continue; | ||
if (isNewLine(char)) { | ||
if (isNewLine(_char2)) { | ||
line++; | ||
@@ -312,3 +313,3 @@ eatCharacter(); | ||
if (WHITESPACE.test(char)) { | ||
if (WHITESPACE.test(_char2)) { | ||
eatCharacter(); | ||
@@ -318,3 +319,3 @@ continue; | ||
if (char === "$") { | ||
if (_char2 === "$") { | ||
var _startColumn2 = column; | ||
@@ -324,4 +325,4 @@ eatCharacter(); | ||
while (idchar.test(char)) { | ||
value += char; | ||
while (idchar.test(_char2)) { | ||
value += _char2; | ||
eatCharacter(); | ||
@@ -338,3 +339,3 @@ } | ||
if (NUMBERS.test(char) || NUMBER_KEYWORDS.test(lookahead(3, 0)) || char === "-" || char === "+") { | ||
if (NUMBERS.test(_char2) || NUMBER_KEYWORDS.test(lookahead(3, 0)) || _char2 === "-" || _char2 === "+") { | ||
var _startColumn3 = column; | ||
@@ -345,3 +346,3 @@ | ||
if (_value === "") { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -354,4 +355,4 @@ | ||
if (char && !PARENS.test(char) && !WHITESPACE.test(char)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
if (_char2 && !PARENS.test(_char2) && !WHITESPACE.test(_char2)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -362,3 +363,3 @@ | ||
if (char === '"') { | ||
if (_char2 === '"') { | ||
var _startColumn4 = column; | ||
@@ -368,8 +369,8 @@ var _value2 = ""; | ||
while (char !== '"') { | ||
if (isNewLine(char)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
while (_char2 !== '"') { | ||
if (isNewLine(_char2)) { | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
_value2 += char; | ||
_value2 += _char2; | ||
eatCharacter(); // char | ||
@@ -388,8 +389,8 @@ } | ||
if (LETTERS.test(char)) { | ||
if (LETTERS.test(_char2)) { | ||
var _value3 = ""; | ||
var _startColumn5 = column; | ||
while (char && LETTERS.test(char)) { | ||
_value3 += char; | ||
while (_char2 && LETTERS.test(_char2)) { | ||
_value3 += _char2; | ||
eatCharacter(); | ||
@@ -402,3 +403,3 @@ } | ||
if (char === ".") { | ||
if (_char2 === ".") { | ||
var dotStartColumn = column; | ||
@@ -414,3 +415,3 @@ | ||
while (char === ".") { | ||
while (_char2 === ".") { | ||
eatCharacter(); // Eat the dot | ||
@@ -421,4 +422,4 @@ | ||
while (LETTERS.test(char)) { | ||
_value3 += char; | ||
while (LETTERS.test(_char2)) { | ||
_value3 += _char2; | ||
eatCharacter(); | ||
@@ -471,3 +472,3 @@ } | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(char)); | ||
throw new Error(getCodeFrame(input, line, column) + "Unexpected character " + JSON.stringify(_char2)); | ||
} | ||
@@ -474,0 +475,0 @@ |
{ | ||
"name": "@webassemblyjs/wast-parser", | ||
"version": "1.11.1", | ||
"version": "1.11.3", | ||
"description": "WebAssembly text format parser", | ||
@@ -21,11 +21,11 @@ "keywords": [ | ||
"dependencies": { | ||
"@webassemblyjs/ast": "1.11.1", | ||
"@webassemblyjs/floating-point-hex-parser": "1.11.1", | ||
"@webassemblyjs/helper-api-error": "1.11.1", | ||
"@webassemblyjs/helper-code-frame": "1.11.1", | ||
"@webassemblyjs/helper-fsm": "1.11.1", | ||
"@webassemblyjs/ast": "1.11.3", | ||
"@webassemblyjs/floating-point-hex-parser": "1.11.3", | ||
"@webassemblyjs/helper-api-error": "1.11.3", | ||
"@webassemblyjs/helper-code-frame": "1.11.3", | ||
"@webassemblyjs/helper-fsm": "1.11.3", | ||
"@xtuc/long": "4.2.2" | ||
}, | ||
"devDependencies": { | ||
"@webassemblyjs/helper-test-framework": "1.11.1", | ||
"@webassemblyjs/helper-test-framework": "1.11.3", | ||
"mamacro": "^0.0.7" | ||
@@ -40,3 +40,3 @@ }, | ||
}, | ||
"gitHead": "3f07e2db2031afe0ce686630418c542938c1674b" | ||
"gitHead": "5fd2425602b752576bbe8089c343d5d70ebc861c" | ||
} |
136549
11
3809
+ Added@webassemblyjs/ast@1.11.3(transitive)
+ Added@webassemblyjs/helper-code-frame@1.11.3(transitive)
+ Added@webassemblyjs/wast-printer@1.11.3(transitive)
- Removed@webassemblyjs/ast@1.11.1(transitive)
- Removed@webassemblyjs/floating-point-hex-parser@1.11.1(transitive)
- Removed@webassemblyjs/helper-api-error@1.11.1(transitive)
- Removed@webassemblyjs/helper-code-frame@1.11.1(transitive)
- Removed@webassemblyjs/helper-fsm@1.11.1(transitive)
- Removed@webassemblyjs/helper-numbers@1.11.1(transitive)
- Removed@webassemblyjs/helper-wasm-bytecode@1.11.1(transitive)
- Removed@webassemblyjs/wast-printer@1.11.1(transitive)
Updated@webassemblyjs/ast@1.11.3