From a6b2b3999dab05531781dc48a506acdc91fb24d0 Mon Sep 17 00:00:00 2001 From: Jendrik Wenke Date: Fri, 23 Feb 2018 15:19:22 +0100 Subject: [PATCH] remove latex-style quoting --- .../scala/util/parsing/combinator/JavaTokenParsers.scala | 2 +- .../scala/util/parsing/combinator/RegexParsers.scala | 8 ++++---- .../scala/util/parsing/combinator/token/StdTokens.scala | 2 +- .../util/parsing/combinator/JavaTokenParsersTest.scala | 6 +++--- .../util/parsing/combinator/PackratParsersTest.scala | 2 +- .../scala/util/parsing/combinator/RegexParsersTest.scala | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala index 12bb4838..e1f7fbb7 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala @@ -28,7 +28,7 @@ trait JavaTokenParsers extends RegexParsers { */ def ident: Parser[String] = ( "" ~> // handle whitespace - rep1(acceptIf(Character.isJavaIdentifierStart)("identifier expected but `" + _ + "' found"), + rep1(acceptIf(Character.isJavaIdentifierStart)("identifier expected but '" + _ + "' found"), elem("identifier part", Character.isJavaIdentifierPart(_: Char))) ^^ (_.mkString) ) diff --git a/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala index 52e781d0..7a05c542 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala @@ -95,8 +95,8 @@ trait RegexParsers extends Parsers { if (i == s.length) Success(source.subSequence(start, j).toString, in.drop(j - offset)) else { - val found = if (start == source.length()) "end of source" else "`"+source.charAt(start)+"'" - Failure("`"+s+"' expected but "+found+" found", in.drop(start - offset)) + val found = if (start == source.length()) "end of source" else "'"+source.charAt(start)+"'" + Failure("'"+s+"' expected but "+found+" found", in.drop(start - offset)) } } } @@ -112,8 +112,8 @@ trait RegexParsers extends Parsers { Success(source.subSequence(start, start + matched.end).toString, in.drop(start + matched.end - offset)) case None => - val found = if (start == source.length()) "end of source" else "`"+source.charAt(start)+"'" - Failure("string matching regex `"+r+"' expected but "+found+" found", in.drop(start - offset)) + val found = if (start == source.length()) "end of source" else "'"+source.charAt(start)+"'" + Failure("string matching regex '"+r+"' expected but "+found+" found", in.drop(start - offset)) } } } diff --git a/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala b/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala index a102d154..b05379a5 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala @@ -19,7 +19,7 @@ package token trait StdTokens extends Tokens { /** The class of keyword tokens */ case class Keyword(chars: String) extends Token { - override def toString = "`"+chars+"'" + override def toString = "'"+chars+"'" } /** The class of numeric literal tokens */ diff --git a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala index 9527feea..2a18ac67 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala @@ -16,7 +16,7 @@ class JavaTokenParsersTest { assertEquals(".1", decimalNumber(new CharArrayReader(".1".toCharArray)).get) // should fail to parse and we should get Failure as ParseResult val failure = decimalNumber(new CharArrayReader("!1".toCharArray)).asInstanceOf[Failure] - assertEquals("""string matching regex `(\d+(\.\d*)?|\d*\.\d+)' expected but `!' found""", failure.msg) + assertEquals("""string matching regex '(\d+(\.\d*)?|\d*\.\d+)' expected but '!' found""", failure.msg) } @Test @@ -73,7 +73,7 @@ class JavaTokenParsersTest { parseResult1 match { case e @ Failure(message, next) => assertEquals(next.pos.column, 7) - assert(message.endsWith("string matching regex `(?i)AND' expected but `s' found")) + assert(message.endsWith("string matching regex '(?i)AND' expected but 's' found")) case _ => sys.error(parseResult1.toString) } @@ -97,7 +97,7 @@ class JavaTokenParsersTest { case Failure(message, next) => assertEquals(next.pos.line, 1) assertEquals(next.pos.column, 1) - assert(message.endsWith(s"identifier expected but `-' found")) + assert(message.endsWith(s"identifier expected but '-' found")) case _ => sys.error(parseResult.toString) } diff --git a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala index aec44bc0..e1bdd02a 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala @@ -122,7 +122,7 @@ class PackratParsersTest { val failure = parseResult.asInstanceOf[Failure] assertEquals(expectedFailureMsg, failure.msg) } - assertFailure("'`b'' expected but `c' found", "a a a a b b b c c c c") + assertFailure("''b'' expected but 'c' found", "a a a a b b b c c c c") assertFailure("end of input", "a a a a b b b b c c c") } diff --git a/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala index f894af3f..15db17c3 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala @@ -25,9 +25,9 @@ class RegexParsersTest { } val failure1 = parseAll(p, "-x").asInstanceOf[Failure] - assertEquals("string matching regex `\\d+' expected but `x' found", failure1.msg) + assertEquals("string matching regex '\\d+' expected but 'x' found", failure1.msg) val failure2 = parseAll(p, "x").asInstanceOf[Failure] - assertEquals("string matching regex `\\d+' expected but `x' found", failure2.msg) + assertEquals("string matching regex '\\d+' expected but 'x' found", failure2.msg) assertEquals(result(-5), extractResult(parseAll(p, "-5"))) assertEquals(result(5), extractResult(parseAll(p, "5"))) val error1 = parseAll(q, "-x").asInstanceOf[Error]