Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javac/util/Names.java	Thu Feb 23 09:53:09 2012 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/util/Names.java	Fri Feb 24 10:40:32 2012 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -47,108 +47,127 @@
    1.11          return instance;
    1.12      }
    1.13  
    1.14 -    public final Name slash;
    1.15 +    // operators and punctuation
    1.16 +    public final Name asterisk;
    1.17 +    public final Name comma;
    1.18 +    public final Name empty;
    1.19      public final Name hyphen;
    1.20 -    public final Name T;
    1.21 -    public final Name slashequals;
    1.22 -    public final Name deprecated;
    1.23 -    public final Name init;
    1.24 -    public final Name clinit;
    1.25 -    public final Name error;
    1.26 -    public final Name any;
    1.27 -    public final Name empty;
    1.28      public final Name one;
    1.29      public final Name period;
    1.30 -    public final Name comma;
    1.31      public final Name semicolon;
    1.32 -    public final Name asterisk;
    1.33 +    public final Name slash;
    1.34 +    public final Name slashequals;
    1.35 +
    1.36 +    // keywords
    1.37 +    public final Name _class;
    1.38 +    public final Name _default;
    1.39 +    public final Name _super;
    1.40      public final Name _this;
    1.41 -    public final Name _super;
    1.42 -    public final Name _default;
    1.43 -    public final Name _class;
    1.44 -    public final Name java_lang;
    1.45 -    public final Name java_lang_Object;
    1.46 +
    1.47 +    // field and method names
    1.48 +    public final Name _name;
    1.49 +    public final Name addSuppressed;
    1.50 +    public final Name any;
    1.51 +    public final Name append;
    1.52 +    public final Name clinit;
    1.53 +    public final Name clone;
    1.54 +    public final Name close;
    1.55 +    public final Name compareTo;
    1.56 +    public final Name desiredAssertionStatus;
    1.57 +    public final Name equals;
    1.58 +    public final Name error;
    1.59 +    public final Name family;
    1.60 +    public final Name finalize;
    1.61 +    public final Name forName;
    1.62 +    public final Name getClass;
    1.63 +    public final Name getClassLoader;
    1.64 +    public final Name getComponentType;
    1.65 +    public final Name getDeclaringClass;
    1.66 +    public final Name getMessage;
    1.67 +    public final Name hasNext;
    1.68 +    public final Name hashCode;
    1.69 +    public final Name init;
    1.70 +    public final Name initCause;
    1.71 +    public final Name iterator;
    1.72 +    public final Name length;
    1.73 +    public final Name next;
    1.74 +    public final Name ordinal;
    1.75 +    public final Name serialVersionUID;
    1.76 +    public final Name toString;
    1.77 +    public final Name value;
    1.78 +    public final Name valueOf;
    1.79 +    public final Name values;
    1.80 +
    1.81 +    // class names
    1.82 +    public final Name java_io_Serializable;
    1.83 +    public final Name java_lang_AutoCloseable;
    1.84      public final Name java_lang_Class;
    1.85      public final Name java_lang_Cloneable;
    1.86 -    public final Name java_io_Serializable;
    1.87 -    public final Name serialVersionUID;
    1.88      public final Name java_lang_Enum;
    1.89 +    public final Name java_lang_Object;
    1.90      public final Name java_lang_invoke_MethodHandle;
    1.91 -    public final Name package_info;
    1.92 +
    1.93 +    // names of builtin classes
    1.94 +    public final Name Array;
    1.95 +    public final Name Bound;
    1.96 +    public final Name Method;
    1.97 +
    1.98 +    // package names
    1.99 +    public final Name java_lang;
   1.100 +
   1.101 +    // attribute names
   1.102 +    public final Name Annotation;
   1.103 +    public final Name AnnotationDefault;
   1.104 +    public final Name Bridge;
   1.105 +    public final Name CharacterRangeTable;
   1.106 +    public final Name Code;
   1.107 +    public final Name CompilationID;
   1.108      public final Name ConstantValue;
   1.109 +    public final Name Deprecated;
   1.110 +    public final Name EnclosingMethod;
   1.111 +    public final Name Enum;
   1.112 +    public final Name Exceptions;
   1.113 +    public final Name InnerClasses;
   1.114      public final Name LineNumberTable;
   1.115      public final Name LocalVariableTable;
   1.116      public final Name LocalVariableTypeTable;
   1.117 -    public final Name CharacterRangeTable;
   1.118 +    public final Name RuntimeInvisibleAnnotations;
   1.119 +    public final Name RuntimeInvisibleParameterAnnotations;
   1.120 +    public final Name RuntimeInvisibleTypeAnnotations;
   1.121 +    public final Name RuntimeVisibleAnnotations;
   1.122 +    public final Name RuntimeVisibleParameterAnnotations;
   1.123 +    public final Name RuntimeVisibleTypeAnnotations;
   1.124 +    public final Name Signature;
   1.125 +    public final Name SourceFile;
   1.126 +    public final Name SourceID;
   1.127      public final Name StackMap;
   1.128      public final Name StackMapTable;
   1.129 -    public final Name SourceID;
   1.130 -    public final Name CompilationID;
   1.131 -    public final Name Code;
   1.132 -    public final Name Exceptions;
   1.133 -    public final Name SourceFile;
   1.134 -    public final Name InnerClasses;
   1.135      public final Name Synthetic;
   1.136 -    public final Name Bridge;
   1.137 -    public final Name Deprecated;
   1.138 -    public final Name Enum;
   1.139 -    public final Name _name;
   1.140 -    public final Name Signature;
   1.141 +    public final Name Value;
   1.142      public final Name Varargs;
   1.143 -    public final Name Annotation;
   1.144 -    public final Name RuntimeVisibleAnnotations;
   1.145 -    public final Name RuntimeInvisibleAnnotations;
   1.146 -    public final Name RuntimeVisibleTypeAnnotations;
   1.147 -    public final Name RuntimeInvisibleTypeAnnotations;
   1.148 -    public final Name RuntimeVisibleParameterAnnotations;
   1.149 -    public final Name RuntimeInvisibleParameterAnnotations;
   1.150 -    public final Name Value;
   1.151 -    public final Name EnclosingMethod;
   1.152 -    public final Name desiredAssertionStatus;
   1.153 -    public final Name append;
   1.154 -    public final Name family;
   1.155 -    public final Name forName;
   1.156 -    public final Name toString;
   1.157 -    public final Name length;
   1.158 -    public final Name valueOf;
   1.159 -    public final Name value;
   1.160 -    public final Name getMessage;
   1.161 -    public final Name getClass;
   1.162 +
   1.163 +    // members of java.lang.annotation.ElementType
   1.164 +    public final Name ANNOTATION_TYPE;
   1.165 +    public final Name CONSTRUCTOR;
   1.166 +    public final Name FIELD;
   1.167 +    public final Name LOCAL_VARIABLE;
   1.168 +    public final Name METHOD;
   1.169 +    public final Name PACKAGE;
   1.170 +    public final Name PARAMETER;
   1.171      public final Name TYPE;
   1.172 +    public final Name TYPE_PARAMETER;
   1.173      public final Name TYPE_USE;
   1.174 -    public final Name TYPE_PARAMETER;
   1.175 -    public final Name FIELD;
   1.176 -    public final Name METHOD;
   1.177 -    public final Name PARAMETER;
   1.178 -    public final Name CONSTRUCTOR;
   1.179 -    public final Name LOCAL_VARIABLE;
   1.180 -    public final Name ANNOTATION_TYPE;
   1.181 -    public final Name PACKAGE;
   1.182 -    public final Name SOURCE;
   1.183 +
   1.184 +    // members of java.lang.annotation.RetentionPolicy
   1.185      public final Name CLASS;
   1.186      public final Name RUNTIME;
   1.187 -    public final Name Array;
   1.188 -    public final Name Method;
   1.189 -    public final Name Bound;
   1.190 -    public final Name clone;
   1.191 -    public final Name getComponentType;
   1.192 -    public final Name getClassLoader;
   1.193 -    public final Name initCause;
   1.194 -    public final Name values;
   1.195 -    public final Name iterator;
   1.196 -    public final Name hasNext;
   1.197 -    public final Name next;
   1.198 -    public final Name AnnotationDefault;
   1.199 -    public final Name ordinal;
   1.200 -    public final Name equals;
   1.201 -    public final Name hashCode;
   1.202 -    public final Name compareTo;
   1.203 -    public final Name getDeclaringClass;
   1.204 +    public final Name SOURCE;
   1.205 +
   1.206 +    // other identifiers
   1.207 +    public final Name T;
   1.208 +    public final Name deprecated;
   1.209      public final Name ex;
   1.210 -    public final Name finalize;
   1.211 -    public final Name java_lang_AutoCloseable;
   1.212 -    public final Name close;
   1.213 -    public final Name addSuppressed;
   1.214 +    public final Name package_info;
   1.215  
   1.216      public final Name.Table table;
   1.217  
   1.218 @@ -156,116 +175,127 @@
   1.219          Options options = Options.instance(context);
   1.220          table = createTable(options);
   1.221  
   1.222 -        slash = fromString("/");
   1.223 +        // operators and punctuation
   1.224 +        asterisk = fromString("*");
   1.225 +        comma = fromString(",");
   1.226 +        empty = fromString("");
   1.227          hyphen = fromString("-");
   1.228 -        T = fromString("T");
   1.229 -        slashequals = fromString("/=");
   1.230 -        deprecated = fromString("deprecated");
   1.231 -
   1.232 -        init = fromString("<init>");
   1.233 -        clinit = fromString("<clinit>");
   1.234 -        error = fromString("<error>");
   1.235 -        any = fromString("<any>");
   1.236 -        empty = fromString("");
   1.237          one = fromString("1");
   1.238          period = fromString(".");
   1.239 -        comma = fromString(",");
   1.240          semicolon = fromString(";");
   1.241 -        asterisk = fromString("*");
   1.242 +        slash = fromString("/");
   1.243 +        slashequals = fromString("/=");
   1.244 +
   1.245 +        // keywords
   1.246 +        _class = fromString("class");
   1.247 +        _default = fromString("default");
   1.248 +        _super = fromString("super");
   1.249          _this = fromString("this");
   1.250 -        _super = fromString("super");
   1.251 -        _default = fromString("default");
   1.252  
   1.253 -        _class = fromString("class");
   1.254 -        java_lang = fromString("java.lang");
   1.255 -        java_lang_Object = fromString("java.lang.Object");
   1.256 +        // field and method names
   1.257 +        _name = fromString("name");
   1.258 +        addSuppressed = fromString("addSuppressed");
   1.259 +        any = fromString("<any>");
   1.260 +        append = fromString("append");
   1.261 +        clinit = fromString("<clinit>");
   1.262 +        clone = fromString("clone");
   1.263 +        close = fromString("close");
   1.264 +        compareTo = fromString("compareTo");
   1.265 +        desiredAssertionStatus = fromString("desiredAssertionStatus");
   1.266 +        equals = fromString("equals");
   1.267 +        error = fromString("<error>");
   1.268 +        family = fromString("family");
   1.269 +        finalize = fromString("finalize");
   1.270 +        forName = fromString("forName");
   1.271 +        getClass = fromString("getClass");
   1.272 +        getClassLoader = fromString("getClassLoader");
   1.273 +        getComponentType = fromString("getComponentType");
   1.274 +        getDeclaringClass = fromString("getDeclaringClass");
   1.275 +        getMessage = fromString("getMessage");
   1.276 +        hasNext = fromString("hasNext");
   1.277 +        hashCode = fromString("hashCode");
   1.278 +        init = fromString("<init>");
   1.279 +        initCause = fromString("initCause");
   1.280 +        iterator = fromString("iterator");
   1.281 +        length = fromString("length");
   1.282 +        next = fromString("next");
   1.283 +        ordinal = fromString("ordinal");
   1.284 +        serialVersionUID = fromString("serialVersionUID");
   1.285 +        toString = fromString("toString");
   1.286 +        value = fromString("value");
   1.287 +        valueOf = fromString("valueOf");
   1.288 +        values = fromString("values");
   1.289 +
   1.290 +        // class names
   1.291 +        java_io_Serializable = fromString("java.io.Serializable");
   1.292 +        java_lang_AutoCloseable = fromString("java.lang.AutoCloseable");
   1.293          java_lang_Class = fromString("java.lang.Class");
   1.294          java_lang_Cloneable = fromString("java.lang.Cloneable");
   1.295 -        java_io_Serializable = fromString("java.io.Serializable");
   1.296          java_lang_Enum = fromString("java.lang.Enum");
   1.297 +        java_lang_Object = fromString("java.lang.Object");
   1.298          java_lang_invoke_MethodHandle = fromString("java.lang.invoke.MethodHandle");
   1.299 -        package_info = fromString("package-info");
   1.300 -        serialVersionUID = fromString("serialVersionUID");
   1.301 +
   1.302 +        // names of builtin classes
   1.303 +        Array = fromString("Array");
   1.304 +        Bound = fromString("Bound");
   1.305 +        Method = fromString("Method");
   1.306 +
   1.307 +        // package names
   1.308 +        java_lang = fromString("java.lang");
   1.309 +
   1.310 +        // attribute names
   1.311 +        Annotation = fromString("Annotation");
   1.312 +        AnnotationDefault = fromString("AnnotationDefault");
   1.313 +        Bridge = fromString("Bridge");
   1.314 +        CharacterRangeTable = fromString("CharacterRangeTable");
   1.315 +        Code = fromString("Code");
   1.316 +        CompilationID = fromString("CompilationID");
   1.317          ConstantValue = fromString("ConstantValue");
   1.318 +        Deprecated = fromString("Deprecated");
   1.319 +        EnclosingMethod = fromString("EnclosingMethod");
   1.320 +        Enum = fromString("Enum");
   1.321 +        Exceptions = fromString("Exceptions");
   1.322 +        InnerClasses = fromString("InnerClasses");
   1.323          LineNumberTable = fromString("LineNumberTable");
   1.324          LocalVariableTable = fromString("LocalVariableTable");
   1.325          LocalVariableTypeTable = fromString("LocalVariableTypeTable");
   1.326 -        CharacterRangeTable = fromString("CharacterRangeTable");
   1.327 +        RuntimeInvisibleAnnotations = fromString("RuntimeInvisibleAnnotations");
   1.328 +        RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations");
   1.329 +        RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations");
   1.330 +        RuntimeVisibleAnnotations = fromString("RuntimeVisibleAnnotations");
   1.331 +        RuntimeVisibleParameterAnnotations = fromString("RuntimeVisibleParameterAnnotations");
   1.332 +        RuntimeVisibleTypeAnnotations = fromString("RuntimeVisibleTypeAnnotations");
   1.333 +        Signature = fromString("Signature");
   1.334 +        SourceFile = fromString("SourceFile");
   1.335 +        SourceID = fromString("SourceID");
   1.336          StackMap = fromString("StackMap");
   1.337          StackMapTable = fromString("StackMapTable");
   1.338 -        SourceID = fromString("SourceID");
   1.339 -        CompilationID = fromString("CompilationID");
   1.340 -        Code = fromString("Code");
   1.341 -        Exceptions = fromString("Exceptions");
   1.342 -        SourceFile = fromString("SourceFile");
   1.343 -        InnerClasses = fromString("InnerClasses");
   1.344          Synthetic = fromString("Synthetic");
   1.345 -        Bridge = fromString("Bridge");
   1.346 -        Deprecated = fromString("Deprecated");
   1.347 -        Enum = fromString("Enum");
   1.348 -        _name = fromString("name");
   1.349 -        Signature = fromString("Signature");
   1.350 +        Value = fromString("Value");
   1.351          Varargs = fromString("Varargs");
   1.352 -        Annotation = fromString("Annotation");
   1.353 -        RuntimeVisibleAnnotations = fromString("RuntimeVisibleAnnotations");
   1.354 -        RuntimeInvisibleAnnotations = fromString("RuntimeInvisibleAnnotations");
   1.355 -        RuntimeVisibleTypeAnnotations = fromString("RuntimeVisibleTypeAnnotations");
   1.356 -        RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations");
   1.357 -        RuntimeVisibleParameterAnnotations = fromString("RuntimeVisibleParameterAnnotations");
   1.358 -        RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations");
   1.359 -        Value = fromString("Value");
   1.360 -        EnclosingMethod = fromString("EnclosingMethod");
   1.361  
   1.362 -        desiredAssertionStatus = fromString("desiredAssertionStatus");
   1.363 +        // members of java.lang.annotation.ElementType
   1.364 +        ANNOTATION_TYPE = fromString("ANNOTATION_TYPE");
   1.365 +        CONSTRUCTOR = fromString("CONSTRUCTOR");
   1.366 +        FIELD = fromString("FIELD");
   1.367 +        LOCAL_VARIABLE = fromString("LOCAL_VARIABLE");
   1.368 +        METHOD = fromString("METHOD");
   1.369 +        PACKAGE = fromString("PACKAGE");
   1.370 +        PARAMETER = fromString("PARAMETER");
   1.371 +        TYPE = fromString("TYPE");
   1.372 +        TYPE_PARAMETER = fromString("TYPE_PARAMETER");
   1.373 +        TYPE_USE = fromString("TYPE_USE");
   1.374  
   1.375 -        append = fromString("append");
   1.376 -        family = fromString("family");
   1.377 -        forName = fromString("forName");
   1.378 -        toString = fromString("toString");
   1.379 -        length = fromString("length");
   1.380 -        valueOf = fromString("valueOf");
   1.381 -        value = fromString("value");
   1.382 -        getMessage = fromString("getMessage");
   1.383 -        getClass = fromString("getClass");
   1.384 -
   1.385 -        TYPE = fromString("TYPE");
   1.386 -        TYPE_USE = fromString("TYPE_USE");
   1.387 -        TYPE_PARAMETER = fromString("TYPE_PARAMETER");
   1.388 -        FIELD = fromString("FIELD");
   1.389 -        METHOD = fromString("METHOD");
   1.390 -        PARAMETER = fromString("PARAMETER");
   1.391 -        CONSTRUCTOR = fromString("CONSTRUCTOR");
   1.392 -        LOCAL_VARIABLE = fromString("LOCAL_VARIABLE");
   1.393 -        ANNOTATION_TYPE = fromString("ANNOTATION_TYPE");
   1.394 -        PACKAGE = fromString("PACKAGE");
   1.395 -
   1.396 -        SOURCE = fromString("SOURCE");
   1.397 +        // members of java.lang.annotation.RetentionPolicy
   1.398          CLASS = fromString("CLASS");
   1.399          RUNTIME = fromString("RUNTIME");
   1.400 +        SOURCE = fromString("SOURCE");
   1.401  
   1.402 -        Array = fromString("Array");
   1.403 -        Method = fromString("Method");
   1.404 -        Bound = fromString("Bound");
   1.405 -        clone = fromString("clone");
   1.406 -        getComponentType = fromString("getComponentType");
   1.407 -        getClassLoader = fromString("getClassLoader");
   1.408 -        initCause = fromString("initCause");
   1.409 -        values = fromString("values");
   1.410 -        iterator = fromString("iterator");
   1.411 -        hasNext = fromString("hasNext");
   1.412 -        next = fromString("next");
   1.413 -        AnnotationDefault = fromString("AnnotationDefault");
   1.414 -        ordinal = fromString("ordinal");
   1.415 -        equals = fromString("equals");
   1.416 -        hashCode = fromString("hashCode");
   1.417 -        compareTo = fromString("compareTo");
   1.418 -        getDeclaringClass = fromString("getDeclaringClass");
   1.419 +        // other identifiers
   1.420 +        T = fromString("T");
   1.421 +        deprecated = fromString("deprecated");
   1.422          ex = fromString("ex");
   1.423 -        finalize = fromString("finalize");
   1.424 -
   1.425 -        java_lang_AutoCloseable = fromString("java.lang.AutoCloseable");
   1.426 -        close = fromString("close");
   1.427 -        addSuppressed = fromString("addSuppressed");
   1.428 +        package_info = fromString("package-info");
   1.429      }
   1.430  
   1.431      protected Name.Table createTable(Options options) {