no postfixops in patmat

Author: som-snytt

src/compiler/scala/tools/nsc/transform/patmat/Logic.scala

@@ -13,15 +13,14 @@
 package scala
 package tools.nsc.transform.patmat
 
-import scala.language.postfixOps
 import scala.collection.mutable
 import scala.collection.immutable.ArraySeq
 import scala.reflect.internal.util.{HashSet, NoPosition, Position, StatisticsStatics}
 
 trait Logic extends Debugging  {
   import global.statistics
 
-  private def max(xs: Seq[Int]) = if (xs isEmpty) 0 else xs max
+  private def max(xs: Seq[Int]) = if (xs.isEmpty) 0 else xs.max
   private def alignedColumns(cols: Seq[Any]): Seq[String] = {
     def toString(x: Any) = if (x == null) "" else x.toString
     if (cols.isEmpty || cols.tails.isEmpty) cols map toString

src/compiler/scala/tools/nsc/transform/patmat/MatchCodeGen.scala

@@ -12,8 +12,6 @@
 
 package scala.tools.nsc.transform.patmat
 
-import scala.language.postfixOps
-
 import scala.tools.nsc.symtab.Flags.SYNTHETIC
 import scala.reflect.internal.util.Position
 
@@ -128,11 +126,11 @@ trait MatchCodeGen extends Interface {
         // must compute catchAll after caseLabels (side-effects nextCase)
         // catchAll.isEmpty iff no synthetic default case needed (the (last) user-defined case is a default)
         // if the last user-defined case is a default, it will never jump to the next case; it will go immediately to matchEnd
-        val catchAllDef = matchFailGen map { matchFailGen =>
+        val catchAllDef = matchFailGen.map { matchFailGen =>
           val scrutRef = scrutSym.fold(EmptyTree: Tree)(REF) // for alternatives
 
-          LabelDef(_currCase, Nil, matchEnd APPLY (matchFailGen(scrutRef)))
-        } toList // at most 1 element
+          LabelDef(_currCase, Nil, matchEnd APPLY matchFailGen(scrutRef))
+        }.toList // at most 1 element
 
         // scrutSym == NoSymbol when generating an alternatives matcher
         val scrutDef = scrutSym.fold(List[Tree]())(ValDef(_, scrut) :: Nil) // for alternatives

src/compiler/scala/tools/nsc/transform/patmat/MatchOptimization.scala

@@ -12,8 +12,6 @@
 
 package scala.tools.nsc.transform.patmat
 
-import scala.language.postfixOps
-
 import scala.tools.nsc.symtab.Flags.MUTABLE
 import scala.collection.mutable
 import scala.reflect.internal.util.Position
@@ -62,7 +60,7 @@ trait MatchOptimization extends MatchTreeMaking with MatchAnalysis {
         if (conds(False)) false // stop when we encounter a definite "no" or a "not sure"
         else {
           val nonTrivial = conds - True
-          if (nonTrivial nonEmpty) {
+          if (!nonTrivial.isEmpty) {
             tested ++= nonTrivial
 
             // is there an earlier test that checks our condition and whose dependencies are implied by ours?
@@ -468,7 +466,7 @@ trait MatchOptimization extends MatchTreeMaking with MatchAnalysis {
           // a switch with duplicate cases yields a verify error,
           // and a switch with duplicate cases and guards cannot soundly be rewritten to an unguarded switch
           // (even though the verify error would disappear, the behaviour would change)
-          val allReachable = unreachableCase(caseDefsWithGuards) map (cd => reportUnreachable(cd.body.pos)) isEmpty
+          val allReachable = unreachableCase(caseDefsWithGuards).map(cd => reportUnreachable(cd.body.pos)).isEmpty
 
           if (!allReachable) Nil
           else if (noGuards(caseDefsWithGuards)) {
@@ -536,7 +534,7 @@ trait MatchOptimization extends MatchTreeMaking with MatchAnalysis {
       // TODO: if patterns allow switch but the type of the scrutinee doesn't, cast (type-test) the scrutinee to the corresponding switchable type and switch on the result
       if (regularSwitchMaker.switchableTpe(dealiasWiden(scrutSym.tpe))) {
         val caseDefsWithDefault = regularSwitchMaker(cases map {c => (scrutSym, c)}, pt)
-        if (caseDefsWithDefault isEmpty) None // not worth emitting a switch.
+        if (caseDefsWithDefault.isEmpty) None // not worth emitting a switch.
         else {
           // match on scrutSym -- converted to an int if necessary -- not on scrut directly (to avoid duplicating scrut)
           val scrutToInt: Tree =
@@ -586,7 +584,7 @@ trait MatchOptimization extends MatchTreeMaking with MatchAnalysis {
     // TODO: drop null checks
     override def emitTypeSwitch(bindersAndCases: List[(Symbol, List[TreeMaker])], pt: Type): Option[List[CaseDef]] = {
       val caseDefsWithDefault = typeSwitchMaker(bindersAndCases, pt)
-      if (caseDefsWithDefault isEmpty) None
+      if (caseDefsWithDefault.isEmpty) None
       else Some(caseDefsWithDefault)
     }
   }

src/compiler/scala/tools/nsc/transform/patmat/MatchTranslation.scala

@@ -12,10 +12,8 @@
 
 package scala.tools.nsc.transform.patmat
 
-import scala.language.postfixOps
 import scala.reflect.internal.util.StatisticsStatics
 
-
 /** Translate typed Trees that represent pattern matches into the patternmatching IR, defined by TreeMakers.
  */
 trait MatchTranslation {
@@ -30,8 +28,6 @@ trait MatchTranslation {
   private def setVarInfo(sym: Symbol, info: Type) =
     sym setInfo debug.patmatResult(s"changing ${sym.defString} to")(repeatedToSeq(info))
 
-  private def hasSym(t: Tree) = t.symbol != null && t.symbol != NoSymbol
-
   trait MatchTranslator extends TreeMakers with TreeMakerWarnings {
     import typer.context
     def selectorPos: Position
@@ -62,8 +58,8 @@ trait MatchTranslation {
 
     object SymbolBound {
       def unapply(tree: Tree): Option[(Symbol, Tree)] = tree match {
-        case Bind(_, expr) if hasSym(tree) => Some(tree.symbol -> expr)
-        case _                             => None
+        case Bind(_, expr) if tree.hasExistingSymbol => Some(tree.symbol -> expr)
+        case _                                       => None
       }
     }
 
@@ -408,7 +404,7 @@ trait MatchTranslation {
       }
 
       // never store these in local variables (for PreserveSubPatBinders)
-      lazy val ignoredSubPatBinders: Set[Symbol] = subPatBinders zip args collect { case (b, PatternBoundToUnderscore()) => b } toSet
+      lazy val ignoredSubPatBinders: Set[Symbol] = (subPatBinders zip args).collect { case (b, PatternBoundToUnderscore()) => b }.toSet
 
       // there are `productArity` non-seq elements in the tuple.
       protected def firstIndexingBinder = productArity

src/compiler/scala/tools/nsc/transform/patmat/MatchTreeMaking.scala

@@ -12,8 +12,6 @@
 
 package scala.tools.nsc.transform.patmat
 
-import scala.language.postfixOps
-
 import scala.tools.nsc.symtab.Flags.{SYNTHETIC, ARTIFACT}
 import scala.collection.mutable
 import scala.reflect.internal.util.Position
@@ -632,7 +630,7 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
         emitSwitch(scrut, scrutSym, casesNoSubstOnly, pt, matchFailGenOverride, unchecked = suppression.suppressExhaustive).getOrElse{
           if (requireSwitch) reporter.warning(scrut.pos, "could not emit switch for @switch annotated match")
 
-          if (casesNoSubstOnly nonEmpty) {
+          if (!casesNoSubstOnly.isEmpty) {
             // before optimizing, check casesNoSubstOnly for presence of a default case,
             // since DCE will eliminate trivial cases like `case _ =>`, even if they're the last one
             // exhaustivity and reachability must be checked before optimization as well
@@ -652,7 +650,7 @@ trait MatchTreeMaking extends MatchCodeGen with Debugging {
 
             val matchRes = codegen.matcher(scrut, scrutSym, pt)(cases map combineExtractors, synthCatchAll)
 
-            if (toHoist isEmpty) matchRes else Block(toHoist, matchRes)
+            if (toHoist.isEmpty) matchRes else Block(toHoist, matchRes)
           } else {
             codegen.matcher(scrut, scrutSym, pt)(Nil, matchFailGen)
           }

src/compiler/scala/tools/nsc/transform/patmat/PatternMatching.scala

@@ -15,7 +15,6 @@ package scala.tools.nsc.transform.patmat
 import scala.collection.mutable.ListBuffer
 import scala.tools.nsc.Global
 import scala.tools.nsc.ast
-import scala.language.postfixOps
 import scala.tools.nsc.transform.TypingTransformers
 import scala.tools.nsc.transform.Transform
 import scala.reflect.internal.util.Statistics
@@ -207,7 +206,7 @@ trait Interface extends ast.TreeDSL {
       def apply(from: Symbol, to: Tree): Substitution = new Substitution(from :: Nil, to :: Nil)
       // requires sameLength(from, to)
       def apply(from: List[Symbol], to: List[Tree]): Substitution =
-        if (from nonEmpty) new Substitution(from, to) else EmptySubstitution
+        if (from.isEmpty) EmptySubstitution else new Substitution(from, to)
     }
 
     class Substitution(val from: List[Symbol], val to: List[Tree]) {