finished code clean up.

This commit is contained in:
Pavel Talanov
2011-12-08 19:38:07 +04:00
parent db13f57dc1
commit 6a07101bd7
4 changed files with 3 additions and 8 deletions
@@ -87,7 +87,6 @@ public final class ClassInitializerTranslator extends AbstractInitializerTransla
return result; return result;
} }
//TODO: util method
@NotNull @NotNull
List<JsParameter> translatePrimaryConstructorParameters() { List<JsParameter> translatePrimaryConstructorParameters() {
List<JetParameter> parameterList = classDeclaration.getPrimaryConstructorParameters(); List<JetParameter> parameterList = classDeclaration.getPrimaryConstructorParameters();
@@ -19,7 +19,6 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOpe
/** /**
* @author Talanov Pavel * @author Talanov Pavel
*/ */
//TODO: reexamine class, see if can be clearer
public abstract class IncrementTranslator extends AbstractTranslator { public abstract class IncrementTranslator extends AbstractTranslator {
public static boolean isIncrement(@NotNull JetUnaryExpression expression) { public static boolean isIncrement(@NotNull JetUnaryExpression expression) {
@@ -11,11 +11,12 @@ import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.Translation; import org.jetbrains.k2js.translate.general.Translation;
import org.jetbrains.k2js.translate.intrinsic.array.ArrayGetIntrinsic; import org.jetbrains.k2js.translate.intrinsic.array.ArrayGetIntrinsic;
import org.jetbrains.k2js.translate.intrinsic.array.ArraySetIntrinsic; import org.jetbrains.k2js.translate.intrinsic.array.ArraySetIntrinsic;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import org.jetbrains.k2js.translate.utils.TranslationUtils; import org.jetbrains.k2js.translate.utils.TranslationUtils;
import java.util.List; import java.util.List;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
/** /**
* @author Talanov Pavel * @author Talanov Pavel
*/ */
@@ -35,10 +36,7 @@ public final class ArrayAccessTranslator extends AccessTranslator {
@NotNull TranslationContext context) { @NotNull TranslationContext context) {
super(context); super(context);
this.expression = expression; this.expression = expression;
DeclarationDescriptor descriptorForReferenceExpression = this.methodDescriptor = getDescriptorForReferenceExpression(context.bindingContext(), expression);
BindingUtils.getDescriptorForReferenceExpression(context.bindingContext(), expression);
assert descriptorForReferenceExpression != null : "Array access expression must reference a descriptor";
this.methodDescriptor = descriptorForReferenceExpression;
} }
@Override @Override
@@ -169,7 +169,6 @@ public final class BindingUtils {
return !superClassDescriptor.equals(JetStandardClasses.getAny()); return !superClassDescriptor.equals(JetStandardClasses.getAny());
} }
//TODO: duplication
public static boolean isOwnedByNamespace(@NotNull DeclarationDescriptor descriptor) { public static boolean isOwnedByNamespace(@NotNull DeclarationDescriptor descriptor) {
if (descriptor instanceof ConstructorDescriptor) { if (descriptor instanceof ConstructorDescriptor) {
DeclarationDescriptor classDescriptor = descriptor.getContainingDeclaration(); DeclarationDescriptor classDescriptor = descriptor.getContainingDeclaration();