summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-17 00:03:58 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-17 00:03:58 -0800
commit4fda6b8ad990762dc63fce6b56b9c97fb5d169d8 (patch)
tree5ca148bf2e4ead76dce33b55047c8a5f5cdd760c
parentf9f749398874120e93eb5bc15eaffbe21462b398 (diff)
downloadhands-on-scala-js-4fda6b8ad990762dc63fce6b56b9c97fb5d169d8.tar.gz
hands-on-scala-js-4fda6b8ad990762dc63fce6b56b9c97fb5d169d8.tar.bz2
hands-on-scala-js-4fda6b8ad990762dc63fce6b56b9c97fb5d169d8.zip
Made line comments (//) not eat the newline so other things can use it
-rw-r--r--scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala2
-rw-r--r--scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala16
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
)