fluencelabs/assemblyscript
1
0
Fork 0
mirror of https://github.com/fluencelabs/assemblyscript synced 2025-04-25 15:12:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of readonly/type as identifiers, see #115

Browse Source
This commit is contained in:
dcodeIO 2018-05-21 10:52:55 +02:00
parent e049e72171
commit 940392f463
5 changed files with 85 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/assemblyscript.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/assemblyscript.js.map vendored
View File

File diff suppressed because one or more lines are too long

101
src/parser.ts
View File

@ -244,15 +244,16 @@ export class Parser extends DiagnosticEmitter {
break;
}
case Token.ABSTRACT: {
let state = tn.mark();
tn.next();
flags |= CommonFlags.ABSTRACT;
if (!tn.skip(Token.CLASS)) {
this.error(
DiagnosticCode._0_expected,
tn.range(tn.pos), "class"
);
tn.reset(state);
statement = this.parseStatement(tn, true);
break;
} else {
tn.discard(state);
}
flags |= CommonFlags.ABSTRACT;
// fall through
}
case Token.CLASS:
@ -263,9 +264,16 @@ export class Parser extends DiagnosticEmitter {
break;
}
case Token.NAMESPACE: {
let state = tn.mark();
tn.next();
statement = this.parseNamespace(tn, flags, decorators, startPos);
decorators = null;
if (tn.peek(false, IdentifierHandling.PREFER) == Token.IDENTIFIER) {
tn.discard(state);
statement = this.parseNamespace(tn, flags, decorators, startPos);
decorators = null;
} else {
tn.reset(state);
statement = this.parseStatement(tn, true);
}
break;
}
case Token.IMPORT: {
@ -278,10 +286,17 @@ export class Parser extends DiagnosticEmitter {
}
break;
}
case Token.TYPE: {
case Token.TYPE: { // also identifier
let state = tn.mark();
tn.next();
statement = this.parseTypeDeclaration(tn, flags, decorators, startPos);
decorators = null;
if (tn.peek(false, IdentifierHandling.PREFER) == Token.IDENTIFIER) {
tn.discard(state);
statement = this.parseTypeDeclaration(tn, flags, decorators, startPos);
decorators = null;
} else {
tn.reset(state);
statement = this.parseStatement(tn, true);
}
break;
}
default: {
@ -1033,43 +1048,28 @@ export class Parser extends DiagnosticEmitter {
var isOptional = false;
var startRange: Range | null = null;
var accessFlags: CommonFlags = CommonFlags.NONE;
if (tn.skip(Token.PUBLIC)) {
startRange = tn.range();
if (!isConstructor) {
this.error(
DiagnosticCode._0_modifier_cannot_be_used_here,
startRange, "public"
);
if (isConstructor) {
if (tn.skip(Token.PUBLIC)) {
startRange = tn.range();
accessFlags |= CommonFlags.PUBLIC;
} else if (tn.skip(Token.PROTECTED)) {
startRange = tn.range();
accessFlags |= CommonFlags.PROTECTED;
} else if (tn.skip(Token.PRIVATE)) {
startRange = tn.range();
accessFlags |= CommonFlags.PRIVATE;
}
accessFlags |= CommonFlags.PUBLIC;
} else if (tn.skip(Token.PROTECTED)) {
startRange = tn.range();
if (!isConstructor) {
this.error(
DiagnosticCode._0_modifier_cannot_be_used_here,
startRange, "protected"
);
if (tn.peek() == Token.READONLY) {
let state = tn.mark();
tn.next();
if (tn.peek() != Token.COLON) { // modifier
tn.discard(state);
if (!startRange) startRange = tn.range();
accessFlags |= CommonFlags.READONLY;
} else { // identifier
tn.reset(state);
}
}
accessFlags |= CommonFlags.PROTECTED;
} else if (tn.skip(Token.PRIVATE)) {
startRange = tn.range();
if (!isConstructor) {
this.error(
DiagnosticCode._0_modifier_cannot_be_used_here,
startRange, "private"
);
}
accessFlags |= CommonFlags.PRIVATE;
}
if (tn.skip(Token.READONLY)) {
if (!startRange) startRange = tn.range();
if (!isConstructor) {
this.error(
DiagnosticCode._0_modifier_cannot_be_used_here,
startRange, "readonly"
);
}
accessFlags |= CommonFlags.READONLY;
}
if (tn.skip(Token.DOT_DOT_DOT)) {
if (accessFlags) {
@ -2183,10 +2183,6 @@ export class Parser extends DiagnosticEmitter {
statement = this.parseTryStatement(tn);
break;
}
case Token.TYPE: {
statement = this.parseTypeDeclaration(tn, CommonFlags.NONE, null, tn.tokenPos);
break;
}
case Token.VOID: {
statement = this.parseVoidStatement(tn);
break;
@ -2195,6 +2191,13 @@ export class Parser extends DiagnosticEmitter {
statement = this.parseWhileStatement(tn);
break;
}
case Token.TYPE: { // also identifier
if (tn.peek(false, IdentifierHandling.PREFER) == Token.IDENTIFIER) {
statement = this.parseTypeDeclaration(tn, CommonFlags.NONE, null, tn.tokenPos);
break;
}
// fall-through
}
default: {
tn.reset(state);
statement = this.parseExpressionStatement(tn);

17
tests/parser/reserved-keywords.ts Normal file
View File

@ -0,0 +1,17 @@
function alsoIdentifier(readonly: i32): void {}
class AClass {
constructor(readonly: i32) {}
constructor(readonly readonly: i32) {}
}
type type = i32;
var type: i32;
type = 123;
namespace namespace {}
var namespace: i32;
namespace = 123;
abstract class AClass {}
var abstract: i32;
abstract = 123;

14
tests/parser/reserved-keywords.ts.fixture.ts Normal file
View File

@ -0,0 +1,14 @@
function alsoIdentifier(readonly: i32): void {}
class AClass {
constructor(readonly: i32) {}
constructor(readonly readonly: i32) {}
}
type type = i32;
var type: i32;
type = 123;
namespace namespace {}
var namespace: i32;
namespace = 123;
abstract class AClass {}
var abstract: i32;
abstract = 123;