diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-10 15:50:20 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-10 15:50:20 -0800 |
| commit | 47562e7adbf8577789b3432f4bfbb36d786c6b32 (patch) | |
| tree | 55b7f2bbd5e65ecb66eec9454e702525e3a3f727 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
| parent | 9cdbe28c00b39c51ae9afe3066c8b44a6e5f6f96 (diff) | |
| download | scala-47562e7adbf8577789b3432f4bfbb36d786c6b32.tar.gz scala-47562e7adbf8577789b3432f4bfbb36d786c6b32.tar.bz2 scala-47562e7adbf8577789b3432f4bfbb36d786c6b32.zip | |
Revert "SI-6426, importable _."
This reverts commit d2316df920ffa4804fe51e8f8780240c46efa982.
We can't make `_` an illegal identifier -- it's legal in Java,
so we must be able to name these Java underscores.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 996287dea8..b9e4109623 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -980,8 +980,11 @@ self => /** Assumed (provisionally) to be TermNames. */ def ident(skipIt: Boolean): Name = - if (isIdent) rawIdent().encode - else { + if (isIdent) { + val name = in.name.encode + in.nextToken() + name + } else { syntaxErrorOrIncomplete(expectedMsg(IDENTIFIER), skipIt) nme.ERROR } |