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

Refactor: add hasBody() to JetDeclarationWithBody interface

Browse Source 
Use it where appropriate
This commit is contained in:
Pavel V. Talanov
2014-03-26 17:14:57 +04:00
parent e7fd8c4118
commit 66aae37bc6
15 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+2 -2
View File
@@ -102,11 +102,11 @@ public final class PropertyTranslator extends AbstractTranslator {
}
private boolean hasCustomGetter() {
return declaration != null && declaration.getGetter() != null && getCustomGetterDeclaration().getBodyExpression() != null;
return declaration != null && declaration.getGetter() != null && getCustomGetterDeclaration().hasBody();
}
private boolean hasCustomSetter() {
return declaration != null && declaration.getSetter() != null && getCustomSetterDeclaration().getBodyExpression() != null;
return declaration != null && declaration.getSetter() != null && getCustomSetterDeclaration().hasBody();
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+1 -2
View File
@@ -110,8 +110,7 @@ public final class FunctionTranslator extends AbstractTranslator {
}
private void translateBody() {
JetExpression jetBodyExpression = functionDeclaration.getBodyExpression();
if (jetBodyExpression == null) {
if (!functionDeclaration.hasBody()) {
assert descriptor.getModality().equals(Modality.ABSTRACT);
return;
}