From 2d10c87ce537fb42fdb134efcae53dca7305a7b7 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 11 Oct 2016 17:28:39 +0200 Subject: Move sbt-bridge --- .../src/sbt-test/source-dependencies/inline/A.scala | 3 +++ .../src/sbt-test/source-dependencies/inline/C.scala | 5 +++++ .../source-dependencies/inline/changes/B1.scala | 4 ++++ .../source-dependencies/inline/changes/B2.scala | 4 ++++ .../source-dependencies/inline/changes/B3.scala | 4 ++++ .../inline/project/DottyInjectedPlugin.scala | 17 +++++++++++++++++ .../bridge/src/sbt-test/source-dependencies/inline/test | 14 ++++++++++++++ 7 files changed, 51 insertions(+) create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala create mode 100644 sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test (limited to 'sbt-bridge/bridge/src/sbt-test/source-dependencies/inline') diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala new file mode 100644 index 000000000..e889eef79 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/A.scala @@ -0,0 +1,3 @@ +object A { + def get: Int = 1 +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala new file mode 100644 index 000000000..caeb61535 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/C.scala @@ -0,0 +1,5 @@ +object C { + def main(args: Array[String]): Unit = { + val i: Int = B.getInline + } +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala new file mode 100644 index 000000000..5685152b3 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B1.scala @@ -0,0 +1,4 @@ +object B { + @inline def getInline: Int = + A.get +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala new file mode 100644 index 000000000..1de104357 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B2.scala @@ -0,0 +1,4 @@ +object B { + @inline def getInline: Double = + A.get +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala new file mode 100644 index 000000000..991bd17b8 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/changes/B3.scala @@ -0,0 +1,4 @@ +object B { + @inline def getInline: Int = + sys.error("This is an expected failure when running C") +} diff --git a/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000..3433779b6 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/project/DottyInjectedPlugin.scala @@ -0,0 +1,17 @@ +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/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test new file mode 100644 index 000000000..56fdb0486 --- /dev/null +++ b/sbt-bridge/bridge/src/sbt-test/source-dependencies/inline/test @@ -0,0 +1,14 @@ +$ copy-file changes/B1.scala B.scala +> compile + +$ copy-file changes/B2.scala B.scala +# Compilation of C.scala should fail because B.getInline now has type Double instead of Int +-> compile + +$ copy-file changes/B1.scala B.scala +> run + +$ copy-file changes/B3.scala B.scala +# The body of B.getInline was changed so C.scala should be recompiled +# If it was recompiled, run should fail since B.getInline now throws an exception +-> run -- cgit v1.2.3