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

-:5c956be64b9e
+:71f35e4b93a5
 * are annotated onto the Symbol. However this class depends on the facts that
 * List (in javac) is immutable.
 *
 * An instance of this class can be in one of three states:
 *
-* NOT_STARTED indicates that the Symbol this instance belongs to have not been
+* NOT_STARTED indicates that the Symbol this instance belongs to has not been
 * annotated (yet). Specifically if the declaration is not annotated this
 * instance will never move past NOT_STARTED. You can never go back to
 * NOT_STARTED.
 *
 * IN_PROGRESS annotations have been found on the declaration. Will be processed
 * later. You can reset to IN_PROGRESS. While IN_PROGRESS you can set the list
 * of attributes (and this moves out of the IN_PROGRESS state).
 *
 * "unnamed" this Annotations contains some attributes, possibly the final set.
 * While in this state you can only prepend or append to the attributes not set
-* it directly. You can also move back to the IN_PROGRESS sate using reset().
+* it directly. You can also move back to the IN_PROGRESS state using reset().
 *
 * <p><b>This is NOT part of any supported API. If you write code that depends
 * on this, you do so at your own risk. This code and its internal interfaces
 * are subject to change or deletion without notice.</b>
 */
 public class Annotations {
-private static final List<Attribute.Compound> NOT_STARTED = List.of(null);
+private static final List<Attribute.Compound> DECL_NOT_STARTED = List.of(null);
-private static final List<Attribute.Compound> IN_PROGRESS = List.of(null);
+private static final List<Attribute.Compound> DECL_IN_PROGRESS = List.of(null);
 /*
 * This field should never be null
 */
-private List<Attribute.Compound> attributes = NOT_STARTED;
+private List<Attribute.Compound> attributes = DECL_NOT_STARTED;
 /*
-* The Symbol this Annotations belong to
+* This field should never be null
+*/
+private List<Attribute.TypeCompound> type_attributes = List.<Attribute.TypeCompound>nil();
+/*
+* The Symbol this Annotations instance belongs to
 */
 private final Symbol sym;
 public Annotations(Symbol sym) {
 this.sym = sym;
 }
-public List<Attribute.Compound> getAttributes() {
+public List<Attribute.Compound> getDeclarationAttributes() {
-return filterSentinels(attributes);
+return filterDeclSentinels(attributes);
 }
-public void setAttributes(List<Attribute.Compound> a) {
+public List<Attribute.TypeCompound> getTypeAttributes() {
+return type_attributes;
+}
+public void setDeclarationAttributes(List<Attribute.Compound> a) {
 Assert.check(pendingCompletion() || !isStarted());
 if (a == null) {
 throw new NullPointerException();
 }
 attributes = a;
 }
+public void setTypeAttributes(List<Attribute.TypeCompound> a) {
+if (a == null) {
+throw new NullPointerException();
+}
+type_attributes = a;
+}
 public void setAttributes(Annotations other) {
 if (other == null) {
 throw new NullPointerException();
 }
-setAttributes(other.getAttributes());
+setDeclarationAttributes(other.getDeclarationAttributes());
-}
+setTypeAttributes(other.getTypeAttributes());
+}
-public void setAttributesWithCompletion(final Annotate.AnnotateRepeatedContext ctx) {
+public void setDeclarationAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.Compound> ctx) {
 Assert.check(pendingCompletion() || (!isStarted() && sym.kind == PCK));
+this.setDeclarationAttributes(getAttributesForCompletion(ctx));
-Map<Symbol.TypeSymbol, ListBuffer<Attribute.Compound>> annotated = ctx.annotated;
+}
+public void appendTypeAttributesWithCompletion(final Annotate.AnnotateRepeatedContext<Attribute.TypeCompound> ctx) {
+this.appendUniqueTypes(getAttributesForCompletion(ctx));
+}
+private <T extends Attribute.Compound> List<T> getAttributesForCompletion(
+final Annotate.AnnotateRepeatedContext<T> ctx) {
+Map<Symbol.TypeSymbol, ListBuffer<T>> annotated = ctx.annotated;
 boolean atLeastOneRepeated = false;
-List<Attribute.Compound> buf = List.<Attribute.Compound>nil();
+List<T> buf = List.<T>nil();
-for (ListBuffer<Attribute.Compound> lb : annotated.values()) {
+for (ListBuffer<T> lb : annotated.values()) {
 if (lb.size() == 1) {
 buf = buf.prepend(lb.first());
 } else { // repeated
-buf = buf.prepend(new Placeholder(lb.toList(), sym));
+// This will break when other subtypes of Attributs.Compound
+// are introduced, because PlaceHolder is a subtype of TypeCompound.
+T res;
+@SuppressWarnings("unchecked")
+T ph = (T) new Placeholder<T>(ctx, lb.toList(), sym);
+res = ph;
+buf = buf.prepend(res);
 atLeastOneRepeated = true;
 }
 }
-// Add non-repeating attributes
-setAttributes(buf.reverse());
 if (atLeastOneRepeated) {
 // The Symbol s is now annotated with a combination of
 // finished non-repeating annotations and placeholders for
 // repeating annotations.
 // fist pass.
 // Queue a pass that will replace Attribute.Placeholders
 // with Attribute.Compound (made from synthesized containers).
 ctx.annotateRepeated(new Annotate.Annotator() {
 @Override
 public String toString() {
 return "repeated annotation pass of: " + sym + " in: " + sym.owner;
 }
 public void enterAnnotation() {
 complete(ctx);
 }
 });
 }
+// Add non-repeating attributes
+return buf.reverse();
 }
 public Annotations reset() {
-attributes = IN_PROGRESS;
+attributes = DECL_IN_PROGRESS;
 return this;
 }
 public boolean isEmpty() {
 return !isStarted()
 || pendingCompletion()
 || attributes.isEmpty();
 }
+public boolean isTypesEmpty() {
+return type_attributes.isEmpty();
+}
 public boolean pendingCompletion() {
-return attributes == IN_PROGRESS;
+return attributes == DECL_IN_PROGRESS;
 }
 public Annotations append(List<Attribute.Compound> l) {
-attributes = filterSentinels(attributes);
+attributes = filterDeclSentinels(attributes);
 if (l.isEmpty()) {
 ; // no-op
 } else if (attributes.isEmpty()) {
 attributes = l;
 attributes = attributes.appendList(l);
 }
 return this;
 }
+public Annotations appendUniqueTypes(List<Attribute.TypeCompound> l) {
+if (l.isEmpty()) {
+; // no-op
+} else if (type_attributes.isEmpty()) {
+type_attributes = l;
+} else {
+// TODO: in case we expect a large number of annotations, this
+// might be inefficient.
+for (Attribute.TypeCompound tc : l) {
+if (!type_attributes.contains(tc))
+type_attributes = type_attributes.append(tc);
+}
+}
+return this;
+}
 public Annotations prepend(List<Attribute.Compound> l) {
-attributes = filterSentinels(attributes);
+attributes = filterDeclSentinels(attributes);
 if (l.isEmpty()) {
 ; // no-op
 } else if (attributes.isEmpty()) {
 attributes = l;
 attributes = attributes.prependList(l);
 }
 return this;
 }
-private List<Attribute.Compound> filterSentinels(List<Attribute.Compound> a) {
+private List<Attribute.Compound> filterDeclSentinels(List<Attribute.Compound> a) {
-return (a == IN_PROGRESS || a == NOT_STARTED)
+return (a == DECL_IN_PROGRESS || a == DECL_NOT_STARTED)
 ? List.<Attribute.Compound>nil()
 : a;
 }
 private boolean isStarted() {
-return attributes != NOT_STARTED;
+return attributes != DECL_NOT_STARTED;
 }
 private List<Attribute.Compound> getPlaceholders() {
 List<Attribute.Compound> res = List.<Attribute.Compound>nil();
-for (Attribute.Compound a : filterSentinels(attributes)) {
+for (Attribute.Compound a : filterDeclSentinels(attributes)) {
+if (a instanceof Placeholder) {
+res = res.prepend(a);
+}
+}
+return res.reverse();
+}
+private List<Attribute.TypeCompound> getTypePlaceholders() {
+List<Attribute.TypeCompound> res = List.<Attribute.TypeCompound>nil();
+for (Attribute.TypeCompound a : type_attributes) {
 if (a instanceof Placeholder) {
 res = res.prepend(a);
 }
 }
 return res.reverse();
 }
 /*
 * Replace Placeholders for repeating annotations with their containers
 */
-private void complete(Annotate.AnnotateRepeatedContext ctx) {
+private <T extends Attribute.Compound> void complete(Annotate.AnnotateRepeatedContext<T> ctx) {
-Assert.check(!pendingCompletion());
 Log log = ctx.log;
 Env<AttrContext> env = ctx.env;
 JavaFileObject oldSource = log.useSource(env.toplevel.sourcefile);
 try {
+// TODO: can we reduce duplication in the following branches?
-if (isEmpty()) {
+if (ctx.isTypeCompound) {
-return;
+Assert.check(!isTypesEmpty());
-}
+if (isTypesEmpty()) {
-List<Attribute.Compound> result = List.nil();
+return;
-for (Attribute.Compound a : getAttributes()) {
+}
-if (a instanceof Placeholder) {
-Attribute.Compound replacement = replaceOne((Placeholder) a, ctx);
+List<Attribute.TypeCompound> result = List.nil();
+for (Attribute.TypeCompound a : getTypeAttributes()) {
-if (null != replacement) {
+if (a instanceof Placeholder) {
-result = result.prepend(replacement);
+@SuppressWarnings("unchecked")
+Placeholder<Attribute.TypeCompound> ph = (Placeholder<Attribute.TypeCompound>) a;
+Attribute.TypeCompound replacement = replaceOne(ph, ph.getRepeatedContext());
+if (null != replacement) {
+result = result.prepend(replacement);
+}
+} else {
+result = result.prepend(a);
 }
-} else {
+}
-result = result.prepend(a);
-}
+type_attributes = result.reverse();
-}
+Assert.check(Annotations.this.getTypePlaceholders().isEmpty());
-attributes = result.reverse();
+} else {
+Assert.check(!pendingCompletion());
-Assert.check(Annotations.this.getPlaceholders().isEmpty());
+if (isEmpty()) {
+return;
+}
+List<Attribute.Compound> result = List.nil();
+for (Attribute.Compound a : getDeclarationAttributes()) {
+if (a instanceof Placeholder) {
+@SuppressWarnings("unchecked")
+Attribute.Compound replacement = replaceOne((Placeholder<T>) a, ctx);
+if (null != replacement) {
+result = result.prepend(replacement);
+}
+} else {
+result = result.prepend(a);
+}
+}
+attributes = result.reverse();
+Assert.check(Annotations.this.getPlaceholders().isEmpty());
+}
 } finally {
 log.useSource(oldSource);
 }
 }
-private Attribute.Compound replaceOne(Placeholder placeholder, Annotate.AnnotateRepeatedContext ctx) {
+private <T extends Attribute.Compound> T replaceOne(Placeholder<T> placeholder, Annotate.AnnotateRepeatedContext<T> ctx) {
 Log log = ctx.log;
 // Process repeated annotations
-Attribute.Compound validRepeated =
+T validRepeated = ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor(), sym);
-ctx.processRepeatedAnnotations(placeholder.getPlaceholderFor(), sym);
 if (validRepeated != null) {
 // Check that the container isn't manually
 // present along with repeated instances of
 // its contained annotation.
-ListBuffer<Attribute.Compound> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
+ListBuffer<T> manualContainer = ctx.annotated.get(validRepeated.type.tsym);
 if (manualContainer != null) {
 log.error(ctx.pos.get(manualContainer.first()), "invalid.repeatable.annotation.repeated.and.container.present",
 manualContainer.first().type.tsym);
 }
 }
 // A null return will delete the Placeholder
 return validRepeated;
+}
-}
+private static class Placeholder<T extends Attribute.Compound> extends Attribute.TypeCompound {
-private static class Placeholder extends Attribute.Compound {
+private final Annotate.AnnotateRepeatedContext<T> ctx;
-private List<Attribute.Compound> placeholderFor;
+private final List<T> placeholderFor;
-private Symbol on;
+private final Symbol on;
-public Placeholder(List<Attribute.Compound> placeholderFor, Symbol on) {
+public Placeholder(Annotate.AnnotateRepeatedContext<T> ctx, List<T> placeholderFor, Symbol on) {
-super(Type.noType, List.<Pair<Symbol.MethodSymbol, Attribute>>nil());
+super(on.type, List.<Pair<Symbol.MethodSymbol, Attribute>>nil(),
+ctx.isTypeCompound ?
+((Attribute.TypeCompound)placeholderFor.head).position :
+null);
+this.ctx = ctx;
 this.placeholderFor = placeholderFor;
 this.on = on;
 }
 @Override
 public String toString() {
 return "<placeholder: " + placeholderFor + " on: " + on + ">";
 }
-public List<Attribute.Compound> getPlaceholderFor() {
+public List<T> getPlaceholderFor() {
 return placeholderFor;
 }
+public Annotate.AnnotateRepeatedContext<T> getRepeatedContext() {
+return ctx;
+}
 }
 }

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

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

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