jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/code/Symbol.java

-:d13af7751456
+:137994c189e5
 // TODO: getEnclosedElements should return a javac List, fix in FilteredMemberList
 public java.util.List<Symbol> getEnclosedElements() {
 return List.nil();
 }
-public List<TypeSymbol> getTypeParameters() {
+public List<TypeVariableSymbol> getTypeParameters() {
-ListBuffer<TypeSymbol> l = ListBuffer.lb();
+ListBuffer<TypeVariableSymbol> l = ListBuffer.lb();
 for (Type t : type.getTypeArguments()) {
-l.append(t.tsym);
+Assert.check(t.tsym.getKind() == ElementKind.TYPE_PARAMETER);
+l.append((TypeVariableSymbol)t.tsym);
 }
 return l.toList();
 }
 public static class DelegatedSymbol<T extends Symbol> extends Symbol {
 public T getUnderlyingSymbol() {
 return other;
 }
 }
-/** A class for type symbols. Type variables are represented by instances
+/** A base class for Symbols representing types.
-*  of this class, classes and packages by instances of subclasses.
+*/
-*/
+public static abstract class TypeSymbol extends Symbol {
-public static class TypeSymbol
+public TypeSymbol(int kind, long flags, Name name, Type type, Symbol owner) {
-extends Symbol implements TypeParameterElement {
+super(kind, flags, name, type, owner);
-// Implements TypeParameterElement because type parameters don't
+}
-// have their own TypeSymbol subclass.
-// TODO: type parameters should have their own TypeSymbol subclass
-public TypeSymbol(long flags, Name name, Type type, Symbol owner) {
-super(TYP, flags, name, type, owner);
-}
 /** form a fully qualified name from a name and an owner
 */
 static public Name formFullName(Name name, Symbol owner) {
 if (owner == null) return name;
 if (((owner.kind != ERR)) &&
 }
 }
 return this.type.hasTag(TYPEVAR);
 }
-// For type params; overridden in subclasses.
+@Override
-public ElementKind getKind() {
-return ElementKind.TYPE_PARAMETER;
-}
 public java.util.List<Symbol> getEnclosedElements() {
 List<Symbol> list = List.nil();
 if (kind == TYP && type.hasTag(TYPEVAR)) {
 return list;
 }
 list = list.prepend(e.sym);
 }
 return list;
 }
-// For type params.
+@Override
-// Perhaps not needed if getEnclosingElement can be spec'ed
+public <R, P> R accept(Symbol.Visitor<R, P> v, P p) {
-// to do the same thing.
+return v.visitTypeSymbol(this, p);
-// TODO: getGenericElement() might not be needed
+}
+}
+/**
+* Type variables are represented by instances of this class.
+*/
+public static class TypeVariableSymbol
+extends TypeSymbol implements TypeParameterElement {
+public TypeVariableSymbol(long flags, Name name, Type type, Symbol owner) {
+super(TYP, flags, name, type, owner);
+}
+public ElementKind getKind() {
+return ElementKind.TYPE_PARAMETER;
+}
+@Override
 public Symbol getGenericElement() {
 return owner;
-}
-public <R, P> R accept(ElementVisitor<R, P> v, P p) {
-Assert.check(type.hasTag(TYPEVAR)); // else override will be invoked
-return v.visitTypeParameter(this, p);
-}
-public <R, P> R accept(Symbol.Visitor<R, P> v, P p) {
-return v.visitTypeSymbol(this, p);
 }
 public List<Type> getBounds() {
 TypeVar t = (TypeVar)type;
 Type bound = t.getUpperBound();
 // No superclass was given in bounds.
 // In this case, supertype is Object, erasure is first interface.
 return ct.interfaces_field;
 }
 }
+@Override
+public <R, P> R accept(ElementVisitor<R, P> v, P p) {
+return v.visitTypeParameter(this, p);
+}
 }
 /** A class for package symbols
 */
 public static class PackageSymbol extends TypeSymbol
 public Scope members_field;
 public Name fullname;
 public ClassSymbol package_info; // see bug 6443073
 public PackageSymbol(Name name, Type type, Symbol owner) {
-super(0, name, type, owner);
+super(PCK, 0, name, type, owner);
-this.kind = PCK;
 this.members_field = null;
 this.fullname = formFullName(name, owner);
 }
 public PackageSymbol(Name name, Symbol owner) {
 /** the constant pool of the class
 */
 public Pool pool;
 public ClassSymbol(long flags, Name name, Type type, Symbol owner) {
-super(flags, name, type, owner);
+super(TYP, flags, name, type, owner);
 this.members_field = null;
 this.fullname = formFullName(name, owner);
 this.flatname = formFlatName(name, owner);
 this.sourcefile = null;
 this.classfile = null;

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

comparison: src/share/classes/com/sun/tools/javac/code/Symbol.java

src/share/classes/com/sun/tools/javac/code/Symbol.java