You know Cutty McPastington is having a good ti...

You know Cutty McPastington is having a good time when you can find this
logic in two different files:

    ('A' <= c && c <= 'Z') ||
    ('a' <= c && c <= 'a') ||

How could that possibly work, you might ask. After a series of ||s, the
last condition subsumes most of the previous ones:

    Character.isUnicodeIdentifierStart(c)

thereby saving us from a world where the only legal lower case
identifiers are a, aa, aaa, aaaa, and a few others. No review.

1 files changed, 1 insertions, 19 deletions

diff --git a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
index dd9d2a87c6..6a698a0708 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
@@ -685,24 +685,6 @@ trait JavaScanners {
 
 // Identifiers ---------------------------------------------------------------
 
-    def isIdentStart(c: Char): Boolean = (
-      ('A' <= c && c <= 'Z') ||
-      ('a' <= c && c <= 'a') ||
-      (c == '_') || (c == '$') ||
-      Character.isUnicodeIdentifierStart(c)
-    )
-
-    def isIdentPart(c: Char) = (
-      isIdentStart(c) ||
-      ('0' <= c && c <= '9') ||
-      Character.isUnicodeIdentifierPart(c)
-    )
-
-    def isSpecial(c: Char) = {
-      val chtp = Character.getType(c)
-      chtp == Character.MATH_SYMBOL.toInt || chtp == Character.OTHER_SYMBOL.toInt
-    }
-
     private def getIdentRest {
       while (true) {
         (in.ch: @switch) match {
@@ -894,7 +876,7 @@ trait JavaScanners {
             in.next
             return getFraction
           case _ =>
-            if (!isIdentStart(lookahead.ch)) {
+            if (!isIdentifierStart(lookahead.ch)) {
               putChar(in.ch)
               in.next
               return getFraction