summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-12 10:13:17 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-12 10:13:17 -0800
commit0959b68d8f2acb33dd7f4795dcd586e8935e2f0c (patch)
treea864f1e2ea38432f962bda3874080042e4c03dc9
parent3b68b45a200087104a1ac2de7c4b86635023fd4d (diff)
parentf98e4d05a68a8a41a92d292bd590ce765b1a6bd5 (diff)
downloadscala-0959b68d8f2acb33dd7f4795dcd586e8935e2f0c.tar.gz
scala-0959b68d8f2acb33dd7f4795dcd586e8935e2f0c.tar.bz2
scala-0959b68d8f2acb33dd7f4795dcd586e8935e2f0c.zip
Merge pull request #1602 from gkossakowski/wrong-implicit-classTag
Fix type of the custom `ClassTag` in `PatternMatching.scala`
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
index 7d504d8c81..31db042942 100644
--- a/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
@@ -2037,9 +2037,9 @@ trait PatternMatching extends Transform with TypingTransformers with ast.TreeDSL
// CNF: a formula is a conjunction of clauses
type Formula = Array[Clause]
/** Override Array creation for efficiency (to not go through reflection). */
- private implicit val formulaTag: scala.reflect.ClassTag[Formula] = new scala.reflect.ClassTag[Formula] {
- def runtimeClass: java.lang.Class[Formula] = classOf[Formula]
- final override def newArray(len: Int): Array[Formula] = new Array[Formula](len)
+ private implicit val clauseTag: scala.reflect.ClassTag[Clause] = new scala.reflect.ClassTag[Clause] {
+ def runtimeClass: java.lang.Class[Clause] = classOf[Clause]
+ final override def newArray(len: Int): Array[Clause] = new Array[Clause](len)
}
def formula(c: Clause*): Formula = c.toArray
def andFormula(a: Formula, b: Formula): Formula = a ++ b