From e06803e622b7c165c7c5059f453ba521a74bbe70 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi@dropbox.com>
Date: Sat, 29 Nov 2014 00:01:32 -0800
Subject: all the way to files/run/literals.scala

---
 scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala |  1 +
 scalaParser/src/test/resources/test.scala                |  4 +---
 scalaParser/src/test/scala/scalaParser/SyntaxTest.scala  | 13 +++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala
index 29bff1e..0421c60 100644
--- a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala
+++ b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala
@@ -365,6 +365,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif
   def TemplateBody: R0 = rule {
     '{' ~
     optional(SelfType) ~
+    optional(Semis) ~
     zeroOrMore(TemplateStat).separatedBy(Semis) ~
     optional(Semis) ~
     '}'
diff --git a/scalaParser/src/test/resources/test.scala b/scalaParser/src/test/resources/test.scala
index 5e7a009..b56b7c6 100644
--- a/scalaParser/src/test/resources/test.scala
+++ b/scalaParser/src/test/resources/test.scala
@@ -1,4 +1,2 @@
 
-object Test {
-  def t1: M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[M[Inty @unchecked]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] = x
-}
\ No newline at end of file
+object Test extends { type T = Int } with App
diff --git a/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala b/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala
index 2a324bb..a1e4fe4 100644
--- a/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala
+++ b/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala
@@ -784,6 +784,10 @@ object SyntaxTest extends TestSuite{
             |}
           """.stripMargin
         )
+        * - check(
+          """abstract class Mix___eFoo___wBar_I_ extends Foo___ with Bar_I_    { ; ; f; }
+          """.stripMargin
+        )
       }
       'neg{
         * - checkNeg(
@@ -857,7 +861,7 @@ object SyntaxTest extends TestSuite{
 
     'omg{
 //      val root = new java.io.File("book/target/clones/scala-js/")
-      val root = new java.io.File("../scala/test/files/pos")
+      val root = new java.io.File("../scala")
       def listFiles(s: java.io.File): Iterator[String] = {
         val (dirs, files) = s.listFiles().toIterator.partition(_.isDirectory)
         files.map(_.getPath) ++ dirs.flatMap(listFiles)
@@ -870,7 +874,12 @@ object SyntaxTest extends TestSuite{
         "scala/src/scaladoc/scala/tools/nsc/doc/html",
         "jvm/interpreter.scala",
         "disabled", // don't bother parsing disabled tests
-        "neg" // or neg tests
+        "neg", // or neg tests
+        "deprecate-early-type-defs.scala", // or deprecated tests
+        // Lots of guys in these folders seem
+        // to be borked, skip all of them
+        "test/files/positions",
+        "test/files/presentation"
       )
       for{
         f <- listFiles(root)
-- 
cgit v1.2.3