Rewrite compiler files back to old syntax

Previous edits already used new syntax. Rewriting to old syntax
was done automatically.

Author: odersky

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -1596,10 +1596,11 @@ object Parsers {
           if (rewriteToOldSyntax()) revertToParens(t)
           in.nextToken()
         }
-        else
+        else {
           in.observeIndented(noIndentAfterConditionTokens)
           if (rewriteToNewSyntax(t.span))
             dropParensOrBraces(t.span.start, s"${tokenString(altToken)}")
+        }
         t
       }
       else {
@@ -3466,14 +3467,14 @@ object Parsers {
 
     /** TemplateOpt = [Template]
      */
-    def templateOpt(constr: DefDef): Template =
+    def templateOpt(constr: DefDef): Template = {
       possibleTemplateStart()
       if (in.token == EXTENDS || isIdent(nme.derives))
         template(constr)
-      else {
+      else
         if (in.isNestedStart) template(constr)
         else Template(constr, Nil, Nil, EmptyValDef, Nil)
-      }
+    }
 
     /** TemplateBody ::= [nl] `{' TemplateStatSeq `}'
      */

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

@@ -547,13 +547,14 @@ object Scanners {
           case _ => nextWidth
         }
 
-        if lastWidth < nextWidth
+        if (lastWidth < nextWidth
            && !unless.contains(nextToken)
-           && (unlessSoftKW.isEmpty || token != IDENTIFIER || name != unlessSoftKW) then
+           && (unlessSoftKW.isEmpty || token != IDENTIFIER || name != unlessSoftKW)) {
           currentRegion = Indented(nextWidth, Set(), COLONEOL, currentRegion)
           if (!newLineInserted) next.copyFrom(this)
           offset = nextOffset
           token = INDENT
+        }
       }
 
     /** - Join CASE + CLASS => CASECLASS, CASE + OBJECT => CASEOBJECT, SEMI + ELSE => ELSE, COLON + <EOL> => COLONEOL
@@ -595,7 +596,7 @@ object Scanners {
           lookahead()
           val atEOL = isAfterLineEnd
           reset()
-          if colonSyntax && atEOL then token = COLONEOL
+          if (colonSyntax && atEOL) token = COLONEOL
         case EOF | RBRACE =>
           currentRegion match {
             case r: Indented if !r.isOutermost =>

compiler/src/dotty/tools/dotc/typer/Applications.scala

@@ -890,8 +890,8 @@ trait Applications extends Compatibility {
         case err: ErrorType => cpy.Apply(tree)(fun1, proto.unforcedTypedArgs).withType(err)
         case TryDynamicCallType => typedDynamicApply(tree, pt)
         case _ =>
-          if originalProto.isDropped then fun1
-          else if fun1.symbol == defn.Compiletime_summonFrom then
+          if (originalProto.isDropped) fun1
+          else if (fun1.symbol == defn.Compiletime_summonFrom)
             // Special handling of `summonFrom { ... }`.
             // We currently cannot use a macro for that since unlike other inline methods
             // summonFrom needs to expand lazily. For instance, in

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -1252,7 +1252,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
            |""".stripMargin
       ctx.error(msg, inlinedFrom.sourcePos)
       EmptyTree
-    } else {
+    }
+    else {
       val evaluatedSplice = Splicer.splice(body, inlinedFrom.sourcePos, MacroClassLoader.fromContext)(ctx1)
 
       val inlinedNormailizer = new TreeMap {
@@ -1270,10 +1271,10 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
   /** Return the set of symbols that are refered at level -1 by the tree and defined in the current run.
    *  This corresponds to the symbols that will need to be interpreted.
    */
-  private def macroDependencies(tree: Tree)(implicit ctx: Context) = {
+  private def macroDependencies(tree: Tree)(implicit ctx: Context) =
     new TreeAccumulator[Set[Symbol]] {
       private[this] var level = -1
-      override def apply(syms: Set[Symbol], tree: tpd.Tree)(implicit ctx: Context): Set[Symbol] = {
+      override def apply(syms: Set[Symbol], tree: tpd.Tree)(implicit ctx: Context): Set[Symbol] =
         if (level != -1) foldOver(syms, tree)
         else tree match {
           case tree: RefTree if level == -1 && tree.symbol.isDefinedInCurrentRun && !tree.symbol.isLocal =>
@@ -1289,8 +1290,6 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
           case _ =>
             foldOver(syms, tree)
         }
-      }
     }.apply(Set.empty, tree)
-  }
 }