Merge pull request #19808 from apple/bananaphone

dcci · web-flow · commit 3b96d21a2c35 · 2018-10-10T14:16:46.000-07:00
[Lexer] Allow '$x' to be parsed as identifier in debugger mode.
diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
@@ -955,6 +955,8 @@ void Lexer::lexDollarIdent() {
     // independent of language mode.
     return formToken(tok::identifier, tokStart);
   } else {
+    if (LangOpts.EnableDollarIdentifiers && !LangOpts.Playground)
+      return formToken(tok::identifier, tokStart);
     return formToken(tok::dollarident, tokStart);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -955,6 +955,8 @@ void Lexer::lexDollarIdent() {`
`955`	`955`	`// independent of language mode.`
`956`	`956`	`return formToken(tok::identifier, tokStart);`
`957`	`957`	`} else {`
	`958`	`+ if (LangOpts.EnableDollarIdentifiers && !LangOpts.Playground)`
	`959`	`+ return formToken(tok::identifier, tokStart);`
`958`	`960`	`return formToken(tok::dollarident, tokStart);`
`959`	`961`	`}`
`960`	`962`	`}`