The initial results of running a basic cut and ...

The initial results of running a basic cut and paste detector over trunk
and trying to undo some of it. I can live with history but if I see
Cutty McPastington in new commits I will get all finger waggly. Don't
make me cross that ocean. No review.

2 files changed, 7 insertions, 36 deletions

diff --git a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
index 113f1265e5..dd9d2a87c6 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
 package javac
 
 import scala.tools.nsc.util._
-import Chars.{LF, FF, CR, SU}
+import Chars._
 import JavaTokens._
 import scala.annotation.switch
 
@@ -754,13 +754,13 @@ trait JavaScanners {
         in.next
         if ('0' <= in.ch && in.ch <= '7') {
           val leadch: Char = in.ch
-          var oct: Int = in.digit2int(in.ch, 8)
+          var oct: Int = digit2int(in.ch, 8)
           in.next
           if ('0' <= in.ch && in.ch <= '7') {
-            oct = oct * 8 + in.digit2int(in.ch, 8)
+            oct = oct * 8 + digit2int(in.ch, 8)
             in.next
             if (leadch <= '3' && '0' <= in.ch && in.ch <= '7') {
-              oct = oct * 8 + in.digit2int(in.ch, 8)
+              oct = oct * 8 + digit2int(in.ch, 8)
               in.next
             }
           }
@@ -840,7 +840,7 @@ trait JavaScanners {
         var i = 0
         val len = name.length
         while (i < len) {
-          val d = in.digit2int(name(i), base)
+          val d = digit2int(name(i), base)
           if (d < 0) {
             syntaxError("malformed integer number")
             return 0
@@ -879,7 +879,7 @@ trait JavaScanners {
     /** read a number into name and set base
     */
     protected def getNumber {
-      while (in.digit2int(in.ch, if (base < 10) 10 else base) >= 0) {
+      while (digit2int(in.ch, if (base < 10) 10 else base) >= 0) {
         putChar(in.ch)
         in.next
       }
diff --git a/src/compiler/scala/tools/nsc/javac/JavaTokens.scala b/src/compiler/scala/tools/nsc/javac/JavaTokens.scala
index 3e0637d374..c91ecc95c2 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaTokens.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaTokens.scala
@@ -7,21 +7,8 @@
 package scala.tools.nsc
 package javac
 
-object JavaTokens {
+object JavaTokens extends ast.parser.Tokens {
 
-  /** special tokens */
-  final val EMPTY = -3
-  final val UNDEF = -2
-  final val ERROR = -1
-  final val EOF = 0
-
-  /** literals */
-  final val CHARLIT = 1
-  final val INTLIT = 2
-  final val LONGLIT = 3
-  final val FLOATLIT = 4
-  final val DOUBLELIT = 5
-  final val STRINGLIT = 6
   def isLiteral(code : Int) =
     code >= CHARLIT && code <= STRINGLIT
 
@@ -139,20 +126,4 @@ object JavaTokens {
   final val RBRACKET = 118
   final val LBRACE = 119
   final val RBRACE = 120
-
-  def isBrace(code : Int) =
-    code >= LPAREN && code <= RBRACE
-  def isOpenBrace(code : Int) = isBrace(code) && (code % 2 == 0)
-  def isCloseBrace(code : Int) = isBrace(code) && (code % 2 == 1)
-
-  def isSpace(at : Char) = at match {
-    case ' ' | '\t' => true
-    case _ => false
-  }
-  import util.Chars._
-
-  def isNewLine(at : Char) = at match {
-    case CR | LF | FF => true
-    case _ => false
-  }
 }