10 files changed, 254 insertions, 0 deletions
diff --git a/test/files/neg/t3481.check b/test/files/neg/t3481.check
new file mode 100644
index 0000000000..48e6ff357b
--- /dev/null
+++ b/test/files/neg/t3481.check
@@ -0,0 +1,29 @@
+t3481.scala:5: error: type mismatch;
+ found   : String("hello")
+ required: _$1 where type +_$1
+    f[A[Int]]("hello")
+              ^
+t3481.scala:11: error: type mismatch;
+ found   : _$2 where type +_$2
+ required: b.T
+    (which expands to)  _$2
+    def f[T <: B[_]](a: T#T, b: T) = b.m(a)
+                                         ^
+t3481.scala:12: error: type mismatch;
+ found   : String("Hello")
+ required: _$2 where type +_$2
+    f("Hello", new B[Int])
+      ^
+t3481.scala:18: error: type mismatch;
+ found   : String("Hello")
+ required: t3481.ex3.b.T2
+    (which expands to)  _$3
+    b.m("Hello")
+        ^
+t3481.scala:25: error: type mismatch;
+ found   : String("Hello")
+ required: t3481.ex4.Test.b.T2
+    (which expands to)  _$4
+      b.m("Hello")
+          ^
+5 errors found
diff --git a/test/files/neg/t3481.scala b/test/files/neg/t3481.scala
new file mode 100644
index 0000000000..f4b781ee37
--- /dev/null
+++ b/test/files/neg/t3481.scala
@@ -0,0 +1,28 @@
+object t3481 {
+  object ex1 {
+    trait A[T] { type B = T }
+    def f[T <: A[_]](a: T#B) = 1
+    f[A[Int]]("hello")
+  }
+
+  object ex2 {
+    trait A { type T; def m(t: T) = t.toString }
+    class B[T2] extends A { type T = T2 }
+    def f[T <: B[_]](a: T#T, b: T) = b.m(a)
+    f("Hello", new B[Int])
+  }
+
+  object ex3 {
+    class B[T] { type T2 = T; def m(t: T2) = t.toString }
+    val b: B[_] = new B[Int]
+    b.m("Hello")
+  }
+
+  object ex4 {
+    abstract class B[T] { type T2 = T; def m(t: T2): Any }
+    object Test {
+      val b: B[_] = sys.error("")
+      b.m("Hello")
+    }
+  }
+}
+\ No newline at end of file
diff --git a/test/files/run/parserFilter.check b/test/files/run/parserFilter.check
new file mode 100644
index 0000000000..be04454426
--- /dev/null
+++ b/test/files/run/parserFilter.check
@@ -0,0 +1,9 @@
+[1.3] failure: Input doesn't match filter: false
+
+if false
+  ^
+[1.1] failure: Input doesn't match filter: not
+
+not true
+^
+[1.8] parsed: (if~true)
diff --git a/test/files/run/parserFilter.scala b/test/files/run/parserFilter.scala
new file mode 100644
index 0000000000..d007d441f4
--- /dev/null
+++ b/test/files/run/parserFilter.scala
@@ -0,0 +1,15 @@
+object Test extends scala.util.parsing.combinator.RegexParsers {
+    val keywords = Set("if", "false")
+    def word: Parser[String] = "\\w+".r
+
+    def keyword: Parser[String] = word filter (keywords.contains)
+    def ident: Parser[String] = word filter(!keywords.contains(_))
+
+    def test = keyword ~ ident
+
+    def main(args: Array[String]) {
+      println(parseAll(test, "if false"))
+      println(parseAll(test, "not true"))
+      println(parseAll(test, "if true"))
+    }
+}
diff --git a/test/files/run/parserForFilter.check b/test/files/run/parserForFilter.check
new file mode 100644
index 0000000000..a53c147719
--- /dev/null
+++ b/test/files/run/parserForFilter.check
@@ -0,0 +1 @@
+[1.13] parsed: (second,first)
diff --git a/test/files/run/parserForFilter.scala b/test/files/run/parserForFilter.scala
new file mode 100644
index 0000000000..1bc44f8033
--- /dev/null
+++ b/test/files/run/parserForFilter.scala
@@ -0,0 +1,12 @@
+object Test extends scala.util.parsing.combinator.RegexParsers {
+  def word: Parser[String] = "\\w+".r
+
+  def twoWords = for {
+    (a ~ b) <- word ~ word
+  } yield (b, a)
+
+  def main(args: Array[String]) {
+    println(parseAll(twoWords, "first second"))
+  }
+}
+
diff --git a/test/files/run/parserNoSuccessMessage.check b/test/files/run/parserNoSuccessMessage.check
new file mode 100644
index 0000000000..fe00d2fd3a
--- /dev/null
+++ b/test/files/run/parserNoSuccessMessage.check
@@ -0,0 +1,20 @@
+[1.2] failure: string matching regex `\d+' expected but `x' found
+
+-x
+ ^
+[1.1] failure: string matching regex `\d+' expected but `x' found
+
+x
+^
+[1.3] parsed: (Some(-)~5)
+[1.2] parsed: (None~5)
+[1.2] error: Number expected!
+
+-x
+ ^
+[1.1] error: Number expected!
+
+x
+^
+[1.3] parsed: (Some(-)~5)
+[1.2] parsed: (None~5)
diff --git a/test/files/run/parserNoSuccessMessage.scala b/test/files/run/parserNoSuccessMessage.scala
new file mode 100644
index 0000000000..93aa252db0
--- /dev/null
+++ b/test/files/run/parserNoSuccessMessage.scala
@@ -0,0 +1,19 @@
+object Test extends scala.util.parsing.combinator.RegexParsers {
+  def sign = "-"
+  def number = "\\d+".r
+  def p = sign.? ~ number withErrorMessage  "Number expected!"
+  def q = sign.? ~! number withErrorMessage  "Number expected!"
+
+  def main(args: Array[String]) {
+    println(parseAll(p, "-x"))
+    println(parseAll(p, "x"))
+    println(parseAll(p, "-5"))
+    println(parseAll(p, "5"))
+    println(parseAll(q, "-x"))
+    println(parseAll(q, "x"))
+    println(parseAll(q, "-5"))
+    println(parseAll(q, "5"))
+  }
+}
+
+
diff --git a/test/files/run/t4658.check b/test/files/run/t4658.check
new file mode 100644
index 0000000000..743b0faee3
--- /dev/null
+++ b/test/files/run/t4658.check
@@ -0,0 +1,80 @@
+Ranges:
+1073741824
+1073741824
+0
+0
+55
+25
+1
+-45
+-55
+0
+-24
+-30
+0
+-40
+-55
+-10
+-24
+-30
+-10
+IntRanges:
+Disabled #1
+Disabled #2
+0
+0
+55
+25
+1
+-45
+-55
+0
+-24
+-30
+0
+-40
+-55
+-10
+-24
+-30
+-10
+LongRanges:
+Disabled #1
+Disabled #2
+0
+0
+55
+25
+1
+-45
+-55
+0
+-24
+-30
+0
+-40
+-55
+-10
+-24
+-30
+-10
+BigIntRanges:
+Disabled #1
+Disabled #2
+0
+0
+55
+25
+1
+-45
+-55
+0
+-24
+-30
+0
+-40
+-55
+-10
+-24
+-30
+-10
diff --git a/test/files/run/t4658.scala b/test/files/run/t4658.scala
new file mode 100644
index 0000000000..e1799fae9b
--- /dev/null
+++ b/test/files/run/t4658.scala
@@ -0,0 +1,41 @@
+import scala.collection.immutable.NumericRange
+//#4658
+object Test {
+
+  case class R(start: Int, end: Int, step: Int = 1, inclusive: Boolean = true)
+
+  val rangeData = Array(
+    R(1, Int.MaxValue), R(-Int.MaxValue, -1), R(0, 0), R(0,0, inclusive = false), R(1,10),
+    R(1,10,2), R(1,10,11), R(-10, -5), R(-10, 0), R(-10, 10), R(-10, -5, 2), R(-10, 0, 2), R(-10, 10, 2),
+    R(-10, -5, inclusive = false), R(-10, 0, inclusive = false), R(-10, 10, inclusive = false),
+    R(-10, -5, 2, inclusive = false), R(-10, 0, 2, inclusive = false), R(-10, 10, 2, inclusive = false)
+  )
+
+  def ranges = rangeData.map(r => if (r.inclusive) r.start to r.end by r.step else r.start until r.end by r.step)
+
+  def numericIntRanges = rangeData.map(r => if (r.inclusive) NumericRange.inclusive(r.start, r.end, r.step) else NumericRange(r.start, r.end, r.step))
+
+  def numericLongRanges = rangeData.map(r => if (r.inclusive) NumericRange.inclusive(r.start.toLong, r.end, r.step) else NumericRange(r.start.toLong, r.end, r.step))
+
+  def numericBigIntRanges = rangeData.map(r => if (r.inclusive) NumericRange.inclusive(BigInt(r.start), BigInt(r.end), BigInt(r.step)) else NumericRange(BigInt(r.start), BigInt(r.end), BigInt(r.step)))
+
+  def main(args: Array[String]) {
+    // We drop the first two tests for all ranges which don't have a decent sum implementation,
+    // because it is just too slow.
+    println("Ranges:")
+    ranges.foreach{range => println(range.sum)}
+    println("IntRanges:")
+    println("Disabled #1")
+    println("Disabled #2")
+    numericIntRanges.drop(2).foreach{range => println(range.sum)}
+    println("LongRanges:")
+    println("Disabled #1")
+    println("Disabled #2")
+    numericLongRanges.drop(2).foreach{range => println(range.sum)}
+    println("BigIntRanges:")
+    println("Disabled #1")
+    println("Disabled #2")
+    numericBigIntRanges.drop(2).foreach{range => println(range.sum)}
+  }
+
+}
+\ No newline at end of file