jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java

equal deleted inserted replaced

-:3b3e23e67329
+:3651128c74eb
 *  This code and its internal interfaces are subject to change or
 *  deletion without notice.</b>
 */
 public class ClassReader {
 /** The context key for the class reader. */
-protected static final Context.Key<ClassReader> classReaderKey =
+protected static final Context.Key<ClassReader> classReaderKey = new Context.Key<>();
-new Context.Key<ClassReader>();
 public static final int INITIAL_BUFFER_SIZE = 0x0fff0;
 Annotate annotate;
 boolean sawMethodParameters;
 /**
 * The set of attribute names for which warnings have been generated for the current class
 */
-Set<Name> warnedAttrs = new HashSet<Name>();
+Set<Name> warnedAttrs = new HashSet<>();
 /**
 * Completer that delegates to the complete-method of this class.
 */
 private final Completer thisCompleter = new Completer() {
 Assert.check(packages == null || packages == syms.packages);
 packages = syms.packages;
 Assert.check(classes == null || classes == syms.classes);
 classes = syms.classes;
 } else {
-packages = new HashMap<Name, PackageSymbol>();
+packages = new HashMap<>();
-classes = new HashMap<Name, ClassSymbol>();
+classes = new HashMap<>();
 }
 packages.put(names.empty, syms.rootPackage);
 syms.rootPackage.completer = thisCompleter;
 syms.unnamedPackage.completer = thisCompleter;
 /************************************************************************
 * Reading Attributes
 ***********************************************************************/
-protected enum AttributeKind { CLASS, MEMBER };
+protected enum AttributeKind { CLASS, MEMBER }
 protected abstract class AttributeReader {
 protected AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
 this.name = name;
 this.version = version;
 this.kinds = kinds;
 protected Set<AttributeKind> MEMBER_ATTRIBUTE =
 EnumSet.of(AttributeKind.MEMBER);
 protected Set<AttributeKind> CLASS_OR_MEMBER_ATTRIBUTE =
 EnumSet.of(AttributeKind.CLASS, AttributeKind.MEMBER);
-protected Map<Name, AttributeReader> attributeReaders = new HashMap<Name, AttributeReader>();
+protected Map<Name, AttributeReader> attributeReaders = new HashMap<>();
 private void initAttributeReaders() {
 AttributeReader[] readers = {
 // v45.3 attributes
 try {
 ClassType ct1 = (ClassType)c.type;
 Assert.check(c == currentOwner);
 ct1.typarams_field = readTypeParams(nextChar());
 ct1.supertype_field = sigToType();
-ListBuffer<Type> is = new ListBuffer<Type>();
+ListBuffer<Type> is = new ListBuffer<>();
 while (sigp != siglimit) is.append(sigToType());
 ct1.interfaces_field = is.toList();
 } finally {
 readingClassAttr = false;
 }
 } else {
 ((ClassType)sym.type).setEnclosingType(Type.noType);
 }
 enterTypevars(self);
 if (!missingTypeVariables.isEmpty()) {
-ListBuffer<Type> typeVars =  new ListBuffer<Type>();
+ListBuffer<Type> typeVars =  new ListBuffer<>();
 for (Type typevar : missingTypeVariables) {
 typeVars.append(findTypeVar(typevar.tsym.name));
 }
 foundTypeVariables = typeVars.toList();
 } else {
 /** Attach annotations.
 */
 void attachAnnotations(final Symbol sym) {
 int numAttributes = nextChar();
 if (numAttributes != 0) {
-ListBuffer<CompoundAnnotationProxy> proxies =
+ListBuffer<CompoundAnnotationProxy> proxies = new ListBuffer<>();
-new ListBuffer<CompoundAnnotationProxy>();
 for (int i = 0; i<numAttributes; i++) {
 CompoundAnnotationProxy proxy = readCompoundAnnotation();
 if (proxy.type.tsym == syms.proprietaryType.tsym)
 sym.flags_field |= PROPRIETARY;
 else if (proxy.type.tsym == syms.profileType.tsym) {
 }
 CompoundAnnotationProxy readCompoundAnnotation() {
 Type t = readTypeOrClassSymbol(nextChar());
 int numFields = nextChar();
-ListBuffer<Pair<Name,Attribute>> pairs =
+ListBuffer<Pair<Name,Attribute>> pairs = new ListBuffer<>();
-new ListBuffer<Pair<Name,Attribute>>();
 for (int i=0; i<numFields; i++) {
 Name name = readName(nextChar());
 Attribute value = readAttributeValue();
-pairs.append(new Pair<Name,Attribute>(name, value));
+pairs.append(new Pair<>(name, value));
 }
 return new CompoundAnnotationProxy(t, pairs.toList());
 }
 TypeAnnotationProxy readTypeAnnotation() {
 return new EnumAttributeProxy(readEnumType(nextChar()), readName(nextChar()));
 case 'c':
 return new Attribute.Class(types, readTypeOrClassSymbol(nextChar()));
 case '[': {
 int n = nextChar();
-ListBuffer<Attribute> l = new ListBuffer<Attribute>();
+ListBuffer<Attribute> l = new ListBuffer<>();
 for (int i=0; i<n; i++)
 l.append(readAttributeValue());
 return new ArrayAttributeProxy(l.toList());
 }
 case '@':
 private ClassSymbol requestingOwner = currentOwner.kind == MTH
 ? currentOwner.enclClass() : (ClassSymbol)currentOwner;
 List<Attribute.Compound> deproxyCompoundList(List<CompoundAnnotationProxy> pl) {
 // also must fill in types!!!!
-ListBuffer<Attribute.Compound> buf =
+ListBuffer<Attribute.Compound> buf = new ListBuffer<>();
-new ListBuffer<Attribute.Compound>();
 for (List<CompoundAnnotationProxy> l = pl; l.nonEmpty(); l=l.tail) {
 buf.append(deproxyCompound(l.head));
 }
 return buf.toList();
 }
 Attribute.Compound deproxyCompound(CompoundAnnotationProxy a) {
-ListBuffer<Pair<Symbol.MethodSymbol,Attribute>> buf =
+ListBuffer<Pair<Symbol.MethodSymbol,Attribute>> buf = new ListBuffer<>();
-new ListBuffer<Pair<Symbol.MethodSymbol,Attribute>>();
 for (List<Pair<Name,Attribute>> l = a.values;
 l.nonEmpty();
 l = l.tail) {
 MethodSymbol meth = findAccessMethod(a.type, l.head.fst);
-buf.append(new Pair<Symbol.MethodSymbol,Attribute>
+buf.append(new Pair<>(meth, deproxy(meth.type.getReturnType(), l.head.snd)));
-(meth, deproxy(meth.type.getReturnType(), l.head.snd)));
 }
 return new Attribute.Compound(a.type, buf.toList());
 }
 MethodSymbol findAccessMethod(Type container, Name name) {

changeset 22163	3651128c74eb
parent 21043	3b000be15694
child 22167	e0ba35f27975