* Preserve the more restrictive syntax for typed patterns in the lang…

…uage specification * Make the parser's warning a migration warning
scala · May 11, 2023 · 07c395b · 07c395b
1 parent b65ef59
commit 07c395b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 6 deletions.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -2871,14 +2871,25 @@ object Parsers {
       if (isIdent(nme.raw.BAR)) { in.nextToken(); pattern1(location) :: patternAlts(location) }
       else Nil
 
-    /**  Pattern1     ::= Pattern2 [Ascription]
+    /**  Pattern1     ::= PatVar Ascription
+     *                  | [‘-’] integerLiteral Ascription
+     *                  | [‘-’] floatingPointLiteral Ascription
+     *                  | Pattern2
      */
     def pattern1(location: Location = Location.InPattern): Tree =
       val p = pattern2()
       if in.isColon then
         val isVariableOrNumber = isVarPattern(p) || p.isInstanceOf[Number]
         if !isVariableOrNumber then
-          warning(em"Only variable and number literal patterns can have type ascriptions")
+          report.gradualErrorOrMigrationWarning(
+            em"""Type ascriptions after patterns other than:
+                |  * variable pattern, e.g. `case x: String =>`
+                |  * number literal pattern, e.g. `case 10.5: Double =>`
+                |are no longer supported. Remove the type ascription or move it to a separate variable pattern.""",
+            in.sourcePos(),
+            warnFrom = `3.3`,
+            errorFrom = future
+          )
         in.nextToken()
         ascription(p, location)
       else p

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -185,6 +185,7 @@ class CompilationTests {
       compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")),
       compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")),
       compileFile("tests/neg-custom-args/jdk-9-app.scala", defaultOptions.and("-release:8")),
+      compileFile("tests/neg-custom-args/i10994.scala", defaultOptions.and("-source", "future")),
     ).checkExpectedErrors()
   }
 

diff --git a/docs/_docs/internals/syntax.md b/docs/_docs/internals/syntax.md
@@ -314,7 +314,10 @@ TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
 TypeCaseClause    ::=  ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi]
 
 Pattern           ::=  Pattern1 { ‘|’ Pattern1 }                                Alternative(pats)
-Pattern1          ::=  Pattern2 [‘:’ RefinedType]                               Bind(name, Typed(Ident(wildcard), tpe))
+Pattern1          ::=  PatVar ‘:’ RefinedType                                   Bind(name, Typed(Ident(wildcard), tpe))
+                    |  [‘-’] integerLiteral ‘:’ RefinedType                     Typed(pat, tpe)
+                    |  [‘-’] floatingPointLiteral ‘:’ RefinedType               Typed(pat, tpe)
+                    |  Pattern2
 Pattern2          ::=  [id ‘@’] InfixPattern [‘*’]                              Bind(name, pat)
 InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }                  InfixOp(pat, op, pat)
 SimplePattern     ::=  PatVar                                                   Ident(wildcard)

diff --git a/docs/_docs/reference/syntax.md b/docs/_docs/reference/syntax.md
@@ -312,7 +312,10 @@ TypeCaseClauses   ::=  TypeCaseClause { TypeCaseClause }
 TypeCaseClause    ::=  ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi]
 
 Pattern           ::=  Pattern1 { ‘|’ Pattern1 }
-Pattern1          ::=  Pattern2 [‘:’ RefinedType]
+Pattern1          ::=  PatVar ‘:’ RefinedType
+                    |  [‘-’] integerLiteral ‘:’ RefinedType
+                    |  [‘-’] floatingPointLiteral ‘:’ RefinedType
+                    |  Pattern2
 Pattern2          ::=  [id ‘@’] InfixPattern [‘*’]
 InfixPattern      ::=  SimplePattern { id [nl] SimplePattern }
 SimplePattern     ::=  PatVar

diff --git a/tests/neg-custom-args/i10994.check b/tests/neg-custom-args/i10994.check
@@ -0,0 +1,7 @@
+-- Error: tests/neg-custom-args/i10994.scala:2:19 ----------------------------------------------------------------------
+2 |  case (b: Boolean): Boolean => () // error
+  |                   ^
+  |                   Type ascriptions after patterns other than:
+  |                     * variable pattern, e.g. `case x: String =>`
+  |                     * number literal pattern, e.g. `case 10.5: Double =>`
+  |                   are no longer supported. Remove the type ascription or move it to a separate variable pattern.
diff --git a/tests/neg-custom-args/i10994.scala b/tests/neg-custom-args/i10994.scala
@@ -0,0 +1,2 @@
+def foo = true match
+  case (b: Boolean): Boolean => () // error
diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check
@@ -59,7 +59,10 @@
 -- Warning: tests/neg/t5702-neg-bad-and-wild.scala:13:22 ---------------------------------------------------------------
 13 |      case List(1, _*3:) =>  // error // error
    |                      ^
-   |                      Only variable and number literal patterns can have type ascriptions
+   |                  Type ascriptions after patterns other than:
+   |                    * variable pattern, e.g. `case x: String =>`
+   |                    * number literal pattern, e.g. `case 10.5: Double =>`
+   |                  are no longer supported. Remove the type ascription or move it to a separate variable pattern.
 -- Warning: tests/neg/t5702-neg-bad-and-wild.scala:22:20 ---------------------------------------------------------------
 22 |    val K(x @ _*) = k
    |                    ^

diff --git a/tests/pos/i10994.scala b/tests/pos/i10994.scala
@@ -1,2 +1,2 @@
 def foo = true match
-  case (b: Boolean): Boolean => ()
+  case (b: Boolean): Boolean => () // warning
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def foo = true match
		case (b: Boolean): Boolean => () // error