Merge pull request #49 from retronym/topic/2.13-restore

Minor changes to the scala corpus for 2.13 compat

Author: retronym

corpus/scala/21d12e9/compiler/scala/tools/nsc/ast/parser/Parsers.scala

@@ -1971,7 +1971,7 @@ self =>
        *  }}}
        */
       def pattern3(): Tree = {
-        val top = simplePattern(badPattern3)
+        val top = simplePattern(() => badPattern3())
         val base = opstack
         // See SI-3189, SI-4832 for motivation. Cf SI-3480 for counter-motivation.
         def isCloseDelim = in.token match {
@@ -1987,7 +1987,7 @@ self =>
           case _ => EmptyTree
         }
         def loop(top: Tree): Tree = reducePatternStack(base, top) match {
-          case next if isIdent && !isRawBar => pushOpInfo(next) ; loop(simplePattern(badPattern3))
+          case next if isIdent && !isRawBar => pushOpInfo(next) ; loop(simplePattern(() => badPattern3()))
           case next                         => next
         }
         checkWildStar orElse stripParens(loop(top))

corpus/scala/21d12e9/compiler/scala/tools/nsc/ast/parser/Scanners.scala

@@ -546,9 +546,9 @@ trait Scanners extends ScannersCommon {
           def fetchSingleQuote() = {
             nextChar()
             if (isIdentifierStart(ch))
-              charLitOr(getIdentRest)
+              charLitOr(() => getIdentRest())
             else if (isOperatorPart(ch) && (ch != '\\'))
-              charLitOr(getOperatorRest)
+              charLitOr(() => getOperatorRest())
             else if (!isAtEnd && (ch != SU && ch != CR && ch != LF || isUnicodeEscape)) {
               getLitChar()
               if (ch == '\'') {

corpus/scala/21d12e9/compiler/scala/tools/nsc/javac/JavaParsers.scala

@@ -315,7 +315,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       if (in.token == LT) {
         in.nextToken()
         val t1 = convertToTypeId(t)
-        val args = repsep(typeArg, COMMA)
+        val args = repsep(() => typeArg(), COMMA)
         acceptClosingAngle()
         atPos(t1.pos) {
           val t2: Tree = AppliedTypeTree(t1, args)
@@ -401,7 +401,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
     def typeParams(): List[TypeDef] =
       if (in.token == LT) {
         in.nextToken()
-        val tparams = repsep(typeParam, COMMA)
+        val tparams = repsep(() => typeParam(), COMMA)
         acceptClosingAngle()
         tparams
       } else List()
@@ -428,7 +428,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
 
     def formalParams(): List[ValDef] = {
       accept(LPAREN)
-      val vparams = if (in.token == RPAREN) List() else repsep(formalParam, COMMA)
+      val vparams = if (in.token == RPAREN) List() else repsep(() => formalParam(), COMMA)
       accept(RPAREN)
       vparams
     }
@@ -449,7 +449,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
     def optThrows() {
       if (in.token == THROWS) {
         in.nextToken()
-        repsep(typ, COMMA)
+        repsep(() => typ(), COMMA)
       }
     }
 
@@ -679,7 +679,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
     def interfacesOpt() =
       if (in.token == IMPLEMENTS) {
         in.nextToken()
-        repsep(typ, COMMA)
+        repsep(() => typ(), COMMA)
       } else {
         List()
       }
@@ -711,7 +711,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       val parents =
         if (in.token == EXTENDS) {
           in.nextToken()
-          repsep(typ, COMMA)
+          repsep(() => typ(), COMMA)
         } else {
           List(javaLangObject())
         }

corpus/scala/21d12e9/compiler/scala/tools/nsc/transform/patmat/MatchOptimization.scala

@@ -104,7 +104,7 @@ trait MatchOptimization extends MatchTreeMaking with MatchAnalysis {
               reusedTest <- test.reuses;
               nextDeps <- dependencies.get(reusedTest);
               diff <- (nextDeps -- currDeps).headOption;
-              _ <- Some(currDeps = nextDeps))
+              _ <- {currDeps = nextDeps; Some(currDeps)})
                 yield diff).nonEmpty
         }
 

corpus/scala/21d12e9/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -757,7 +757,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
         if (immediate) {
           action()
         } else {
-          unit.toCheck += action
+          unit.toCheck += {() => action}
           true
         }
       }

corpus/scala/21d12e9/compiler/scala/tools/nsc/util/ShowPickled.scala

@@ -210,17 +210,17 @@ object ShowPickled extends Names {
         case CONSTANTtpe =>
           printTypeRef(); printConstantRef()
         case TYPEREFtpe =>
-          printTypeRef(); printSymbolRef(); buf.until(end, printTypeRef)
+          printTypeRef(); printSymbolRef(); buf.until(end, () => printTypeRef())
         case TYPEBOUNDStpe =>
           printTypeRef(); printTypeRef()
         case REFINEDtpe =>
-          printSymbolRef(); buf.until(end, printTypeRef)
+          printSymbolRef(); buf.until(end, () => printTypeRef())
         case CLASSINFOtpe =>
-          printSymbolRef(); buf.until(end, printTypeRef)
+          printSymbolRef(); buf.until(end, () => printTypeRef())
         case METHODtpe | IMPLICITMETHODtpe =>
-          printTypeRef(); buf.until(end, printTypeRef)
+          printTypeRef(); buf.until(end, () => printTypeRef())
         case POLYtpe =>
-          printTypeRef(); buf.until(end, printSymbolRef)
+          printTypeRef(); buf.until(end, () => printSymbolRef())
         case LITERALboolean =>
           out.print(if (buf.readLong(len) == 0L) " false" else " true")
         case LITERALbyte    =>
@@ -246,17 +246,17 @@ object ShowPickled extends Names {
         case LITERALclass   =>
           printTypeRef()
         case CHILDREN       =>
-          printSymbolRef(); buf.until(end, printSymbolRef)
+          printSymbolRef(); buf.until(end, () => printSymbolRef())
         case SYMANNOT       =>
-          printSymbolRef(); printTypeRef(); buf.until(end, printAnnotArgRef)
+          printSymbolRef(); printTypeRef(); buf.until(end, () => printAnnotArgRef())
         case ANNOTATEDtpe   =>
-          printTypeRef(); buf.until(end, printAnnotInfoRef)
+          printTypeRef(); buf.until(end, () => printAnnotInfoRef())
         case ANNOTINFO      =>
-          printTypeRef(); buf.until(end, printAnnotArgRef)
+          printTypeRef(); buf.until(end, () => printAnnotArgRef())
         case ANNOTARGARRAY  =>
-          buf.until(end, printConstAnnotArgRef)
+          buf.until(end, () => printConstAnnotArgRef())
         case EXISTENTIALtpe =>
-          printTypeRef(); buf.until(end, printSymbolRef)
+          printTypeRef(); buf.until(end, () => printSymbolRef())
 
         case _ =>
       }

corpus/scala/21d12e9/library/scala/sys/process/BasicIO.scala

@@ -162,7 +162,7 @@ object BasicIO {
     */
   def processFully(processLine: String => Unit): InputStream => Unit = in => {
     val reader = new BufferedReader(new InputStreamReader(in))
-    try processLinesFully(processLine)(reader.readLine)
+    try processLinesFully(processLine)(() => reader.readLine())
     finally reader.close()
   }
 

corpus/scala/21d12e9/reflect/scala/reflect/internal/pickling/UnPickler.scala

@@ -146,7 +146,7 @@ abstract class UnPickler {
     }
 
     private def maybeReadSymbol(): Either[Int, Symbol] = readNat() match {
-      case index if isSymbolRef(index) => Right(at(index, readSymbol))
+      case index if isSymbolRef(index) => Right(at(index, () => readSymbol()))
       case index                       => Left(index)
     }
 
@@ -268,7 +268,7 @@ abstract class UnPickler {
 
       // symbols that were pickled with Pickler.writeSymInfo
       val nameref      = readNat()
-      val name         = at(nameref, readName)
+      val name         = at(nameref, () => readName())
       val owner        = readSymbolRef()
       val flags        = pickledToRawFlags(readLongNat())
 
@@ -446,9 +446,9 @@ abstract class UnPickler {
      *  as a Constant or a Tree.
      */
     protected def readAnnotArg(i: Int): Tree = bytes(index(i)) match {
-      case TREE => at(i, readTree)
+      case TREE => at(i, () => readTree())
       case _    =>
-        val const = at(i, readConstant)
+        val const = at(i, () => readConstant())
         Literal(const) setType const.tpe
     }
 
@@ -460,9 +460,9 @@ abstract class UnPickler {
       until(end, () => readClassfileAnnotArg(readNat())).toArray(JavaArgumentTag)
     }
     protected def readClassfileAnnotArg(i: Int): ClassfileAnnotArg = bytes(index(i)) match {
-      case ANNOTINFO     => NestedAnnotArg(at(i, readAnnotation))
+      case ANNOTINFO     => NestedAnnotArg(at(i, () => readAnnotation()))
       case ANNOTARGARRAY => at(i, () => ArrayAnnotArg(readArrayAnnot()))
-      case _             => LiteralAnnotArg(at(i, readConstant))
+      case _             => LiteralAnnotArg(at(i, () => readConstant()))
     }
 
     /** Read an AnnotationInfo. Not to be called directly, use
@@ -475,7 +475,7 @@ abstract class UnPickler {
       while (readIndex != end) {
         val argref = readNat()
         if (isNameEntry(argref)) {
-          val name = at(argref, readName)
+          val name = at(argref, () => readName())
           val arg = readClassfileAnnotArg(readNat())
           assocs += ((name, arg))
         }
@@ -634,12 +634,12 @@ abstract class UnPickler {
       r.asInstanceOf[Symbol]
     }
 
-    protected def readNameRef(): Name                 = at(readNat(), readName)
+    protected def readNameRef(): Name                 = at(readNat(), () => readName())
     protected def readTypeRef(): Type                 = at(readNat(), () => readType()) // after the NMT_TRANSITION period, we can leave off the () => ... ()
-    protected def readConstantRef(): Constant         = at(readNat(), readConstant)
-    protected def readAnnotationRef(): AnnotationInfo = at(readNat(), readAnnotation)
-    protected def readModifiersRef(): Modifiers       = at(readNat(), readModifiers)
-    protected def readTreeRef(): Tree                 = at(readNat(), readTree)
+    protected def readConstantRef(): Constant         = at(readNat(), () => readConstant())
+    protected def readAnnotationRef(): AnnotationInfo = at(readNat(), () => readAnnotation())
+    protected def readModifiersRef(): Modifiers       = at(readNat(), () => readModifiers())
+    protected def readTreeRef(): Tree                 = at(readNat(), () => readTree())
 
     protected def readTypeNameRef(): TypeName         = readNameRef().toTypeName
 
@@ -749,7 +749,7 @@ abstract class UnPickler {
       override def completeInternal(sym: Symbol) = try {
         super.completeInternal(sym)
 
-        var alias = at(j, readSymbol)
+        var alias = at(j, () => readSymbol())
         if (alias.isOverloaded)
           alias = slowButSafeEnteringPhase(picklerPhase)((alias suchThat (alt => sym.tpe =:= sym.owner.thisType.memberType(alt))))