Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Fri Sep 12 23:32:51 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Tue Sep 16 18:35:18 2008 -0700
     1.3 @@ -28,6 +28,7 @@
     1.4  import com.sun.tools.javac.util.Context;
     1.5  import com.sun.tools.javac.util.Log;
     1.6  import com.sun.tools.javac.util.Name;
     1.7 +import com.sun.tools.javac.util.Names;
     1.8  
     1.9  import static com.sun.tools.javac.parser.Token.*;
    1.10  
    1.11 @@ -51,12 +52,12 @@
    1.12      }
    1.13  
    1.14      private final Log log;
    1.15 -    private final Name.Table names;
    1.16 +    private final Names names;
    1.17  
    1.18      protected Keywords(Context context) {
    1.19          context.put(keywordsKey, this);
    1.20          log = Log.instance(context);
    1.21 -        names = Name.Table.instance(context);
    1.22 +        names = Names.instance(context);
    1.23  
    1.24          for (Token t : Token.values()) {
    1.25              if (t.name != null)
    1.26 @@ -69,13 +70,13 @@
    1.27          for (int i = 0; i <= maxKey; i++) key[i] = IDENTIFIER;
    1.28          for (Token t : Token.values()) {
    1.29              if (t.name != null)
    1.30 -                key[tokenName[t.ordinal()].index] = t;
    1.31 +                key[tokenName[t.ordinal()].getIndex()] = t;
    1.32          }
    1.33      }
    1.34  
    1.35  
    1.36      public Token key(Name name) {
    1.37 -        return (name.index > maxKey) ? IDENTIFIER : key[name.index];
    1.38 +        return (name.getIndex() > maxKey) ? IDENTIFIER : key[name.getIndex()];
    1.39      }
    1.40  
    1.41      /**
    1.42 @@ -94,6 +95,6 @@
    1.43      private void enterKeyword(String s, Token token) {
    1.44          Name n = names.fromString(s);
    1.45          tokenName[token.ordinal()] = n;
    1.46 -        if (n.index > maxKey) maxKey = n.index;
    1.47 +        if (n.getIndex() > maxKey) maxKey = n.getIndex();
    1.48      }
    1.49  }