reduce postfixops in scalap

Author: som-snytt

src/scalap/scala/tools/scalap/scalax/rules/Rules.scala

@@ -14,8 +14,6 @@ package scala.tools.scalap
 package scalax
 package rules
 
-import language.postfixOps
-
 trait Name {
   def name: String
   override def toString = name
@@ -129,7 +127,7 @@ trait StateRules {
   /** Create a rule that succeeds with a list of all the provided rules that succeed.
       @param rules the rules to apply in sequence.
   */
-  def anyOf[A, X](rules: Seq[Rule[A, X]]) = allOf(rules.map(_ ?)) ^^ { opts => opts.flatMap(x => x) }
+  def anyOf[A, X](rules: Seq[Rule[A, X]]) = allOf(rules.map(_.?)) ^^ { opts => opts.flatMap(x => x) }
 
   /** Repeatedly apply a rule from initial value until finished condition is met. */
   def repeatUntil[T, X](rule: Rule[T => T, X])(finished: T => Boolean)(initial: T) = apply {

src/scalap/scala/tools/scalap/scalax/rules/SeqRule.scala

@@ -52,7 +52,7 @@ class SeqRule[S, +A, +X](rule: Rule[S, S, A, X]) {
 
   /** Creates a rule that always succeeds with a Boolean value.
    *  Value is 'true' if this rule succeeds, 'false' otherwise */
-  def -? = ? map { _ isDefined }
+  def -? = ? map (_.isDefined)
 
   def * = from[S] {
     // tail-recursive function with reverse list accumulator

src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala

@@ -96,11 +96,11 @@ trait ByteCodeReader extends RulesWithState {
   type S = ByteCode
   type Parser[A] = Rule[A, String]
 
-  val byte = apply(_ nextByte)
+  val byte = apply(_.nextByte)
 
   val u1 = byte ^^ (_ & 0xFF)
-  val u2 = bytes(2) ^^ (_ toInt)
-  val u4 = bytes(4) ^^ (_ toInt) // should map to Long??
+  val u2 = bytes(2) ^^ (_.toInt)
+  val u4 = bytes(4) ^^ (_.toInt) // should map to Long??
 
   def bytes(n: Int) = apply(_ next n)
 }
@@ -111,7 +111,7 @@ object ClassFileParser extends ByteCodeReader {
 
   val magicNumber = (u4 filter (_ == 0xCAFEBABE)) | error("Not a valid class file")
   val version = u2 ~ u2 ^^ { case minor ~ major => (major,  minor) }
-  val constantPool = (u2 ^^ ConstantPool) >> repeatUntil(constantPoolEntry)(_ isFull)
+  val constantPool = (u2 ^^ ConstantPool) >> repeatUntil(constantPoolEntry)(_.isFull)
 
   // NOTE currently most constants just evaluate to a string description
   // TODO evaluate to useful values

src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala

@@ -15,8 +15,8 @@ package scalax
 package rules
 package scalasig
 
-import scala.language.postfixOps
 import scala.language.implicitConversions
+import scala.language.postfixOps
 
 import ClassFileParser._
 import scala.reflect.internal.pickling.ByteCodecs
@@ -92,7 +92,7 @@ object ScalaSigAttributeParsers extends ByteCodeReader  {
   val scalaSig = nat ~ nat ~ symtab ^~~^ ScalaSig
 
   val utf8 = read(x => x.fromUTF8StringAndBytes.string)
-  val longValue = read(_ toLong)
+  val longValue = read(_.toLong)
 }
 
 case class ScalaSig(majorVersion: Int, minorVersion: Int, table: Seq[Int ~ ByteCode]) extends DefaultMemoisable {