diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:45:27 -0700 |
commit | cbba68fb6085f238097fbf1635046051bd7c6889 (patch) | |
tree | c2ad5795f1fc7935a543018854264d3f431df2cd /test/files/run | |
parent | 067a4d36a6d30d6431a520c9db8ec4714f1a8675 (diff) | |
parent | 1706a37eb84ec252aea77bccebad3e48448534ad (diff) | |
download | scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.gz scala-cbba68fb6085f238097fbf1635046051bd7c6889.tar.bz2 scala-cbba68fb6085f238097fbf1635046051bd7c6889.zip |
Merge 2.11.x into 2.12.x
Resolved conflicts as in b0e05b67c7
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/t9546.scala | 13 | ||||
-rw-r--r-- | test/files/run/t9546b.scala | 13 | ||||
-rw-r--r-- | test/files/run/t9546c.scala | 13 | ||||
-rw-r--r-- | test/files/run/t9546d.scala | 16 | ||||
-rw-r--r-- | test/files/run/t9546e.scala | 15 |
5 files changed, 70 insertions, 0 deletions
diff --git a/test/files/run/t9546.scala b/test/files/run/t9546.scala new file mode 100644 index 0000000000..7016881084 --- /dev/null +++ b/test/files/run/t9546.scala @@ -0,0 +1,13 @@ +package foo { + case class Opt[A] private[foo](val get: A) extends AnyVal + object Opt { + def mkOpt = Opt("") + } +} + +object Test { + def main(args: Array[String]): Unit = { + foo.Opt.mkOpt + } +} + diff --git a/test/files/run/t9546b.scala b/test/files/run/t9546b.scala new file mode 100644 index 0000000000..0b4d2d3fe5 --- /dev/null +++ b/test/files/run/t9546b.scala @@ -0,0 +1,13 @@ +package foo { + case class Opt[A](val get: A) extends AnyVal { + } + object Opt { + def mkOpt = Opt("") + } +} + +object Test { + def main(args: Array[String]): Unit = { + foo.Opt.mkOpt + } +} diff --git a/test/files/run/t9546c.scala b/test/files/run/t9546c.scala new file mode 100644 index 0000000000..ea6a5a36b4 --- /dev/null +++ b/test/files/run/t9546c.scala @@ -0,0 +1,13 @@ +package foo { + case class Opt[A] private[foo](val get: A) + object Opt { + def mkOpt = Opt("") + } +} + +object Test { + def main(args: Array[String]): Unit = { + foo.Opt.mkOpt + } +} + diff --git a/test/files/run/t9546d.scala b/test/files/run/t9546d.scala new file mode 100644 index 0000000000..00bf37dc18 --- /dev/null +++ b/test/files/run/t9546d.scala @@ -0,0 +1,16 @@ +class X { + def test: Any = { + object Opt { + def mkOpt = Opt("") + } + case class Opt[A] private[X](val get: A) + Opt.mkOpt + } +} + +object Test { + def main(args: Array[String]): Unit = { + new X().test + } +} + diff --git a/test/files/run/t9546e.scala b/test/files/run/t9546e.scala new file mode 100644 index 0000000000..b19d0871aa --- /dev/null +++ b/test/files/run/t9546e.scala @@ -0,0 +1,15 @@ +case class A private (x: Int) +case class B private (x: Int)(y: Int) + +class C { + def f = A(1) + def g = B(1)(2) // was: constructor B in class B cannot be accessed in class C +} + +object Test { + def main(args: Array[String]): Unit = { + new C().f + new C().g + } + +} |