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

-:9e2eb4bc49eb
+:56830d5cb5bb
 import java.util.Locale;
 import com.sun.tools.javac.api.Formattable;
 import com.sun.tools.javac.api.Messages;
 import com.sun.tools.javac.parser.Tokens.Token.Tag;
+import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.util.Name;
 import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.ListBuffer;
 import com.sun.tools.javac.util.Names;
 /** A class that defines codes/utilities for Java source tokens
 *  returned from lexical analysis.
 *
 public String toString(Locale locale, Messages messages) {
 return name != null ? toString() : messages.getLocalizedString(locale, "compiler.misc." + toString());
 }
 }
+public interface Comment {
+enum CommentStyle {
+LINE,
+BLOCK,
+JAVADOC,
+}
+String getText();
+CommentStyle getStyle();
+boolean isDeprecated();
+}
 /**
 * This is the class representing a javac token. Each token has several fields
 * that are set by the javac lexer (i.e. start/end position, string value, etc).
 */
 public static class Token {
 public final int pos;
 /** The end position of this token */
 public final int endPos;
-/** Is this token preceeded by a deprecated comment? */
+/** Comment reader associated with this token */
-public final boolean deprecatedFlag;
+public final List<Comment> comments;
-/** Is this token preceeded by a deprecated comment? */
+Token(TokenKind kind, int pos, int endPos, List<Comment> comments) {
-public String docComment;
-Token(TokenKind kind, int pos, int endPos,
-boolean deprecatedFlag) {
 this.kind = kind;
 this.pos = pos;
 this.endPos = endPos;
-this.deprecatedFlag = deprecatedFlag;
+this.comments = comments;
 checkKind();
 }
 Token[] split(Tokens tokens) {
 if (kind.name.length() < 2 || kind.tag != Tag.DEFAULT) {
 if (t1 == null || t2 == null) {
 throw new AssertionError("Cant split - bad subtokens");
 }
 return new Token[] {
-new Token(t1, pos, pos + t1.name.length(), deprecatedFlag),
+new Token(t1, pos, pos + t1.name.length(), comments),
-new Token(t2, pos + t1.name.length(), endPos, false)
+new Token(t2, pos + t1.name.length(), endPos, null)
 };
 }
 protected void checkKind() {
 if (kind.tag != Tag.DEFAULT) {
 }
 public int radix() {
 throw new UnsupportedOperationException();
 }
+/**
+* Preserve classic semantics - if multiple javadocs are found on the token
+* the last one is returned
+*/
+public String comment(Comment.CommentStyle style) {
+List<Comment> readers = getReaders(Comment.CommentStyle.JAVADOC);
+return readers.isEmpty() ?
+null :
+readers.head.getText();
+}
+/**
+* Preserve classic semantics - deprecated should be set if at least one
+* javadoc comment attached to this token contains the '@deprecated' string
+*/
+public boolean deprecatedFlag() {
+for (Comment r : getReaders(Comment.CommentStyle.JAVADOC)) {
+if (r.isDeprecated()) {
+return true;
+}
+}
+return false;
+}
+private List<Comment> getReaders(Comment.CommentStyle style) {
+if (comments == null) {
+return List.nil();
+} else {
+ListBuffer<Comment> buf = ListBuffer.lb();
+for (Comment r : comments) {
+if (r.getStyle() == style) {
+buf.add(r);
+}
+}
+return buf.toList();
+}
+}
 }
 final static class NamedToken extends Token {
 /** The name of this token */
 public final Name name;
-public NamedToken(TokenKind kind, int pos, int endPos, Name name, boolean deprecatedFlag) {
+public NamedToken(TokenKind kind, int pos, int endPos, Name name, List<Comment> comments) {
-super(kind, pos, endPos, deprecatedFlag);
+super(kind, pos, endPos, comments);
 this.name = name;
 }
 protected void checkKind() {
 if (kind.tag != Tag.NAMED) {
 static class StringToken extends Token {
 /** The string value of this token */
 public final String stringVal;
-public StringToken(TokenKind kind, int pos, int endPos, String stringVal, boolean deprecatedFlag) {
+public StringToken(TokenKind kind, int pos, int endPos, String stringVal, List<Comment> comments) {
-super(kind, pos, endPos, deprecatedFlag);
+super(kind, pos, endPos, comments);
 this.stringVal = stringVal;
 }
 protected void checkKind() {
 if (kind.tag != Tag.STRING) {
 final static class NumericToken extends StringToken {
 /** The 'radix' value of this token */
 public final int radix;
-public NumericToken(TokenKind kind, int pos, int endPos, String stringVal, int radix, boolean deprecatedFlag) {
+public NumericToken(TokenKind kind, int pos, int endPos, String stringVal, int radix, List<Comment> comments) {
-super(kind, pos, endPos, stringVal, deprecatedFlag);
+super(kind, pos, endPos, stringVal, comments);
 this.radix = radix;
 }
 protected void checkKind() {
 if (kind.tag != Tag.NUMERIC) {
 return radix;
 }
 }
 public static final Token DUMMY =
-new Token(TokenKind.ERROR, 0, 0, false);
+new Token(TokenKind.ERROR, 0, 0, null);
 }

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

comparison: src/share/classes/com/sun/tools/javac/parser/Tokens.java

src/share/classes/com/sun/tools/javac/parser/Tokens.java