Skip to content

Commit

Permalink
fix(parser): Fix a bunch of edge cases
Browse files Browse the repository at this point in the history
  • Loading branch information
KFlash committed Jun 6, 2019
1 parent 39dc0e7 commit 96126e4
Show file tree
Hide file tree
Showing 9 changed files with 169 additions and 89 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meriyah",
"version": "0.2.9",
"version": "0.2.10",
"description": "A 100% compliant, self-hosted javascript parser with high focus on both performance and stability",
"main": "dist/meriyah.umd.js",
"module": "dist/meriyah.esm.js",
Expand Down
6 changes: 2 additions & 4 deletions src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const enum BindingOrigin {
export const enum AssignmentKind {
None = 0,
IsAssignable = 1 << 0,
CannotAssign = 1 << 1
CannotAssign = 1 << 1
}

export const enum DestructuringKind {
Expand All @@ -102,9 +102,7 @@ export const enum Flags {
NewLine = 1 << 0,
HasConstructor = 1 << 5,
Octals = 1 << 6,
SimpleParameterList = 1 << 7,
Await = 1 << 8,
Yield = 1 << 9,
SimpleParameterList = 1 << 7
}

export const enum FunctionStatement {
Expand Down
10 changes: 4 additions & 6 deletions src/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ export const enum Errors {
IllegalContinue,
IllegalBreak,
InvalidLetBracket,
InvalidArrayCompoundAssignment,
InvalidObjCompoundAssignment,
InvalidDestructuringTarget,
InvalidRestObjBinding,
RestDefaultInitializer,
Expand Down Expand Up @@ -158,7 +156,8 @@ export const enum Errors {
InvalidImportTail,
ImportNotOneArg,
InvalidImportNew,
InvalidSpreadInImport
InvalidSpreadInImport,
UncompleteArrow
}

/*@internal*/
Expand Down Expand Up @@ -243,8 +242,6 @@ export const errorMessages: {
[Errors.IllegalContinue]: 'Illegal continue statement',
[Errors.IllegalBreak]: 'Illegal break statement',
[Errors.InvalidLetBracket]: 'Cannot have `let[...]` as a var name in strict mode',
[Errors.InvalidArrayCompoundAssignment]: 'Cannot compound-assign to an array literal',
[Errors.InvalidObjCompoundAssignment]: 'Cannot compound-assign to an object literal',
[Errors.InvalidDestructuringTarget]: 'Invalid destructuring assignment target',
[Errors.InvalidRestObjBinding]:
'The rest argument of an object binding pattern must always be a simple ident and not an array pattern',
Expand Down Expand Up @@ -330,7 +327,8 @@ export const errorMessages: {
[Errors.InvalidImportTail]: 'Trailing comma is disallowed inside import(...) arguments',
[Errors.ImportNotOneArg]: 'import() requires exactly one argument',
[Errors.InvalidImportNew]: 'Cannot use new with import(...)',
[Errors.InvalidSpreadInImport]: '... is not allowed in import()'
[Errors.InvalidSpreadInImport]: '... is not allowed in import()',
[Errors.UncompleteArrow]: "Expected '=>'"
};

export class ParseError extends SyntaxError {
Expand Down
Loading

0 comments on commit 96126e4

Please sign in to comment.