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

Jet api refactoring: remove JetBodyDeclarationWithBody interface from JetFunctionLiteralExpression

Browse Source
This commit is contained in:
Mikhael Bogdanov
2013-03-20 11:32:55 +04:00
parent 93b860e4ad
commit 8e5f0abb84
14 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+2 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.descriptors.Modality;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFunctionLiteral;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.translate.context.TranslationContext;
@@ -154,6 +155,6 @@ public final class FunctionTranslator extends AbstractTranslator {
}
private boolean isExtensionFunction() {
return JsDescriptorUtils.isExtension(descriptor) && !(functionDeclaration instanceof JetFunctionLiteralExpression);
return JsDescriptorUtils.isExtension(descriptor) && !(functionDeclaration instanceof JetFunctionLiteral);
}
}
js/js.translator/src/org/jetbrains/k2js/translate/expression/LiteralFunctionTranslator.java
+2 -2
View File
@@ -57,7 +57,7 @@ public class LiteralFunctionTranslator {
}
public JsExpression translate(@NotNull JetFunctionLiteralExpression declaration) {
FunctionDescriptor descriptor = getFunctionDescriptor(rootContext.bindingContext(), declaration);
FunctionDescriptor descriptor = getFunctionDescriptor(rootContext.bindingContext(), declaration.getFunctionLiteral());
JsFunction fun = createFunction();
TranslationContext funContext;
@@ -75,7 +75,7 @@ public class LiteralFunctionTranslator {
funContext = rootContext.contextWithScope(fun);
}
fun.getBody().getStatements().addAll(translateFunctionBody(descriptor, declaration, funContext).getStatements());
fun.getBody().getStatements().addAll(translateFunctionBody(descriptor, declaration.getFunctionLiteral(), funContext).getStatements());
InnerFunctionTranslator translator = null;
if (!asInner) {