From 9a28f580bbe822379f8785d89fb70686fa1e594e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 18 Jul 2012 17:15:55 +0400 Subject: [PATCH] Move NO_INTRINSIC to FunctionIntrinsic --- .../functions/FunctionIntrinsics.java | 20 +------------------ .../functions/basic/FunctionIntrinsic.java | 16 +++++++++++++++ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java index 2b051fd60fb..afa4de9275f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java @@ -18,11 +18,9 @@ package org.jetbrains.k2js.translate.intrinsic.functions; import closurecompiler.internal.com.google.common.collect.Lists; import closurecompiler.internal.com.google.common.collect.Maps; -import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.k2js.translate.context.TranslationContext; import org.jetbrains.k2js.translate.intrinsic.functions.basic.FunctionIntrinsic; import org.jetbrains.k2js.translate.intrinsic.functions.factories.*; @@ -34,22 +32,6 @@ import java.util.Map; */ public final class FunctionIntrinsics { - @NotNull - private static final FunctionIntrinsic NO_INTRINSIC = new FunctionIntrinsic() { - @Override - public boolean exists() { - return false; - } - - @NotNull - @Override - public JsExpression apply(@Nullable JsExpression receiver, - @NotNull List arguments, - @NotNull TranslationContext context) { - throw new UnsupportedOperationException("FunctionIntrinsic#NO_INTRINSIC_#apply"); - } - }; - @NotNull private final Map intrinsicCache = Maps.newHashMap(); @@ -103,6 +85,6 @@ public final class FunctionIntrinsics { return factory.getIntrinsic(descriptor); } } - return NO_INTRINSIC; + return FunctionIntrinsic.NO_INTRINSIC; } } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java index 19d8cc6e95b..d51f9c10c50 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/basic/FunctionIntrinsic.java @@ -30,6 +30,22 @@ import java.util.List; */ public abstract class FunctionIntrinsic { + @NotNull + public static final FunctionIntrinsic NO_INTRINSIC = new FunctionIntrinsic() { + @Override + public boolean exists() { + return false; + } + + @NotNull + @Override + public JsExpression apply(@Nullable JsExpression receiver, + @NotNull List arguments, + @NotNull TranslationContext context) { + throw new UnsupportedOperationException("FunctionIntrinsic#NO_INTRINSIC_#apply"); + } + }; + @NotNull public abstract JsExpression apply(@Nullable JsExpression receiver, @NotNull List arguments, @NotNull TranslationContext context);