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

equal deleted inserted replaced

-:91f0b2d4d816
+:5c742eabba7c
 */
 byte[] buf = new byte[INITIAL_BUFFER_SIZE];
 /** The current input pointer.
 */
-int bp;
+protected int bp;
 /** The objects of the constant pool.
 */
 Object[] poolObj;
 * Reading Attributes
 ***********************************************************************/
 protected enum AttributeKind { CLASS, MEMBER };
 protected abstract class AttributeReader {
-AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
+protected AttributeReader(Name name, ClassFile.Version version, Set<AttributeKind> kinds) {
 this.name = name;
 this.version = version;
 this.kinds = kinds;
 }
-boolean accepts(AttributeKind kind) {
+protected boolean accepts(AttributeKind kind) {
 if (kinds.contains(kind)) {
 if (majorVersion > version.major || (majorVersion == version.major && minorVersion >= version.minor))
 return true;
 if (lintClassfile && !warnedAttrs.contains(name)) {
 }
 }
 return false;
 }
-abstract void read(Symbol sym, int attrLen);
+protected abstract void read(Symbol sym, int attrLen);
-final Name name;
+protected final Name name;
-final ClassFile.Version version;
+protected final ClassFile.Version version;
-final Set<AttributeKind> kinds;
+protected final Set<AttributeKind> kinds;
 }
 protected Set<AttributeKind> CLASS_ATTRIBUTE =
 EnumSet.of(AttributeKind.CLASS);
 protected Set<AttributeKind> MEMBER_ATTRIBUTE =
 private void initAttributeReaders() {
 AttributeReader[] readers = {
 // v45.3 attributes
 new AttributeReader(names.Code, V45_3, MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 if (readAllOfClassFile || saveParameterNames)
 ((MethodSymbol)sym).code = readCode(sym);
 else
 bp = bp + attrLen;
 }
 },
 new AttributeReader(names.ConstantValue, V45_3, MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 Object v = readPool(nextChar());
 // Ignore ConstantValue attribute if field not final.
 if ((sym.flags() & FINAL) != 0)
 ((VarSymbol) sym).setData(v);
 }
 },
 new AttributeReader(names.Deprecated, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 sym.flags_field |= DEPRECATED;
 }
 },
 new AttributeReader(names.Exceptions, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 int nexceptions = nextChar();
 List<Type> thrown = List.nil();
 for (int j = 0; j < nexceptions; j++)
 thrown = thrown.prepend(readClassSymbol(nextChar()).type);
 if (sym.type.getThrownTypes().isEmpty())
 sym.type.asMethodType().thrown = thrown.reverse();
 }
 },
 new AttributeReader(names.InnerClasses, V45_3, CLASS_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 ClassSymbol c = (ClassSymbol) sym;
 readInnerClasses(c);
 }
 },
 new AttributeReader(names.LocalVariableTable, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 int newbp = bp + attrLen;
 if (saveParameterNames) {
 // Pick up parameter names from the variable table.
 // Parameter names are not explicitly identified as such,
 // but all parameter name entries in the LocalVariableTable
 bp = newbp;
 }
 },
 new AttributeReader(names.SourceFile, V45_3, CLASS_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 ClassSymbol c = (ClassSymbol) sym;
 Name n = readName(nextChar());
 c.sourcefile = new SourceFileObject(n, c.flatname);
 }
 },
 new AttributeReader(names.Synthetic, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 // bridge methods are visible when generics not enabled
 if (allowGenerics || (sym.flags_field & BRIDGE) == 0)
 sym.flags_field |= SYNTHETIC;
 }
 },
 // standard v49 attributes
 new AttributeReader(names.EnclosingMethod, V49, CLASS_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 int newbp = bp + attrLen;
 readEnclosingMethodAttr(sym);
 bp = newbp;
 }
 },
 new AttributeReader(names.Signature, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
 @Override
-boolean accepts(AttributeKind kind) {
+protected boolean accepts(AttributeKind kind) {
 return super.accepts(kind) && allowGenerics;
 }
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 if (sym.kind == TYP) {
 ClassSymbol c = (ClassSymbol) sym;
 readingClassAttr = true;
 try {
 ClassType ct1 = (ClassType)c.type;
 },
 // v49 annotation attributes
 new AttributeReader(names.AnnotationDefault, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 attachAnnotationDefault(sym);
 }
 },
 new AttributeReader(names.RuntimeInvisibleAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 attachAnnotations(sym);
 }
 },
 new AttributeReader(names.RuntimeInvisibleParameterAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 attachParameterAnnotations(sym);
 }
 },
 new AttributeReader(names.RuntimeVisibleAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 attachAnnotations(sym);
 }
 },
 new AttributeReader(names.RuntimeVisibleParameterAnnotations, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 attachParameterAnnotations(sym);
 }
 },
 // additional "legacy" v49 attributes, superceded by flags
 new AttributeReader(names.Annotation, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 if (allowAnnotations)
 sym.flags_field |= ANNOTATION;
 }
 },
 new AttributeReader(names.Bridge, V49, MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 sym.flags_field |= BRIDGE;
 if (!allowGenerics)
 sym.flags_field &= ~SYNTHETIC;
 }
 },
 new AttributeReader(names.Enum, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 sym.flags_field |= ENUM;
 }
 },
 new AttributeReader(names.Varargs, V49, CLASS_OR_MEMBER_ATTRIBUTE) {
-void read(Symbol sym, int attrLen) {
+protected void read(Symbol sym, int attrLen) {
 if (allowVarargs)
 sym.flags_field |= VARARGS;
 }
 },
 printCCF("ccf.unrecognized.attribute", attrName);
 }
-void readEnclosingMethodAttr(Symbol sym) {
+protected void readEnclosingMethodAttr(Symbol sym) {
 // sym is a nested class with an "Enclosing Method" attribute
 // remove sym from it's current owners scope and place it in
 // the scope specified by the attribute
 sym.owner.members().remove(sym);
 ClassSymbol self = (ClassSymbol)sym;

changeset 13635	5c742eabba7c
parent 12335	4725d88691dd
child 13689	4d519199a6aa