diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-11 17:28:39 +0200 |
---|---|---|
committer | Guillaume Martres <smarter@ubuntu.com> | 2016-11-22 01:35:06 +0100 |
commit | 2d10c87ce537fb42fdb134efcae53dca7305a7b7 (patch) | |
tree | a3629c9a3ad6db3e9d07df8fa8621f8c8211076c /bridge/src/sbt-test/source-dependencies/linearization | |
parent | 34d64f381362b12a595fd26690c7c9b1c26d16f7 (diff) | |
download | dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.gz dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.tar.bz2 dotty-2d10c87ce537fb42fdb134efcae53dca7305a7b7.zip |
Move sbt-bridge
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/linearization')
9 files changed, 0 insertions, 47 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/linearization/A.scala b/bridge/src/sbt-test/source-dependencies/linearization/A.scala deleted file mode 100644 index 69399d3fb..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait A { - def x = 3 -} diff --git a/bridge/src/sbt-test/source-dependencies/linearization/B.scala b/bridge/src/sbt-test/source-dependencies/linearization/B.scala deleted file mode 100644 index 608b53052..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/B.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait B extends A { - override def x = super.x * 2 -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/linearization/C.scala b/bridge/src/sbt-test/source-dependencies/linearization/C.scala deleted file mode 100644 index 3fbd747e0..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/C.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait C extends A { - override def x = super.x + 5 -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/linearization/D.scala b/bridge/src/sbt-test/source-dependencies/linearization/D.scala deleted file mode 100644 index 7b46ebf97..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/D.scala +++ /dev/null @@ -1,2 +0,0 @@ -// define the order -trait D extends C with B
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/linearization/E.scala b/bridge/src/sbt-test/source-dependencies/linearization/E.scala deleted file mode 100644 index f69ea1d51..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/E.scala +++ /dev/null @@ -1,2 +0,0 @@ -// put a level in between D and its concrete class -trait E extends D diff --git a/bridge/src/sbt-test/source-dependencies/linearization/F.scala b/bridge/src/sbt-test/source-dependencies/linearization/F.scala deleted file mode 100644 index 6dda903f5..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/F.scala +++ /dev/null @@ -1,3 +0,0 @@ -object F extends E { - def main(args: Array[String]) = assert(x == args(0).toInt, x) -}
\ No newline at end of file diff --git a/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala b/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala deleted file mode 100644 index 84c173887..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/changes/D.scala +++ /dev/null @@ -1 +0,0 @@ -trait D extends B with C diff --git a/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala deleted file mode 100644 index 3433779b6..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,17 +0,0 @@ -import sbt._ -import Keys._ - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - override val projectSettings = Seq( - scalaVersion := "0.1-SNAPSHOT", - scalaOrganization := "ch.epfl.lamp", - scalacOptions += "-language:Scala2", - scalaBinaryVersion := "2.11", - autoScalaLibrary := false, - libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"), - scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources() - ) -} diff --git a/bridge/src/sbt-test/source-dependencies/linearization/test b/bridge/src/sbt-test/source-dependencies/linearization/test deleted file mode 100644 index e6078ebfb..000000000 --- a/bridge/src/sbt-test/source-dependencies/linearization/test +++ /dev/null @@ -1,13 +0,0 @@ -> compile - -# the value of F.x should be 16 -> run 16 - -# modify D.scala so that the linearization changes -$ copy-file changes/D.scala D.scala -# F.x becomes 11 -> compile - -# if F is recompiled, the value of x should be 11, otherwise it will still be 16 -# and this will fail -> run 11
\ No newline at end of file |