From 04f21eee509f4cf1a1c7d5d5cf6b2fa6c12cf521 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 27 Mar 2014 14:48:24 +0400
Subject: [PATCH] getReturnType() removed from ScriptDescriptor

---
 .../src/org/jetbrains/jet/codegen/ScriptCodegen.java      | 2 +-
 .../org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java   | 7 ++++++-
 .../jetbrains/jet/lang/descriptors/ScriptDescriptor.java  | 4 ----
 .../jet/lang/descriptors/ScriptDescriptorImpl.java        | 8 --------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
index 9c9592a86cf..81ebffbd007 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
@@ -116,7 +116,7 @@ public class ScriptCodegen extends MemberCodegen {
             @NotNull MethodContext context
     ) {
 
-        Type blockType = typeMapper.mapType(scriptDescriptor.getReturnType());
+        Type blockType = typeMapper.mapType(scriptDescriptor.getScriptCodeDescriptor().getReturnType());
 
         classBuilder.newField(null, ACC_PUBLIC | ACC_FINAL, ScriptDescriptor.LAST_EXPRESSION_VALUE_FIELD_NAME,
                               blockType.getDescriptor(), null, null);
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
index eaa143cdf6f..8fb36aee328 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
@@ -280,7 +280,12 @@ public class ReplInterpreter {
 
             earlierLines.add(new EarlierLine(line, scriptDescriptor, scriptClass, scriptInstance, scriptClassType));
 
-            return LineResult.successful(rv, scriptDescriptor.getReturnType().equals(KotlinBuiltIns.getInstance().getUnitType()));
+            return LineResult.successful(
+                        rv,
+                        KotlinBuiltIns.getInstance().getUnitType().equals(
+                                scriptDescriptor.getScriptCodeDescriptor().getReturnType()
+                        )
+            );
         } catch (Throwable e) {
             PrintWriter writer = new PrintWriter(System.err);
             classLoader.dumpClasses(writer);
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
index 46796b152b8..8cc4d4ef21e 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.descriptors;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
 import org.jetbrains.jet.lang.descriptors.impl.ScriptCodeDescriptor;
-import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.List;
@@ -28,9 +27,6 @@ public interface ScriptDescriptor extends Annotated, DeclarationDescriptor, Decl
     String LAST_EXPRESSION_VALUE_FIELD_NAME = "rv";
     Name NAME = Name.special("<script>");
 
-    @NotNull
-    JetType getReturnType();
-
     int getPriority();
 
     @NotNull
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
index e3af027ef27..51e6b73ed6f 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
@@ -39,7 +39,6 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
 
     private final int priority;
 
-    private JetType returnType;
     private List<ValueParameterDescriptor> valueParameters;
 
     private final ScriptCodeDescriptor scriptCodeDescriptor = new ScriptCodeDescriptor(this);
@@ -75,7 +74,6 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
             @NotNull List<? extends PropertyDescriptorImpl> properties,
             @NotNull List<? extends FunctionDescriptor> functions
     ) {
-        this.returnType = returnType;
         scriptCodeDescriptor.initialize(implicitReceiver, valueParameters, returnType);
 
         PropertyDescriptorImpl propertyDescriptor = PropertyDescriptorImpl.create(classDescriptor,
@@ -122,12 +120,6 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
         return priority;
     }
 
-    @Override
-    @NotNull
-    public JetType getReturnType() {
-        return returnType;
-    }
-
     @Override
     @NotNull
     public List<ValueParameterDescriptor> getValueParameters() {