diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5356b63b8e4..9d4410a88b1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,11 +14,17 @@
-
-
-
+
+
+
-
+
+
+
+
+
+
+
@@ -128,7 +134,7 @@
-
+
@@ -141,7 +147,7 @@
-
+
@@ -193,6 +199,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -250,49 +282,88 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -301,43 +372,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -347,57 +382,28 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -406,16 +412,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -430,7 +427,7 @@
-
+
@@ -439,6 +436,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -457,35 +492,33 @@
+
-
-
-
@@ -566,338 +599,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1026,6 +727,214 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1066,115 +975,17 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1233,6 +1044,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1391,14 +1295,14 @@
-
localhost
@@ -1430,6 +1334,15 @@
1319812241928
1319812241928
+
+ 1327398620289
+ 1327398620289
+
+
+ 1327420478272
+ 1327420478272
+
+
@@ -1470,13 +1383,15 @@
-
-
+
+
+
-
+
+
@@ -1519,7 +1434,7 @@
-
+
@@ -1532,8 +1447,6 @@
-
-
@@ -1557,6 +1470,8 @@
+
+
@@ -1566,116 +1481,119 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/translator/src/org/jetbrains/k2js/K2JSTranslator.java b/translator/src/org/jetbrains/k2js/K2JSTranslator.java
index ad6b216cba6..e14c2c995f3 100644
--- a/translator/src/org/jetbrains/k2js/K2JSTranslator.java
+++ b/translator/src/org/jetbrains/k2js/K2JSTranslator.java
@@ -120,7 +120,7 @@ public final class K2JSTranslator {
}
private void includeRtJar() {
- final File rtJar = CompileEnvironment.findRtJar(true);
+ final File rtJar = CompileEnvironment.findRtJar();
environment.addToClasspath(rtJar);
}
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
index 25a3cf9c272..7504f3ba3c3 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java
@@ -1,7 +1,7 @@
package org.jetbrains.k2js.translate.declaration;
+import com.google.dart.compiler.backend.js.ast.JsExpression;
import com.google.dart.compiler.backend.js.ast.JsInvocation;
-import com.google.dart.compiler.backend.js.ast.JsNameRef;
import com.google.dart.compiler.backend.js.ast.JsObjectLiteral;
import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer;
import com.google.dart.compiler.util.AstUtil;
@@ -15,6 +15,7 @@ import org.jetbrains.jet.lang.psi.JetParameter;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
import org.jetbrains.k2js.translate.general.Translation;
+import org.jetbrains.k2js.translate.reference.ReferenceTranslator;
import org.jetbrains.k2js.translate.utils.BindingUtils;
import java.util.ArrayList;
@@ -67,14 +68,14 @@ public final class ClassTranslator extends AbstractTranslator {
}
private void addSuperclassReferences(@NotNull JsInvocation jsClassDeclaration) {
- for (JsNameRef superClassReference : getSuperclassNameReferences()) {
+ for (JsExpression superClassReference : getSuperclassNameReferences()) {
jsClassDeclaration.getArguments().add(superClassReference);
}
}
@NotNull
- private List getSuperclassNameReferences() {
- List superclassReferences = new ArrayList();
+ private List getSuperclassNameReferences() {
+ List superclassReferences = new ArrayList();
List superclassDescriptors =
BindingUtils.getSuperclassDescriptors(context().bindingContext(), classDeclaration);
addAncestorClass(superclassReferences, superclassDescriptors);
@@ -82,7 +83,7 @@ public final class ClassTranslator extends AbstractTranslator {
return superclassReferences;
}
- private void addTraits(@NotNull List superclassReferences,
+ private void addTraits(@NotNull List superclassReferences,
@NotNull List superclassDescriptors) {
for (ClassDescriptor superClassDescriptor :
superclassDescriptors) {
@@ -91,7 +92,7 @@ public final class ClassTranslator extends AbstractTranslator {
}
}
- private void addAncestorClass(@NotNull List superclassReferences,
+ private void addAncestorClass(@NotNull List superclassReferences,
@NotNull List superclassDescriptors) {
//here we remove ancestor class from the list
ClassDescriptor ancestorClass = findAndRemoveAncestorClass(superclassDescriptors);
@@ -101,10 +102,14 @@ public final class ClassTranslator extends AbstractTranslator {
}
@NotNull
- private JsNameRef getClassReference(@NotNull ClassDescriptor superClassDescriptor) {
+ private JsExpression getClassReference(@NotNull ClassDescriptor superClassDescriptor) {
//TODO we actually know that in current implementation superclass must have an alias but
// in future it might change
- return context().aliaser().getAliasForDeclaration(superClassDescriptor).makeRef();
+ if (aliaser().hasAliasForDeclaration(superClassDescriptor)) {
+ return context().aliaser().getAliasForDeclaration(superClassDescriptor).makeRef();
+ } else {
+ return ReferenceTranslator.translateAsFQReference(superClassDescriptor, context());
+ }
}
@Nullable
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
index 6c5cecc8a12..c89fe93deca 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
@@ -11,10 +11,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetUnaryExpression;
-import org.jetbrains.jet.lang.resolve.calls.DefaultValueArgument;
-import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
-import org.jetbrains.jet.lang.resolve.calls.ResolvedCallImpl;
-import org.jetbrains.jet.lang.resolve.calls.ResolvedValueArgument;
+import org.jetbrains.jet.lang.resolve.calls.*;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.k2js.translate.context.TranslationContext;
import org.jetbrains.k2js.translate.general.AbstractTranslator;
@@ -52,7 +49,7 @@ public final class CallTranslator extends AbstractTranslator {
List arguments = Collections.emptyList();
ResolvedCall resolvedCall =
getResolvedCall(context.bindingContext(), unaryExpression.getOperationReference());
- return new CallTranslator(receiver, arguments, resolvedCall, null, context);
+ return new CallTranslator(receiver, null, arguments, resolvedCall, null, context);
}
//TODO: method too long
@@ -75,7 +72,7 @@ public final class CallTranslator extends AbstractTranslator {
ResolvedCall resolvedCall =
getResolvedCall(context.bindingContext(), binaryExpression.getOperationReference());
- return new CallTranslator(receiver, arguments, resolvedCall, null, context);
+ return new CallTranslator(receiver, null, arguments, resolvedCall, null, context);
}
@NotNull
@@ -83,7 +80,23 @@ public final class CallTranslator extends AbstractTranslator {
@Nullable JsExpression receiver) {
ResolvedCall resolvedCall = getResolvedCallForCallExpression(context.bindingContext(), callExpression);
List arguments = translateArgumentsForCallExpression(callExpression, context);
- return new CallTranslator(receiver, arguments, resolvedCall, null, context);
+ JsExpression callee = null;
+ if (resolvedCall.getCandidateDescriptor() instanceof ExpressionAsFunctionDescriptor) {
+ callee = Translation.translateAsExpression(getCallee(callExpression), context);
+ }
+ return new CallTranslator(receiver, callee, arguments, resolvedCall, null, context);
+ }
+
+ @Nullable
+ private JsExpression translateCalleeIfExpressionAsFunction(@NotNull JetCallExpression callExpression) {
+ //TODO: util
+ JetExpression calleeExpression = callExpression.getCalleeExpression();
+ assert calleeExpression != null;
+ JsExpression callee = null;
+ if (isExpressionAsFunction(context.bindingContext(), calleeExpression)) {
+ callee = Translation.translateAsExpression(calleeExpression, context);
+ }
+ return callee;
}
@NotNull
@@ -134,7 +147,7 @@ public final class CallTranslator extends AbstractTranslator {
@NotNull ResolvedCall resolvedCall,
@Nullable CallableDescriptor descriptorToCall,
@NotNull TranslationContext context) {
- return (new CallTranslator(receiver, arguments, resolvedCall, descriptorToCall, context)).translate();
+ return (new CallTranslator(receiver, null, arguments, resolvedCall, descriptorToCall, context)).translate();
}
@NotNull
@@ -172,7 +185,10 @@ public final class CallTranslator extends AbstractTranslator {
}
@Nullable
- private JsExpression receiver;
+ private /*var*/ JsExpression receiver;
+
+ @Nullable
+ private final JsExpression callee;
@NotNull
private final List arguments;
@@ -183,13 +199,15 @@ public final class CallTranslator extends AbstractTranslator {
@NotNull
private final CallableDescriptor descriptor;
- private CallTranslator(@Nullable JsExpression receiver, @NotNull List arguments,
+ private CallTranslator(@Nullable JsExpression receiver, @Nullable JsExpression callee,
+ @NotNull List arguments,
@NotNull ResolvedCall resolvedCall,
@Nullable CallableDescriptor descriptorToCall,
@NotNull TranslationContext context) {
super(context);
this.receiver = receiver;
this.arguments = arguments;
+ this.callee = callee;
this.resolvedCall = resolvedCall;
if (descriptorToCall != null) {
this.descriptor = descriptorToCall;
@@ -268,6 +286,9 @@ public final class CallTranslator extends AbstractTranslator {
@NotNull
private JsExpression calleeReference() {
+ if (callee != null) {
+ return callee;
+ }
if (isVariableDescriptor(descriptor)) {
//TODO: write tests on this cases
VariableDescriptor variableDescriptor =
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
index 357bc94aa17..afff7de56bd 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java
@@ -6,6 +6,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.calls.ExpressionAsFunctionDescriptor;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.types.JetStandardClasses;
@@ -307,4 +308,14 @@ public final class BindingUtils {
return hasNextDescriptor;
}
+ public static boolean isExpressionAsFunction(@NotNull BindingContext context,
+ @NotNull JetExpression calleeExpression) {
+ DeclarationDescriptor declarationDescriptor =
+ context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, calleeExpression);
+ if (declarationDescriptor == null) {
+ return false;
+ }
+ return (declarationDescriptor instanceof ExpressionAsFunctionDescriptor);
+ }
+
}
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/ClassSorter.java b/translator/src/org/jetbrains/k2js/translate/utils/ClassSorter.java
index f7da41fc4f2..645959c04bb 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/ClassSorter.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/ClassSorter.java
@@ -88,7 +88,8 @@ public final class ClassSorter {
private ClassDescriptor popFromList() {
assert !classesWithNoAncestors.isEmpty();
ClassDescriptor result = classesWithNoAncestors.get(classesWithNoAncestors.size() - 1);
- classesWithNoAncestors.remove(classesWithNoAncestors.size() - 1);
+ ClassDescriptor removed = classesWithNoAncestors.remove(classesWithNoAncestors.size() - 1);
+ assert removed != null;
return result;
}
@@ -105,9 +106,16 @@ public final class ClassSorter {
private void setInitialCount() {
for (ClassDescriptor descriptor : descriptorList) {
List superclasses = getSuperclassDescriptors(descriptor);
+ int count = 0;
+ for (ClassDescriptor superclassDescriptor : superclasses) {
+ if (descriptorList.contains(superclassDescriptor)) {
+ count++;
+ }
+ }
classWasInheritedCount.put(descriptor, superclasses.size());
- if (!superclasses.isEmpty()) {
- classesWithNoAncestors.remove(descriptor);
+ if (count > 0) {
+ boolean success = classesWithNoAncestors.remove(descriptor);
+ assert success;
}
}
}
diff --git a/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java b/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
index c1c450da736..f23a6846164 100644
--- a/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java
@@ -75,7 +75,7 @@ public final class PsiUtils {
}
@NotNull
- /*package*/ static JetExpression getCallee(@NotNull JetCallExpression expression) {
+ public static JetExpression getCallee(@NotNull JetCallExpression expression) {
JetExpression calleeExpression = expression.getCalleeExpression();
assert calleeExpression != null;
return calleeExpression;
diff --git a/translator/test/org/jetbrains/k2js/test/StdlibTest.java b/translator/test/org/jetbrains/k2js/test/StdlibTest.java
new file mode 100644
index 00000000000..ac73219aa76
--- /dev/null
+++ b/translator/test/org/jetbrains/k2js/test/StdlibTest.java
@@ -0,0 +1,20 @@
+package org.jetbrains.k2js.test;
+
+import org.junit.Test;
+
+/**
+ * @author Pavel Talanov
+ */
+public final class StdlibTest extends TranslationTest {
+ final private static String MAIN = "stdlib/";
+
+ @Override
+ protected String mainDirectory() {
+ return MAIN;
+ }
+
+ @Test
+ public void filter() throws Exception {
+ testFooBoxIsTrue("Filter.kt");
+ }
+}
diff --git a/translator/testFiles/examples/cases/inheritedMethod.jet b/translator/testFiles/examples/cases/inheritedMethod.jet
index 597910dc7b4..97d432077a8 100644
--- a/translator/testFiles/examples/cases/inheritedMethod.jet
+++ b/translator/testFiles/examples/cases/inheritedMethod.jet
@@ -1,8 +1,8 @@
-open class Foo {
+open class Foo() {
fun xyzzy(): String = "xyzzy"
}
-class Bar(): Foo {
+class Bar(): Foo() {
fun test(): String = xyzzy()
}
diff --git a/translator/testFiles/stdlib/cases/Filter.kt b/translator/testFiles/stdlib/cases/Filter.kt
new file mode 100644
index 00000000000..6b1f89f2f89
--- /dev/null
+++ b/translator/testFiles/stdlib/cases/Filter.kt
@@ -0,0 +1,60 @@
+package foo
+
+import js.*
+import java.util.*
+
+class NoSuchElementException() : Exception() {}
+
+/*
+Filters given iterator
+*/
+inline fun Iterator.filter(f: (T)-> Boolean) : Iterator = FilterIterator(this, f)
+
+/*
+Adds filtered elements in to given container
+*/
+inline fun > Iterable.filterTo(var container: U, filter: (T)->Boolean) : U {
+ for(element in this) {
+ if(filter(element))
+ container.add(element)
+ }
+ return container
+}
+
+/*
+Create iterator filtering given java.lang.Iterable
+*/
+/*
+inline fun Iterable.filter(f: (T)->Boolean) : Iterator = (iterator() as Iterator).filter(f)
+*/
+
+private class FilterIterator(val original: Iterator, val filter: (T)-> Boolean) : Iterator {
+ var state = 0
+ var nextElement: T? = null
+
+ override val hasNext: Boolean
+ get() =
+ when(state) {
+ 1 -> true // checked and next present
+ 2 -> false // checked and next not present
+ else -> {{() : Boolean ->
+ while(original.hasNext) {
+ val candidate = original.next()
+ if((filter)(candidate)) {
+ nextElement = candidate
+ state = 1
+ return true
+ }
+ }
+ state = 2
+ return false
+ }()}
+ }
+
+ override fun next(): T {
+ val res = nextElement as T
+ nextElement = null
+ state = 0
+ return res
+ }
+}