From d705443159ac69ad0c364323271979bdfc8bc9bb Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Thu, 9 Apr 2015 16:28:40 +0200 Subject: Code simplifications stimulated by SimplifyBooleanExpressionChecker. --- src/dotty/tools/dotc/core/pickling/TreeUnpickler.scala | 2 +- src/dotty/tools/dotc/parsing/MarkupParsers.scala | 4 +++- src/dotty/tools/dotc/parsing/Utility.scala | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dotty/tools/dotc/core/pickling/TreeUnpickler.scala b/src/dotty/tools/dotc/core/pickling/TreeUnpickler.scala index c46ff8d6f..c177b05c0 100644 --- a/src/dotty/tools/dotc/core/pickling/TreeUnpickler.scala +++ b/src/dotty/tools/dotc/core/pickling/TreeUnpickler.scala @@ -491,7 +491,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) { false } } - noInitss.forall(_ == true) + noInitss.forall(_) } /** Process package with given operation `op`. The operation takes as arguments diff --git a/src/dotty/tools/dotc/parsing/MarkupParsers.scala b/src/dotty/tools/dotc/parsing/MarkupParsers.scala index 3afaf171c..bcedd5bca 100644 --- a/src/dotty/tools/dotc/parsing/MarkupParsers.scala +++ b/src/dotty/tools/dotc/parsing/MarkupParsers.scala @@ -421,7 +421,9 @@ object MarkupParsers { xSpaceOpt val ts = new ArrayBuffer[Tree] - val isEmptyTag = (ch == '/') && { nextch ; true } + + val isEmptyTag = ch == '/' + if (isEmptyTag) nextch() xToken('>') if (!isEmptyTag) { diff --git a/src/dotty/tools/dotc/parsing/Utility.scala b/src/dotty/tools/dotc/parsing/Utility.scala index 44ed268e1..83a61b47e 100644 --- a/src/dotty/tools/dotc/parsing/Utility.scala +++ b/src/dotty/tools/dotc/parsing/Utility.scala @@ -83,7 +83,8 @@ object Utility { * See [66] */ def parseCharRef(ch: () => Char, nextch: () => Unit, reportSyntaxError: String => Unit, reportTruncatedError: String => Unit): String = { - val hex = (ch() == 'x') && { nextch(); true } + val hex = ch() == 'x' + if (hex) nextch() val base = if (hex) 16 else 10 var i = 0 while (ch() != ';') { -- cgit v1.2.3