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

change some things to expectPlugin

Browse Source
This commit is contained in:
Henry Zhu
2017-08-03 11:13:00 -04:00
parent cf3ebacf4f
commit 2dbba25d1a
22 changed files with 110 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/parser/statement.js
View File

@@ -237,9 +237,7 @@ export default class StatementParser extends ExpressionParser {
}
parseDecorator(): N.Decorator {
if (!(this.hasPlugin("decorators") || this.hasPlugin("decorators2"))) {
this.unexpected();
}
this.expectOnePlugin(["decorators", "decorators2"]);
const node = this.startNode();
this.next();
@@ -340,11 +338,8 @@ export default class StatementParser extends ExpressionParser {
this.state.labels.push(loopLabel);
let forAwait = false;
if (
this.hasPlugin("asyncGenerators") &&
this.state.inAsync &&
this.isContextual("await")
) {
if (this.state.inAsync && this.isContextual("await")) {
this.expectPlugin("asyncGenerators");
forAwait = true;
this.next();
}
@@ -489,12 +484,13 @@ export default class StatementParser extends ExpressionParser {
if (this.match(tt._catch)) {
const clause = this.startNode();
this.next();
if (this.match(tt.parenL) || !this.hasPlugin("optionalCatchBinding")) {
if (this.match(tt.parenL)) {
this.expect(tt.parenL);
clause.param = this.parseBindingAtom();
this.checkLVal(clause.param, true, Object.create(null), "catch clause");
this.expect(tt.parenR);
} else {
this.expectPlugin("optionalCatchBinding");
clause.param = null;
}
clause.body = this.parseBlock();
@@ -782,12 +778,11 @@ export default class StatementParser extends ExpressionParser {
this.initFunction(node, isAsync);
if (this.match(tt.star)) {
if (node.async && !this.hasPlugin("asyncGenerators")) {
this.unexpected();
} else {
node.generator = true;
this.next();
if (node.async) {
this.expectPlugin("asyncGenerators");
}
node.generator = true;
this.next();
}
if (
@@ -960,8 +955,9 @@ export default class StatementParser extends ExpressionParser {
isStatic = true;
}
if (this.hasPlugin("classPrivateProperties") && this.match(tt.hash)) {
if (this.match(tt.hash)) {
// Private property
this.expectPlugin("classPrivateProperties");
this.next();
const privateProp: N.ClassPrivateProperty = memberAny;
privateProp.key = this.parseIdentifier(true);
@@ -1047,8 +1043,12 @@ export default class StatementParser extends ExpressionParser {
this.pushClassProperty(classBody, prop);
} else if (isSimple && key.name === "async" && !this.isLineTerminator()) {
// an async method
const isGenerator =
this.hasPlugin("asyncGenerators") && this.eat(tt.star);
let isGenerator = false;
if (this.match(tt.star)) {
this.expectPlugin("asyncGenerators");
this.next();
isGenerator = true;
}
method.kind = "method";
this.parsePropertyName(method);
if (this.isNonstaticConstructor(method)) {