Adapt parser to soft keyword scheme

odersky · odersky · commit 330f666fd25c · 2018-11-21T20:26:24.000+01:00
This fixes some rebase breakage.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1209,7 +1209,7 @@ object Parsers {
       case FOR =>
         forExpr()
       case _ =>
-        if (isIdent(nme.INLINEkw)) {
+        if (isIdent(nme.inline) && !in.inModifierPosition() && in.lookaheadIn(canStartExpressionTokens)) {
           val start = in.skipToken()
           in.token match {
             case IF =>
diff --git a/compiler/src/dotty/tools/dotc/parsing/Tokens.scala b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala
@@ -249,5 +249,5 @@ object Tokens extends TokensCommon {
 
   final val numericLitTokens: TokenSet = BitSet(INTLIT, LONGLIT, FLOATLIT, DOUBLELIT)
 
-  final val softModifierNames = Set(nme.`inline`, nme.`opaque`)
+  final val softModifierNames = Set(nme.inline, nme.opaque)
 }

Original file line number	Diff line number	Diff line change
`@@ -249,5 +249,5 @@ object Tokens extends TokensCommon {`
`249`	`249`
`250`	`250`	`final val numericLitTokens: TokenSet = BitSet(INTLIT, LONGLIT, FLOATLIT, DOUBLELIT)`
`251`	`251`
`252`		- final val softModifierNames = Set(nme.`inline`, nme.`opaque`)
	`252`	`+ final val softModifierNames = Set(nme.inline, nme.opaque)`
`253`	`253`	`}`