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

-:cbcd9b484759
+:950d8195a5a4
 /*
-* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 protected DCTree blockTag() {
 int p = bp;
 try {
 nextChar();
 if (isIdentifierStart(ch)) {
-int namePos = bp;
+Name name = readIdentifier();
-nextChar();
-while (isIdentifierPart(ch))
-nextChar();
-int nameLen = bp - namePos;
-Name name = names.fromChars(buf, namePos, nameLen);
 TagParser tp = tagParsers.get(name);
 if (tp == null) {
 List<DCTree> content = blockContent();
 return m.at(p).UnknownBlockTag(name, content);
 } else {
 protected DCTree inlineTag() {
 int p = bp - 1;
 try {
 nextChar();
 if (isIdentifierStart(ch)) {
-int namePos = bp;
+Name name = readIdentifier();
-nextChar();
-while (isIdentifierPart(ch))
-nextChar();
-int nameLen = bp - namePos;
 skipWhitespace();
-Name name = names.fromChars(buf, namePos, nameLen);
 TagParser tp = tagParsers.get(name);
 if (tp == null) {
 DCTree text = inlineText();
 if (text != null) {
 nextChar();
 protected DCIdentifier identifier() throws ParseException {
 skipWhitespace();
 int pos = bp;
 if (isJavaIdentifierStart(ch)) {
-nextChar();
+Name name = readJavaIdentifier();
-while (isJavaIdentifierPart(ch))
+return m.at(pos).Identifier(name);
-nextChar();
-return m.at(pos).Identifier(names.fromChars(buf, pos, bp - pos));
 }
 throw new ParseException("dc.identifier.expected");
 }
 * {@literal &identifier; } or {@literal &#digits; } or {@literal &#xhex-digits; }
 */
 protected DCTree entity() {
 int p = bp;
 nextChar();
-int namep = bp;
+Name name = null;
 boolean checkSemi = false;
 if (ch == '#') {
+int namep = bp;
 nextChar();
 if (isDecimalDigit(ch)) {
 nextChar();
 while (isDecimalDigit(ch))
 nextChar();
-checkSemi = true;
+name = names.fromChars(buf, namep, bp - namep);
 } else if (ch == 'x' || ch == 'X') {
 nextChar();
 if (isHexDigit(ch)) {
 nextChar();
 while (isHexDigit(ch))
 nextChar();
-checkSemi = true;
+name = names.fromChars(buf, namep, bp - namep);
 }
 }
 } else if (isIdentifierStart(ch)) {
+name = readIdentifier();
+}
+if (name == null)
+return erroneous("dc.bad.entity", p);
+else {
+if (ch != ';')
+return erroneous("dc.missing.semicolon", p);
 nextChar();
-while (isIdentifierPart(ch))
+return m.at(p).Entity(name);
-nextChar();
-checkSemi = true;
-}
-if (checkSemi && ch == ';') {
-nextChar();
-return m.at(p).Entity(names.fromChars(buf, namep, bp - namep - 1));
-} else {
-String code = checkSemi
-? "dc.missing.semicolon"
-: "dc.bad.entity";
-return erroneous(code, p);
 }
 }
 /**
 * Read the start or end of an HTML tag, or an HTML comment
 */
 protected DCTree html() {
 int p = bp;
 nextChar();
 if (isIdentifierStart(ch)) {
-int namePos = bp;
+Name name = readIdentifier();
-nextChar();
-while (isIdentifierPart(ch))
-nextChar();
-int nameLen = bp - namePos;
 List<DCTree> attrs = htmlAttrs();
 if (attrs != null) {
 boolean selfClosing = false;
 if (ch == '/') {
 nextChar();
 selfClosing = true;
 }
 if (ch == '>') {
 nextChar();
-Name name = names.fromChars(buf, namePos, nameLen);
 return m.at(p).StartElement(name, attrs, selfClosing);
 }
 }
 } else if (ch == '/') {
 nextChar();
 if (isIdentifierStart(ch)) {
-int namePos = bp;
+Name name = readIdentifier();
-nextChar();
-while (isIdentifierPart(ch))
-nextChar();
-int nameLen = bp - namePos;
 skipWhitespace();
 if (ch == '>') {
 nextChar();
-Name name = names.fromChars(buf, namePos, nameLen);
 return m.at(p).EndElement(name);
 }
 }
 } else if (ch == '!') {
 nextChar();
 skipWhitespace();
 loop:
 while (isIdentifierStart(ch)) {
 int namePos = bp;
-nextChar();
+Name name = readIdentifier();
-while (isIdentifierPart(ch))
-nextChar();
-int nameLen = bp - namePos;
 skipWhitespace();
 List<DCTree> value = null;
 ValueKind vkind = ValueKind.EMPTY;
 if (ch == '=') {
 ListBuffer<DCTree> v = new ListBuffer<DCTree>();
 addPendingText(v, bp - 1);
 }
 skipWhitespace();
 value = v.toList();
 }
-Name name = names.fromChars(buf, namePos, nameLen);
 DCAttribute attr = m.at(namePos).Attribute(name, vkind, value);
 attrs.add(attr);
 }
 return attrs.toList();
 }
 protected DCErroneous erroneous(String code, int pos) {
 int i = bp - 1;
 loop:
-while (i > 0) {
+while (i > pos) {
 switch (buf[i]) {
 case '\f': case '\n': case '\r':
 newline = true;
 break;
 case '\t': case ' ':
 protected boolean isIdentifierStart(char ch) {
 return Character.isUnicodeIdentifierStart(ch);
 }
-protected boolean isIdentifierPart(char ch) {
+protected Name readIdentifier() {
-return Character.isUnicodeIdentifierPart(ch);
+int start = bp;
+nextChar();
+while (bp < buflen && Character.isUnicodeIdentifierPart(ch))
+nextChar();
+return names.fromChars(buf, start, bp - start);
 }
 protected boolean isJavaIdentifierStart(char ch) {
 return Character.isJavaIdentifierStart(ch);
 }
-protected boolean isJavaIdentifierPart(char ch) {
+protected Name readJavaIdentifier() {
-return Character.isJavaIdentifierPart(ch);
+int start = bp;
+nextChar();
+while (bp < buflen && Character.isJavaIdentifierPart(ch))
+nextChar();
+return names.fromChars(buf, start, bp - start);
 }
 protected boolean isDecimalDigit(char ch) {
 return ('0' <= ch && ch <= '9');
 }

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

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

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