From 86cbfc91c647a2197b18ada0896fc0071e5ed5f7 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Tue, 17 Jan 2012 17:45:45 +0400 Subject: [PATCH] refactor and TODO clean-up --- .../google/dart/compiler/util/AstUtil.java | 22 ------------------- .../translate/context/DynamicContext.java | 2 -- .../k2js/translate/context/NamingScope.java | 1 - .../translate/expression/TryTranslator.java | 1 + .../operation/IncrementTranslator.java | 1 + .../OverloadedIncrementTranslator.java | 1 - .../translate/reference/CallTranslator.java | 1 - 7 files changed, 2 insertions(+), 27 deletions(-) diff --git a/js/src/com/google/dart/compiler/util/AstUtil.java b/js/src/com/google/dart/compiler/util/AstUtil.java index 69ad4c21241..c47a04abcfd 100644 --- a/js/src/com/google/dart/compiler/util/AstUtil.java +++ b/js/src/com/google/dart/compiler/util/AstUtil.java @@ -309,28 +309,6 @@ public class AstUtil { throw new AssertionError("Set qualifier should be applied only to JsInvocation or JsNameRef instances"); } - public static JsExpression getQualifier(JsExpression expression) { - if (expression instanceof JsInvocation) { - return ((JsInvocation) expression).getQualifier(); - } - if (expression instanceof JsNameRef) { - return ((JsNameRef) expression).getQualifier(); - } - throw new AssertionError("Get qualifier should be applied only to JsInvocation or JsNameRef instances"); - } - - public static void substituteTopLevelQualifier(JsExpression expression, JsExpression substitutor) { - assert expression != null; - JsExpression previous = expression; - JsExpression current = getQualifier(expression); - assert current != null : "Cannot be applied to unqualified expression"; - while (getQualifier(current) != null) { - previous = current; - current = getQualifier(current); - } - setQualifier(previous, substitutor); - } - //TODO: look for should-be-usages public static JsNameRef qualified(JsName selector, JsExpression qualifier) { JsNameRef reference = selector.makeRef(); diff --git a/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java b/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java index 79a28f96a0c..15773f4ecc3 100644 --- a/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java +++ b/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java @@ -5,8 +5,6 @@ import com.google.dart.compiler.util.AstUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -//TODO: track that temporary declarations is in the scope of the block where they are declared - public class DynamicContext { @NotNull diff --git a/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java b/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java index ccdac3d0b8b..a34c8dce45a 100644 --- a/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java +++ b/translator/src/org/jetbrains/k2js/translate/context/NamingScope.java @@ -106,7 +106,6 @@ public final class NamingScope { return (getName(descriptor.getOriginal()) != null); } - //TODO protect global namespace public JsName declareTemporary() { return scope.declareTemporary(); } diff --git a/translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java index c2538a80a4f..7d488fb4b00 100644 --- a/translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/expression/TryTranslator.java @@ -19,6 +19,7 @@ import static com.google.dart.compiler.util.AstUtil.convertToBlock; /** * @author Pavel Talanov */ +//TODO: not implemented catch logic public final class TryTranslator extends AbstractTranslator { @NotNull diff --git a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java index 04b794ad3fc..357daf3d37c 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/IncrementTranslator.java @@ -19,6 +19,7 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.isIntrinsicOpe /** * @author Pavel Talanov */ +// TODO: provide better increment translator logic public abstract class IncrementTranslator extends AbstractTranslator { public static boolean isIncrement(@NotNull JetUnaryExpression expression) { diff --git a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java index fd4ced47e33..0e117ce1ca8 100644 --- a/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/operation/OverloadedIncrementTranslator.java @@ -12,7 +12,6 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.getMethodRefer /** * @author Pavel Talanov */ -// TODO: provide better increment translator logic public final class OverloadedIncrementTranslator extends IncrementTranslator { @NotNull diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java index b3683741075..883934d8acd 100644 --- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java +++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java @@ -30,7 +30,6 @@ import static org.jetbrains.k2js.translate.utils.TranslationUtils.*; /** * @author Pavel Talanov */ -//TODO: move translate() static methods into builder (consider!) //TODO: write tests on calling backing fields as functions public final class CallTranslator extends AbstractTranslator {