summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-03-23 08:38:08 -0700
committerPaul Phillips <paulp@improving.org>2013-03-23 08:38:08 -0700
commited45b711e6a05635630bd8967a3a59dae4fde95e (patch)
treea8d3cae7a26b599669cd415ac258b92ee0a314a6 /test/files
parentc5ad8b478ab9fd3c1aaa0b42bf5f52098636740a (diff)
parent395e90a786874ebe795e656f532b50110c8c1a98 (diff)
downloadscala-ed45b711e6a05635630bd8967a3a59dae4fde95e.tar.gz
scala-ed45b711e6a05635630bd8967a3a59dae4fde95e.tar.bz2
scala-ed45b711e6a05635630bd8967a3a59dae4fde95e.zip
Merge pull request #2266 from paulp/issue/7251
SI-7251, compiler crash with $.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/t7251.check4
-rw-r--r--test/files/neg/t7251/A_1.scala10
-rw-r--r--test/files/neg/t7251/B_2.scala7
3 files changed, 21 insertions, 0 deletions
diff --git a/test/files/neg/t7251.check b/test/files/neg/t7251.check
new file mode 100644
index 0000000000..8df8984d63
--- /dev/null
+++ b/test/files/neg/t7251.check
@@ -0,0 +1,4 @@
+B_2.scala:5: error: object s.Outer$Triple$ is not a value
+ println( s.Outer$Triple$ )
+ ^
+one error found
diff --git a/test/files/neg/t7251/A_1.scala b/test/files/neg/t7251/A_1.scala
new file mode 100644
index 0000000000..d05373ed28
--- /dev/null
+++ b/test/files/neg/t7251/A_1.scala
@@ -0,0 +1,10 @@
+package s
+
+object Outer {
+ type Triple[+A, +B, +C] = Tuple3[A, B, C]
+ object Triple {
+ def apply[A, B, C](x: A, y: B, z: C) = Tuple3(x, y, z)
+ def unapply[A, B, C](x: Tuple3[A, B, C]): Option[Tuple3[A, B, C]] = Some(x)
+ }
+}
+
diff --git a/test/files/neg/t7251/B_2.scala b/test/files/neg/t7251/B_2.scala
new file mode 100644
index 0000000000..eb59b30902
--- /dev/null
+++ b/test/files/neg/t7251/B_2.scala
@@ -0,0 +1,7 @@
+package s
+
+object Test {
+ def main(args: Array[String]): Unit = {
+ println( s.Outer$Triple$ )
+ }
+}