From 7d94339d16de4c6dce0cd121777b623815fa51a5 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Fri, 10 Jan 2014 14:46:55 -0800 Subject: [PATCH 1/2] Update SBT build to 0.13.1 and Scala 2.11.0-M7 --- build.sbt | 10 ++++++---- project/build.properties | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 8e84bd19c73e..a9dfe7fe856b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,12 +2,14 @@ name := "dotty" organization := "lamp" -scalaVersion := "2.10.0" +scalaVersion := "2.11.0-M7" -scalaSource in Compile <<= baseDirectory / "src" +scalaSource in Compile := baseDirectory.value / "src" scalacOptions in Global ++= Seq("-feature", "-deprecation", "-language:_") -libraryDependencies <+= scalaVersion ( sv => "org.scala-lang" % "scala-reflect" % sv ) +libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value -scalaSource in Test <<= baseDirectory / "test" \ No newline at end of file +libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.0-RC7" + +scalaSource in Test := baseDirectory.value / "test" \ No newline at end of file diff --git a/project/build.properties b/project/build.properties index 66ad72ce2eba..37b489cb6e30 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.2 +sbt.version=0.13.1 From 4d23955c3fd7a1c9b5b1a6f25929cfcb4dee588c Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Fri, 10 Jan 2014 14:47:28 -0800 Subject: [PATCH 2/2] TODO: comments --- src/dotty/tools/dotc/ast/Trees.scala | 2 +- src/dotty/tools/dotc/core/Denotations.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotty/tools/dotc/ast/Trees.scala b/src/dotty/tools/dotc/ast/Trees.scala index 13f7d6f18a6e..306df7a014ca 100644 --- a/src/dotty/tools/dotc/ast/Trees.scala +++ b/src/dotty/tools/dotc/ast/Trees.scala @@ -581,7 +581,7 @@ object Trees { s"TypeTree${if (hasType) s"[$typeOpt]" else s"($original)"}" } - /** ref.type */ + /** ref.type todo: Make TermRef? */ case class SingletonTypeTree[-T >: Untyped] private[ast] (ref: Tree[T]) extends DenotingTree[T] with TypTree[T] { type ThisTree[-T >: Untyped] = SingletonTypeTree[T] diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala index e6d5023e5fbb..1af81ddea83c 100644 --- a/src/dotty/tools/dotc/core/Denotations.scala +++ b/src/dotty/tools/dotc/core/Denotations.scala @@ -548,7 +548,7 @@ object Denotations { if (denots.exists && denots.containsSig(signature)) NoDenotation else this def mapInherited(ownDenots: PreDenotation, prevDenots: PreDenotation, pre: Type)(implicit ctx: Context): SingleDenotation = if (hasUniqueSym && prevDenots.containsSym(symbol)) NoDenotation - else if (isType) filterDisjoint(ownDenots).asSeenFrom(pre) + else if (isType) filterDisjoint(ownDenots).asSeenFrom(pre) // comment!! (it's an optimization) else asSeenFrom(pre).filterDisjoint(ownDenots) final def filterExcluded(excluded: FlagSet)(implicit ctx: Context): SingleDenotation = if (excluded.isEmpty || !(this overlaps excluded)) this else NoDenotation