Skip to content

SBT build update, TODO comments #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
adriaanm wants to merge 2 commits into from
Closed

SBT build update, TODO comments #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d94339
Update SBT build to 0.13.1 and Scala 2.11.0-M7
adriaanm Jan 10, 2014
4d23955
TODO: comments
adriaanm Jan 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.0-RC7"

scalaSource in Test := baseDirectory.value / "test"
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.12.2
sbt.version=0.13.1
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/ast/Trees.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/core/Denotations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down