Rename rewrite options

pascal-style --> new-syntax
c-style --> old-syntax

Author: odersky

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -48,8 +48,8 @@ class ScalaSettings extends Settings.SettingGroup {
   val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.") withAbbreviation "--no-warnings"
   val fromTasty: Setting[Boolean] = BooleanSetting("-from-tasty", "Compile classes from tasty in classpath. The arguments are used as class names.") withAbbreviation "--from-tasty"
 
-  val cStyle: Setting[Boolean] = BooleanSetting("-c-style", "when used with -rewrite, produces control expressions with parentheses")
-  val pascalStyle: Setting[Boolean] = BooleanSetting("-pascal-style", "when used with -rewrite, produces control expressions without parentheses")
+  val newSyntax: Setting[Boolean] = BooleanSetting("-new-syntax", "When used with -rewrite, produces control expressions without parentheses")
+  val oldSyntax: Setting[Boolean] = BooleanSetting("-old-syntax", "when used with -rewrite, produces control expressions with parentheses")
 
   /** Decompiler settings */
   val printTasty: Setting[Boolean] = BooleanSetting("-print-tasty", "Prints the raw tasty.") withAbbreviation "--print-tasty"

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

@@ -1353,15 +1353,15 @@ object Parsers {
           }
         if (in.token == altToken) {
           in.nextToken()
-          if (in.rewriteC) revertToParens(t)
+          if (in.rewriteOldSyntax) revertToParens(t)
         }
-        else if (in.rewritePascal)
+        else if (in.rewriteNewSyntax)
           dropParensOrBraces(t.span.start, s"${tokenString(altToken)}")
         t
       } else {
         val t = inSepRegion(LPAREN, RPAREN)(expr())
         accept(altToken)
-        if (in.rewriteC) revertToParens(t)
+        if (in.rewriteOldSyntax) revertToParens(t)
         t
       }
     }
@@ -1994,7 +1994,7 @@ object Parsers {
             val closingOnNewLine = in.isAfterLineEnd()
             accept(leading + 1)
             openParens.change(leading, -1)
-            if (in.rewritePascal && enumsOnNewLine == (leading == LBRACE)) { // Don't rewrite if that would change meaning of newlines
+            if (in.rewriteNewSyntax && enumsOnNewLine == (leading == LBRACE)) { // Don't rewrite if that would change meaning of newlines
               newLinesOpt()
               dropParensOrBraces(start, if (in.token == YIELD || in.token == DO) "" else "do")
             }
@@ -2009,7 +2009,7 @@ object Parsers {
           val ts = // If we use indent syntax, the distinction below should no longer be necessary
             if (impliedBraces) enumerators()
             else inSepRegion(LPAREN, RPAREN)(enumerators())
-          if (in.rewriteC && ts.nonEmpty) {
+          if (in.rewriteOldSyntax && ts.nonEmpty) {
             if (impliedBraces) {
               patch(source, Span(forEnd), " {")
               patch(source, Span(in.offset), "} ")
@@ -2027,7 +2027,7 @@ object Parsers {
         ForYield(enums, expr())
       }
       else if (in.token == DO) {
-        if (in.rewriteC) {
+        if (in.rewriteOldSyntax) {
           var startOffset = in.offset
           var endOffset = in.lastCharOffset
           if (in.isAfterLineEnd()) {

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

@@ -223,8 +223,8 @@ object Scanners {
     private var allowLeadingInfixOperators = true
 
     val rewrite = ctx.settings.rewrite.value.isDefined
-    val rewritePascal = rewrite && ctx.settings.pascalStyle.value
-    val rewriteC = rewrite && ctx.settings.cStyle.value
+    val rewriteNewSyntax = rewrite && ctx.settings.newSyntax.value
+    val rewriteOldSyntax = rewrite && ctx.settings.oldSyntax.value
 
     /** All doc comments kept by their end position in a `Map` */
     private[this] var docstringMap: SortedMap[Int, Comment] = SortedMap.empty

tests/pos/syntaxRewrites.scala

@@ -1,3 +1,7 @@
+// Compile with -rewrite -pascal-style
+// Then compile again with -rewrite c-style
+// The resulting file is the same as the original one, except for some extra spaces
+// at line ends
 object Test {
 
   val xs = List(1, 2, 3)