From 34344dcaa21f464db607a67d91de3b4cee726c2b Mon Sep 17 00:00:00 2001 From: sumito3478 Date: Tue, 9 Sep 2014 01:45:05 +0900 Subject: [PATCH 1/5] Bump versions --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 4872af6..2f6a243 100644 --- a/build.sbt +++ b/build.sbt @@ -8,8 +8,8 @@ lazy val commonSettings = scalaModuleSettings ++ Seq( repoName := "scala-continuations", organization := "org.scala-lang.plugins", version := "1.0.1-SNAPSHOT", - scalaVersion := "2.11.1", - snapshotScalaBinaryVersion := "2.11.1" + scalaVersion := "2.11.2", + snapshotScalaBinaryVersion := "2.11.2" ) lazy val root = project.in( file(".") ).settings( publishArtifact := false ).aggregate(plugin, library).settings(commonSettings : _*) From 23a4e6a0837bb674b97dd60384db839f7ba2ae92 Mon Sep 17 00:00:00 2001 From: sumito3478 Date: Tue, 9 Sep 2014 06:56:35 +0900 Subject: [PATCH 2/5] Avoid deprecation/feature warnings This commit adds -deprecation and -feature to scalacOptions and fix source code to avoid deprecation/feature warnings. Since scala/scala-continuations#8 is already working on the usages of deprecated CompilationUnit, this commit does not fix them. --- build.sbt | 5 ++++- .../scala/scala/tools/selectivecps/TestSuite.scala | 10 +++++----- .../main/scala/scala/tools/selectivecps/CPSUtils.scala | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 2f6a243..73f268a 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,10 @@ lazy val commonSettings = scalaModuleSettings ++ Seq( organization := "org.scala-lang.plugins", version := "1.0.1-SNAPSHOT", scalaVersion := "2.11.2", - snapshotScalaBinaryVersion := "2.11.2" + snapshotScalaBinaryVersion := "2.11.2", + scalacOptions ++= Seq( + "-deprecation", + "-feature") ) lazy val root = project.in( file(".") ).settings( publishArtifact := false ).aggregate(plugin, library).settings(commonSettings : _*) diff --git a/library/src/test/scala/scala/tools/selectivecps/TestSuite.scala b/library/src/test/scala/scala/tools/selectivecps/TestSuite.scala index dc7db47..b270d4a 100644 --- a/library/src/test/scala/scala/tools/selectivecps/TestSuite.scala +++ b/library/src/test/scala/scala/tools/selectivecps/TestSuite.scala @@ -6,7 +6,7 @@ import org.junit.Assert.assertEquals import scala.annotation._ import scala.collection.Seq import scala.collection.generic.CanBuildFrom -import scala.language.{ implicitConversions } +import scala.language.{ implicitConversions, higherKinds } import scala.util.continuations._ import scala.util.control.Exception @@ -403,9 +403,9 @@ class Suspendable { def test4[A](x: List[A]): A @suspendable = x match { case List(x) => x } @Test def t1821 { - assertEquals((), reset(test1())) + assertEquals((), reset(test1(()))) assertEquals((), reset(test2(List(())))) - assertEquals((), reset(test3())) + assertEquals((), reset(test3(()))) assertEquals((), reset(test4(List(())))) } } @@ -716,12 +716,12 @@ class HigherOrder { reset { f(element) if (super.decrementAndGet() == 0) { - continue() + continue(()) } } } if (super.decrementAndGet() == 0) { - continue() + continue(()) } } }) diff --git a/plugin/src/main/scala/scala/tools/selectivecps/CPSUtils.scala b/plugin/src/main/scala/scala/tools/selectivecps/CPSUtils.scala index 26480ee..380e4ab 100644 --- a/plugin/src/main/scala/scala/tools/selectivecps/CPSUtils.scala +++ b/plugin/src/main/scala/scala/tools/selectivecps/CPSUtils.scala @@ -35,7 +35,7 @@ trait CPSUtils { lazy val MarkerCPSAdaptMinus = rootMirror.getRequiredClass("scala.util.continuations.cpsMinus") lazy val Context = rootMirror.getRequiredClass("scala.util.continuations.ControlContext") - lazy val ModCPS = rootMirror.getPackage("scala.util.continuations") + lazy val ModCPS = rootMirror.getPackage(TermName("scala.util.continuations")) lazy val MethShiftUnit = definitions.getMember(ModCPS, cpsNames.shiftUnit) lazy val MethShiftUnit0 = definitions.getMember(ModCPS, cpsNames.shiftUnit0) From a36b9017b48c44c55349b6aa0e96ed7e438eef40 Mon Sep 17 00:00:00 2001 From: sumito3478 Date: Tue, 16 Sep 2014 16:29:56 +0900 Subject: [PATCH 3/5] Use reporter.warning instead of deprecated unit.warning --- .../scala/tools/selectivecps/SelectiveANFTransform.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/scala/scala/tools/selectivecps/SelectiveANFTransform.scala b/plugin/src/main/scala/scala/tools/selectivecps/SelectiveANFTransform.scala index 6ff51b8..5756118 100644 --- a/plugin/src/main/scala/scala/tools/selectivecps/SelectiveANFTransform.scala +++ b/plugin/src/main/scala/scala/tools/selectivecps/SelectiveANFTransform.scala @@ -395,7 +395,7 @@ abstract class SelectiveANFTransform extends PluginComponent with Transform with debuglog("cps type conversion (expected: " + cpsR.get + "): " + expr) if (!hasPlusMarker(expr.tpe)) - unit.warning(tree.pos, "expression " + tree + " is cps-transformed unexpectedly") + reporter.warning(tree.pos, "expression " + tree + " is cps-transformed unexpectedly") try { val Some((a, b)) = cpsR @@ -446,7 +446,7 @@ abstract class SelectiveANFTransform extends PluginComponent with Transform with // all is well if (hasPlusMarker(expr.tpe)) { - unit.warning(tree.pos, "expression " + expr + " of type " + expr.tpe + " is not expected to have a cps type") + reporter.warning(tree.pos, "expression " + expr + " of type " + expr.tpe + " is not expected to have a cps type") expr modifyType removeAllCPSAnnotations } From d177b6f6da1dac6e9cb64c3271a8a0f5b6c2d3f0 Mon Sep 17 00:00:00 2001 From: sumito3478 Date: Tue, 16 Sep 2014 16:30:41 +0900 Subject: [PATCH 4/5] Update sbt to 0.13.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index be6c454..64abd37 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 +sbt.version=0.13.6 From e73131d2401a21627a2e20636329eed89e5b5a87 Mon Sep 17 00:00:00 2001 From: sumito3478 Date: Tue, 16 Sep 2014 16:46:45 +0900 Subject: [PATCH 5/5] Update the scala version to 2.11.0 in .travis.yaml Testing with 2.11.0-SNAPSHOT results "UNRESOLVED DEPENDENCIES". --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dbb17eb..e48b184 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ script: - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' clean update compile test # TODO: -Dbuild.publish.user=${SONATYPE_USER} -Dbuild.publish.password=${SONATYPE_PASS} $(bash project/release_on_tag.sh) scala: - - 2.11.0-SNAPSHOT + - 2.11.0 jdk: - openjdk6 # - openjdk7