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

Merge branch 'master' into top-secret

Browse Source 
# Conflicts:
#	packages/babylon/src/options.js
#	src/acorn/plugins/flow.js
#	src/acorn/src/util.js
This commit is contained in:
Sebastian McKenzie
2015-07-11 21:04:33 +01:00
parent a226641631 7763c74563
commit f9498d7a2d
34 changed files with 294 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/babylon/src/plugins/flow.js
View File

@@ -784,19 +784,19 @@ export default function (instance) {
instance.extend("parseImportSpecifiers", function (inner) {
return function (node) {
node.isType = false;
if (this.isContextual("type")) {
var startPos = this.start, startLoc = this.startLoc;
var typeId = this.parseIdent();
if ((this.type === tt.name && this.value !== "from") || this.type === tt.braceL || this.type === tt.star) {
node.isType = true;
} else {
node.specifiers.push(this.parseImportSpecifierDefault(typeId, startPos, startLoc));
if (this.isContextual("from")) return;
this.eat(tt.comma);
node.importKind = "value"
var kind =
(this.type === tt._typeof ? "typeof" :
(this.isContextual("type") ? "type" : null))
if (kind) {
var lh = this.lookahead()
if ((lh.type === tt.name && lh.value !== "from") || lh.type === tt.braceL || lh.type === tt.star) {
this.next()
node.importKind = kind
}
}
inner.call(this, node);
inner.call(this, node)
};
});