azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recovery for initializer if no LBRACE

Browse Source 
- If no LBRACE after 'init' keyword parse initializer without body
- Made getBody() nullable, appropriate checks added
This commit is contained in:
Denis Zharkov
2015-03-18 19:58:15 +03:00
parent f4ed05cd90
commit eefea26d54
11 changed files with 130 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
+6 -1
View File
@@ -846,7 +846,12 @@ public class JetParsing extends AbstractJetParsing {
}
else if (at(INIT_KEYWORD)) {
advance(); // init
parseBlock();
if (at(LBRACE)) {
parseBlock();
}
else {
mark().error("Expecting '{' after 'init'");
}
declType = ANONYMOUS_INITIALIZER;
}
else if (at(CONSTRUCTOR_KEYWORD)) {
compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassInitializer.java
+2 -4
View File
@@ -38,11 +38,9 @@ public class JetClassInitializer extends JetDeclarationStub<KotlinPlaceHolderStu
return visitor.visitAnonymousInitializer(this, data);
}
@NotNull
@Nullable
public JetExpression getBody() {
JetExpression body = findChildByClass(JetExpression.class);
assert body != null;
return body;
return findChildByClass(JetExpression.class);
}
@Nullable
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+4 -1
View File
@@ -458,7 +458,10 @@ public class BodyResolver {
JetScope scopeForInitializers = classDescriptor.getScopeForInitializerResolution();
if (!classDescriptor.getConstructors().isEmpty()) {
expressionTypingServices.getType(scopeForInitializers, anonymousInitializer.getBody(), NO_EXPECTED_TYPE, c.getOuterDataFlowInfo(), trace);
JetExpression body = anonymousInitializer.getBody();
if (body != null) {
expressionTypingServices.getType(scopeForInitializers, body, NO_EXPECTED_TYPE, c.getOuterDataFlowInfo(), trace);
}
processModifiersOnInitializer(anonymousInitializer, scopeForInitializers);
}
else {