From 628a177f7f5654f4c388b944a098c3723cf7f950 Mon Sep 17 00:00:00 2001
From: liu fengyun <liu@fengy.me>
Date: Mon, 12 Dec 2016 13:14:08 +0100
Subject: only allow $_ in patterns

---
 compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'compiler/src/dotty/tools/dotc/parsing/Parsers.scala')

diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
index 1f5ad397d..704f399ca 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -597,7 +597,7 @@ object Parsers {
       val isNegated = negOffset < in.offset
       atPos(negOffset) {
         if (in.token == SYMBOLLIT) atPos(in.skipToken()) { SymbolLit(in.strVal) }
-        else if (in.token == INTERPOLATIONID) interpolatedString()
+        else if (in.token == INTERPOLATIONID) interpolatedString(inPattern)
         else finish(in.token match {
           case CHARLIT                => in.charVal
           case INTLIT                 => in.intVal(isNegated).toInt
@@ -621,11 +621,11 @@ object Parsers {
       in.nextToken()
       while (in.token == STRINGPART) {
         segmentBuf += Thicket(
-            literal(),
+            literal(inPattern = inPattern),
             atPos(in.offset) {
               if (in.token == IDENTIFIER)
                 termIdent()
-              else if (in.token == USCORE) {
+              else if (in.token == USCORE && inPattern) {
                 in.nextToken()
                 Ident(nme.WILDCARD)
               }
@@ -637,12 +637,12 @@ object Parsers {
                 if (inPattern) Block(Nil, inBraces(pattern()))
                 else expr()
               else {
-                ctx.error(InterpolatedStringError())
+                ctx.error(InterpolatedStringError(), source atPos Position(in.offset))
                 EmptyTree
               }
             })
       }
-      if (in.token == STRINGLIT) segmentBuf += literal()
+      if (in.token == STRINGLIT) segmentBuf += literal(inPattern = inPattern)
       InterpolatedString(interpolator, segmentBuf.toList)
     }
 
@@ -1448,7 +1448,7 @@ object Parsers {
       case XMLSTART =>
         xmlLiteralPattern()
       case _ =>
-        if (isLiteral) literal()
+        if (isLiteral) literal(inPattern = true)
         else {
           syntaxErrorOrIncomplete(IllegalStartOfSimplePattern())
           errorTermTree
-- 
cgit v1.2.3