Fixed problems with new deprecated idents scheme.

1 files changed, 6 insertions, 7 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
index 105db805d8..583da36ead 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
@@ -115,17 +115,16 @@ trait Scanners extends ScannersCommon {
     /** Clear buffer and set name and token */
     private def finishNamed(idtoken: Int = IDENTIFIER) {
       name = newTermName(cbuf.toString)
+      cbuf.clear()
       token = idtoken
-      val idx = name.start - kwOffset
-      if (idx >= 0 && idx < kwArray.length) {
-        token = kwArray(idx)
-        if (token == IDENTIFIER) {
-          if (idtoken == IDENTIFIER && allowIdent != name)
+      if (idtoken == IDENTIFIER) {
+        val idx = name.start - kwOffset
+        if (idx >= 0 && idx < kwArray.length) {
+          token = kwArray(idx)
+          if (token == IDENTIFIER && allowIdent != name)
             deprecationWarning(name+" is now a reserved word; usage as an identifier is deprecated")
-          token = idtoken
         }
       }
-      cbuf.clear()
     }
 
     /** Clear buffer and set string */