From 459652c61eec953fb09d22b6b497a1554a1a378a Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Mon, 28 Aug 2017 11:45:44 +0200
Subject: [PATCH 1/2] Change definition of `repl` in `Build.scala`

---
 project/Build.scala | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 0d087f3f586e..9242db757896 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -391,8 +391,6 @@ object Build {
         )
       }.evaluated,
 
-      repl := run.evaluated,
-
       javaOptions ++= (javaOptions in `dotty-compiler`).value,
       fork in run := true,
       fork in Test := true,
@@ -581,6 +579,20 @@ object Build {
       }.evaluated,
       dotc := run.evaluated,
 
+      repl := Def.inputTaskDyn {
+        val dottyLib = packageAll.value("dotty-library")
+        val args: Seq[String] = spaceDelimited("<arg>").parsed
+
+        val fullArgs = args.span(_ != "-classpath") match {
+          case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil)
+          case (beforeCp, rest) => beforeCp ++ rest
+        }
+
+        (runMain in Compile).toTask(
+          s" dotty.tools.repl.Main " + fullArgs.mkString(" ")
+        )
+      }.evaluated,
+
       // enable verbose exception messages for JUnit
       testOptions in Test += Tests.Argument(
         TestFrameworks.JUnit, "-a", "-v",

From 8534d69928d1c044e5d18a5f0befe257c2258469 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Mon, 28 Aug 2017 12:11:14 +0200
Subject: [PATCH 2/2] Fix `dist/bin/dotr`

---
 dist/bin/dotc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/bin/dotc b/dist/bin/dotc
index 0aa352d65abf..3eb596fa15d7 100755
--- a/dist/bin/dotc
+++ b/dist/bin/dotc
@@ -32,7 +32,7 @@ bootcp=true
 
 CompilerMain=dotty.tools.dotc.Main
 FromTasty=dotty.tools.dotc.FromTasty
-ReplMain=dotty.tools.dotc.repl.Main
+ReplMain=dotty.tools.repl.Main
 
 PROG_NAME=$CompilerMain