cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove guardedHandlers from ASTs (#9979)

Browse Source
This commit is contained in:
Daniel Tschinder 2019-05-15 03:37:22 -07:00 committed by GitHub
parent 1969e6b6aa
commit 85432e2c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/babel-parser/src/parser/statement.js
View File

@ -22,10 +22,6 @@ import {
SCOPE_SUPER, SCOPE_SUPER,
} from "../util/scopeflags"; } from "../util/scopeflags";
// Reused empty array added for node fields that are always empty.
const empty = [];
const loopLabel = { kind: "loop" }, const loopLabel = { kind: "loop" },
switchLabel = { kind: "switch" }; switchLabel = { kind: "switch" };
@ -683,7 +679,6 @@ export default class StatementParser extends ExpressionParser {
node.handler = this.finishNode(clause, "CatchClause"); node.handler = this.finishNode(clause, "CatchClause");
} }
node.guardedHandlers = empty;
node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null; node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null;
if (!node.handler && !node.finalizer) { if (!node.handler && !node.finalizer) {

2
packages/babel-parser/src/types.js
View File

@ -263,8 +263,6 @@ export type TryStatement = NodeBase & {
block: BlockStatement, block: BlockStatement,
handler: CatchClause | null, handler: CatchClause | null,
finalizer: BlockStatement | null, finalizer: BlockStatement | null,
guardedHandlers: $ReadOnlyArray<empty>, // TODO: Not in spec
}; };
export type CatchClause = NodeBase & { export type CatchClause = NodeBase & {

1
packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/output.json vendored
View File

@ -198,7 +198,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
}, },
{ {

2
packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/output.json vendored
View File

@ -238,14 +238,12 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
}, },
{ {

1
packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/output.json vendored
View File

@ -161,7 +161,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/276/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/277/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/278/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/279/output.json vendored
View File

@ -176,7 +176,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/280/output.json vendored
View File

@ -61,7 +61,6 @@
"directives": [] "directives": []
}, },
"handler": null, "handler": null,
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 16, "start": 16,

1
packages/babel-parser/test/fixtures/core/uncategorised/281/output.json vendored
View File

@ -225,7 +225,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/core/uncategorised/282/output.json vendored
View File

@ -225,7 +225,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 47, "start": 47,

1
packages/babel-parser/test/fixtures/es2015/uncategorised/313/output.json vendored
View File

@ -164,7 +164,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/output.json vendored
View File

@ -93,7 +93,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 28, "start": 28,

1
packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/output.json vendored
View File

@ -93,7 +93,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/output.json vendored
View File

@ -108,7 +108,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch/output.json vendored
View File

@ -476,7 +476,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/output.json vendored
View File

@ -161,7 +161,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/output.json vendored
View File

@ -108,7 +108,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-catch-parameter/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0000/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0001/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0002/output.json vendored
View File

@ -109,7 +109,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0003/output.json vendored
View File

@ -176,7 +176,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0004/output.json vendored
View File

@ -61,7 +61,6 @@
"directives": [] "directives": []
}, },
"handler": null, "handler": null,
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 16, "start": 16,

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0005/output.json vendored
View File

@ -225,7 +225,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0006/output.json vendored
View File

@ -225,7 +225,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 47, "start": 47,

1
packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/output.json vendored
View File

@ -523,7 +523,6 @@
"directives": [] "directives": []
}, },
"handler": null, "handler": null,
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 173, "start": 173,

1
packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/output.json vendored
View File

@ -398,7 +398,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 98, "start": 98,

1
packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/output.json vendored
View File

@ -396,7 +396,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "BlockStatement", "type": "BlockStatement",
"start": 91, "start": 91,

1
packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/output.json vendored
View File

@ -396,7 +396,6 @@
"directives": [] "directives": []
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

1
packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/output.json vendored
View File

@ -125,7 +125,6 @@
"expectedNode": "BlockStatement" "expectedNode": "BlockStatement"
} }
}, },
"guardedHandlers": [],
"finalizer": { "finalizer": {
"type": "Placeholder", "type": "Placeholder",
"start": 36, "start": 36,

1
packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/output.json vendored
View File

@ -141,7 +141,6 @@
"expectedNode": "BlockStatement" "expectedNode": "BlockStatement"
} }
}, },
"guardedHandlers": [],
"finalizer": null "finalizer": null
} }
], ],

3
packages/babel-parser/test/helpers/runFixtureTests.js
View File

@ -166,6 +166,9 @@ function runTest(test, parseFunction) {
const mis = misMatch(JSON.parse(test.expect.code), ast); const mis = misMatch(JSON.parse(test.expect.code), ast);
if (mis) { if (mis) {
if (process.env.OVERWRITE) {
return save(test, ast);
}
throw new Error(mis); throw new Error(mis);
} }
} }