From 4fda6b8ad990762dc63fce6b56b9c97fb5d169d8 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 17 Nov 2014 00:03:58 -0800 Subject: Made line comments (//) not eat the newline so other things can use it --- .../src/main/scala/scalaparser/syntax/Literals.scala | 2 +- scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala index 6e8c79d..80d7db7 100644 --- a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala +++ b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala @@ -22,7 +22,7 @@ trait Literals { self: Parser with Basic with Identifiers => def MultilineComment: Rule0 = rule { "/*" ~ zeroOrMore(MultilineComment | !"*/" ~ ANY) ~ "*/" } def Comment: Rule0 = rule { MultilineComment | - "//" ~ zeroOrMore(!Basic.Newline ~ ANY) ~ (Basic.Newline | EOI) + "//" ~ zeroOrMore(!Basic.Newline ~ ANY) ~ &(Basic.Newline | EOI) } def Literal = rule { diff --git a/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala b/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala index 4e69bc2..a7ceead 100644 --- a/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala +++ b/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala @@ -261,18 +261,10 @@ object SyntaxTest extends TestSuite{ ) * - check( """ - |object SyntaxTest extends TestSuite{ - | def check[T](input: String) = { - | new ScalaSyntax(input).CompilationUnit.run() match{ - | case Failure(f: ParseError) => - | println(f.position) - | println(f.formatExpectedAsString) - | println(f.formatTraces) - | throw new Exception(f.position + "\t" + f.formatTraces) - | case Success(parsed) => - | assert(parsed == input) - | } - | } + |object Foo{ + | val a = d // g + | val b = e // h + | val c = f |} """.stripMargin ) -- cgit v1.2.3