Remove side-effect in isColon

Since we now convert to COLONeol only on demand, there's no need to
conert back in `isColon`.

Author: odersky

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

@@ -311,7 +311,7 @@ object Parsers {
 
     def acceptColon(): Int =
       val offset = in.offset
-      if in.isColon() then { in.nextToken(); offset }
+      if in.isColon then { in.nextToken(); offset }
       else accept(COLONop)
 
     /** semi = nl {nl} | `;'
@@ -890,7 +890,7 @@ object Parsers {
           lookahead.nextToken()
           skipParams()
       skipParams()
-      lookahead.isColon()
+      lookahead.isColon
 
     def followingIsExtension() =
       val next = in.lookahead.token
@@ -1460,7 +1460,7 @@ object Parsers {
             val paramStart = in.offset
             val ts = in.currentRegion.withCommasExpected {
               funArgType() match
-                case Ident(name) if name != tpnme.WILDCARD && in.isColon() =>
+                case Ident(name) if name != tpnme.WILDCARD && in.isColon =>
                   isValParamList = true
                   commaSeparatedRest(
                     typedFunParam(paramStart, name.toTermName, imods),
@@ -1867,7 +1867,7 @@ object Parsers {
     }
 
     def contextBounds(pname: TypeName): List[Tree] =
-      if in.isColon() then
+      if in.isColon then
         atSpan(in.skipToken()) {
           AppliedTypeTree(toplevelTyp(), Ident(pname))
         } :: contextBounds(pname)
@@ -1882,7 +1882,7 @@ object Parsers {
         Nil
 
     def typedOpt(): Tree =
-      if in.isColon() then { in.nextToken(); toplevelTyp() }
+      if in.isColon then { in.nextToken(); toplevelTyp() }
       else TypeTree().withSpan(Span(in.lastOffset))
 
     def typeDependingOn(location: Location): Tree =
@@ -2110,8 +2110,8 @@ object Parsers {
         else expr1Rest(postfixExpr(location), location)
     end expr1
 
-    def expr1Rest(t: Tree, location: Location): Tree = in.token match
-      case EQUALS =>
+    def expr1Rest(t: Tree, location: Location): Tree =
+      if in.token == EQUALS then
         t match
           case Ident(_) | Select(_, _) | Apply(_, _) | PrefixOp(_, _) =>
             atSpan(startOffset(t), in.skipToken()) {
@@ -2120,12 +2120,11 @@ object Parsers {
             }
           case _ =>
             t
-      case COLONop | COLONfollow =>
+      else if in.isColon then
         in.nextToken()
         ascription(t, location)
-      case _ =>
+      else
         t
-    end expr1Rest
 
     def ascription(t: Tree, location: Location): Tree = atSpan(startOffset(t)) {
       in.token match {
@@ -2354,7 +2353,7 @@ object Parsers {
         case _ =>
           if isLiteral then
             literal()
-          else if in.isColon() then
+          else if in.isColon then
             syntaxError(IllegalStartSimpleExpr(tokenString(in.token)))
             in.nextToken()
             simpleExpr(location)
@@ -2381,7 +2380,7 @@ object Parsers {
         case USCORE =>
           atSpan(startOffset(t), in.skipToken()) { PostfixOp(t, Ident(nme.WILDCARD)) }
         case _ =>
-          if in.isColon() && location == Location.InParens && followingIsLambdaParams() then
+          if in.isColon && location == Location.InParens && followingIsLambdaParams() then
             t match
               case id @ Ident(name) =>
                 if name.is(WildcardParamName) then
@@ -2485,7 +2484,7 @@ object Parsers {
             !fn.isInstanceOf[Trees.Apply[?]] // allow one () as annotation argument
           else if lookahead.token == IDENTIFIER then
             lookahead.nextToken()
-            !lookahead.isColon()
+            !lookahead.isColon
           else in.canStartExprTokens.contains(lookahead.token)
         }
       }
@@ -2718,7 +2717,7 @@ object Parsers {
      */
     def pattern1(location: Location = Location.InPattern): Tree =
       val p = pattern2()
-      if in.token == COLONop || in.token == COLONfollow then
+      if in.isColon then
         in.nextToken()
         ascription(p, location)
       else p
@@ -2919,7 +2918,7 @@ object Parsers {
         if allowed.contains(in.token)
            || in.isSoftModifier
               && localModifierTokens.subsetOf(allowed) // soft modifiers are admissible everywhere local modifiers are
-              && !in.lookahead.isColon()
+              && !in.lookahead.isColon
         then
           val isAccessMod = accessModifierTokens contains in.token
           val mods1 = addModifier(mods)
@@ -3126,7 +3125,7 @@ object Parsers {
               val isParams =
                 !impliedMods.is(Given)
                 || startParamTokens.contains(in.token)
-                || isIdent && (in.name == nme.inline || in.lookahead.isColon())
+                || isIdent && (in.name == nme.inline || in.lookahead.isColon)
               if isParams then commaSeparated(() => param())
               else contextTypes(ofClass, nparams, impliedMods)
           checkVarArgsRules(clause)
@@ -3739,7 +3738,7 @@ object Parsers {
         isUsingClause(extParams)
       do ()
       leadParamss ++= paramClauses(givenOnly = true, numLeadParams = nparams)
-      if in.isColon() then
+      if in.isColon then
         syntaxError("no `:` expected here")
         in.nextToken()
       val methods: List[Tree] =
@@ -3949,7 +3948,7 @@ object Parsers {
      */
     def selfType(): ValDef =
       if (in.isIdent || in.token == THIS)
-            && in.lookahead.token == COLONop && followingIsSelfType()
+            && in.lookahead.isColon && followingIsSelfType()
             || in.lookahead.token == ARROW
       then
         atSpan(in.offset) {
@@ -3959,7 +3958,7 @@ object Parsers {
               nme.WILDCARD
             else ident()
           val selfTpt =
-            if in.token == COLONfollow then
+            if in.isColon then
               in.nextToken()
               infixType()
             else

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

@@ -75,13 +75,8 @@ object Scanners {
     def isNestedStart = token == LBRACE || token == INDENT
     def isNestedEnd = token == RBRACE || token == OUTDENT
 
-    /** Is token a COLON, after having converted COLONeol to COLON?
-     *  The conversion means that indentation is not significant after `:`
-     *  anymore. So, warning: this is a side-effecting operation.
-     */
-    def isColon() =
-      if token == COLONeol then token = COLONop
-      token == COLONop || token == COLONfollow
+    def isColon =
+      token == COLONop || token == COLONfollow || token == COLONeol
 
     /** Is current token first one after a newline? */
     def isAfterLineEnd: Boolean = lineOffset >= 0
@@ -1192,7 +1187,7 @@ object Scanners {
       isSoftModifier && inModifierPosition()
 
     def isSoftModifierInParamModifierPosition: Boolean =
-      isSoftModifier && lookahead.token != COLONop && lookahead.token != COLONfollow
+      isSoftModifier && !lookahead.isColon
 
     def isErased: Boolean = isIdent(nme.erased) && erasedEnabled
 

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

@@ -283,7 +283,7 @@ object Tokens extends TokensCommon {
 
   final val endMarkerTokens = identifierTokens | BitSet(IF, WHILE, FOR, MATCH, TRY, NEW, THROW, GIVEN, VAL, THIS)
 
-  final val colonEOLPredecessors = BitSet(RPAREN, RBRACKET, BACKQUOTED_IDENT, THIS, SUPER, QUOTEID, STRINGLIT, NEW)
+  final val colonEOLPredecessors = BitSet(RPAREN, RBRACKET, BACKQUOTED_IDENT, THIS, SUPER, QUOTEID, STRINGLIT)
 
   final val closingParens = BitSet(RPAREN, RBRACKET, RBRACE)