diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 09:18:12 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-06-04 09:18:12 +0200 |
| commit | a6ecfa633a76162575ceb332b40ceed93eef490a (patch) | |
| tree | 79260bb4e91b00c72acff965b03cd6e0ef49f312 /test | |
| parent | b24e7573a17332606d9f9da49a397e02abec1b63 (diff) | |
| parent | 300db2a1e3eefc2a6ed379c870bc7da42a26e69a (diff) | |
| download | scala-a6ecfa633a76162575ceb332b40ceed93eef490a.tar.gz scala-a6ecfa633a76162575ceb332b40ceed93eef490a.tar.bz2 scala-a6ecfa633a76162575ceb332b40ceed93eef490a.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.11.x-20140604
Conflicts:
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/pos/t8596.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t8596.scala | 7 | ||||
| -rw-r--r-- | test/files/presentation/t7915.check | 20 | ||||
| -rw-r--r-- | test/files/presentation/t7915/src/Foo.scala | 4 |
4 files changed, 31 insertions, 1 deletions
diff --git a/test/files/pos/t8596.flags b/test/files/pos/t8596.flags new file mode 100644 index 0000000000..281f0a10cd --- /dev/null +++ b/test/files/pos/t8596.flags @@ -0,0 +1 @@ +-Yrangepos diff --git a/test/files/pos/t8596.scala b/test/files/pos/t8596.scala new file mode 100644 index 0000000000..bfed58eadf --- /dev/null +++ b/test/files/pos/t8596.scala @@ -0,0 +1,7 @@ +class TypeTreeObjects { + class Container { + def typeParamAndDefaultArg[C](name: String = ""): String = "" + } + // crashed under -Yrangepos + new Container().typeParamAndDefaultArg[Any]() +} diff --git a/test/files/presentation/t7915.check b/test/files/presentation/t7915.check index b18b4ddb55..0849aaa82b 100644 --- a/test/files/presentation/t7915.check +++ b/test/files/presentation/t7915.check @@ -9,3 +9,23 @@ askHyperlinkPos for `bar` at (7,22) Foo.scala ================================================================================ [response] found askHyperlinkPos for `bar` at (2,7) Foo.scala ================================================================================ + +askHyperlinkPos for `Bar` at (8,11) Foo.scala +================================================================================ +[response] found askHyperlinkPos for `Bar` at (1,7) Foo.scala +================================================================================ + +askHyperlinkPos for `baz` at (8,22) Foo.scala +================================================================================ +[response] found askHyperlinkPos for `baz` at (2,31) Foo.scala +================================================================================ + +askHyperlinkPos for `Bar` at (9,11) Foo.scala +================================================================================ +[response] found askHyperlinkPos for `Bar` at (1,7) Foo.scala +================================================================================ + +askHyperlinkPos for `baz` at (9,22) Foo.scala +================================================================================ +[response] found askHyperlinkPos for `baz` at (2,31) Foo.scala +================================================================================ diff --git a/test/files/presentation/t7915/src/Foo.scala b/test/files/presentation/t7915/src/Foo.scala index a4166ae5b4..5c9ca36a6e 100644 --- a/test/files/presentation/t7915/src/Foo.scala +++ b/test/files/presentation/t7915/src/Foo.scala @@ -1,9 +1,11 @@ class Bar { - def bar(b: Int = 2) {} + def bar(b: Int = 2) {}; def baz[X](b: Int = 2) {} } class Foo { def foo() { new Bar/*#*/().bar/*#*/() + new Bar/*#*/().baz/*#*/[Any]() + new Bar/*#*/().baz/*#*/() } } |