diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-13 12:31:14 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-13 14:22:27 +0200 |
commit | 2c5890b3a7aa227643fde86ba72820a8016bc453 (patch) | |
tree | db02fc3ceb9fbd7112fe74cc47df24900a05d0df /test | |
parent | 758f0a7ac5366c9748739032383456b6e7727d37 (diff) | |
download | scala-2c5890b3a7aa227643fde86ba72820a8016bc453.tar.gz scala-2c5890b3a7aa227643fde86ba72820a8016bc453.tar.bz2 scala-2c5890b3a7aa227643fde86ba72820a8016bc453.zip |
SI-5956 trigger copy generation with correct namer
the call to `addCopyMethod` passes `templateNamer`, which is supposed to be the
namer of the case class template. with two classes of the same name, `addCopyMethod`
was triggered in the wrong template.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/t1286.check | 6 | ||||
-rw-r--r-- | test/files/neg/t5956.check | 20 | ||||
-rw-r--r-- | test/files/neg/t5956.scala | 2 |
3 files changed, 23 insertions, 5 deletions
diff --git a/test/files/neg/t1286.check b/test/files/neg/t1286.check index c937fb9cf1..912709613c 100644 --- a/test/files/neg/t1286.check +++ b/test/files/neg/t1286.check @@ -1,9 +1,5 @@ -a.scala:1: error: Companions 'object Foo' and 'trait Foo' must be defined in same file: - Found in t1286/b.scala and t1286/a.scala -trait Foo { - ^ b.scala:1: error: Companions 'trait Foo' and 'object Foo' must be defined in same file: Found in t1286/a.scala and t1286/b.scala object Foo extends Foo { ^ -two errors found +one error found diff --git a/test/files/neg/t5956.check b/test/files/neg/t5956.check new file mode 100644 index 0000000000..6641dac97f --- /dev/null +++ b/test/files/neg/t5956.check @@ -0,0 +1,20 @@ +t5956.scala:1: warning: case classes without a parameter list have been deprecated; +use either case objects or case classes with `()' as parameter list. +object O { case class C[T]; class C } + ^ +t5956.scala:2: warning: case classes without a parameter list have been deprecated; +use either case objects or case classes with `()' as parameter list. +object T { case class C[T]; case class C } + ^ +t5956.scala:2: warning: case classes without a parameter list have been deprecated; +use either case objects or case classes with `()' as parameter list. +object T { case class C[T]; case class C } + ^ +t5956.scala:1: error: C is already defined as case class C +object O { case class C[T]; class C } + ^ +t5956.scala:2: error: C is already defined as case class C +object T { case class C[T]; case class C } + ^ +three warnings found +two errors found diff --git a/test/files/neg/t5956.scala b/test/files/neg/t5956.scala new file mode 100644 index 0000000000..d985fa97a4 --- /dev/null +++ b/test/files/neg/t5956.scala @@ -0,0 +1,2 @@ +object O { case class C[T]; class C } +object T { case class C[T]; case class C } |