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

generate pseudocode for functions in local classes

Browse Source 
#KT-4405 In progress
 #KT-3501 Fixed
This commit is contained in:
Svetlana Isakova
2014-01-17 18:12:18 +04:00
parent f74fbf9f8b
commit 5ef320173c
9 changed files with 183 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+7 -10
View File
@@ -916,16 +916,6 @@ public class JetControlFlowProcessor {
JetObjectDeclaration declaration = expression.getObjectDeclaration();
generateInstructions(declaration, context);
List<JetDeclaration> declarations = declaration.getDeclarations();
List<JetDeclaration> functions = Lists.newArrayList();
for (JetDeclaration localDeclaration : declarations) {
if (!(localDeclaration instanceof JetProperty) && !(localDeclaration instanceof JetClassInitializer)) {
functions.add(localDeclaration);
}
}
for (JetDeclaration function : functions) {
generateInstructions(function, context);
}
builder.createAnonymousObject(expression);
}
@@ -961,6 +951,13 @@ public class JetControlFlowProcessor {
generateInstructions(specifier, context);
}
List<JetDeclaration> declarations = classOrObject.getDeclarations();
if (JetPsiUtil.isLocal(classOrObject)) {
for (JetDeclaration declaration : declarations) {
generateInstructions(declaration, context);
}
return;
}
//For top-level and inner classes and objects functions are collected and checked separately.
for (JetDeclaration declaration : declarations) {
if (declaration instanceof JetProperty || declaration instanceof JetClassInitializer) {
generateInstructions(declaration, context);