From 15cad77cd06afba2de7371c2b57a03af1df1208d Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 7 Nov 2011 17:14:36 +0400
Subject: [PATCH] super expression added

---
 .../jet/j2k/ast/SuperExpression.java          | 20 +++++++++++++++++++
 .../jet/j2k/visitors/ExpressionVisitor.java   |  1 +
 .../superExpression/class/classAextendsB.jav  | 11 ++++++++++
 .../superExpression/class/classAextendsB.kt   |  9 +++++++++
 .../statement/superStatement.jav              |  1 +
 .../statement/superStatement.kt               |  1 +
 6 files changed, 43 insertions(+)
 create mode 100644 src/org/jetbrains/jet/j2k/ast/SuperExpression.java
 create mode 100644 testData/ast/superExpression/class/classAextendsB.jav
 create mode 100644 testData/ast/superExpression/class/classAextendsB.kt
 create mode 100644 testData/ast/superExpression/statement/superStatement.jav
 create mode 100644 testData/ast/superExpression/statement/superStatement.kt

diff --git a/src/org/jetbrains/jet/j2k/ast/SuperExpression.java b/src/org/jetbrains/jet/j2k/ast/SuperExpression.java
new file mode 100644
index 00000000000..a52ce00c448
--- /dev/null
+++ b/src/org/jetbrains/jet/j2k/ast/SuperExpression.java
@@ -0,0 +1,20 @@
+package org.jetbrains.jet.j2k.ast;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author ignatov
+ */
+public class SuperExpression extends Expression {
+  private Type myType;
+
+  public SuperExpression(Type type) {
+    myType = type;
+  }
+
+  @NotNull
+  @Override
+  public String toKotlin() {
+    return "super" + "<" + myType.toKotlin() + ">";
+  }
+}
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
index cb40da43b4f..18b7deb3e9c 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
@@ -236,6 +236,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
   @Override
   public void visitSuperExpression(PsiSuperExpression expression) {
     super.visitSuperExpression(expression);
+    myResult = new SuperExpression(typeToNotNullableType(expression.getType()));
   }
 
   @Override
diff --git a/testData/ast/superExpression/class/classAextendsB.jav b/testData/ast/superExpression/class/classAextendsB.jav
new file mode 100644
index 00000000000..b50235108d0
--- /dev/null
+++ b/testData/ast/superExpression/class/classAextendsB.jav
@@ -0,0 +1,11 @@
+class B {
+  void call() {}
+}
+
+class A extends B {
+  A() {
+    super();
+  }
+
+  void call() { return super.call(); }
+}
\ No newline at end of file
diff --git a/testData/ast/superExpression/class/classAextendsB.kt b/testData/ast/superExpression/class/classAextendsB.kt
new file mode 100644
index 00000000000..4d9518ab15b
--- /dev/null
+++ b/testData/ast/superExpression/class/classAextendsB.kt
@@ -0,0 +1,9 @@
+open class B {
+fun call() : Unit {
+}
+}
+open class A : B {
+override fun call() : Unit {
+return super<B>.call()
+}
+}
\ No newline at end of file
diff --git a/testData/ast/superExpression/statement/superStatement.jav b/testData/ast/superExpression/statement/superStatement.jav
new file mode 100644
index 00000000000..4b2f79a6823
--- /dev/null
+++ b/testData/ast/superExpression/statement/superStatement.jav
@@ -0,0 +1 @@
+super.call();
\ No newline at end of file
diff --git a/testData/ast/superExpression/statement/superStatement.kt b/testData/ast/superExpression/statement/superStatement.kt
new file mode 100644
index 00000000000..2ee17f5e923
--- /dev/null
+++ b/testData/ast/superExpression/statement/superStatement.kt
@@ -0,0 +1 @@
+super<Any>.call()
\ No newline at end of file