diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-11 13:19:16 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-11 13:19:16 -0800 |
commit | ba7bf5e2296c5148c16eabc52d1550040dea06b3 (patch) | |
tree | e29c725384fd7686a17443f8b9141e2d755be565 /src/compiler | |
parent | da919ec24cecbb8a1eb7ccbf513ecfa42670459e (diff) | |
parent | 47562e7adbf8577789b3432f4bfbb36d786c6b32 (diff) | |
download | scala-ba7bf5e2296c5148c16eabc52d1550040dea06b3.tar.gz scala-ba7bf5e2296c5148c16eabc52d1550040dea06b3.tar.bz2 scala-ba7bf5e2296c5148c16eabc52d1550040dea06b3.zip |
Merge pull request #3261 from adriaanm/ticket-6426
Revert ", importable _."
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 7 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 5 |
2 files changed, 6 insertions, 6 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 } diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 1aa50be83a..8d295a28d0 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -611,10 +611,7 @@ trait Scanners extends ScannersCommon { if (ch == '`') { nextChar() finishNamed(BACKQUOTED_IDENT) - if (name.length == 0) - syntaxError("empty quoted identifier") - else if (name == nme.WILDCARD) - syntaxError("wildcard invalid as backquoted identifier") + if (name.length == 0) syntaxError("empty quoted identifier") } else syntaxError("unclosed quoted identifier") } |