diff options
author | Paul Phillips <paulp@improving.org> | 2012-09-28 06:55:49 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-09-28 07:19:01 -0700 |
commit | 886c4061222773d76f3ee3f4ff1469f9d4a48eaf (patch) | |
tree | 70b13842e325bafd48e5494c844078f35b02f5b7 /test/files/pos | |
parent | 41f37bc428a309b9766f545da0179f270ea01d77 (diff) | |
parent | 57db28c55c3610f508b07940f7077cb73932418f (diff) | |
download | scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.tar.gz scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.tar.bz2 scala-886c4061222773d76f3ee3f4ff1469f9d4a48eaf.zip |
Merge branch '2.10.x' into 210-merge
* 2.10.x: (37 commits)
Added logic and tests for unchecked refinements.
Moved isNonRefinementClassType somewhere logical.
Moved two tests to less breaky locations.
Nailed down the "impossible match" logic.
Finish docs for string interpolation.
moves Context.ParseError outside the cake
revives macros.Infrastructure
moves Context.runtimeUniverse to TreeBuild.mkRuntimeUniverseRef
a more precise type for Context.mirror
gets rid of macros.Infrastructure
simplifies Context.Run and Context.CompilationUnit
exposes Position.source as SourceFile
removes extraneous stuff from macros.Infrastructure
merges macros.CapturedVariables into macros.Universe
merges macros.Exprs and macros.TypeTags into Context
removes front ends from scala-reflect.jar
PositionApi => Position
hides BuildUtils from Scaladoc
MirrorOf => Mirror
docs.pre-lib now checks for mods in reflect
...
Conflicts:
test/files/neg/t4302.check
test/files/neg/unchecked.check
test/files/neg/unchecked2.check
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t1107b/O.scala (renamed from test/files/pos/t1107/O.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1107b/T.scala (renamed from test/files/pos/t1107/T.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t1203b/J.java (renamed from test/files/pos/t1203/J.java) | 0 | ||||
-rw-r--r-- | test/files/pos/t1203b/S.scala (renamed from test/files/pos/t1203/S.scala) | 0 | ||||
-rw-r--r-- | test/files/pos/t6275.flags | 1 | ||||
-rw-r--r-- | test/files/pos/t6275.scala | 11 |
6 files changed, 12 insertions, 0 deletions
diff --git a/test/files/pos/t1107/O.scala b/test/files/pos/t1107b/O.scala index aa605a6d09..aa605a6d09 100644 --- a/test/files/pos/t1107/O.scala +++ b/test/files/pos/t1107b/O.scala diff --git a/test/files/pos/t1107/T.scala b/test/files/pos/t1107b/T.scala index 1f3712d529..1f3712d529 100644 --- a/test/files/pos/t1107/T.scala +++ b/test/files/pos/t1107b/T.scala diff --git a/test/files/pos/t1203/J.java b/test/files/pos/t1203b/J.java index 7fae118e04..7fae118e04 100644 --- a/test/files/pos/t1203/J.java +++ b/test/files/pos/t1203b/J.java diff --git a/test/files/pos/t1203/S.scala b/test/files/pos/t1203b/S.scala index 68eac4bf6d..68eac4bf6d 100644 --- a/test/files/pos/t1203/S.scala +++ b/test/files/pos/t1203b/S.scala diff --git a/test/files/pos/t6275.flags b/test/files/pos/t6275.flags new file mode 100644 index 0000000000..85d8eb2ba2 --- /dev/null +++ b/test/files/pos/t6275.flags @@ -0,0 +1 @@ +-Xfatal-warnings diff --git a/test/files/pos/t6275.scala b/test/files/pos/t6275.scala new file mode 100644 index 0000000000..6b5ec7dceb --- /dev/null +++ b/test/files/pos/t6275.scala @@ -0,0 +1,11 @@ + +sealed trait A[T] +final class B[T] extends A[T] + +object ParsedAxis { + type BI = B[Int] + + def f1(a: A[Int]) = a match { case b: B[Int] => 3 } + def f2(a: A[Int]) = a match { case b: BI => 3 } + def f3(a: A[Int]) = a match { case b: B[t] => 3 } +} |