Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.xml	Wed Nov 14 16:41:51 2012 -0800
     1.2 +++ b/make/build.xml	Wed Nov 14 17:23:10 2012 -0800
     1.3 @@ -1,6 +1,6 @@
     1.4  <?xml version="1.0" encoding="UTF-8"?>
     1.5  <!--
     1.6 - Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7 + Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.8   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9  
    1.10   This code is free software; you can redistribute it and/or modify it
    1.11 @@ -277,7 +277,7 @@
    1.12          <!-- transform the output to a simple html -->
    1.13          <xslt  in="${dist.checkstyle.dir}/checkstyle_report.xml"
    1.14                 out="${dist.checkstyle.dir}/checkstyle_report.html"
    1.15 -               style="${checkstyle.home}/contrib/checkstyle-simple.xsl"/>            
    1.16 +               style="${checkstyle.home}/contrib/checkstyle-simple.xsl"/>
    1.17          <!-- transform the output to a very simple emacs friendly text file -->
    1.18          <xslt  in="${dist.checkstyle.dir}/checkstyle_report.xml"
    1.19                 out="${dist.checkstyle.dir}/checkstyle_report.tmp"
    1.20 @@ -297,9 +297,9 @@
    1.21      <target name="checkstyle-ide" depends="checkstyle">
    1.22          <concat>
    1.23              <fileset file="${dist.checkstyle.dir}/checkstyle_report.emacs.txt"/>
    1.24 -        </concat>  
    1.25 +        </concat>
    1.26      </target>
    1.27 -    
    1.28 +
    1.29      <target name="findbugs" depends="-def-findbugs,build-all-tools">
    1.30          <property name="findbugs.reportLevel" value="medium"/>
    1.31          <mkdir dir="${dist.findbugs.dir}"/>
    1.32 @@ -368,7 +368,7 @@
    1.33              executable="${dist.bin.dir}/javac"
    1.34              srcdir="test/tools/javac/diags"
    1.35              destdir="${build.dir}/diag-examples/classes"
    1.36 -            includes="ArgTypeCompilerFactory.java,Example.java,FileManager.java,HTMLWriter.java,RunExamples.java"
    1.37 +            includes="ArgTypeCompilerFactory.java,Example.java,FileManager.java,HTMLWriter.java,RunExamples.java,DocCommentProcessor.java"
    1.38              sourcepath=""
    1.39              classpath="${dist.lib.dir}/javac.jar"
    1.40              includeAntRuntime="no"
    1.41 @@ -381,6 +381,7 @@
    1.42              dir="test/tools/javac/diags"
    1.43              classpath="${build.dir}/diag-examples/classes;${dist.lib.dir}/javac.jar"
    1.44              classname="RunExamples">
    1.45 +            <jvmarg value="-Dtest.classes=${build.dir}/diag-examples/classes"/>
    1.46              <arg value="-examples"/>
    1.47              <arg value="examples"/>
    1.48              <arg value="-o"/>
    1.49 @@ -695,7 +696,7 @@
    1.50      <target name="-check-checkstyle.home" depends="-def-check">
    1.51          <check name="checkstyle" property="checkstyle.home" marker="${checkstyle.name.version}.jar"/>
    1.52      </target>
    1.53 -    
    1.54 +
    1.55      <target name="-check-jtreg.home" depends="-def-check">
    1.56          <check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
    1.57      </target>
    1.58 @@ -1005,7 +1006,7 @@
    1.59          </taskdef>
    1.60          <property name="checkstyle.defined" value="true"/>
    1.61      </target>
    1.62 -    
    1.63 +
    1.64      <target name="-def-findbugs" unless="findbugs.defined"
    1.65          depends="-check-findbugs.home,-check-target.java.home">
    1.66          <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/share/classes/com/sun/source/doctree/AttributeTree.java	Wed Nov 14 17:23:10 2012 -0800
     2.3 @@ -0,0 +1,42 @@
     2.4 +/*
     2.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.  Oracle designates this
    2.11 + * particular file as subject to the "Classpath" exception as provided
    2.12 + * by Oracle in the LICENSE file that accompanied this code.
    2.13 + *
    2.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 + * version 2 for more details (a copy is included in the LICENSE file that
    2.18 + * accompanied this code).
    2.19 + *
    2.20 + * You should have received a copy of the GNU General Public License version
    2.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 + *
    2.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.25 + * or visit www.oracle.com if you need additional information or have any
    2.26 + * questions.
    2.27 + */
    2.28 +
    2.29 +package com.sun.source.doctree;
    2.30 +
    2.31 +import java.util.List;
    2.32 +import javax.lang.model.element.Name;
    2.33 +
    2.34 +/**
    2.35 + * A tree node for an attribute in an HTML element.
    2.36 + *
    2.37 + * @since 1.8
    2.38 + */
    2.39 +public interface AttributeTree extends DocTree {
    2.40 +    enum ValueKind { EMPTY, UNQUOTED, SINGLE, DOUBLE };
    2.41 +
    2.42 +    Name getName();
    2.43 +    ValueKind getValueKind();
    2.44 +    List<? extends DocTree> getValue();
    2.45 +}

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/share/classes/com/sun/source/doctree/AuthorTree.java	Wed Nov 14 17:23:10 2012 -0800
     3.3 @@ -0,0 +1,40 @@
     3.4 +/*
     3.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + *
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.  Oracle designates this
    3.11 + * particular file as subject to the "Classpath" exception as provided
    3.12 + * by Oracle in the LICENSE file that accompanied this code.
    3.13 + *
    3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.17 + * version 2 for more details (a copy is included in the LICENSE file that
    3.18 + * accompanied this code).
    3.19 + *
    3.20 + * You should have received a copy of the GNU General Public License version
    3.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.23 + *
    3.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.25 + * or visit www.oracle.com if you need additional information or have any
    3.26 + * questions.
    3.27 + */
    3.28 +
    3.29 +package com.sun.source.doctree;
    3.30 +
    3.31 +import java.util.List;
    3.32 +
    3.33 +/**
    3.34 + * A tree node for an @author block tag.
    3.35 + *
    3.36 + * <p>
    3.37 + * &#064;author name-text.
    3.38 + *
    3.39 + * @since 1.8
    3.40 + */
    3.41 +public interface AuthorTree extends BlockTagTree {
    3.42 +    List<? extends DocTree> getName();
    3.43 +}

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/share/classes/com/sun/source/doctree/BlockTagTree.java	Wed Nov 14 17:23:10 2012 -0800
     4.3 @@ -0,0 +1,36 @@
     4.4 +/*
     4.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 + *
     4.8 + * This code is free software; you can redistribute it and/or modify it
     4.9 + * under the terms of the GNU General Public License version 2 only, as
    4.10 + * published by the Free Software Foundation.  Oracle designates this
    4.11 + * particular file as subject to the "Classpath" exception as provided
    4.12 + * by Oracle in the LICENSE file that accompanied this code.
    4.13 + *
    4.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    4.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.17 + * version 2 for more details (a copy is included in the LICENSE file that
    4.18 + * accompanied this code).
    4.19 + *
    4.20 + * You should have received a copy of the GNU General Public License version
    4.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    4.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.23 + *
    4.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    4.25 + * or visit www.oracle.com if you need additional information or have any
    4.26 + * questions.
    4.27 + */
    4.28 +
    4.29 +package com.sun.source.doctree;
    4.30 +
    4.31 +/**
    4.32 + * A tree node used as the base class for the different types of
    4.33 + * block tags.
    4.34 + *
    4.35 + * @since 1.8
    4.36 + */
    4.37 +public interface BlockTagTree extends DocTree {
    4.38 +    String getTagName();
    4.39 +}

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/src/share/classes/com/sun/source/doctree/CommentTree.java	Wed Nov 14 17:23:10 2012 -0800
     5.3 @@ -0,0 +1,39 @@
     5.4 +/*
     5.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 + *
     5.8 + * This code is free software; you can redistribute it and/or modify it
     5.9 + * under the terms of the GNU General Public License version 2 only, as
    5.10 + * published by the Free Software Foundation.  Oracle designates this
    5.11 + * particular file as subject to the "Classpath" exception as provided
    5.12 + * by Oracle in the LICENSE file that accompanied this code.
    5.13 + *
    5.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    5.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.17 + * version 2 for more details (a copy is included in the LICENSE file that
    5.18 + * accompanied this code).
    5.19 + *
    5.20 + * You should have received a copy of the GNU General Public License version
    5.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    5.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.23 + *
    5.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.25 + * or visit www.oracle.com if you need additional information or have any
    5.26 + * questions.
    5.27 + */
    5.28 +
    5.29 +package com.sun.source.doctree;
    5.30 +
    5.31 +/**
    5.32 + * An embedded HTML comment.
    5.33 + *
    5.34 + * <p>
    5.35 + * {@literal <!-- text --> }
    5.36 + *
    5.37 + * @since 1.8
    5.38 + */
    5.39 +public interface CommentTree extends DocTree {
    5.40 +    String getBody();
    5.41 +}
    5.42 +

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/src/share/classes/com/sun/source/doctree/DeprecatedTree.java	Wed Nov 14 17:23:10 2012 -0800
     6.3 @@ -0,0 +1,40 @@
     6.4 +/*
     6.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     6.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.7 + *
     6.8 + * This code is free software; you can redistribute it and/or modify it
     6.9 + * under the terms of the GNU General Public License version 2 only, as
    6.10 + * published by the Free Software Foundation.  Oracle designates this
    6.11 + * particular file as subject to the "Classpath" exception as provided
    6.12 + * by Oracle in the LICENSE file that accompanied this code.
    6.13 + *
    6.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    6.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.17 + * version 2 for more details (a copy is included in the LICENSE file that
    6.18 + * accompanied this code).
    6.19 + *
    6.20 + * You should have received a copy of the GNU General Public License version
    6.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    6.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.23 + *
    6.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.25 + * or visit www.oracle.com if you need additional information or have any
    6.26 + * questions.
    6.27 + */
    6.28 +
    6.29 +package com.sun.source.doctree;
    6.30 +
    6.31 +import java.util.List;
    6.32 +
    6.33 +/**
    6.34 + * A tree node for an @deprecated block tag.
    6.35 + *
    6.36 + * <p>
    6.37 + * &#064;deprecated deprecated text.
    6.38 + *
    6.39 + * @since 1.8
    6.40 + */
    6.41 +public interface DeprecatedTree extends BlockTagTree {
    6.42 +    List<? extends DocTree> getBody();
    6.43 +}

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/src/share/classes/com/sun/source/doctree/DocCommentTree.java	Wed Nov 14 17:23:10 2012 -0800
     7.3 @@ -0,0 +1,42 @@
     7.4 +/*
     7.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.7 + *
     7.8 + * This code is free software; you can redistribute it and/or modify it
     7.9 + * under the terms of the GNU General Public License version 2 only, as
    7.10 + * published by the Free Software Foundation.  Oracle designates this
    7.11 + * particular file as subject to the "Classpath" exception as provided
    7.12 + * by Oracle in the LICENSE file that accompanied this code.
    7.13 + *
    7.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    7.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    7.17 + * version 2 for more details (a copy is included in the LICENSE file that
    7.18 + * accompanied this code).
    7.19 + *
    7.20 + * You should have received a copy of the GNU General Public License version
    7.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    7.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.23 + *
    7.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.25 + * or visit www.oracle.com if you need additional information or have any
    7.26 + * questions.
    7.27 + */
    7.28 +
    7.29 +package com.sun.source.doctree;
    7.30 +
    7.31 +import java.util.List;
    7.32 +
    7.33 +/**
    7.34 + * The top level representation of a documentation comment.
    7.35 + *
    7.36 + * <p>
    7.37 + * first-sentence body block-tags
    7.38 + *
    7.39 + * @since 1.8
    7.40 + */
    7.41 +public interface DocCommentTree extends DocTree {
    7.42 +    List<? extends DocTree> getFirstSentence();
    7.43 +    List<? extends DocTree> getBody();
    7.44 +    List<? extends DocTree> getBlockTags();
    7.45 +}

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/src/share/classes/com/sun/source/doctree/DocRootTree.java	Wed Nov 14 17:23:10 2012 -0800
     8.3 @@ -0,0 +1,36 @@
     8.4 +/*
     8.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     8.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.7 + *
     8.8 + * This code is free software; you can redistribute it and/or modify it
     8.9 + * under the terms of the GNU General Public License version 2 only, as
    8.10 + * published by the Free Software Foundation.  Oracle designates this
    8.11 + * particular file as subject to the "Classpath" exception as provided
    8.12 + * by Oracle in the LICENSE file that accompanied this code.
    8.13 + *
    8.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    8.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    8.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    8.17 + * version 2 for more details (a copy is included in the LICENSE file that
    8.18 + * accompanied this code).
    8.19 + *
    8.20 + * You should have received a copy of the GNU General Public License version
    8.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    8.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    8.23 + *
    8.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    8.25 + * or visit www.oracle.com if you need additional information or have any
    8.26 + * questions.
    8.27 + */
    8.28 +
    8.29 +package com.sun.source.doctree;
    8.30 +
    8.31 +/**
    8.32 + * A tree node for an @docroot inline tag.
    8.33 + *
    8.34 + * <p>
    8.35 + * {&#064;docroot}
    8.36 + *
    8.37 + * @since 1.8
    8.38 + */
    8.39 +public interface DocRootTree extends InlineTagTree { }

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/src/share/classes/com/sun/source/doctree/DocTree.java	Wed Nov 14 17:23:10 2012 -0800
     9.3 @@ -0,0 +1,254 @@
     9.4 +/*
     9.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     9.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.7 + *
     9.8 + * This code is free software; you can redistribute it and/or modify it
     9.9 + * under the terms of the GNU General Public License version 2 only, as
    9.10 + * published by the Free Software Foundation.  Oracle designates this
    9.11 + * particular file as subject to the "Classpath" exception as provided
    9.12 + * by Oracle in the LICENSE file that accompanied this code.
    9.13 + *
    9.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
    9.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    9.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    9.17 + * version 2 for more details (a copy is included in the LICENSE file that
    9.18 + * accompanied this code).
    9.19 + *
    9.20 + * You should have received a copy of the GNU General Public License version
    9.21 + * 2 along with this work; if not, write to the Free Software Foundation,
    9.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    9.23 + *
    9.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    9.25 + * or visit www.oracle.com if you need additional information or have any
    9.26 + * questions.
    9.27 + */
    9.28 +
    9.29 +package com.sun.source.doctree;
    9.30 +
    9.31 +/**
    9.32 + * Common interface for all nodes in a documentation syntax tree.
    9.33 + *
    9.34 + * @since 1.8
    9.35 + */
    9.36 +public interface DocTree {
    9.37 +    enum Kind {
    9.38 +        /**
    9.39 +         * Used for instances of {@link AttributeTree}
    9.40 +         * representing an HTML attribute.
    9.41 +         */
    9.42 +        ATTRIBUTE,
    9.43 +
    9.44 +        /**
    9.45 +         * Used for instances of {@link AuthorTree}
    9.46 +         * representing an @author tag.
    9.47 +         */
    9.48 +        AUTHOR("author"),
    9.49 +
    9.50 +        /**
    9.51 +         * Used for instances of {@link LiteralTree}
    9.52 +         * representing an @code tag.
    9.53 +         */
    9.54 +        CODE("code"),
    9.55 +
    9.56 +        /**
    9.57 +         * Used for instances of {@link CommentTree}
    9.58 +         * representing an HTML comment.
    9.59 +         */
    9.60 +        COMMENT,
    9.61 +
    9.62 +        /**
    9.63 +         * Used for instances of {@link DeprecatedTree}
    9.64 +         * representing an @deprecated tag.
    9.65 +         */
    9.66 +        DEPRECATED("deprecated"),
    9.67 +
    9.68 +        /**
    9.69 +         * Used for instances of {@link DocCommentTree}
    9.70 +         * representing a complete doc comment.
    9.71 +         */
    9.72 +        DOC_COMMENT,
    9.73 +
    9.74 +        /**
    9.75 +         * Used for instances of {@link DocRootTree}
    9.76 +         * representing an @docRoot tag.
    9.77 +         */
    9.78 +        DOC_ROOT("docRoot"),
    9.79 +
    9.80 +        /**
    9.81 +         * Used for instances of {@link EndElementTree}
    9.82 +         * representing the end of an HTML element.
    9.83 +         */
    9.84 +        END_ELEMENT,
    9.85 +
    9.86 +        /**
    9.87 +         * Used for instances of {@link EntityTree}
    9.88 +         * representing an HTML entity.
    9.89 +         */
    9.90 +        ENTITY,
    9.91 +
    9.92 +        /**
    9.93 +         * Used for instances of {@link ErroneousTree}
    9.94 +         * representing some invalid text.
    9.95 +         */
    9.96 +        ERRONEOUS,
    9.97 +
    9.98 +        /**
    9.99 +         * Used for instances of {@link ThrowsTree}
   9.100 +         * representing an @exception tag.
   9.101 +         */
   9.102 +        EXCEPTION("exception"),
   9.103 +
   9.104 +        /**
   9.105 +         * Used for instances of {@link IdentifierTree}
   9.106 +         * representing an identifier.
   9.107 +         */
   9.108 +        IDENTIFIER,
   9.109 +
   9.110 +        /**
   9.111 +         * Used for instances of {@link InheritDocTree}
   9.112 +         * representing an @inheritDoc tag.
   9.113 +         */
   9.114 +        INHERIT_DOC("inheritDoc"),
   9.115 +
   9.116 +        /**
   9.117 +         * Used for instances of {@link LinkTree}
   9.118 +         * representing an @link tag.
   9.119 +         */
   9.120 +        LINK("link"),
   9.121 +
   9.122 +        /**
   9.123 +         * Used for instances of {@link LinkTree}
   9.124 +         * representing an @linkplain tag.
   9.125 +         */
   9.126 +        LINK_PLAIN("linkplain"),
   9.127 +
   9.128 +        /**
   9.129 +         * Used for instances of {@link LiteralTree}
   9.130 +         * representing an @literal tag.
   9.131 +         */
   9.132 +        LITERAL("literal"),
   9.133 +
   9.134 +        /**
   9.135 +         * Used for instances of {@link ParamTree}
   9.136 +         * representing an @param tag.
   9.137 +         */
   9.138 +        PARAM("param"),
   9.139 +
   9.140 +        /**
   9.141 +         * Used for instances of {@link ReferenceTree}
   9.142 +         * representing a reference to a element in the
   9.143 +         * Java programming language.
   9.144 +         */
   9.145 +        REFERENCE,
   9.146 +
   9.147 +        /**
   9.148 +         * Used for instances of {@link ReturnTree}
   9.149 +         * representing an @return tag.
   9.150 +         */
   9.151 +        RETURN("return"),
   9.152 +
   9.153 +        /**
   9.154 +         * Used for instances of {@link SeeTree}
   9.155 +         * representing an @see tag.
   9.156 +         */
   9.157 +        SEE("see"),
   9.158 +
   9.159 +        /**
   9.160 +         * Used for instances of {@link SerialTree}
   9.161 +         * representing an @serial tag.
   9.162 +         */
   9.163 +        SERIAL("serial"),
   9.164 +
   9.165 +        /**
   9.166 +         * Used for instances of {@link SerialDataTree}
   9.167 +         * representing an @serialData tag.
   9.168 +         */
   9.169 +        SERIAL_DATA("serialData"),
   9.170 +
   9.171 +        /**
   9.172 +         * Used for instances of {@link SerialFieldTree}
   9.173 +         * representing an @serialField tag.
   9.174 +         */
   9.175 +        SERIAL_FIELD("serialField"),
   9.176 +
   9.177 +        /**
   9.178 +         * Used for instances of {@link SinceTree}
   9.179 +         * representing an @since tag.
   9.180 +         */
   9.181 +        SINCE("since"),
   9.182 +
   9.183 +        /**
   9.184 +         * Used for instances of {@link EndElementTree}
   9.185 +         * representing the start of an HTML element.
   9.186 +         */
   9.187 +        START_ELEMENT,
   9.188 +
   9.189 +        /**
   9.190 +         * Used for instances of {@link TextTree}
   9.191 +         * representing some documentation text.
   9.192 +         */
   9.193 +        TEXT,
   9.194 +
   9.195 +        /**
   9.196 +         * Used for instances of {@link ThrowsTree}
   9.197 +         * representing an @throws tag.
   9.198 +         */
   9.199 +        THROWS("throws"),
   9.200 +
   9.201 +        /**
   9.202 +         * Used for instances of {@link UnknownBlockTagTree}
   9.203 +         * representing an unknown block tag.
   9.204 +         */
   9.205 +        UNKNOWN_BLOCK_TAG,
   9.206 +
   9.207 +        /**
   9.208 +         * Used for instances of {@link UnknownInlineTagTree}
   9.209 +         * representing an unknown inline tag.
   9.210 +         */
   9.211 +        UNKNOWN_INLINE_TAG,
   9.212 +
   9.213 +        /**
   9.214 +         * Used for instances of {@link ValueTree}
   9.215 +         * representing an @value tag.
   9.216 +         */
   9.217 +        VALUE("value"),
   9.218 +
   9.219 +        /**
   9.220 +         * Used for instances of {@link VersionTree}
   9.221 +         * representing an @version tag.
   9.222 +         */
   9.223 +        VERSION("version"),
   9.224 +
   9.225 +        /**
   9.226 +         * An implementation-reserved node. This is the not the node
   9.227 +         * you are looking for.
   9.228 +         */
   9.229 +        OTHER;
   9.230 +
   9.231 +        public final String tagName;
   9.232 +
   9.233 +        Kind() {
   9.234 +            tagName = null;
   9.235 +        }
   9.236 +
   9.237 +        Kind(String tagName) {
   9.238 +            this.tagName = tagName;
   9.239 +        }
   9.240 +    };
   9.241 +
   9.242 +    /**
   9.243 +     * Gets the kind of this tree.
   9.244 +     *
   9.245 +     * @return the kind of this tree.
   9.246 +     */
   9.247 +    Kind getKind();
   9.248 +
   9.249 +    /**
   9.250 +     * Accept method used to implement the visitor pattern.  The
   9.251 +     * visitor pattern is used to implement operations on trees.
   9.252 +     *
   9.253 +     * @param <R> result type of this operation.
   9.254 +     * @param <D> type of additional data.
   9.255 +     */
   9.256 +    <R, D> R accept(DocTreeVisitor<R,D> visitor, D data);
   9.257 +}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java	Wed Nov 14 17:23:10 2012 -0800
    10.3 @@ -0,0 +1,87 @@
    10.4 +/*
    10.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.7 + *
    10.8 + * This code is free software; you can redistribute it and/or modify it
    10.9 + * under the terms of the GNU General Public License version 2 only, as
   10.10 + * published by the Free Software Foundation.  Oracle designates this
   10.11 + * particular file as subject to the "Classpath" exception as provided
   10.12 + * by Oracle in the LICENSE file that accompanied this code.
   10.13 + *
   10.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   10.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   10.17 + * version 2 for more details (a copy is included in the LICENSE file that
   10.18 + * accompanied this code).
   10.19 + *
   10.20 + * You should have received a copy of the GNU General Public License version
   10.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   10.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.23 + *
   10.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   10.25 + * or visit www.oracle.com if you need additional information or have any
   10.26 + * questions.
   10.27 + */
   10.28 +
   10.29 +package com.sun.source.doctree;
   10.30 +
   10.31 +
   10.32 +/**
   10.33 + * A visitor of trees, in the style of the visitor design pattern.
   10.34 + * Classes implementing this interface are used to operate
   10.35 + * on a tree when the kind of tree is unknown at compile time.
   10.36 + * When a visitor is passed to an tree's {@link DocTree#accept
   10.37 + * accept} method, the <tt>visit<i>XYZ</i></tt> method most applicable
   10.38 + * to that tree is invoked.
   10.39 + *
   10.40 + * <p> Classes implementing this interface may or may not throw a
   10.41 + * {@code NullPointerException} if the additional parameter {@code p}
   10.42 + * is {@code null}; see documentation of the implementing class for
   10.43 + * details.
   10.44 + *
   10.45 + * <p> <b>WARNING:</b> It is possible that methods will be added to
   10.46 + * this interface to accommodate new, currently unknown, doc comment
   10.47 + * structures added to future versions of the Java&trade; programming
   10.48 + * language.  Therefore, visitor classes directly implementing this
   10.49 + * interface may be source incompatible with future versions of the
   10.50 + * platform.
   10.51 + *
   10.52 + * @param <R> the return type of this visitor's methods.  Use {@link
   10.53 + *            Void} for visitors that do not need to return results.
   10.54 + * @param <P> the type of the additional parameter to this visitor's
   10.55 + *            methods.  Use {@code Void} for visitors that do not need an
   10.56 + *            additional parameter.
   10.57 + *
   10.58 + * @since 1.8
   10.59 + */
   10.60 +public interface DocTreeVisitor<R,P> {
   10.61 +    R visitAttribute(AttributeTree node, P p);
   10.62 +    R visitAuthor(AuthorTree node, P p);
   10.63 +    R visitComment(CommentTree node, P p);
   10.64 +    R visitDeprecated(DeprecatedTree node, P p);
   10.65 +    R visitDocComment(DocCommentTree node, P p);
   10.66 +    R visitDocRoot(DocRootTree node, P p);
   10.67 +    R visitEndElement(EndElementTree node, P p);
   10.68 +    R visitEntity(EntityTree node, P p);
   10.69 +    R visitErroneous(ErroneousTree node, P p);
   10.70 +    R visitIdentifier(IdentifierTree node, P p);
   10.71 +    R visitInheritDoc(InheritDocTree node, P p);
   10.72 +    R visitLink(LinkTree node, P p);
   10.73 +    R visitLiteral(LiteralTree node, P p);
   10.74 +    R visitParam(ParamTree node, P p);
   10.75 +    R visitReference(ReferenceTree node, P p);
   10.76 +    R visitReturn(ReturnTree node, P p);
   10.77 +    R visitSee(SeeTree node, P p);
   10.78 +    R visitSerial(SerialTree node, P p);
   10.79 +    R visitSerialData(SerialDataTree node, P p);
   10.80 +    R visitSerialField(SerialFieldTree node, P p);
   10.81 +    R visitSince(SinceTree node, P p);
   10.82 +    R visitStartElement(StartElementTree node, P p);
   10.83 +    R visitText(TextTree node, P p);
   10.84 +    R visitThrows(ThrowsTree node, P p);
   10.85 +    R visitUnknownBlockTag(UnknownBlockTagTree node, P p);
   10.86 +    R visitUnknownInlineTag(UnknownInlineTagTree node, P p);
   10.87 +    R visitValue(ValueTree node, P p);
   10.88 +    R visitVersion(VersionTree node, P p);
   10.89 +    R visitOther(DocTree node, P p);
   10.90 +}

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/src/share/classes/com/sun/source/doctree/EndElementTree.java	Wed Nov 14 17:23:10 2012 -0800
    11.3 @@ -0,0 +1,40 @@
    11.4 +/*
    11.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    11.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.7 + *
    11.8 + * This code is free software; you can redistribute it and/or modify it
    11.9 + * under the terms of the GNU General Public License version 2 only, as
   11.10 + * published by the Free Software Foundation.  Oracle designates this
   11.11 + * particular file as subject to the "Classpath" exception as provided
   11.12 + * by Oracle in the LICENSE file that accompanied this code.
   11.13 + *
   11.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   11.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   11.17 + * version 2 for more details (a copy is included in the LICENSE file that
   11.18 + * accompanied this code).
   11.19 + *
   11.20 + * You should have received a copy of the GNU General Public License version
   11.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   11.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.23 + *
   11.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.25 + * or visit www.oracle.com if you need additional information or have any
   11.26 + * questions.
   11.27 + */
   11.28 +
   11.29 +package com.sun.source.doctree;
   11.30 +
   11.31 +import javax.lang.model.element.Name;
   11.32 +
   11.33 +/**
   11.34 + * A tree node for the end of an HTML element.
   11.35 + *
   11.36 + * <p>
   11.37 + * &lt;/ name &gt;
   11.38 + *
   11.39 + * @since 1.8
   11.40 + */
   11.41 +public interface EndElementTree extends DocTree {
   11.42 +    Name getName();
   11.43 +}

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/src/share/classes/com/sun/source/doctree/EntityTree.java	Wed Nov 14 17:23:10 2012 -0800
    12.3 @@ -0,0 +1,41 @@
    12.4 +/*
    12.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    12.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 + *
    12.8 + * This code is free software; you can redistribute it and/or modify it
    12.9 + * under the terms of the GNU General Public License version 2 only, as
   12.10 + * published by the Free Software Foundation.  Oracle designates this
   12.11 + * particular file as subject to the "Classpath" exception as provided
   12.12 + * by Oracle in the LICENSE file that accompanied this code.
   12.13 + *
   12.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   12.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.17 + * version 2 for more details (a copy is included in the LICENSE file that
   12.18 + * accompanied this code).
   12.19 + *
   12.20 + * You should have received a copy of the GNU General Public License version
   12.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   12.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.23 + *
   12.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.25 + * or visit www.oracle.com if you need additional information or have any
   12.26 + * questions.
   12.27 + */
   12.28 +
   12.29 +package com.sun.source.doctree;
   12.30 +
   12.31 +import javax.lang.model.element.Name;
   12.32 +
   12.33 +
   12.34 +/**
   12.35 + * A tree node for an HTML entity.
   12.36 + *
   12.37 + * <p>
   12.38 + * &amp; name ;
   12.39 + *
   12.40 + * @since 1.8
   12.41 + */
   12.42 +public interface EntityTree extends DocTree {
   12.43 +    Name getName();
   12.44 +}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/src/share/classes/com/sun/source/doctree/ErroneousTree.java	Wed Nov 14 17:23:10 2012 -0800
    13.3 @@ -0,0 +1,43 @@
    13.4 +/*
    13.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    13.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.7 + *
    13.8 + * This code is free software; you can redistribute it and/or modify it
    13.9 + * under the terms of the GNU General Public License version 2 only, as
   13.10 + * published by the Free Software Foundation.  Oracle designates this
   13.11 + * particular file as subject to the "Classpath" exception as provided
   13.12 + * by Oracle in the LICENSE file that accompanied this code.
   13.13 + *
   13.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   13.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.17 + * version 2 for more details (a copy is included in the LICENSE file that
   13.18 + * accompanied this code).
   13.19 + *
   13.20 + * You should have received a copy of the GNU General Public License version
   13.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   13.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.23 + *
   13.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.25 + * or visit www.oracle.com if you need additional information or have any
   13.26 + * questions.
   13.27 + */
   13.28 +package com.sun.source.doctree;
   13.29 +
   13.30 +import javax.tools.Diagnostic;
   13.31 +import javax.tools.JavaFileObject;
   13.32 +
   13.33 +/**
   13.34 + * A tree node to stand in for a malformed text
   13.35 + *
   13.36 + * @since 1.8
   13.37 + */
   13.38 +public interface ErroneousTree extends TextTree {
   13.39 +    /**
   13.40 +     * Gets a diagnostic object giving details about
   13.41 +     * the reason the body text is in error.
   13.42 +     *
   13.43 +     * @return a diagnostic
   13.44 +     */
   13.45 +    Diagnostic<JavaFileObject> getDiagnostic();
   13.46 +}

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/src/share/classes/com/sun/source/doctree/IdentifierTree.java	Wed Nov 14 17:23:10 2012 -0800
    14.3 @@ -0,0 +1,40 @@
    14.4 +/*
    14.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.7 + *
    14.8 + * This code is free software; you can redistribute it and/or modify it
    14.9 + * under the terms of the GNU General Public License version 2 only, as
   14.10 + * published by the Free Software Foundation.  Oracle designates this
   14.11 + * particular file as subject to the "Classpath" exception as provided
   14.12 + * by Oracle in the LICENSE file that accompanied this code.
   14.13 + *
   14.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   14.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   14.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   14.17 + * version 2 for more details (a copy is included in the LICENSE file that
   14.18 + * accompanied this code).
   14.19 + *
   14.20 + * You should have received a copy of the GNU General Public License version
   14.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   14.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   14.23 + *
   14.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   14.25 + * or visit www.oracle.com if you need additional information or have any
   14.26 + * questions.
   14.27 + */
   14.28 +
   14.29 +package com.sun.source.doctree;
   14.30 +
   14.31 +import javax.lang.model.element.Name;
   14.32 +
   14.33 +/**
   14.34 + * An identifier in a documentation comment.
   14.35 + *
   14.36 + * <p>
   14.37 + * name
   14.38 + *
   14.39 + * @since 1.8
   14.40 + */
   14.41 +public interface IdentifierTree extends DocTree {
   14.42 +    Name getName();
   14.43 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/src/share/classes/com/sun/source/doctree/InheritDocTree.java	Wed Nov 14 17:23:10 2012 -0800
    15.3 @@ -0,0 +1,37 @@
    15.4 +/*
    15.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.7 + *
    15.8 + * This code is free software; you can redistribute it and/or modify it
    15.9 + * under the terms of the GNU General Public License version 2 only, as
   15.10 + * published by the Free Software Foundation.  Oracle designates this
   15.11 + * particular file as subject to the "Classpath" exception as provided
   15.12 + * by Oracle in the LICENSE file that accompanied this code.
   15.13 + *
   15.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   15.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   15.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   15.17 + * version 2 for more details (a copy is included in the LICENSE file that
   15.18 + * accompanied this code).
   15.19 + *
   15.20 + * You should have received a copy of the GNU General Public License version
   15.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   15.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   15.23 + *
   15.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   15.25 + * or visit www.oracle.com if you need additional information or have any
   15.26 + * questions.
   15.27 + */
   15.28 +
   15.29 +package com.sun.source.doctree;
   15.30 +
   15.31 +/**
   15.32 + *
   15.33 + * A tree node for an @inheritDoc inline tag.
   15.34 + *
   15.35 + * <p>
   15.36 + * {&#064;inheritDoc}
   15.37 + *
   15.38 + * @since 1.8
   15.39 + */
   15.40 +public interface InheritDocTree extends InlineTagTree { }

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/src/share/classes/com/sun/source/doctree/InlineTagTree.java	Wed Nov 14 17:23:10 2012 -0800
    16.3 @@ -0,0 +1,36 @@
    16.4 +/*
    16.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    16.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.7 + *
    16.8 + * This code is free software; you can redistribute it and/or modify it
    16.9 + * under the terms of the GNU General Public License version 2 only, as
   16.10 + * published by the Free Software Foundation.  Oracle designates this
   16.11 + * particular file as subject to the "Classpath" exception as provided
   16.12 + * by Oracle in the LICENSE file that accompanied this code.
   16.13 + *
   16.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   16.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   16.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   16.17 + * version 2 for more details (a copy is included in the LICENSE file that
   16.18 + * accompanied this code).
   16.19 + *
   16.20 + * You should have received a copy of the GNU General Public License version
   16.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   16.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   16.23 + *
   16.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   16.25 + * or visit www.oracle.com if you need additional information or have any
   16.26 + * questions.
   16.27 + */
   16.28 +
   16.29 +package com.sun.source.doctree;
   16.30 +
   16.31 +/**
   16.32 + * A tree node used as the base class for the different types of
   16.33 + * inline tags.
   16.34 + *
   16.35 + * @since 1.8
   16.36 + */
   16.37 +public interface InlineTagTree extends DocTree {
   16.38 +    String getTagName();
   16.39 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/src/share/classes/com/sun/source/doctree/LinkTree.java	Wed Nov 14 17:23:10 2012 -0800
    17.3 @@ -0,0 +1,42 @@
    17.4 +/*
    17.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    17.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.7 + *
    17.8 + * This code is free software; you can redistribute it and/or modify it
    17.9 + * under the terms of the GNU General Public License version 2 only, as
   17.10 + * published by the Free Software Foundation.  Oracle designates this
   17.11 + * particular file as subject to the "Classpath" exception as provided
   17.12 + * by Oracle in the LICENSE file that accompanied this code.
   17.13 + *
   17.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   17.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   17.17 + * version 2 for more details (a copy is included in the LICENSE file that
   17.18 + * accompanied this code).
   17.19 + *
   17.20 + * You should have received a copy of the GNU General Public License version
   17.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   17.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.23 + *
   17.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.25 + * or visit www.oracle.com if you need additional information or have any
   17.26 + * questions.
   17.27 + */
   17.28 +
   17.29 +package com.sun.source.doctree;
   17.30 +
   17.31 +import java.util.List;
   17.32 +
   17.33 +/**
   17.34 + * A tree node for an @link or @linkplain inline tag.
   17.35 + *
   17.36 + * <p>
   17.37 + * {&#064;link reference label} <br>
   17.38 + * {&#064;linkplain reference label }
   17.39 + *
   17.40 + * @since 1.8
   17.41 + */
   17.42 +public interface LinkTree extends InlineTagTree {
   17.43 +    ReferenceTree getReference();
   17.44 +    List<? extends DocTree> getLabel();
   17.45 +}

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/src/share/classes/com/sun/source/doctree/LiteralTree.java	Wed Nov 14 17:23:10 2012 -0800
    18.3 @@ -0,0 +1,39 @@
    18.4 +/*
    18.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    18.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.7 + *
    18.8 + * This code is free software; you can redistribute it and/or modify it
    18.9 + * under the terms of the GNU General Public License version 2 only, as
   18.10 + * published by the Free Software Foundation.  Oracle designates this
   18.11 + * particular file as subject to the "Classpath" exception as provided
   18.12 + * by Oracle in the LICENSE file that accompanied this code.
   18.13 + *
   18.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   18.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.17 + * version 2 for more details (a copy is included in the LICENSE file that
   18.18 + * accompanied this code).
   18.19 + *
   18.20 + * You should have received a copy of the GNU General Public License version
   18.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   18.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.23 + *
   18.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.25 + * or visit www.oracle.com if you need additional information or have any
   18.26 + * questions.
   18.27 + */
   18.28 +
   18.29 +package com.sun.source.doctree;
   18.30 +
   18.31 +/**
   18.32 + *
   18.33 + * A tree node for an @literal or @code inline tag.
   18.34 + *
   18.35 + * <p>
   18.36 + * {&#064;literal text}
   18.37 + *
   18.38 + * @since 1.8
   18.39 + */
   18.40 +public interface LiteralTree extends InlineTagTree {
   18.41 +    TextTree getBody();
   18.42 +}

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/src/share/classes/com/sun/source/doctree/ParamTree.java	Wed Nov 14 17:23:10 2012 -0800
    19.3 @@ -0,0 +1,42 @@
    19.4 +/*
    19.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    19.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 + *
    19.8 + * This code is free software; you can redistribute it and/or modify it
    19.9 + * under the terms of the GNU General Public License version 2 only, as
   19.10 + * published by the Free Software Foundation.  Oracle designates this
   19.11 + * particular file as subject to the "Classpath" exception as provided
   19.12 + * by Oracle in the LICENSE file that accompanied this code.
   19.13 + *
   19.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 + * version 2 for more details (a copy is included in the LICENSE file that
   19.18 + * accompanied this code).
   19.19 + *
   19.20 + * You should have received a copy of the GNU General Public License version
   19.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   19.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 + *
   19.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 + * or visit www.oracle.com if you need additional information or have any
   19.26 + * questions.
   19.27 + */
   19.28 +
   19.29 +package com.sun.source.doctree;
   19.30 +
   19.31 +import java.util.List;
   19.32 +
   19.33 +/**
   19.34 + * A tree node for an @param block tag.
   19.35 + *
   19.36 + * <p>
   19.37 + * &#064;param parameter-name description
   19.38 + *
   19.39 + * @since 1.8
   19.40 + */
   19.41 +public interface ParamTree extends BlockTagTree {
   19.42 +    boolean isTypeParameter();
   19.43 +    IdentifierTree getName();
   19.44 +    List<? extends DocTree> getDescription();
   19.45 +}

    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/src/share/classes/com/sun/source/doctree/ReferenceTree.java	Wed Nov 14 17:23:10 2012 -0800
    20.3 @@ -0,0 +1,38 @@
    20.4 +/*
    20.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    20.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.7 + *
    20.8 + * This code is free software; you can redistribute it and/or modify it
    20.9 + * under the terms of the GNU General Public License version 2 only, as
   20.10 + * published by the Free Software Foundation.  Oracle designates this
   20.11 + * particular file as subject to the "Classpath" exception as provided
   20.12 + * by Oracle in the LICENSE file that accompanied this code.
   20.13 + *
   20.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   20.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   20.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   20.17 + * version 2 for more details (a copy is included in the LICENSE file that
   20.18 + * accompanied this code).
   20.19 + *
   20.20 + * You should have received a copy of the GNU General Public License version
   20.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   20.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   20.23 + *
   20.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   20.25 + * or visit www.oracle.com if you need additional information or have any
   20.26 + * questions.
   20.27 + */
   20.28 +
   20.29 +package com.sun.source.doctree;
   20.30 +
   20.31 +/**
   20.32 + * A tree node to a reference to a Java language element.
   20.33 + *
   20.34 + * <p>
   20.35 + * package.class#field
   20.36 + *
   20.37 + * @since 1.8
   20.38 + */
   20.39 +public interface ReferenceTree extends DocTree {
   20.40 +    String getSignature();
   20.41 +}

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/src/share/classes/com/sun/source/doctree/ReturnTree.java	Wed Nov 14 17:23:10 2012 -0800
    21.3 @@ -0,0 +1,40 @@
    21.4 +/*
    21.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    21.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.7 + *
    21.8 + * This code is free software; you can redistribute it and/or modify it
    21.9 + * under the terms of the GNU General Public License version 2 only, as
   21.10 + * published by the Free Software Foundation.  Oracle designates this
   21.11 + * particular file as subject to the "Classpath" exception as provided
   21.12 + * by Oracle in the LICENSE file that accompanied this code.
   21.13 + *
   21.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   21.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   21.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   21.17 + * version 2 for more details (a copy is included in the LICENSE file that
   21.18 + * accompanied this code).
   21.19 + *
   21.20 + * You should have received a copy of the GNU General Public License version
   21.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   21.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   21.23 + *
   21.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   21.25 + * or visit www.oracle.com if you need additional information or have any
   21.26 + * questions.
   21.27 + */
   21.28 +
   21.29 +package com.sun.source.doctree;
   21.30 +
   21.31 +import java.util.List;
   21.32 +
   21.33 +/**
   21.34 + * A tree node for an @return block tag.
   21.35 + *
   21.36 + * <p>
   21.37 + * &#064;return description
   21.38 + *
   21.39 + * @since 1.8
   21.40 + */
   21.41 +public interface ReturnTree extends BlockTagTree {
   21.42 +    List<? extends DocTree> getDescription();
   21.43 +}

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/src/share/classes/com/sun/source/doctree/SeeTree.java	Wed Nov 14 17:23:10 2012 -0800
    22.3 @@ -0,0 +1,43 @@
    22.4 +/*
    22.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    22.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.7 + *
    22.8 + * This code is free software; you can redistribute it and/or modify it
    22.9 + * under the terms of the GNU General Public License version 2 only, as
   22.10 + * published by the Free Software Foundation.  Oracle designates this
   22.11 + * particular file as subject to the "Classpath" exception as provided
   22.12 + * by Oracle in the LICENSE file that accompanied this code.
   22.13 + *
   22.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   22.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   22.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   22.17 + * version 2 for more details (a copy is included in the LICENSE file that
   22.18 + * accompanied this code).
   22.19 + *
   22.20 + * You should have received a copy of the GNU General Public License version
   22.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   22.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   22.23 + *
   22.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   22.25 + * or visit www.oracle.com if you need additional information or have any
   22.26 + * questions.
   22.27 + */
   22.28 +
   22.29 +package com.sun.source.doctree;
   22.30 +
   22.31 +import java.util.List;
   22.32 +
   22.33 +/**
   22.34 + *
   22.35 + * A tree node for an @see block tag.
   22.36 + *
   22.37 + * <p>
   22.38 + * &#064;see "string" <br>
   22.39 + * &#064;see &lt;a href="URL#value"&gt; label &lt;/a&gt; <br>
   22.40 + * &#064;see reference
   22.41 + *
   22.42 + * @since 1.8
   22.43 + */
   22.44 +public interface SeeTree extends BlockTagTree {
   22.45 +    List<? extends DocTree> getReference();
   22.46 +}

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/src/share/classes/com/sun/source/doctree/SerialDataTree.java	Wed Nov 14 17:23:10 2012 -0800
    23.3 @@ -0,0 +1,40 @@
    23.4 +/*
    23.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    23.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.7 + *
    23.8 + * This code is free software; you can redistribute it and/or modify it
    23.9 + * under the terms of the GNU General Public License version 2 only, as
   23.10 + * published by the Free Software Foundation.  Oracle designates this
   23.11 + * particular file as subject to the "Classpath" exception as provided
   23.12 + * by Oracle in the LICENSE file that accompanied this code.
   23.13 + *
   23.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   23.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   23.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   23.17 + * version 2 for more details (a copy is included in the LICENSE file that
   23.18 + * accompanied this code).
   23.19 + *
   23.20 + * You should have received a copy of the GNU General Public License version
   23.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   23.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   23.23 + *
   23.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   23.25 + * or visit www.oracle.com if you need additional information or have any
   23.26 + * questions.
   23.27 + */
   23.28 +
   23.29 +package com.sun.source.doctree;
   23.30 +
   23.31 +import java.util.List;
   23.32 +
   23.33 +/**
   23.34 + * A tree node for an @serialData block tag.
   23.35 + *
   23.36 + * <p>
   23.37 + * &#064;serialData data-description
   23.38 + *
   23.39 + * @since 1.8
   23.40 + */
   23.41 +public interface SerialDataTree extends BlockTagTree {
   23.42 +    List<? extends DocTree> getDescription();
   23.43 +}

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/src/share/classes/com/sun/source/doctree/SerialFieldTree.java	Wed Nov 14 17:23:10 2012 -0800
    24.3 @@ -0,0 +1,42 @@
    24.4 +/*
    24.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    24.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.7 + *
    24.8 + * This code is free software; you can redistribute it and/or modify it
    24.9 + * under the terms of the GNU General Public License version 2 only, as
   24.10 + * published by the Free Software Foundation.  Oracle designates this
   24.11 + * particular file as subject to the "Classpath" exception as provided
   24.12 + * by Oracle in the LICENSE file that accompanied this code.
   24.13 + *
   24.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   24.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   24.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   24.17 + * version 2 for more details (a copy is included in the LICENSE file that
   24.18 + * accompanied this code).
   24.19 + *
   24.20 + * You should have received a copy of the GNU General Public License version
   24.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   24.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   24.23 + *
   24.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   24.25 + * or visit www.oracle.com if you need additional information or have any
   24.26 + * questions.
   24.27 + */
   24.28 +
   24.29 +package com.sun.source.doctree;
   24.30 +
   24.31 +import java.util.List;
   24.32 +
   24.33 +/**
   24.34 + * A tree node for an @serialData block tag.
   24.35 + *
   24.36 + * <p>
   24.37 + * &#064;serialField field-name field-type field-description
   24.38 + *
   24.39 + * @since 1.8
   24.40 + */
   24.41 +public interface SerialFieldTree extends BlockTagTree {
   24.42 +    IdentifierTree getName();
   24.43 +    ReferenceTree getType();
   24.44 +    List<? extends DocTree> getDescription();
   24.45 +}

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/src/share/classes/com/sun/source/doctree/SerialTree.java	Wed Nov 14 17:23:10 2012 -0800
    25.3 @@ -0,0 +1,40 @@
    25.4 +/*
    25.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    25.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.7 + *
    25.8 + * This code is free software; you can redistribute it and/or modify it
    25.9 + * under the terms of the GNU General Public License version 2 only, as
   25.10 + * published by the Free Software Foundation.  Oracle designates this
   25.11 + * particular file as subject to the "Classpath" exception as provided
   25.12 + * by Oracle in the LICENSE file that accompanied this code.
   25.13 + *
   25.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   25.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   25.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   25.17 + * version 2 for more details (a copy is included in the LICENSE file that
   25.18 + * accompanied this code).
   25.19 + *
   25.20 + * You should have received a copy of the GNU General Public License version
   25.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   25.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   25.23 + *
   25.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   25.25 + * or visit www.oracle.com if you need additional information or have any
   25.26 + * questions.
   25.27 + */
   25.28 +
   25.29 +package com.sun.source.doctree;
   25.30 +
   25.31 +import java.util.List;
   25.32 +
   25.33 +/**
   25.34 + * A tree node for an @serial block tag.
   25.35 + *
   25.36 + * <p>
   25.37 + * &#064;serial field-description | include | exclude
   25.38 + *
   25.39 + * @since 1.8
   25.40 + */
   25.41 +public interface SerialTree extends BlockTagTree {
   25.42 +    List<? extends DocTree> getDescription();
   25.43 +}

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/src/share/classes/com/sun/source/doctree/SinceTree.java	Wed Nov 14 17:23:10 2012 -0800
    26.3 @@ -0,0 +1,40 @@
    26.4 +/*
    26.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    26.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.7 + *
    26.8 + * This code is free software; you can redistribute it and/or modify it
    26.9 + * under the terms of the GNU General Public License version 2 only, as
   26.10 + * published by the Free Software Foundation.  Oracle designates this
   26.11 + * particular file as subject to the "Classpath" exception as provided
   26.12 + * by Oracle in the LICENSE file that accompanied this code.
   26.13 + *
   26.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   26.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   26.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   26.17 + * version 2 for more details (a copy is included in the LICENSE file that
   26.18 + * accompanied this code).
   26.19 + *
   26.20 + * You should have received a copy of the GNU General Public License version
   26.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   26.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   26.23 + *
   26.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   26.25 + * or visit www.oracle.com if you need additional information or have any
   26.26 + * questions.
   26.27 + */
   26.28 +
   26.29 +package com.sun.source.doctree;
   26.30 +
   26.31 +import java.util.List;
   26.32 +
   26.33 +/**
   26.34 + * A tree node for an @since block tag.
   26.35 + *
   26.36 + * <p>
   26.37 + * &#064;since since-text
   26.38 + *
   26.39 + * @since 1.8
   26.40 + */
   26.41 +public interface SinceTree extends BlockTagTree {
   26.42 +    List<? extends DocTree> getBody();
   26.43 +}

    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/src/share/classes/com/sun/source/doctree/StartElementTree.java	Wed Nov 14 17:23:10 2012 -0800
    27.3 @@ -0,0 +1,43 @@
    27.4 +/*
    27.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    27.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.7 + *
    27.8 + * This code is free software; you can redistribute it and/or modify it
    27.9 + * under the terms of the GNU General Public License version 2 only, as
   27.10 + * published by the Free Software Foundation.  Oracle designates this
   27.11 + * particular file as subject to the "Classpath" exception as provided
   27.12 + * by Oracle in the LICENSE file that accompanied this code.
   27.13 + *
   27.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   27.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   27.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   27.17 + * version 2 for more details (a copy is included in the LICENSE file that
   27.18 + * accompanied this code).
   27.19 + *
   27.20 + * You should have received a copy of the GNU General Public License version
   27.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   27.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   27.23 + *
   27.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   27.25 + * or visit www.oracle.com if you need additional information or have any
   27.26 + * questions.
   27.27 + */
   27.28 +
   27.29 +package com.sun.source.doctree;
   27.30 +
   27.31 +import java.util.List;
   27.32 +import javax.lang.model.element.Name;
   27.33 +
   27.34 +/**
   27.35 + * A tree node for the start of an HTML element.
   27.36 + *
   27.37 + * <p>
   27.38 + * &lt; name [attributes] [/]&gt;
   27.39 + *
   27.40 + * @since 1.8
   27.41 + */
   27.42 +public interface StartElementTree extends DocTree {
   27.43 +    Name getName();
   27.44 +    List<? extends DocTree> getAttributes();
   27.45 +    boolean isSelfClosing();
   27.46 +}

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/src/share/classes/com/sun/source/doctree/TextTree.java	Wed Nov 14 17:23:10 2012 -0800
    28.3 @@ -0,0 +1,35 @@
    28.4 +/*
    28.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    28.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.7 + *
    28.8 + * This code is free software; you can redistribute it and/or modify it
    28.9 + * under the terms of the GNU General Public License version 2 only, as
   28.10 + * published by the Free Software Foundation.  Oracle designates this
   28.11 + * particular file as subject to the "Classpath" exception as provided
   28.12 + * by Oracle in the LICENSE file that accompanied this code.
   28.13 + *
   28.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   28.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   28.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   28.17 + * version 2 for more details (a copy is included in the LICENSE file that
   28.18 + * accompanied this code).
   28.19 + *
   28.20 + * You should have received a copy of the GNU General Public License version
   28.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   28.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   28.23 + *
   28.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   28.25 + * or visit www.oracle.com if you need additional information or have any
   28.26 + * questions.
   28.27 + */
   28.28 +
   28.29 +package com.sun.source.doctree;
   28.30 +
   28.31 +/**
   28.32 + * A tree node for plain text.
   28.33 + *
   28.34 + * @since 1.8
   28.35 + */
   28.36 +public interface TextTree extends DocTree {
   28.37 +    String getBody();
   28.38 +}

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/src/share/classes/com/sun/source/doctree/ThrowsTree.java	Wed Nov 14 17:23:10 2012 -0800
    29.3 @@ -0,0 +1,44 @@
    29.4 +/*
    29.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    29.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.7 + *
    29.8 + * This code is free software; you can redistribute it and/or modify it
    29.9 + * under the terms of the GNU General Public License version 2 only, as
   29.10 + * published by the Free Software Foundation.  Oracle designates this
   29.11 + * particular file as subject to the "Classpath" exception as provided
   29.12 + * by Oracle in the LICENSE file that accompanied this code.
   29.13 + *
   29.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   29.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   29.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   29.17 + * version 2 for more details (a copy is included in the LICENSE file that
   29.18 + * accompanied this code).
   29.19 + *
   29.20 + * You should have received a copy of the GNU General Public License version
   29.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   29.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   29.23 + *
   29.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   29.25 + * or visit www.oracle.com if you need additional information or have any
   29.26 + * questions.
   29.27 + */
   29.28 +
   29.29 +package com.sun.source.doctree;
   29.30 +
   29.31 +import java.util.List;
   29.32 +
   29.33 +/**
   29.34 + *
   29.35 + * A tree node for an @exception or @throws block tag.
   29.36 + * @exception is a synonym for @throws.
   29.37 + *
   29.38 + * <p>
   29.39 + * &#064;exception class-name description <br>
   29.40 + * &#064;throws class-name description
   29.41 + *
   29.42 + * @since 1.8
   29.43 + */
   29.44 +public interface ThrowsTree extends BlockTagTree {
   29.45 +    ReferenceTree getExceptionName();
   29.46 +    List<? extends DocTree> getDescription();
   29.47 +}

    30.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    30.2 +++ b/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java	Wed Nov 14 17:23:10 2012 -0800
    30.3 @@ -0,0 +1,40 @@
    30.4 +/*
    30.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    30.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.7 + *
    30.8 + * This code is free software; you can redistribute it and/or modify it
    30.9 + * under the terms of the GNU General Public License version 2 only, as
   30.10 + * published by the Free Software Foundation.  Oracle designates this
   30.11 + * particular file as subject to the "Classpath" exception as provided
   30.12 + * by Oracle in the LICENSE file that accompanied this code.
   30.13 + *
   30.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   30.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   30.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   30.17 + * version 2 for more details (a copy is included in the LICENSE file that
   30.18 + * accompanied this code).
   30.19 + *
   30.20 + * You should have received a copy of the GNU General Public License version
   30.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   30.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   30.23 + *
   30.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   30.25 + * or visit www.oracle.com if you need additional information or have any
   30.26 + * questions.
   30.27 + */
   30.28 +package com.sun.source.doctree;
   30.29 +
   30.30 +import java.util.List;
   30.31 +
   30.32 +/**
   30.33 + * A tree node for an unrecognized inline tag.
   30.34 + *
   30.35 + * <p>
   30.36 + * &#064;name content
   30.37 + *
   30.38 + * @since 1.8
   30.39 + *
   30.40 + */
   30.41 +public interface UnknownBlockTagTree extends BlockTagTree {
   30.42 +    List<? extends DocTree> getContent();
   30.43 +}

    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java	Wed Nov 14 17:23:10 2012 -0800
    31.3 @@ -0,0 +1,40 @@
    31.4 +/*
    31.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    31.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.7 + *
    31.8 + * This code is free software; you can redistribute it and/or modify it
    31.9 + * under the terms of the GNU General Public License version 2 only, as
   31.10 + * published by the Free Software Foundation.  Oracle designates this
   31.11 + * particular file as subject to the "Classpath" exception as provided
   31.12 + * by Oracle in the LICENSE file that accompanied this code.
   31.13 + *
   31.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   31.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   31.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   31.17 + * version 2 for more details (a copy is included in the LICENSE file that
   31.18 + * accompanied this code).
   31.19 + *
   31.20 + * You should have received a copy of the GNU General Public License version
   31.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   31.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   31.23 + *
   31.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   31.25 + * or visit www.oracle.com if you need additional information or have any
   31.26 + * questions.
   31.27 + */
   31.28 +package com.sun.source.doctree;
   31.29 +
   31.30 +import java.util.List;
   31.31 +
   31.32 +/**
   31.33 + * A tree node for an unrecognized inline tag.
   31.34 + *
   31.35 + * <p>
   31.36 + * {&#064;name content}
   31.37 + *
   31.38 + * @since 1.8
   31.39 + *
   31.40 + */
   31.41 +public interface UnknownInlineTagTree extends InlineTagTree {
   31.42 +    List<? extends DocTree> getContent();
   31.43 +}

    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/src/share/classes/com/sun/source/doctree/ValueTree.java	Wed Nov 14 17:23:10 2012 -0800
    32.3 @@ -0,0 +1,38 @@
    32.4 +/*
    32.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    32.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.7 + *
    32.8 + * This code is free software; you can redistribute it and/or modify it
    32.9 + * under the terms of the GNU General Public License version 2 only, as
   32.10 + * published by the Free Software Foundation.  Oracle designates this
   32.11 + * particular file as subject to the "Classpath" exception as provided
   32.12 + * by Oracle in the LICENSE file that accompanied this code.
   32.13 + *
   32.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   32.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   32.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   32.17 + * version 2 for more details (a copy is included in the LICENSE file that
   32.18 + * accompanied this code).
   32.19 + *
   32.20 + * You should have received a copy of the GNU General Public License version
   32.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   32.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   32.23 + *
   32.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   32.25 + * or visit www.oracle.com if you need additional information or have any
   32.26 + * questions.
   32.27 + */
   32.28 +
   32.29 +package com.sun.source.doctree;
   32.30 +
   32.31 +/**
   32.32 + * A tree node for an @value inline tag.
   32.33 + *
   32.34 + * <p>
   32.35 + * { &#064;value reference }
   32.36 + *
   32.37 + * @since 1.8
   32.38 + */
   32.39 +public interface ValueTree extends InlineTagTree {
   32.40 +    ReferenceTree getReference();
   32.41 +}

    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/src/share/classes/com/sun/source/doctree/VersionTree.java	Wed Nov 14 17:23:10 2012 -0800
    33.3 @@ -0,0 +1,41 @@
    33.4 +/*
    33.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    33.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 + *
    33.8 + * This code is free software; you can redistribute it and/or modify it
    33.9 + * under the terms of the GNU General Public License version 2 only, as
   33.10 + * published by the Free Software Foundation.  Oracle designates this
   33.11 + * particular file as subject to the "Classpath" exception as provided
   33.12 + * by Oracle in the LICENSE file that accompanied this code.
   33.13 + *
   33.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   33.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.17 + * version 2 for more details (a copy is included in the LICENSE file that
   33.18 + * accompanied this code).
   33.19 + *
   33.20 + * You should have received a copy of the GNU General Public License version
   33.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   33.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.23 + *
   33.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   33.25 + * or visit www.oracle.com if you need additional information or have any
   33.26 + * questions.
   33.27 + */
   33.28 +
   33.29 +package com.sun.source.doctree;
   33.30 +
   33.31 +import java.util.List;
   33.32 +
   33.33 +/**
   33.34 + *
   33.35 + * A tree node for an @version block tag.
   33.36 + *
   33.37 + * <p>
   33.38 + * &#064;version version-text
   33.39 + *
   33.40 + * @since 1.8
   33.41 + */
   33.42 +public interface VersionTree extends BlockTagTree {
   33.43 +    List<? extends DocTree> getBody();
   33.44 +}

    34.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    34.2 +++ b/src/share/classes/com/sun/source/doctree/package-info.java	Wed Nov 14 17:23:10 2012 -0800
    34.3 @@ -0,0 +1,34 @@
    34.4 +/*
    34.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    34.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.7 + *
    34.8 + * This code is free software; you can redistribute it and/or modify it
    34.9 + * under the terms of the GNU General Public License version 2 only, as
   34.10 + * published by the Free Software Foundation.  Oracle designates this
   34.11 + * particular file as subject to the "Classpath" exception as provided
   34.12 + * by Oracle in the LICENSE file that accompanied this code.
   34.13 + *
   34.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   34.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   34.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   34.17 + * version 2 for more details (a copy is included in the LICENSE file that
   34.18 + * accompanied this code).
   34.19 + *
   34.20 + * You should have received a copy of the GNU General Public License version
   34.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   34.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   34.23 + *
   34.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   34.25 + * or visit www.oracle.com if you need additional information or have any
   34.26 + * questions.
   34.27 + */
   34.28 +
   34.29 +/**
   34.30 + * Provides interfaces to represent documentation comments as abstract syntax
   34.31 + * trees (AST).
   34.32 + *
   34.33 + * @author Jonathan Gibbons
   34.34 + * @since 1.8
   34.35 + * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a>
   34.36 + */
   34.37 +package com.sun.source.doctree;

    35.1 --- a/src/share/classes/com/sun/source/tree/Tree.java	Wed Nov 14 16:41:51 2012 -0800
    35.2 +++ b/src/share/classes/com/sun/source/tree/Tree.java	Wed Nov 14 17:23:10 2012 -0800
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it
   35.10 @@ -610,7 +610,7 @@
   35.11       * visitor pattern is used to implement operations on trees.
   35.12       *
   35.13       * @param <R> result type of this operation.
   35.14 -     * @param <D> type of additonal data.
   35.15 +     * @param <D> type of additional data.
   35.16       */
   35.17      <R,D> R accept(TreeVisitor<R,D> visitor, D data);
   35.18  }

    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/src/share/classes/com/sun/source/util/DocTreeScanner.java	Wed Nov 14 17:23:10 2012 -0800
    36.3 @@ -0,0 +1,273 @@
    36.4 +/*
    36.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    36.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.7 + *
    36.8 + * This code is free software; you can redistribute it and/or modify it
    36.9 + * under the terms of the GNU General Public License version 2 only, as
   36.10 + * published by the Free Software Foundation.  Oracle designates this
   36.11 + * particular file as subject to the "Classpath" exception as provided
   36.12 + * by Oracle in the LICENSE file that accompanied this code.
   36.13 + *
   36.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   36.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   36.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   36.17 + * version 2 for more details (a copy is included in the LICENSE file that
   36.18 + * accompanied this code).
   36.19 + *
   36.20 + * You should have received a copy of the GNU General Public License version
   36.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   36.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   36.23 + *
   36.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   36.25 + * or visit www.oracle.com if you need additional information or have any
   36.26 + * questions.
   36.27 + */
   36.28 +
   36.29 +package com.sun.source.util;
   36.30 +
   36.31 +import com.sun.source.doctree.*;
   36.32 +
   36.33 +
   36.34 +/**
   36.35 + * A TreeVisitor that visits all the child tree nodes.
   36.36 + * To visit nodes of a particular type, just override the
   36.37 + * corresponding visitXYZ method.
   36.38 + * Inside your method, call super.visitXYZ to visit descendant
   36.39 + * nodes.
   36.40 + *
   36.41 + * <p>The default implementation of the visitXYZ methods will determine
   36.42 + * a result as follows:
   36.43 + * <ul>
   36.44 + * <li>If the node being visited has no children, the result will be null.
   36.45 + * <li>If the node being visited has one child, the result will be the
   36.46 + * result of calling {@code scan} on that child. The child may be a simple node
   36.47 + * or itself a list of nodes.
   36.48 + * <li> If the node being visited has more than one child, the result will
   36.49 + * be determined by calling {@code scan} each child in turn, and then combining the
   36.50 + * result of each scan after the first with the cumulative result
   36.51 + * so far, as determined by the {@link #reduce} method. Each child may be either
   36.52 + * a simple node of a list of nodes. The default behavior of the {@code reduce}
   36.53 + * method is such that the result of the visitXYZ method will be the result of
   36.54 + * the last child scanned.
   36.55 + * </ul>
   36.56 + *
   36.57 + * <p>Here is an example to count the number of erroneous nodes in a tree:
   36.58 + * <pre>
   36.59 + *   class CountErrors extends DocTreeScanner<Integer,Void> {
   36.60 + *      {@literal @}Override
   36.61 + *      public Integer visitErroneous(ErroneousTree node, Void p) {
   36.62 + *          return 1;
   36.63 + *      }
   36.64 + *      {@literal @}Override
   36.65 + *      public Integer reduce(Integer r1, Integer r2) {
   36.66 + *          return (r1 == null ? 0 : r1) + (r2 == null ? 0 : r2);
   36.67 + *      }
   36.68 + *   }
   36.69 + * </pre>
   36.70 + *
   36.71 + * @since 1.8
   36.72 + */
   36.73 +public class DocTreeScanner<R,P> implements DocTreeVisitor<R,P> {
   36.74 +
   36.75 +    /**
   36.76 +     * Scan a single node.
   36.77 +     */
   36.78 +    public R scan(DocTree node, P p) {
   36.79 +        return (node == null) ? null : node.accept(this, p);
   36.80 +    }
   36.81 +
   36.82 +    private R scanAndReduce(DocTree node, P p, R r) {
   36.83 +        return reduce(scan(node, p), r);
   36.84 +    }
   36.85 +
   36.86 +    /**
   36.87 +     * Scan a list of nodes.
   36.88 +     */
   36.89 +    public R scan(Iterable<? extends DocTree> nodes, P p) {
   36.90 +        R r = null;
   36.91 +        if (nodes != null) {
   36.92 +            boolean first = true;
   36.93 +            for (DocTree node : nodes) {
   36.94 +                r = (first ? scan(node, p) : scanAndReduce(node, p, r));
   36.95 +                first = false;
   36.96 +            }
   36.97 +        }
   36.98 +        return r;
   36.99 +    }
  36.100 +
  36.101 +    private R scanAndReduce(Iterable<? extends DocTree> nodes, P p, R r) {
  36.102 +        return reduce(scan(nodes, p), r);
  36.103 +    }
  36.104 +
  36.105 +    /**
  36.106 +     * Reduces two results into a combined result.
  36.107 +     * The default implementation is to return the first parameter.
  36.108 +     * The general contract of the method is that it may take any action whatsoever.
  36.109 +     */
  36.110 +    public R reduce(R r1, R r2) {
  36.111 +        return r1;
  36.112 +    }
  36.113 +
  36.114 +
  36.115 +/* ***************************************************************************
  36.116 + * Visitor methods
  36.117 + ****************************************************************************/
  36.118 +
  36.119 +    @Override
  36.120 +    public R visitAttribute(AttributeTree node, P p) {
  36.121 +        return null;
  36.122 +    }
  36.123 +
  36.124 +    @Override
  36.125 +    public R visitAuthor(AuthorTree node, P p) {
  36.126 +        return scan(node.getName(), p);
  36.127 +    }
  36.128 +
  36.129 +    @Override
  36.130 +    public R visitComment(CommentTree node, P p) {
  36.131 +        return null;
  36.132 +    }
  36.133 +
  36.134 +    @Override
  36.135 +    public R visitDeprecated(DeprecatedTree node, P p) {
  36.136 +        return scan(node.getBody(), p);
  36.137 +    }
  36.138 +
  36.139 +    @Override
  36.140 +    public R visitDocComment(DocCommentTree node, P p) {
  36.141 +        R r = scan(node.getFirstSentence(), p);
  36.142 +        r = scanAndReduce(node.getBody(), p, r);
  36.143 +        r = scanAndReduce(node.getBlockTags(), p, r);
  36.144 +        return r;
  36.145 +    }
  36.146 +
  36.147 +    @Override
  36.148 +    public R visitDocRoot(DocRootTree node, P p) {
  36.149 +        return null;
  36.150 +    }
  36.151 +
  36.152 +    @Override
  36.153 +    public R visitEndElement(EndElementTree node, P p) {
  36.154 +        return null;
  36.155 +    }
  36.156 +
  36.157 +    @Override
  36.158 +    public R visitEntity(EntityTree node, P p) {
  36.159 +        return null;
  36.160 +    }
  36.161 +
  36.162 +    @Override
  36.163 +    public R visitErroneous(ErroneousTree node, P p) {
  36.164 +        return null;
  36.165 +    }
  36.166 +
  36.167 +    @Override
  36.168 +    public R visitIdentifier(IdentifierTree node, P p) {
  36.169 +        return null;
  36.170 +    }
  36.171 +
  36.172 +    @Override
  36.173 +    public R visitInheritDoc(InheritDocTree node, P p) {
  36.174 +        return null;
  36.175 +    }
  36.176 +
  36.177 +    @Override
  36.178 +    public R visitLink(LinkTree node, P p) {
  36.179 +        R r = scan(node.getReference(), p);
  36.180 +        r = scanAndReduce(node.getLabel(), p, r);
  36.181 +        return r;
  36.182 +    }
  36.183 +
  36.184 +    @Override
  36.185 +    public R visitLiteral(LiteralTree node, P p) {
  36.186 +        return null;
  36.187 +    }
  36.188 +
  36.189 +    @Override
  36.190 +    public R visitParam(ParamTree node, P p) {
  36.191 +        R r = scan(node.getName(), p);
  36.192 +        r = scanAndReduce(node.getDescription(), p, r);
  36.193 +        return r;
  36.194 +    }
  36.195 +
  36.196 +    @Override
  36.197 +    public R visitReference(ReferenceTree node, P p) {
  36.198 +        return null;
  36.199 +    }
  36.200 +
  36.201 +    @Override
  36.202 +    public R visitReturn(ReturnTree node, P p) {
  36.203 +        return scan(node.getDescription(), p);
  36.204 +    }
  36.205 +
  36.206 +    @Override
  36.207 +    public R visitSee(SeeTree node, P p) {
  36.208 +        return scan(node.getReference(), p);
  36.209 +    }
  36.210 +
  36.211 +    @Override
  36.212 +    public R visitSerial(SerialTree node, P p) {
  36.213 +        return scan(node.getDescription(), p);
  36.214 +    }
  36.215 +
  36.216 +    @Override
  36.217 +    public R visitSerialData(SerialDataTree node, P p) {
  36.218 +        return scan(node.getDescription(), p);
  36.219 +    }
  36.220 +
  36.221 +    @Override
  36.222 +    public R visitSerialField(SerialFieldTree node, P p) {
  36.223 +        R r = scan(node.getName(), p);
  36.224 +        r = scanAndReduce(node.getType(), p, r);
  36.225 +        r = scanAndReduce(node.getDescription(), p, r);
  36.226 +        return r;
  36.227 +    }
  36.228 +
  36.229 +    @Override
  36.230 +    public R visitSince(SinceTree node, P p) {
  36.231 +        return scan(node.getBody(), p);
  36.232 +    }
  36.233 +
  36.234 +    @Override
  36.235 +    public R visitStartElement(StartElementTree node, P p) {
  36.236 +        return scan(node.getAttributes(), p);
  36.237 +    }
  36.238 +
  36.239 +    @Override
  36.240 +    public R visitText(TextTree node, P p) {
  36.241 +        return null;
  36.242 +    }
  36.243 +
  36.244 +    @Override
  36.245 +    public R visitThrows(ThrowsTree node, P p) {
  36.246 +        R r = scan(node.getExceptionName(), p);
  36.247 +        r = scanAndReduce(node.getDescription(), p, r);
  36.248 +        return r;
  36.249 +    }
  36.250 +
  36.251 +    @Override
  36.252 +    public R visitUnknownBlockTag(UnknownBlockTagTree node, P p) {
  36.253 +        return scan(node.getContent(), p);
  36.254 +    }
  36.255 +
  36.256 +    @Override
  36.257 +    public R visitUnknownInlineTag(UnknownInlineTagTree node, P p) {
  36.258 +        return scan(node.getContent(), p);
  36.259 +    }
  36.260 +
  36.261 +    @Override
  36.262 +    public R visitValue(ValueTree node, P p) {
  36.263 +        return scan(node.getReference(), p);
  36.264 +    }
  36.265 +
  36.266 +    @Override
  36.267 +    public R visitVersion(VersionTree node, P p) {
  36.268 +        return scan(node.getBody(), p);
  36.269 +    }
  36.270 +
  36.271 +    @Override
  36.272 +    public R visitOther(DocTree node, P p) {
  36.273 +        return null;
  36.274 +    }
  36.275 +
  36.276 +}

    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/src/share/classes/com/sun/source/util/DocTrees.java	Wed Nov 14 17:23:10 2012 -0800
    37.3 @@ -0,0 +1,89 @@
    37.4 +/*
    37.5 + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    37.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.7 + *
    37.8 + * This code is free software; you can redistribute it and/or modify it
    37.9 + * under the terms of the GNU General Public License version 2 only, as
   37.10 + * published by the Free Software Foundation.  Oracle designates this
   37.11 + * particular file as subject to the "Classpath" exception as provided
   37.12 + * by Oracle in the LICENSE file that accompanied this code.
   37.13 + *
   37.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   37.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   37.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   37.17 + * version 2 for more details (a copy is included in the LICENSE file that
   37.18 + * accompanied this code).
   37.19 + *
   37.20 + * You should have received a copy of the GNU General Public License version
   37.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   37.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   37.23 + *
   37.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   37.25 + * or visit www.oracle.com if you need additional information or have any
   37.26 + * questions.
   37.27 + */
   37.28 +
   37.29 +package com.sun.source.util;
   37.30 +
   37.31 +import javax.annotation.processing.ProcessingEnvironment;
   37.32 +import javax.lang.model.element.Element;
   37.33 +import javax.tools.JavaCompiler.CompilationTask;
   37.34 +
   37.35 +import com.sun.source.doctree.DocCommentTree;
   37.36 +import com.sun.source.doctree.ReferenceTree;
   37.37 +import javax.tools.Diagnostic;
   37.38 +
   37.39 +/**
   37.40 + * Provides access to syntax trees for doc comments.
   37.41 + *
   37.42 + * @since 1.8
   37.43 + */
   37.44 +public abstract class DocTrees extends Trees {
   37.45 +    /**
   37.46 +     * Gets a DocTrees object for a given CompilationTask.
   37.47 +     * @param task the compilation task for which to get the Trees object
   37.48 +     * @throws IllegalArgumentException if the task does not support the Trees API.
   37.49 +     */
   37.50 +    public static DocTrees instance(CompilationTask task) {
   37.51 +        if (!task.getClass().getName().equals("com.sun.tools.javac.api.JavacTaskImpl"))
   37.52 +            throw new IllegalArgumentException();
   37.53 +        return (DocTrees) getJavacTrees(CompilationTask.class, task);
   37.54 +    }
   37.55 +
   37.56 +    /**
   37.57 +     * Gets a DocTrees object for a given ProcessingEnvironment.
   37.58 +     * @param env the processing environment for which to get the Trees object
   37.59 +     * @throws IllegalArgumentException if the env does not support the Trees API.
   37.60 +     */
   37.61 +    public static DocTrees instance(ProcessingEnvironment env) {
   37.62 +        if (!env.getClass().getName().equals("com.sun.tools.javac.processing.JavacProcessingEnvironment"))
   37.63 +            throw new IllegalArgumentException();
   37.64 +        return (DocTrees) getJavacTrees(ProcessingEnvironment.class, env);
   37.65 +    }
   37.66 +
   37.67 +    /**
   37.68 +     * Gets the doc comment tree, if any, for the Tree node identified by a given TreePath.
   37.69 +     * Returns null if no doc comment was found.
   37.70 +     */
   37.71 +    public abstract DocCommentTree getDocCommentTree(TreePath path);
   37.72 +
   37.73 +    /**
   37.74 +     * Gets the language model element referred to by a ReferenceTree that
   37.75 +     * appears on the declaration identified by the given path.
   37.76 +     */
   37.77 +    public abstract Element getElement(TreePath path, ReferenceTree reference);
   37.78 +
   37.79 +    /**
   37.80 +     * Prints a message of the specified kind at the location of the
   37.81 +     * tree within the provided compilation unit
   37.82 +     *
   37.83 +     * @param kind the kind of message
   37.84 +     * @param msg  the message, or an empty string if none
   37.85 +     * @param t    the tree to use as a position hint
   37.86 +     * @param root the compilation unit that contains tree
   37.87 +     */
   37.88 +    public abstract void printMessage(Diagnostic.Kind kind, CharSequence msg,
   37.89 +            com.sun.source.doctree.DocTree t,
   37.90 +            com.sun.source.doctree.DocCommentTree c,
   37.91 +            com.sun.source.tree.CompilationUnitTree root);
   37.92 +}

    38.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.2 +++ b/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java	Wed Nov 14 17:23:10 2012 -0800
    38.3 @@ -0,0 +1,179 @@
    38.4 +/*
    38.5 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    38.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.7 + *
    38.8 + * This code is free software; you can redistribute it and/or modify it
    38.9 + * under the terms of the GNU General Public License version 2 only, as
   38.10 + * published by the Free Software Foundation.  Oracle designates this
   38.11 + * particular file as subject to the "Classpath" exception as provided
   38.12 + * by Oracle in the LICENSE file that accompanied this code.
   38.13 + *
   38.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   38.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   38.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   38.17 + * version 2 for more details (a copy is included in the LICENSE file that
   38.18 + * accompanied this code).
   38.19 + *
   38.20 + * You should have received a copy of the GNU General Public License version
   38.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   38.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   38.23 + *
   38.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   38.25 + * or visit www.oracle.com if you need additional information or have any
   38.26 + * questions.
   38.27 + */
   38.28 +
   38.29 +package com.sun.source.util;
   38.30 +
   38.31 +import com.sun.source.doctree.*;
   38.32 +
   38.33 +/**
   38.34 + * A simple visitor for tree nodes.
   38.35 + *
   38.36 + * @since 1.8
   38.37 + */
   38.38 +public class SimpleDocTreeVisitor<R,P> implements DocTreeVisitor<R, P> {
   38.39 +    protected final R DEFAULT_VALUE;
   38.40 +
   38.41 +    protected SimpleDocTreeVisitor() {
   38.42 +        DEFAULT_VALUE = null;
   38.43 +    }
   38.44 +
   38.45 +    protected SimpleDocTreeVisitor(R defaultValue) {
   38.46 +        DEFAULT_VALUE = defaultValue;
   38.47 +    }
   38.48 +
   38.49 +    protected R defaultAction(DocTree node, P p) {
   38.50 +        return DEFAULT_VALUE;
   38.51 +    }
   38.52 +
   38.53 +    public final R visit(DocTree node, P p) {
   38.54 +        return (node == null) ? null : node.accept(this, p);
   38.55 +    }
   38.56 +
   38.57 +    public final R visit(Iterable<? extends DocTree> nodes, P p) {
   38.58 +        R r = null;
   38.59 +        if (nodes != null) {
   38.60 +            for (DocTree node : nodes)
   38.61 +                r = visit(node, p);
   38.62 +        }
   38.63 +        return r;
   38.64 +    }
   38.65 +
   38.66 +    public R visitAttribute(AttributeTree node, P p) {
   38.67 +        return defaultAction(node, p);
   38.68 +    }
   38.69 +
   38.70 +    public R visitAuthor(AuthorTree node, P p) {
   38.71 +        return defaultAction(node, p);
   38.72 +    }
   38.73 +
   38.74 +    public R visitComment(CommentTree node, P p) {
   38.75 +        return defaultAction(node, p);
   38.76 +    }
   38.77 +
   38.78 +    public R visitDeprecated(DeprecatedTree node, P p) {
   38.79 +        return defaultAction(node, p);
   38.80 +    }
   38.81 +
   38.82 +    public R visitDocComment(DocCommentTree node, P p) {
   38.83 +        return defaultAction(node, p);
   38.84 +    }
   38.85 +
   38.86 +    public R visitDocRoot(DocRootTree node, P p) {
   38.87 +        return defaultAction(node, p);
   38.88 +    }
   38.89 +
   38.90 +    public R visitEndElement(EndElementTree node, P p) {
   38.91 +        return defaultAction(node, p);
   38.92 +    }
   38.93 +
   38.94 +    public R visitEntity(EntityTree node, P p) {
   38.95 +        return defaultAction(node, p);
   38.96 +    }
   38.97 +
   38.98 +    public R visitErroneous(ErroneousTree node, P p) {
   38.99 +        return defaultAction(node, p);
  38.100 +    }
  38.101 +
  38.102 +    public R visitIdentifier(IdentifierTree node, P p) {
  38.103 +        return defaultAction(node, p);
  38.104 +    }
  38.105 +
  38.106 +    public R visitInheritDoc(InheritDocTree node, P p) {
  38.107 +        return defaultAction(node, p);
  38.108 +    }
  38.109 +
  38.110 +    public R visitLink(LinkTree node, P p) {
  38.111 +        return defaultAction(node, p);
  38.112 +    }
  38.113 +
  38.114 +    public R visitLiteral(LiteralTree node, P p) {
  38.115 +        return defaultAction(node, p);
  38.116 +    }
  38.117 +
  38.118 +    public R visitParam(ParamTree node, P p) {
  38.119 +        return defaultAction(node, p);
  38.120 +    }
  38.121 +
  38.122 +    public R visitReference(ReferenceTree node, P p) {
  38.123 +        return defaultAction(node, p);
  38.124 +    }
  38.125 +
  38.126 +    public R visitReturn(ReturnTree node, P p) {
  38.127 +        return defaultAction(node, p);
  38.128 +    }
  38.129 +
  38.130 +    public R visitSee(SeeTree node, P p) {
  38.131 +        return defaultAction(node, p);
  38.132 +    }
  38.133 +
  38.134 +    public R visitSerial(SerialTree node, P p) {
  38.135 +        return defaultAction(node, p);
  38.136 +    }
  38.137 +
  38.138 +    public R visitSerialData(SerialDataTree node, P p) {
  38.139 +        return defaultAction(node, p);
  38.140 +    }
  38.141 +
  38.142 +    public R visitSerialField(SerialFieldTree node, P p) {
  38.143 +        return defaultAction(node, p);
  38.144 +    }
  38.145 +
  38.146 +    public R visitSince(SinceTree node, P p) {
  38.147 +        return defaultAction(node, p);
  38.148 +    }
  38.149 +
  38.150 +    public R visitStartElement(StartElementTree node, P p) {
  38.151 +        return defaultAction(node, p);
  38.152 +    }
  38.153 +
  38.154 +    public R visitText(TextTree node, P p) {
  38.155 +        return defaultAction(node, p);
  38.156 +    }
  38.157 +
  38.158 +    public R visitThrows(ThrowsTree node, P p) {
  38.159 +        return defaultAction(node, p);
  38.160 +    }
  38.161 +
  38.162 +    public R visitUnknownBlockTag(UnknownBlockTagTree node, P p) {
  38.163 +        return defaultAction(node, p);
  38.164 +    }
  38.165 +
  38.166 +    public R visitUnknownInlineTag(UnknownInlineTagTree node, P p) {
  38.167 +        return defaultAction(node, p);
  38.168 +    }
  38.169 +
  38.170 +    public R visitValue(ValueTree node, P p) {
  38.171 +        return defaultAction(node, p);
  38.172 +    }
  38.173 +
  38.174 +    public R visitVersion(VersionTree node, P p) {
  38.175 +        return defaultAction(node, p);
  38.176 +    }
  38.177 +
  38.178 +    public R visitOther(DocTree node, P p) {
  38.179 +        return defaultAction(node, p);
  38.180 +    }
  38.181 +
  38.182 +}

    39.1 --- a/src/share/classes/com/sun/source/util/Trees.java	Wed Nov 14 16:41:51 2012 -0800
    39.2 +++ b/src/share/classes/com/sun/source/util/Trees.java	Wed Nov 14 17:23:10 2012 -0800
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -26,6 +26,7 @@
   39.11  package com.sun.source.util;
   39.12  
   39.13  import java.lang.reflect.Method;
   39.14 +
   39.15  import javax.annotation.processing.ProcessingEnvironment;
   39.16  import javax.lang.model.element.AnnotationMirror;
   39.17  import javax.lang.model.element.AnnotationValue;
   39.18 @@ -73,7 +74,7 @@
   39.19          return getJavacTrees(ProcessingEnvironment.class, env);
   39.20      }
   39.21  
   39.22 -    private static Trees getJavacTrees(Class<?> argType, Object arg) {
   39.23 +    static Trees getJavacTrees(Class<?> argType, Object arg) {
   39.24          try {
   39.25              ClassLoader cl = arg.getClass().getClassLoader();
   39.26              Class<?> c = Class.forName("com.sun.tools.javac.api.JavacTrees", false, cl);
   39.27 @@ -168,6 +169,7 @@
   39.28      /**
   39.29       * Gets the doc comment, if any, for the Tree node identified by a given TreePath.
   39.30       * Returns null if no doc comment was found.
   39.31 +     * @see DocTrees#getDocCommentTree(TreePath)
   39.32       */
   39.33      public abstract String getDocComment(TreePath path);
   39.34  

    40.1 --- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Wed Nov 14 16:41:51 2012 -0800
    40.2 +++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Wed Nov 14 17:23:10 2012 -0800
    40.3 @@ -26,6 +26,8 @@
    40.4  package com.sun.tools.javac.api;
    40.5  
    40.6  import java.io.IOException;
    40.7 +import java.util.HashSet;
    40.8 +import java.util.Set;
    40.9  
   40.10  import javax.annotation.processing.ProcessingEnvironment;
   40.11  import javax.lang.model.element.AnnotationMirror;
   40.12 @@ -40,19 +42,31 @@
   40.13  import javax.tools.JavaCompiler;
   40.14  import javax.tools.JavaFileObject;
   40.15  
   40.16 +import com.sun.source.doctree.DocCommentTree;
   40.17 +import com.sun.source.doctree.ReferenceTree;
   40.18  import com.sun.source.tree.CatchTree;
   40.19  import com.sun.source.tree.CompilationUnitTree;
   40.20  import com.sun.source.tree.Scope;
   40.21  import com.sun.source.tree.Tree;
   40.22 +import com.sun.source.util.DocTrees;
   40.23  import com.sun.source.util.JavacTask;
   40.24  import com.sun.source.util.SourcePositions;
   40.25  import com.sun.source.util.TreePath;
   40.26 -import com.sun.source.util.Trees;
   40.27  import com.sun.tools.javac.code.Flags;
   40.28 +import com.sun.tools.javac.code.Kinds;
   40.29  import com.sun.tools.javac.code.Symbol;
   40.30  import com.sun.tools.javac.code.Symbol.ClassSymbol;
   40.31 +import com.sun.tools.javac.code.Symbol.MethodSymbol;
   40.32 +import com.sun.tools.javac.code.Symbol.PackageSymbol;
   40.33  import com.sun.tools.javac.code.Symbol.TypeSymbol;
   40.34 +import com.sun.tools.javac.code.Symbol.VarSymbol;
   40.35 +import com.sun.tools.javac.code.Type;
   40.36 +import com.sun.tools.javac.code.Type.ArrayType;
   40.37 +import com.sun.tools.javac.code.Type.ClassType;
   40.38 +import com.sun.tools.javac.code.Type.ErrorType;
   40.39  import com.sun.tools.javac.code.Type.UnionClassType;
   40.40 +import com.sun.tools.javac.code.Types;
   40.41 +import com.sun.tools.javac.code.Types.TypeRelation;
   40.42  import com.sun.tools.javac.comp.Attr;
   40.43  import com.sun.tools.javac.comp.AttrContext;
   40.44  import com.sun.tools.javac.comp.Enter;
   40.45 @@ -61,6 +75,9 @@
   40.46  import com.sun.tools.javac.comp.Resolve;
   40.47  import com.sun.tools.javac.model.JavacElements;
   40.48  import com.sun.tools.javac.processing.JavacProcessingEnvironment;
   40.49 +import com.sun.tools.javac.tree.DCTree;
   40.50 +import com.sun.tools.javac.tree.DCTree.DCDocComment;
   40.51 +import com.sun.tools.javac.tree.DCTree.DCReference;
   40.52  import com.sun.tools.javac.tree.EndPosTable;
   40.53  import com.sun.tools.javac.tree.JCTree;
   40.54  import com.sun.tools.javac.tree.JCTree.*;
   40.55 @@ -71,8 +88,12 @@
   40.56  import com.sun.tools.javac.util.Context;
   40.57  import com.sun.tools.javac.util.JCDiagnostic;
   40.58  import com.sun.tools.javac.util.List;
   40.59 +import com.sun.tools.javac.util.ListBuffer;
   40.60  import com.sun.tools.javac.util.Log;
   40.61 +import com.sun.tools.javac.util.Name;
   40.62 +import com.sun.tools.javac.util.Names;
   40.63  import com.sun.tools.javac.util.Pair;
   40.64 +import static com.sun.tools.javac.code.TypeTag.*;
   40.65  
   40.66  /**
   40.67   * Provides an implementation of Trees.
   40.68 @@ -84,7 +105,7 @@
   40.69   *
   40.70   * @author Peter von der Ahé
   40.71   */
   40.72 -public class JavacTrees extends Trees {
   40.73 +public class JavacTrees extends DocTrees {
   40.74  
   40.75      // in a world of a single context per compilation, these would all be final
   40.76      private Resolve resolve;
   40.77 @@ -95,6 +116,8 @@
   40.78      private TreeMaker treeMaker;
   40.79      private JavacElements elements;
   40.80      private JavacTaskImpl javacTaskImpl;
   40.81 +    private Names names;
   40.82 +    private Types types;
   40.83  
   40.84      // called reflectively from Trees.instance(CompilationTask task)
   40.85      public static JavacTrees instance(JavaCompiler.CompilationTask task) {
   40.86 @@ -134,6 +157,8 @@
   40.87          resolve = Resolve.instance(context);
   40.88          treeMaker = TreeMaker.instance(context);
   40.89          memberEnter = MemberEnter.instance(context);
   40.90 +        names = Names.instance(context);
   40.91 +        types = Types.instance(context);
   40.92  
   40.93          JavacTask t = context.get(JavacTask.class);
   40.94          if (t instanceof JavacTaskImpl)
   40.95 @@ -229,6 +254,324 @@
   40.96          return sym;
   40.97      }
   40.98  
   40.99 +    @Override
  40.100 +    public Element getElement(TreePath path, ReferenceTree reference) {
  40.101 +        if (!(reference instanceof DCReference))
  40.102 +            return null;
  40.103 +        DCReference ref = (DCReference) reference;
  40.104 +
  40.105 +        Env<AttrContext> env = getAttrContext(path);
  40.106 +
  40.107 +        Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
  40.108 +                new Log.DeferredDiagnosticHandler(log);
  40.109 +        try {
  40.110 +            final ClassSymbol tsym;
  40.111 +            final Name memberName;
  40.112 +            if (ref.qualifierExpression == null) {
  40.113 +                tsym = env.enclClass.sym;
  40.114 +                memberName = ref.memberName;
  40.115 +            } else {
  40.116 +                // See if the qualifierExpression is a type or package name.
  40.117 +                // javac does not provide the exact method required, so
  40.118 +                // we first check if qualifierExpression identifies a type,
  40.119 +                // and if not, then we check to see if it identifies a package.
  40.120 +                Type t = attr.attribType(ref.qualifierExpression, env);
  40.121 +                if (t.isErroneous()) {
  40.122 +                    if (ref.memberName == null) {
  40.123 +                        // Attr/Resolve assume packages exist and create symbols as needed
  40.124 +                        // so use getPackageElement to restrict search to existing packages
  40.125 +                        PackageSymbol pck = elements.getPackageElement(ref.qualifierExpression.toString());
  40.126 +                        if (pck != null) {
  40.127 +                            return pck;
  40.128 +                        } else if (ref.qualifierExpression.hasTag(JCTree.Tag.IDENT)) {
  40.129 +                            // fixup:  allow "identifier" instead of "#identifier"
  40.130 +                            // for compatibility with javadoc
  40.131 +                            tsym = env.enclClass.sym;
  40.132 +                            memberName = ((JCIdent) ref.qualifierExpression).name;
  40.133 +                        } else
  40.134 +                            return null;
  40.135 +                    } else {
  40.136 +                        return null;
  40.137 +                    }
  40.138 +                } else {
  40.139 +                    tsym = (ClassSymbol) t.tsym;
  40.140 +                    memberName = ref.memberName;
  40.141 +                }
  40.142 +            }
  40.143 +
  40.144 +            if (memberName == null)
  40.145 +                return tsym;
  40.146 +
  40.147 +            final List<Type> paramTypes;
  40.148 +            if (ref.paramTypes == null)
  40.149 +                paramTypes = null;
  40.150 +            else {
  40.151 +                ListBuffer<Type> lb = new ListBuffer<Type>();
  40.152 +                for (List<JCTree> l = ref.paramTypes; l.nonEmpty(); l = l.tail) {
  40.153 +                    JCTree tree = l.head;
  40.154 +                    Type t = attr.attribType(tree, env);
  40.155 +                    lb.add(t);
  40.156 +                }
  40.157 +                paramTypes = lb.toList();
  40.158 +            }
  40.159 +
  40.160 +            Symbol msym = (memberName == tsym.name)
  40.161 +                    ? findConstructor(tsym, paramTypes)
  40.162 +                    : findMethod(tsym, memberName, paramTypes);
  40.163 +            if (paramTypes != null) {
  40.164 +                // explicit (possibly empty) arg list given, so cannot be a field
  40.165 +                return msym;
  40.166 +            }
  40.167 +
  40.168 +            VarSymbol vsym = (ref.paramTypes != null) ? null : findField(tsym, memberName);
  40.169 +            // prefer a field over a method with no parameters
  40.170 +            if (vsym != null &&
  40.171 +                    (msym == null ||
  40.172 +                        types.isSubtypeUnchecked(vsym.enclClass().asType(), msym.enclClass().asType()))) {
  40.173 +                return vsym;
  40.174 +            } else {
  40.175 +                return msym;
  40.176 +            }
  40.177 +        } finally {
  40.178 +            log.popDiagnosticHandler(deferredDiagnosticHandler);
  40.179 +        }
  40.180 +    }
  40.181 +
  40.182 +    /** @see com.sun.tools.javadoc.ClassDocImpl#findField */
  40.183 +    private VarSymbol findField(ClassSymbol tsym, Name fieldName) {
  40.184 +        return searchField(tsym, fieldName, new HashSet<ClassSymbol>());
  40.185 +    }
  40.186 +
  40.187 +    /** @see com.sun.tools.javadoc.ClassDocImpl#searchField */
  40.188 +    private VarSymbol searchField(ClassSymbol tsym, Name fieldName, Set<ClassSymbol> searched) {
  40.189 +        if (searched.contains(tsym)) {
  40.190 +            return null;
  40.191 +        }
  40.192 +        searched.add(tsym);
  40.193 +
  40.194 +        for (com.sun.tools.javac.code.Scope.Entry e = tsym.members().lookup(fieldName);
  40.195 +                e.scope != null; e = e.next()) {
  40.196 +            if (e.sym.kind == Kinds.VAR) {
  40.197 +                return (VarSymbol)e.sym;
  40.198 +            }
  40.199 +        }
  40.200 +
  40.201 +        //### If we found a VarSymbol above, but which did not pass
  40.202 +        //### the modifier filter, we should return failure here!
  40.203 +
  40.204 +        ClassSymbol encl = tsym.owner.enclClass();
  40.205 +        if (encl != null) {
  40.206 +            VarSymbol vsym = searchField(encl, fieldName, searched);
  40.207 +            if (vsym != null) {
  40.208 +                return vsym;
  40.209 +            }
  40.210 +        }
  40.211 +
  40.212 +        // search superclass
  40.213 +        Type superclass = tsym.getSuperclass();
  40.214 +        if (superclass.tsym != null) {
  40.215 +            VarSymbol vsym = searchField((ClassSymbol) superclass.tsym, fieldName, searched);
  40.216 +            if (vsym != null) {
  40.217 +                return vsym;
  40.218 +            }
  40.219 +        }
  40.220 +
  40.221 +        // search interfaces
  40.222 +        List<Type> intfs = tsym.getInterfaces();
  40.223 +        for (List<Type> l = intfs; l.nonEmpty(); l = l.tail) {
  40.224 +            Type intf = l.head;
  40.225 +            if (intf.isErroneous()) continue;
  40.226 +            VarSymbol vsym = searchField((ClassSymbol) intf.tsym, fieldName, searched);
  40.227 +            if (vsym != null) {
  40.228 +                return vsym;
  40.229 +            }
  40.230 +        }
  40.231 +
  40.232 +        return null;
  40.233 +    }
  40.234 +
  40.235 +    /** @see com.sun.tools.javadoc.ClassDocImpl#findConstructor */
  40.236 +    MethodSymbol findConstructor(ClassSymbol tsym, List<Type> paramTypes) {
  40.237 +        for (com.sun.tools.javac.code.Scope.Entry e = tsym.members().lookup(names.init);
  40.238 +                e.scope != null; e = e.next()) {
  40.239 +            if (e.sym.kind == Kinds.MTH) {
  40.240 +                if (hasParameterTypes((MethodSymbol) e.sym, paramTypes)) {
  40.241 +                    return (MethodSymbol) e.sym;
  40.242 +                }
  40.243 +            }
  40.244 +        }
  40.245 +        return null;
  40.246 +    }
  40.247 +
  40.248 +    /** @see com.sun.tools.javadoc.ClassDocImpl#findMethod */
  40.249 +    private MethodSymbol findMethod(ClassSymbol tsym, Name methodName, List<Type> paramTypes) {
  40.250 +        return searchMethod(tsym, methodName, paramTypes, new HashSet<ClassSymbol>());
  40.251 +    }
  40.252 +
  40.253 +    /** @see com.sun.tools.javadoc.ClassDocImpl#searchMethod */
  40.254 +    private MethodSymbol searchMethod(ClassSymbol tsym, Name methodName,
  40.255 +                                       List<Type> paramTypes, Set<ClassSymbol> searched) {
  40.256 +        //### Note that this search is not necessarily what the compiler would do!
  40.257 +
  40.258 +        // do not match constructors
  40.259 +        if (methodName == names.init)
  40.260 +            return null;
  40.261 +
  40.262 +        if (searched.contains(tsym))
  40.263 +            return null;
  40.264 +        searched.add(tsym);
  40.265 +
  40.266 +        // search current class
  40.267 +        com.sun.tools.javac.code.Scope.Entry e = tsym.members().lookup(methodName);
  40.268 +
  40.269 +        //### Using modifier filter here isn't really correct,
  40.270 +        //### but emulates the old behavior.  Instead, we should
  40.271 +        //### apply the normal rules of visibility and inheritance.
  40.272 +
  40.273 +        if (paramTypes == null) {
  40.274 +            // If no parameters specified, we are allowed to return
  40.275 +            // any method with a matching name.  In practice, the old
  40.276 +            // code returned the first method, which is now the last!
  40.277 +            // In order to provide textually identical results, we
  40.278 +            // attempt to emulate the old behavior.
  40.279 +            MethodSymbol lastFound = null;
  40.280 +            for (; e.scope != null; e = e.next()) {
  40.281 +                if (e.sym.kind == Kinds.MTH) {
  40.282 +                    if (e.sym.name == methodName) {
  40.283 +                        lastFound = (MethodSymbol)e.sym;
  40.284 +                    }
  40.285 +                }
  40.286 +            }
  40.287 +            if (lastFound != null) {
  40.288 +                return lastFound;
  40.289 +            }
  40.290 +        } else {
  40.291 +            for (; e.scope != null; e = e.next()) {
  40.292 +                if (e.sym != null &&
  40.293 +                    e.sym.kind == Kinds.MTH) {
  40.294 +                    if (hasParameterTypes((MethodSymbol) e.sym, paramTypes)) {
  40.295 +                        return (MethodSymbol) e.sym;
  40.296 +                    }
  40.297 +                }
  40.298 +            }
  40.299 +        }
  40.300 +
  40.301 +        //### If we found a MethodSymbol above, but which did not pass
  40.302 +        //### the modifier filter, we should return failure here!
  40.303 +
  40.304 +        // search superclass
  40.305 +        Type superclass = tsym.getSuperclass();
  40.306 +        if (superclass.tsym != null) {
  40.307 +            MethodSymbol msym = searchMethod((ClassSymbol) superclass.tsym, methodName, paramTypes, searched);
  40.308 +            if (msym != null) {
  40.309 +                return msym;
  40.310 +            }
  40.311 +        }
  40.312 +
  40.313 +        // search interfaces
  40.314 +        List<Type> intfs = tsym.getInterfaces();
  40.315 +        for (List<Type> l = intfs; l.nonEmpty(); l = l.tail) {
  40.316 +            Type intf = l.head;
  40.317 +            if (intf.isErroneous()) continue;
  40.318 +            MethodSymbol msym = searchMethod((ClassSymbol) intf.tsym, methodName, paramTypes, searched);
  40.319 +            if (msym != null) {
  40.320 +                return msym;
  40.321 +            }
  40.322 +        }
  40.323 +
  40.324 +        // search enclosing class
  40.325 +        ClassSymbol encl = tsym.owner.enclClass();
  40.326 +        if (encl != null) {
  40.327 +            MethodSymbol msym = searchMethod(encl, methodName, paramTypes, searched);
  40.328 +            if (msym != null) {
  40.329 +                return msym;
  40.330 +            }
  40.331 +        }
  40.332 +
  40.333 +        return null;
  40.334 +    }
  40.335 +
  40.336 +    /** @see com.sun.tools.javadoc.ClassDocImpl */
  40.337 +    private boolean hasParameterTypes(MethodSymbol method, List<Type> paramTypes) {
  40.338 +        if (paramTypes == null)
  40.339 +            return true;
  40.340 +
  40.341 +        if (method.params().size() != paramTypes.size())
  40.342 +            return false;
  40.343 +
  40.344 +        List<Type> methodParamTypes = types.erasureRecursive(method.asType()).getParameterTypes();
  40.345 +
  40.346 +        return (Type.isErroneous(paramTypes))
  40.347 +            ? fuzzyMatch(paramTypes, methodParamTypes)
  40.348 +            : types.isSameTypes(paramTypes, methodParamTypes);
  40.349 +    }
  40.350 +
  40.351 +    boolean fuzzyMatch(List<Type> paramTypes, List<Type> methodParamTypes) {
  40.352 +        List<Type> l1 = paramTypes;
  40.353 +        List<Type> l2 = methodParamTypes;
  40.354 +        while (l1.nonEmpty()) {
  40.355 +            if (!fuzzyMatch(l1.head, l2.head))
  40.356 +                return false;
  40.357 +            l1 = l1.tail;
  40.358 +            l2 = l2.tail;
  40.359 +        }
  40.360 +        return true;
  40.361 +    }
  40.362 +
  40.363 +    boolean fuzzyMatch(Type paramType, Type methodParamType) {
  40.364 +        Boolean b = fuzzyMatcher.visit(paramType, methodParamType);
  40.365 +        return (b == Boolean.TRUE);
  40.366 +    }
  40.367 +
  40.368 +    TypeRelation fuzzyMatcher = new TypeRelation() {
  40.369 +        @Override
  40.370 +        public Boolean visitType(Type t, Type s) {
  40.371 +            if (t == s)
  40.372 +                return true;
  40.373 +
  40.374 +            if (s.isPartial())
  40.375 +                return visit(s, t);
  40.376 +
  40.377 +            switch (t.getTag()) {
  40.378 +            case BYTE: case CHAR: case SHORT: case INT: case LONG: case FLOAT:
  40.379 +            case DOUBLE: case BOOLEAN: case VOID: case BOT: case NONE:
  40.380 +                return t.getTag() == s.getTag();
  40.381 +
  40.382 +            default:
  40.383 +                throw new AssertionError("fuzzyMatcher " + t.getTag());
  40.384 +            }
  40.385 +        }
  40.386 +
  40.387 +        @Override
  40.388 +        public Boolean visitArrayType(ArrayType t, Type s) {
  40.389 +            if (t == s)
  40.390 +                return true;
  40.391 +
  40.392 +            if (s.isPartial())
  40.393 +                return visit(s, t);
  40.394 +
  40.395 +            return s.getTag() == ARRAY
  40.396 +                && visit(t.elemtype, types.elemtype(s));
  40.397 +        }
  40.398 +
  40.399 +        @Override
  40.400 +        public Boolean visitClassType(ClassType t, Type s) {
  40.401 +            if (t == s)
  40.402 +                return true;
  40.403 +
  40.404 +            if (s.isPartial())
  40.405 +                return visit(s, t);
  40.406 +
  40.407 +            return t.tsym == s.tsym;
  40.408 +        }
  40.409 +
  40.410 +        @Override
  40.411 +        public Boolean visitErrorType(ErrorType t, Type s) {
  40.412 +            return s.getTag() == CLASS
  40.413 +                    && t.tsym.name == ((ClassType) s).tsym.name;
  40.414 +        }
  40.415 +    };
  40.416 +
  40.417      public TypeMirror getTypeMirror(TreePath path) {
  40.418          Tree t = path.getLeaf();
  40.419          return ((JCTree)t).type;
  40.420 @@ -250,6 +593,18 @@
  40.421          return null;
  40.422      }
  40.423  
  40.424 +    public DocCommentTree getDocCommentTree(TreePath path) {
  40.425 +        CompilationUnitTree t = path.getCompilationUnit();
  40.426 +        Tree leaf = path.getLeaf();
  40.427 +        if (t instanceof JCTree.JCCompilationUnit && leaf instanceof JCTree) {
  40.428 +            JCCompilationUnit cu = (JCCompilationUnit) t;
  40.429 +            if (cu.docComments != null) {
  40.430 +                return cu.docComments.getCommentTree((JCTree) leaf);
  40.431 +            }
  40.432 +        }
  40.433 +        return null;
  40.434 +    }
  40.435 +
  40.436      public boolean isAccessible(Scope scope, TypeElement type) {
  40.437          if (scope instanceof JavacScope && type instanceof ClassSymbol) {
  40.438              Env<AttrContext> env = ((JavacScope) scope).env;
  40.439 @@ -418,14 +773,27 @@
  40.440      public void printMessage(Diagnostic.Kind kind, CharSequence msg,
  40.441              com.sun.source.tree.Tree t,
  40.442              com.sun.source.tree.CompilationUnitTree root) {
  40.443 +        printMessage(kind, msg, ((JCTree) t).pos(), root);
  40.444 +    }
  40.445 +
  40.446 +    public void printMessage(Diagnostic.Kind kind, CharSequence msg,
  40.447 +            com.sun.source.doctree.DocTree t,
  40.448 +            com.sun.source.doctree.DocCommentTree c,
  40.449 +            com.sun.source.tree.CompilationUnitTree root) {
  40.450 +        printMessage(kind, msg, ((DCTree) t).pos((DCDocComment) c), root);
  40.451 +    }
  40.452 +
  40.453 +    private void printMessage(Diagnostic.Kind kind, CharSequence msg,
  40.454 +            JCDiagnostic.DiagnosticPosition pos,
  40.455 +            com.sun.source.tree.CompilationUnitTree root) {
  40.456          JavaFileObject oldSource = null;
  40.457          JavaFileObject newSource = null;
  40.458 -        JCDiagnostic.DiagnosticPosition pos = null;
  40.459  
  40.460          newSource = root.getSourceFile();
  40.461 -        if (newSource != null) {
  40.462 +        if (newSource == null) {
  40.463 +            pos = null;
  40.464 +        } else {
  40.465              oldSource = log.useSource(newSource);
  40.466 -            pos = ((JCTree) t).pos();
  40.467          }
  40.468  
  40.469          try {

    41.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Nov 14 16:41:51 2012 -0800
    41.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Nov 14 17:23:10 2012 -0800
    41.3 @@ -616,13 +616,13 @@
    41.4      /** Derived visitor method: attribute an expression tree with
    41.5       *  no constraints on the computed type.
    41.6       */
    41.7 -    Type attribExpr(JCTree tree, Env<AttrContext> env) {
    41.8 +    public Type attribExpr(JCTree tree, Env<AttrContext> env) {
    41.9          return attribTree(tree, env, unknownExprInfo);
   41.10      }
   41.11  
   41.12      /** Derived visitor method: attribute a type tree.
   41.13       */
   41.14 -    Type attribType(JCTree tree, Env<AttrContext> env) {
   41.15 +    public Type attribType(JCTree tree, Env<AttrContext> env) {
   41.16          Type result = attribType(tree, env, Type.noType);
   41.17          return result;
   41.18      }

    42.1 --- a/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Wed Nov 14 16:41:51 2012 -0800
    42.2 +++ b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Wed Nov 14 17:23:10 2012 -0800
    42.3 @@ -109,6 +109,7 @@
    42.4                  pendingResolutionPhase.isVarargsRequired();
    42.5      }
    42.6  
    42.7 +    @Override
    42.8      public String toString() {
    42.9          return "AttrContext[" + scope.toString() + "]";
   42.10      }

    43.1 --- a/src/share/classes/com/sun/tools/javac/comp/Env.java	Wed Nov 14 16:41:51 2012 -0800
    43.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Env.java	Wed Nov 14 17:23:10 2012 -0800
    43.3 @@ -1,5 +1,5 @@
    43.4  /*
    43.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    43.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    43.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.8   *
    43.9   * This code is free software; you can redistribute it and/or modify it
   43.10 @@ -122,6 +122,7 @@
   43.11          return env1;
   43.12      }
   43.13  
   43.14 +    @Override
   43.15      public String toString() {
   43.16          return "Env[" + info + (outer == null ? "" : ",outer=" + outer) + "]";
   43.17      }

    44.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Nov 14 16:41:51 2012 -0800
    44.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Nov 14 17:23:10 2012 -0800
    44.3 @@ -1731,7 +1731,7 @@
    44.4  
    44.5      /** Find an unqualified identifier which matches a specified kind set.
    44.6       *  @param env       The current environment.
    44.7 -     *  @param name      The indentifier's name.
    44.8 +     *  @param name      The identifier's name.
    44.9       *  @param kind      Indicates the possible symbol kinds
   44.10       *                   (a subset of VAL, TYP, PCK).
   44.11       */

    45.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.2 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java	Wed Nov 14 17:23:10 2012 -0800
    45.3 @@ -0,0 +1,1288 @@
    45.4 +/*
    45.5 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    45.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    45.7 + *
    45.8 + * This code is free software; you can redistribute it and/or modify it
    45.9 + * under the terms of the GNU General Public License version 2 only, as
   45.10 + * published by the Free Software Foundation.  Oracle designates this
   45.11 + * particular file as subject to the "Classpath" exception as provided
   45.12 + * by Oracle in the LICENSE file that accompanied this code.
   45.13 + *
   45.14 + * This code is distributed in the hope that it will be useful, but WITHOUT
   45.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   45.16 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   45.17 + * version 2 for more details (a copy is included in the LICENSE file that
   45.18 + * accompanied this code).
   45.19 + *
   45.20 + * You should have received a copy of the GNU General Public License version
   45.21 + * 2 along with this work; if not, write to the Free Software Foundation,
   45.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   45.23 + *
   45.24 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   45.25 + * or visit www.oracle.com if you need additional information or have any
   45.26 + * questions.
   45.27 + */
   45.28 +
   45.29 +package com.sun.tools.javac.parser;
   45.30 +
   45.31 +import com.sun.tools.javac.util.Filter;
   45.32 +import java.text.BreakIterator;
   45.33 +import java.util.Arrays;
   45.34 +import java.util.HashMap;
   45.35 +import java.util.HashSet;
   45.36 +import java.util.LinkedList;
   45.37 +import java.util.Locale;
   45.38 +import java.util.Map;
   45.39 +import java.util.Queue;
   45.40 +import java.util.Set;
   45.41 +
   45.42 +import com.sun.source.doctree.AttributeTree.ValueKind;
   45.43 +import com.sun.tools.javac.parser.DocCommentParser.TagParser.Kind;
   45.44 +import com.sun.tools.javac.parser.Tokens.Comment;
   45.45 +import com.sun.tools.javac.parser.Tokens.TokenKind;
   45.46 +import com.sun.tools.javac.tree.DCTree;
   45.47 +import com.sun.tools.javac.tree.DCTree.DCAttribute;
   45.48 +import com.sun.tools.javac.tree.DCTree.DCDocComment;
   45.49 +import com.sun.tools.javac.tree.DCTree.DCEndElement;
   45.50 +import com.sun.tools.javac.tree.DCTree.DCErroneous;
   45.51 +import com.sun.tools.javac.tree.DCTree.DCIdentifier;
   45.52 +import com.sun.tools.javac.tree.DCTree.DCReference;
   45.53 +import com.sun.tools.javac.tree.DCTree.DCStartElement;
   45.54 +import com.sun.tools.javac.tree.DCTree.DCText;
   45.55 +import com.sun.tools.javac.tree.DocTreeMaker;
   45.56 +import com.sun.tools.javac.tree.JCTree;
   45.57 +import com.sun.tools.javac.util.DiagnosticSource;
   45.58 +import com.sun.tools.javac.util.JCDiagnostic;
   45.59 +import com.sun.tools.javac.util.List;
   45.60 +import com.sun.tools.javac.util.ListBuffer;
   45.61 +import com.sun.tools.javac.util.Log;
   45.62 +import com.sun.tools.javac.util.Name;
   45.63 +import com.sun.tools.javac.util.Names;
   45.64 +import com.sun.tools.javac.util.Options;
   45.65 +import com.sun.tools.javac.util.Position;
   45.66 +import static com.sun.tools.javac.util.LayoutCharacters.*;
   45.67 +
   45.68 +/**
   45.69 + *
   45.70 + *  <p><b>This is NOT part of any supported API.
   45.71 + *  If you write code that depends on this, you do so at your own risk.
   45.72 + *  This code and its internal interfaces are subject to change or
   45.73 + *  deletion without notice.</b>
   45.74 + */
   45.75 +public class DocCommentParser {
   45.76 +    static class ParseException extends Exception {
   45.77 +        private static final long serialVersionUID = 0;
   45.78 +        ParseException(String key) {
   45.79 +            super(key);
   45.80 +        }
   45.81 +    }
   45.82 +
   45.83 +    final ParserFactory fac;
   45.84 +    final DiagnosticSource diagSource;
   45.85 +    final Comment comment;
   45.86 +    final DocTreeMaker m;
   45.87 +    final Names names;
   45.88 +
   45.89 +    BreakIterator sentenceBreaker;
   45.90 +
   45.91 +    /** The input buffer, index of most recent character read,
   45.92 +     *  index of one past last character in buffer.
   45.93 +     */
   45.94 +    protected char[] buf;
   45.95 +    protected int bp;
   45.96 +    protected int buflen;
   45.97 +
   45.98 +    /** The current character.
   45.99 +     */
  45.100 +    protected char ch;
  45.101 +
  45.102 +    int textStart = -1;
  45.103 +    int lastNonWhite = -1;
  45.104 +    boolean newline = true;
  45.105 +
  45.106 +    Map<Name, TagParser> tagParsers;
  45.107 +
  45.108 +    DocCommentParser(ParserFactory fac, DiagnosticSource diagSource, Comment comment) {
  45.109 +        this.fac = fac;
  45.110 +        this.diagSource = diagSource;
  45.111 +        this.comment = comment;
  45.112 +        names = fac.names;
  45.113 +        m = fac.docTreeMaker;
  45.114 +
  45.115 +        Locale locale = (fac.locale == null) ? Locale.getDefault() : fac.locale;
  45.116 +
  45.117 +        Options options = fac.options;
  45.118 +        boolean useBreakIterator = options.isSet("breakIterator");
  45.119 +        if (useBreakIterator || !locale.getLanguage().equals(Locale.ENGLISH.getLanguage()))
  45.120 +            sentenceBreaker = BreakIterator.getSentenceInstance(locale);
  45.121 +
  45.122 +        initTagParsers();
  45.123 +    }
  45.124 +
  45.125 +    DCDocComment parse() {
  45.126 +        String c = comment.getText();
  45.127 +        buf = new char[c.length() + 1];
  45.128 +        c.getChars(0, c.length(), buf, 0);
  45.129 +        buf[buf.length - 1] = EOI;
  45.130 +        buflen = buf.length - 1;
  45.131 +        bp = -1;
  45.132 +        nextChar();
  45.133 +
  45.134 +        List<DCTree> body = blockContent();
  45.135 +        List<DCTree> tags = blockTags();
  45.136 +
  45.137 +        // split body into first sentence and body
  45.138 +        ListBuffer<DCTree> fs = new ListBuffer<DCTree>();
  45.139 +        loop:
  45.140 +        for (; body.nonEmpty(); body = body.tail) {
  45.141 +            DCTree t = body.head;
  45.142 +            switch (t.getKind()) {
  45.143 +                case TEXT:
  45.144 +                    String s = ((DCText) t).getBody();
  45.145 +                    int i = getSentenceBreak(s);
  45.146 +                    if (i > 0) {
  45.147 +                        int i0 = i;
  45.148 +                        while (i0 > 0 && isWhitespace(s.charAt(i0 - 1)))
  45.149 +                            i0--;
  45.150 +                        fs.add(m.at(t.pos).Text(s.substring(0, i0)));
  45.151 +                        int i1 = i;
  45.152 +                        while (i1 < s.length() && isWhitespace(s.charAt(i1)))
  45.153 +                            i1++;
  45.154 +                        body = body.tail;
  45.155 +                        if (i1 < s.length())
  45.156 +                            body = body.prepend(m.at(t.pos + i1).Text(s.substring(i1)));
  45.157 +                        break loop;
  45.158 +                    } else if (body.tail.nonEmpty()) {
  45.159 +                        if (isSentenceBreak(body.tail.head)) {
  45.160 +                            int i0 = s.length() - 1;
  45.161 +                            while (i0 > 0 && isWhitespace(s.charAt(i0)))
  45.162 +                                i0--;
  45.163 +                            fs.add(m.at(t.pos).Text(s.substring(0, i0 + 1)));
  45.164 +                            body = body.tail;
  45.165 +                            break loop;
  45.166 +                        }
  45.167 +                    }
  45.168 +                    break;
  45.169 +
  45.170 +                case START_ELEMENT:
  45.171 +                case END_ELEMENT:
  45.172 +                    if (isSentenceBreak(t))
  45.173 +                        break loop;
  45.174 +                    break;
  45.175 +            }
  45.176 +            fs.add(t);
  45.177 +        }
  45.178 +
  45.179 +        @SuppressWarnings("unchecked")
  45.180 +        DCTree first = getFirst(fs.toList(), body, tags);
  45.181 +        int pos = (first == null) ? Position.NOPOS : first.pos;
  45.182 +
  45.183 +        DCDocComment dc = m.at(pos).DocComment(comment, fs.toList(), body, tags);
  45.184 +        return dc;
  45.185 +    }
  45.186 +
  45.187 +    void nextChar() {
  45.188 +        ch = buf[bp < buflen ? ++bp : buflen];
  45.189 +        switch (ch) {
  45.190 +            case '\f': case '\n': case '\r':
  45.191 +                newline = true;
  45.192 +        }
  45.193 +    }
  45.194 +
  45.195 +    /**
  45.196 +     * Read block content, consisting of text, html and inline tags.
  45.197 +     * Terminated by the end of input, or the beginning of the next block tag:
  45.198 +     * i.e. @ as the first non-whitespace character on a line.
  45.199 +     */
  45.200 +    @SuppressWarnings("fallthrough")
  45.201 +    protected List<DCTree> blockContent() {
  45.202 +        ListBuffer<DCTree> trees = new ListBuffer<DCTree>();
  45.203 +        textStart = -1;
  45.204 +
  45.205 +        loop:
  45.206 +        while (bp < buflen) {
  45.207 +            switch (ch) {
  45.208 +                case '\n': case '\r': case '\f':
  45.209 +                    newline = true;
  45.210 +                    // fallthrough
  45.211 +
  45.212 +                case ' ': case '\t':
  45.213 +                    nextChar();
  45.214 +                    break;
  45.215 +
  45.216 +                case '&':
  45.217 +                    entity(trees);
  45.218 +                    break;
  45.219 +
  45.220 +                case '<':
  45.221 +                    newline = false;
  45.222 +                    addPendingText(trees, bp - 1);
  45.223 +                    trees.add(html());
  45.224 +                    if (textStart == -1) {
  45.225 +                        textStart = bp;
  45.226 +                        lastNonWhite = -1;
  45.227 +                    }
  45.228 +                    break;
  45.229 +
  45.230 +                case '>':
  45.231 +                    newline = false;
  45.232 +                    addPendingText(trees, bp - 1);
  45.233 +                    trees.add(m.at(bp).Erroneous(newString(bp, bp+1), diagSource, "dc.bad.gt"));
  45.234 +                    nextChar();
  45.235 +                    if (textStart == -1) {
  45.236 +                        textStart = bp;
  45.237 +                        lastNonWhite = -1;
  45.238 +                    }
  45.239 +                    break;
  45.240 +
  45.241 +                case '{':
  45.242 +                    inlineTag(trees);
  45.243 +                    break;
  45.244 +
  45.245 +                case '@':
  45.246 +                    if (newline) {
  45.247 +                        addPendingText(trees, lastNonWhite);
  45.248 +                        break loop;
  45.249 +                    }
  45.250 +                    // fallthrough
  45.251 +
  45.252 +                default:
  45.253 +                    newline = false;
  45.254 +                    if (textStart == -1)
  45.255 +                        textStart = bp;
  45.256 +                    lastNonWhite = bp;
  45.257 +                    nextChar();
  45.258 +            }
  45.259 +        }
  45.260 +
  45.261 +        if (lastNonWhite != -1)
  45.262 +            addPendingText(trees, lastNonWhite);
  45.263 +
  45.264 +        return trees.toList();
  45.265 +    }
  45.266 +
  45.267 +    /**
  45.268 +     * Read a series of block tags, including their content.
  45.269 +     * Standard tags parse their content appropriately.
  45.270 +     * Non-standard tags are represented by {@link UnknownBlockTag}.
  45.271 +     */
  45.272 +    protected List<DCTree> blockTags() {
  45.273 +        ListBuffer<DCTree> tags = new ListBuffer<DCTree>();
  45.274 +        while (ch == '@')
  45.275 +            tags.add(blockTag());
  45.276 +        return tags.toList();
  45.277 +    }
  45.278 +
  45.279 +    /**
  45.280 +     * Read a single block tag, including its content.
  45.281 +     * Standard tags parse their content appropriately.
  45.282 +     * Non-standard tags are represented by {@link UnknownBlockTag}.
  45.283 +     */
  45.284 +    protected DCTree blockTag() {
  45.285 +        int p = bp;
  45.286 +        try {
  45.287 +            nextChar();
  45.288 +            if (isIdentifierStart(ch)) {
  45.289 +                int namePos = bp;
  45.290 +                nextChar();
  45.291 +                while (isIdentifierPart(ch))
  45.292 +                    nextChar();
  45.293 +                int nameLen = bp - namePos;
  45.294 +
  45.295 +                Name name = names.fromChars(buf, namePos, nameLen);
  45.296 +                TagParser tp = tagParsers.get(name);
  45.297 +                if (tp == null) {
  45.298 +                    List<DCTree> content = blockContent();
  45.299 +                    return m.at(p).UnknownBlockTag(name, content);
  45.300 +                } else {
  45.301 +                    switch (tp.getKind()) {
  45.302 +                        case BLOCK:
  45.303 +                            return tp.parse(p);
  45.304 +                        case INLINE:
  45.305 +                            return erroneous("dc.bad.inline.tag", p);
  45.306 +                    }
  45.307 +                }
  45.308 +            }
  45.309 +            blockContent();
  45.310 +
  45.311 +            return erroneous("dc.no.tag.name", p);
  45.312 +        } catch (ParseException e) {
  45.313 +            blockContent();
  45.314 +            return erroneous(e.getMessage(), p);
  45.315 +        }
  45.316 +    }
  45.317 +
  45.318 +    protected void inlineTag(ListBuffer<DCTree> list) {
  45.319 +        newline = false;
  45.320 +        nextChar();
  45.321 +        if (ch == '@') {
  45.322 +            addPendingText(list, bp - 2);
  45.323 +            list.add(inlineTag());
  45.324 +            textStart = bp;
  45.325 +            lastNonWhite = -1;
  45.326 +        } else {
  45.327 +            if (textStart == -1)
  45.328 +                textStart = bp - 1;
  45.329 +            lastNonWhite = bp;
  45.330 +        }
  45.331 +    }
  45.332 +
  45.333 +    /**
  45.334 +     * Read a single inline tag, including its content.
  45.335 +     * Standard tags parse their content appropriately.
  45.336 +     * Non-standard tags are represented by {@link UnknownBlockTag}.
  45.337 +     * Malformed tags may be returned as {@link Erroneous}.
  45.338 +     */
  45.339 +    protected DCTree inlineTag() {
  45.340 +        int p = bp - 1;
  45.341 +        try {
  45.342 +            nextChar();
  45.343 +            if (isIdentifierStart(ch)) {
  45.344 +                int namePos = bp;
  45.345 +                nextChar();
  45.346 +                while (isIdentifierPart(ch))
  45.347 +                    nextChar();
  45.348 +                int nameLen = bp - namePos;
  45.349 +                skipWhitespace();
  45.350 +
  45.351 +                Name name = names.fromChars(buf, namePos, nameLen);
  45.352 +                TagParser tp = tagParsers.get(name);
  45.353 +                if (tp == null) {
  45.354 +                    DCTree text = inlineText();
  45.355 +                    if (text != null) {
  45.356 +                        nextChar();
  45.357 +                        return m.at(p).UnknownInlineTag(name, List.of(text));
  45.358 +                    }
  45.359 +                } else if (tp.getKind() == TagParser.Kind.INLINE) {
  45.360 +                    DCTree tree =  tp.parse(p);
  45.361 +                    if (tree != null) {
  45.362 +                        return tree;
  45.363 +                    }
  45.364 +                } else {
  45.365 +                    inlineText(); // skip content
  45.366 +                    nextChar();
  45.367 +                }
  45.368 +            }
  45.369 +            return erroneous("dc.no.tag.name", p);
  45.370 +        } catch (ParseException e) {
  45.371 +            return erroneous(e.getMessage(), p);
  45.372 +        }
  45.373 +    }
  45.374 +
  45.375 +    /**
  45.376 +     * Read plain text content of an inline tag.
  45.377 +     * Matching pairs of { } are skipped; the text is terminated by the first
  45.378 +     * unmatched }. It is an error if the beginning of the next tag is detected.
  45.379 +     */
  45.380 +    protected DCTree inlineText() throws ParseException {
  45.381 +        skipWhitespace();
  45.382 +        int pos = bp;
  45.383 +        int depth = 1;
  45.384 +
  45.385 +        loop:
  45.386 +        while (bp < buflen) {
  45.387 +            switch (ch) {
  45.388 +                case '\n': case '\r': case '\f':
  45.389 +                    newline = true;
  45.390 +                    break;
  45.391 +
  45.392 +                case ' ': case '\t':
  45.393 +                    break;
  45.394 +
  45.395 +                case '{':
  45.396 +                    newline = false;
  45.397 +                    lastNonWhite = bp;
  45.398 +                    depth++;
  45.399 +                    break;
  45.400 +
  45.401 +                case '}':
  45.402 +                    if (--depth == 0) {
  45.403 +                        return m.at(pos).Text(newString(pos, bp));
  45.404 +                    }
  45.405 +                    newline = false;
  45.406 +                    lastNonWhite = bp;
  45.407 +                    break;
  45.408 +
  45.409 +                case '@':
  45.410 +                    if (newline)
  45.411 +                        break loop;
  45.412 +                    newline = false;
  45.413 +                    lastNonWhite = bp;
  45.414 +                    break;
  45.415 +
  45.416 +                default:
  45.417 +                    newline = false;
  45.418 +                    lastNonWhite = bp;
  45.419 +                    break;
  45.420 +            }
  45.421 +            nextChar();
  45.422 +        }
  45.423 +        throw new ParseException("dc.unterminated.inline.tag");
  45.424 +    }
  45.425 +
  45.426 +    /**
  45.427 +     * Read Java class name, possibly followed by member
  45.428 +     * Matching pairs of < > are skipped. The text is terminated by the first
  45.429 +     * unmatched }. It is an error if the beginning of the next tag is detected.
  45.430 +     */
  45.431 +    // TODO: boolean allowMember should be enum FORBID, ALLOW, REQUIRE
  45.432 +    // TODO: improve quality of parse to forbid bad constructions.
  45.433 +    @SuppressWarnings("fallthrough")
  45.434 +    protected DCReference reference(boolean allowMember) throws ParseException {
  45.435 +        int pos = bp;
  45.436 +        int depth = 0;
  45.437 +
  45.438 +        // scan to find the end of the signature, by looking for the first
  45.439 +        // whitespace not enclosed in () or <>, or the end of the tag
  45.440 +        loop:
  45.441 +        while (bp < buflen) {
  45.442 +            switch (ch) {
  45.443 +                case '\n': case '\r': case '\f':
  45.444 +                    newline = true;
  45.445 +                    // fallthrough
  45.446 +
  45.447 +                case ' ': case '\t':
  45.448 +                    if (depth == 0)
  45.449 +                        break loop;
  45.450 +                    break;
  45.451 +
  45.452 +                case '(':
  45.453 +                case '<':
  45.454 +                    newline = false;
  45.455 +                    depth++;
  45.456 +                    break;
  45.457 +
  45.458 +                case ')':
  45.459 +                case '>':
  45.460 +                    newline = false;
  45.461 +                    --depth;
  45.462 +                    break;
  45.463 +
  45.464 +                case '}':
  45.465 +                    if (bp == pos)
  45.466 +                        return null;
  45.467 +                    newline = false;
  45.468 +                    break loop;
  45.469 +
  45.470 +                case '@':
  45.471 +                    if (newline)
  45.472 +                        break loop;
  45.473 +                    // fallthrough
  45.474 +
  45.475 +                default:
  45.476 +                    newline = false;
  45.477 +
  45.478 +            }
  45.479 +            nextChar();
  45.480 +        }
  45.481 +
  45.482 +        if (depth != 0)
  45.483 +            throw new ParseException("dc.unterminated.signature");
  45.484 +
  45.485 +        String sig = newString(pos, bp);
  45.486 +
  45.487 +        // Break sig apart into qualifiedExpr member paramTypes.
  45.488 +        JCTree qualExpr;
  45.489 +        Name member;
  45.490 +        List<JCTree> paramTypes;
  45.491 +
  45.492 +        Log.DeferredDiagnosticHandler deferredDiagnosticHandler
  45.493 +                = new Log.DeferredDiagnosticHandler(fac.log);
  45.494 +
  45.495 +        try {
  45.496 +            int hash = sig.indexOf("#");
  45.497 +            int lparen = sig.indexOf("(", hash + 1);
  45.498 +            if (hash == -1) {
  45.499 +                if (lparen == -1) {
  45.500 +                    qualExpr = parseType(sig);
  45.501 +                    member = null;
  45.502 +                } else {
  45.503 +                    qualExpr = null;
  45.504 +                    member = parseMember(sig.substring(0, lparen));
  45.505 +                }
  45.506 +            } else {
  45.507 +                qualExpr = (hash == 0) ? null : parseType(sig.substring(0, hash));
  45.508 +                if (lparen == -1)
  45.509 +                    member = parseMember(sig.substring(hash + 1));
  45.510 +                else
  45.511 +                    member = parseMember(sig.substring(hash + 1, lparen));
  45.512 +            }
  45.513 +
  45.514 +            if (lparen < 0) {
  45.515 +                paramTypes = null;
  45.516 +            } else {
  45.517 +                int rparen = sig.indexOf(")", lparen);
  45.518 +                if (rparen != sig.length() - 1)
  45.519 +                    throw new ParseException("dc.ref.bad.parens");
  45.520 +                paramTypes = parseParams(sig.substring(lparen + 1, rparen));
  45.521 +            }
  45.522 +
  45.523 +            if (!deferredDiagnosticHandler.getDiagnostics().isEmpty())
  45.524 +                throw new ParseException("dc.ref.syntax.error");
  45.525 +
  45.526 +        } finally {
  45.527 +            fac.log.popDiagnosticHandler(deferredDiagnosticHandler);
  45.528 +        }
  45.529 +
  45.530 +        return m.at(pos).Reference(sig, qualExpr, member, paramTypes);
  45.531 +    }
  45.532 +
  45.533 +    JCTree parseType(String s) throws ParseException {
  45.534 +        JavacParser p = fac.newParser(s, false, false, false);
  45.535 +        JCTree tree = p.parseType();
  45.536 +        if (p.token().kind != TokenKind.EOF)
  45.537 +            throw new ParseException("dc.ref.unexpected.input");
  45.538 +        return tree;
  45.539 +    }
  45.540 +
  45.541 +    Name parseMember(String s) throws ParseException {
  45.542 +        JavacParser p = fac.newParser(s, false, false, false);
  45.543 +        Name name = p.ident();
  45.544 +        if (p.token().kind != TokenKind.EOF)
  45.545 +            throw new ParseException("dc.ref.unexpected.input");
  45.546 +        return name;
  45.547 +    }
  45.548 +
  45.549 +    List<JCTree> parseParams(String s) throws ParseException {
  45.550 +        if (s.trim().isEmpty())
  45.551 +            return List.nil();
  45.552 +
  45.553 +        JavacParser p = fac.newParser(s.replace("...", "[]"), false, false, false);
  45.554 +        ListBuffer<JCTree> paramTypes = new ListBuffer<JCTree>();
  45.555 +        paramTypes.add(p.parseType());
  45.556 +
  45.557 +        if (p.token().kind == TokenKind.IDENTIFIER)
  45.558 +            p.nextToken();
  45.559 +
  45.560 +        while (p.token().kind == TokenKind.COMMA) {
  45.561 +            p.nextToken();
  45.562 +            paramTypes.add(p.parseType());
  45.563 +
  45.564 +            if (p.token().kind == TokenKind.IDENTIFIER)
  45.565 +                p.nextToken();
  45.566 +        }
  45.567 +
  45.568 +        if (p.token().kind != TokenKind.EOF)
  45.569 +            throw new ParseException("dc.ref.unexpected.input");
  45.570 +
  45.571 +        return paramTypes.toList();
  45.572 +    }
  45.573 +
  45.574 +    /**
  45.575 +     * Read Java identifier
  45.576 +     * Matching pairs of { } are skipped; the text is terminated by the first
  45.577 +     * unmatched }. It is an error if the beginning of the next tag is detected.
  45.578 +     */
  45.579 +    @SuppressWarnings("fallthrough")
  45.580 +    protected DCIdentifier identifier() throws ParseException {
  45.581 +        skipWhitespace();
  45.582 +        int pos = bp;
  45.583 +
  45.584 +        if (isJavaIdentifierStart(ch)) {
  45.585 +            nextChar();
  45.586 +            while (isJavaIdentifierPart(ch))
  45.587 +                nextChar();
  45.588 +            return m.at(pos).Identifier(names.fromChars(buf, pos, bp - pos));
  45.589 +        }
  45.590 +
  45.591 +        throw new ParseException("dc.identifier.expected");
  45.592 +    }
  45.593 +
  45.594 +    /**
  45.595 +     * Read a quoted string.
  45.596 +     * It is an error if the beginning of the next tag is detected.
  45.597 +     */
  45.598 +    @SuppressWarnings("fallthrough")
  45.599 +    protected DCText quotedString() {
  45.600 +        int pos = bp;
  45.601 +        nextChar();
  45.602 +
  45.603 +        loop:
  45.604 +        while (bp < buflen) {
  45.605 +            switch (ch) {
  45.606 +                case '\n': case '\r': case '\f':
  45.607 +                    newline = true;
  45.608 +                    break;
  45.609 +
  45.610 +                case ' ': case '\t':
  45.611 +                    break;
  45.612 +
  45.613 +                case '"':
  45.614 +                    nextChar();
  45.615 +                    // trim trailing white-space?
  45.616 +                    return m.at(pos).Text(newString(pos, bp));
  45.617 +
  45.618 +                case '@':
  45.619 +                    if (newline)
  45.620 +                        break loop;
  45.621 +
  45.622 +            }
  45.623 +            nextChar();
  45.624 +        }
  45.625 +        return null;
  45.626 +    }
  45.627 +
  45.628 +    /**
  45.629 +     * Read general text content of an inline tag, including HTML entities and elements.
  45.630 +     * Matching pairs of { } are skipped; the text is terminated by the first
  45.631 +     * unmatched }. It is an error if the beginning of the next tag is detected.
  45.632 +     */
  45.633 +    @SuppressWarnings("fallthrough")
  45.634 +    protected List<DCTree> inlineContent() {
  45.635 +        ListBuffer<DCTree> trees = new ListBuffer<DCTree>();
  45.636 +
  45.637 +        skipWhitespace();
  45.638 +        int pos = bp;
  45.639 +        int depth = 1;
  45.640 +        textStart = -1;
  45.641 +
  45.642 +        loop:
  45.643 +        while (bp < buflen) {
  45.644 +
  45.645 +            switch (ch) {
  45.646 +                case '\n': case '\r': case '\f':
  45.647 +                    newline = true;
  45.648 +                    // fall through
  45.649 +
  45.650 +                case ' ': case '\t':
  45.651 +                    nextChar();
  45.652 +                    break;
  45.653 +
  45.654 +                case '&':
  45.655 +                    entity(trees);
  45.656 +                    break;
  45.657 +
  45.658 +                case '<':
  45.659 +                    newline = false;
  45.660 +                    addPendingText(trees, bp - 1);
  45.661 +                    trees.add(html());
  45.662 +                    break;
  45.663 +
  45.664 +                case '{':
  45.665 +                    newline = false;
  45.666 +                    depth++;
  45.667 +                    nextChar();
  45.668 +                    break;
  45.669 +
  45.670 +                case '}':
  45.671 +                    newline = false;
  45.672 +                    if (--depth == 0) {
  45.673 +                        addPendingText(trees, bp - 1);
  45.674 +                        nextChar();
  45.675 +                        return trees.toList();
  45.676 +                    }
  45.677 +                    nextChar();
  45.678 +                    break;
  45.679 +
  45.680 +                case '@':
  45.681 +                    if (newline)
  45.682 +                        break loop;
  45.683 +                    // fallthrough
  45.684 +
  45.685 +                default:
  45.686 +                    if (textStart == -1)
  45.687 +                        textStart = bp;
  45.688 +                    nextChar();
  45.689 +                    break;
  45.690 +            }
  45.691 +        }
  45.692 +
  45.693 +        return List.<DCTree>of(erroneous("dc.unterminated.inline.tag", pos));
  45.694 +    }
  45.695 +
  45.696 +    protected void entity(ListBuffer<DCTree> list) {
  45.697 +        newline = false;
  45.698 +        addPendingText(list, bp - 1);
  45.699 +        list.add(entity());
  45.700 +        if (textStart == -1) {
  45.701 +            textStart = bp;
  45.702 +            lastNonWhite = -1;
  45.703 +        }
  45.704 +    }
  45.705 +
  45.706 +    /**
  45.707 +     * Read an HTML entity.
  45.708 +     * {@literal &identifier; } or {@literal &#digits; } or {@literal &#xhex-digits; }
  45.709 +     */
  45.710 +    protected DCTree entity() {
  45.711 +        int p = bp;
  45.712 +        nextChar();
  45.713 +        int namep = bp;
  45.714 +        boolean checkSemi = false;
  45.715 +        if (ch == '#') {
  45.716 +            nextChar();
  45.717 +            if (isDecimalDigit(ch)) {
  45.718 +                nextChar();
  45.719 +                while (isDecimalDigit(ch))
  45.720 +                    nextChar();
  45.721 +                checkSemi = true;
  45.722 +            } else if (ch == 'x' || ch == 'X') {
  45.723 +                nextChar();
  45.724 +                if (isHexDigit(ch)) {
  45.725 +                    nextChar();
  45.726 +                    while (isHexDigit(ch))
  45.727 +                        nextChar();
  45.728 +                    checkSemi = true;
  45.729 +                }
  45.730 +            }
  45.731 +        } else if (isIdentifierStart(ch)) {
  45.732 +            nextChar();
  45.733 +            while (isIdentifierPart(ch))
  45.734 +                nextChar();
  45.735 +            checkSemi = true;
  45.736 +        }
  45.737 +
  45.738 +        if (checkSemi && ch == ';') {
  45.739 +            nextChar();
  45.740 +            return m.at(p).Entity(names.fromChars(buf, namep, bp - namep - 1));
  45.741 +        } else {
  45.742 +            String code = checkSemi ? "dc.missing.semicolon" : "dc.bad.entity";
  45.743 +            return erroneous(code, p);
  45.744 +        }
  45.745 +    }
  45.746 +
  45.747 +    /**
  45.748 +     * Read the start or end of an HTML tag, or an HTML comment
  45.749 +     * {@literal <identifier attrs> } or {@literal </identifier> }
  45.750 +     */
  45.751 +    protected DCTree html() {
  45.752 +        int p = bp;
  45.753 +        nextChar();
  45.754 +        if (isIdentifierStart(ch)) {
  45.755 +            int namePos = bp;
  45.756 +            nextChar();
  45.757 +            while (isIdentifierPart(ch))
  45.758 +                nextChar();
  45.759 +            int nameLen = bp - namePos;
  45.760 +            List<DCTree> attrs = htmlAttrs();
  45.761 +            if (attrs != null) {
  45.762 +                boolean selfClosing = false;
  45.763 +                if (ch == '/') {
  45.764 +                    nextChar();
  45.765 +                    selfClosing = true;
  45.766 +                }
  45.767 +                if (ch == '>') {
  45.768 +                    nextChar();
  45.769 +                    Name name = names.fromChars(buf, namePos, nameLen);
  45.770 +                    return m.at(p).StartElement(name, attrs, selfClosing);
  45.771 +                }
  45.772 +            }
  45.773 +        } else if (ch == '/') {
  45.774 +            nextChar();
  45.775 +            if (isIdentifierStart(ch)) {
  45.776 +                int namePos = bp;
  45.777 +                nextChar();
  45.778 +                while (isIdentifierPart(ch))
  45.779 +                    nextChar();
  45.780 +                int nameLen = bp - namePos;
  45.781 +                skipWhitespace();
  45.782 +                if (ch == '>') {
  45.783 +                    nextChar();
  45.784 +                    Name name = names.fromChars(buf, namePos, nameLen);
  45.785 +                    return m.at(p).EndElement(name);
  45.786 +                }
  45.787 +            }
  45.788 +        } else if (ch == '!') {
  45.789 +            nextChar();
  45.790 +            if (ch == '-') {
  45.791 +                nextChar();
  45.792 +                if (ch == '-') {
  45.793 +                    nextChar();
  45.794 +                    while (bp < buflen) {
  45.795 +                        int dash = 0;
  45.796 +                        while (ch == '-') {
  45.797 +                            dash++;
  45.798 +                            nextChar();
  45.799 +                        }
  45.800 +                        // strictly speaking, a comment should not contain "--"
  45.801 +                        // so dash > 2 is an error, dash == 2 implies ch == '>'
  45.802 +                        if (dash >= 2 && ch == '>') {
  45.803 +                            nextChar();
  45.804 +                            return m.at(p).Comment(newString(p, bp));
  45.805 +                        }
  45.806 +
  45.807 +                        nextChar();
  45.808 +                    }
  45.809 +                }
  45.810 +            }
  45.811 +        }
  45.812 +
  45.813 +        bp = p + 1;
  45.814 +        ch = buf[bp];
  45.815 +        return erroneous("dc.malformed.html", p);
  45.816 +    }
  45.817 +
  45.818 +    /**
  45.819 +     * Read a series of HTML attributes, terminated by {@literal > }.
  45.820 +     * Each attribute is of the form {@literal identifier[=value] }.
  45.821 +     * "value" may be unquoted, single-quoted, or double-quoted.
  45.822 +     */
  45.823 +    protected List<DCTree> htmlAttrs() {
  45.824 +        ListBuffer<DCTree> attrs = new ListBuffer<DCTree>();
  45.825 +        skipWhitespace();
  45.826 +
  45.827 +        loop:
  45.828 +        while (isIdentifierStart(ch)) {
  45.829 +            int namePos = bp;
  45.830 +            nextChar();
  45.831 +            while (isIdentifierPart(ch))
  45.832 +                nextChar();
  45.833 +            int nameLen = bp - namePos;
  45.834 +            skipWhitespace();
  45.835 +            List<DCTree> value = null;
  45.836 +            ValueKind vkind = ValueKind.EMPTY;
  45.837 +            if (ch == '=') {
  45.838 +                ListBuffer<DCTree> v = new ListBuffer<DCTree>();
  45.839 +                nextChar();
  45.840 +                skipWhitespace();
  45.841 +                if (ch == '\'' || ch == '"') {
  45.842 +                    vkind = (ch == '\'') ? ValueKind.SINGLE : ValueKind.DOUBLE;
  45.843 +                    char quote = ch;
  45.844 +                    nextChar();
  45.845 +                    textStart = bp;
  45.846 +                    while (bp < buflen && ch != quote) {
  45.847 +                        if (newline && ch == '@') {
  45.848 +                            attrs.add(erroneous("dc.unterminated.string", namePos));
  45.849 +                            // No point trying to read more.
  45.850 +                            // In fact, all attrs get discarded by the caller
  45.851 +                            // and superseded by a malformed.html node because
  45.852 +                            // the html tag itself is not terminated correctly.
  45.853 +                            break loop;
  45.854 +                        }
  45.855 +                        attrValueChar(v);
  45.856 +                    }
  45.857 +                    addPendingText(v, bp - 1);
  45.858 +                    nextChar();
  45.859 +                } else {
  45.860 +                    vkind = ValueKind.UNQUOTED;
  45.861 +                    textStart = bp;
  45.862 +                    while (bp < buflen && !isUnquotedAttrValueTerminator(ch)) {
  45.863 +                        attrValueChar(v);
  45.864 +                    }
  45.865 +                    addPendingText(v, bp - 1);
  45.866 +                }
  45.867 +                skipWhitespace();
  45.868 +                value = v.toList();
  45.869 +            }
  45.870 +            Name name = names.fromChars(buf, namePos, nameLen);
  45.871 +            DCAttribute attr = m.at(namePos).Attribute(name, vkind, value);
  45.872 +            attrs.add(attr);
  45.873 +        }
  45.874 +
  45.875 +        return attrs.toList();
  45.876 +    }
  45.877 +
  45.878 +    protected void attrValueChar(ListBuffer<DCTree> list) {
  45.879 +        switch (ch) {
  45.880 +            case '&':
  45.881 +                entity(list);
  45.882 +                break;
  45.883 +
  45.884 +            case '{':
  45.885 +                inlineTag(list);
  45.886 +                break;
  45.887 +
  45.888 +            default:
  45.889 +                nextChar();
  45.890 +        }
  45.891 +    }
  45.892 +
  45.893 +    protected void addPendingText(ListBuffer<DCTree> list, int textEnd) {
  45.894 +        if (textStart != -1 && textStart <= textEnd) {
  45.895 +            list.add(m.at(textStart).Text(newString(textStart, textEnd + 1)));
  45.896 +            textStart = -1;
  45.897 +        }
  45.898 +    }
  45.899 +
  45.900 +    protected DCErroneous erroneous(String code, int pos) {
  45.901 +        int i = bp - 1;
  45.902 +        loop:
  45.903 +        while (i > 0) {
  45.904 +            switch (buf[i]) {
  45.905 +                case '\f': case '\n': case '\r':
  45.906 +                    newline = true;
  45.907 +                    break;
  45.908 +                case '\t': case ' ':
  45.909 +                    break;
  45.910 +                default:
  45.911 +                    break loop;
  45.912 +            }
  45.913 +            i--;
  45.914 +        }
  45.915 +        textStart = -1;
  45.916 +        return m.at(pos).Erroneous(newString(pos, i + 1), diagSource, code);
  45.917 +    }
  45.918 +
  45.919 +    @SuppressWarnings("unchecked")
  45.920 +    <T> T getFirst(List<T>... lists) {
  45.921 +        for (List<T> list: lists) {
  45.922 +            if (list.nonEmpty())
  45.923 +                return list.head;
  45.924 +        }
  45.925 +        return null;
  45.926 +    }
  45.927 +
  45.928 +    protected boolean isIdentifierStart(char ch) {
  45.929 +        return Character.isUnicodeIdentifierStart(ch);
  45.930 +    }
  45.931 +
  45.932 +    protected boolean isIdentifierPart(char ch) {
  45.933 +        return Character.isUnicodeIdentifierPart(ch);
  45.934 +    }
  45.935 +
  45.936 +    protected boolean isJavaIdentifierStart(char ch) {
  45.937 +        return Character.isJavaIdentifierStart(ch);
  45.938 +    }
  45.939 +
  45.940 +    protected boolean isJavaIdentifierPart(char ch) {
  45.941 +        return Character.isJavaIdentifierPart(ch);
  45.942 +    }
  45.943 +
  45.944 +    protected boolean isDecimalDigit(char ch) {
  45.945 +        return ('0' <= ch && ch <= '9');
  45.946 +    }
  45.947 +
  45.948 +    protected boolean isHexDigit(char ch) {
  45.949 +        return ('0' <= ch && ch <= '9')
  45.950 +                || ('a' <= ch && ch <= 'f')
  45.951 +                || ('A' <= ch && ch <= 'F');
  45.952 +    }
  45.953 +
  45.954 +    protected boolean isUnquotedAttrValueTerminator(char ch) {
  45.955 +        switch (ch) {
  45.956 +            case '\f': case '\n': case '\r': case '\t':
  45.957 +            case ' ':
  45.958 +            case '"': case '\'': case '`':
  45.959 +            case '=': case '<': case '>':
  45.960 +                return true;
  45.961 +            default:
  45.962 +                return false;
  45.963 +        }
  45.964 +    }
  45.965 +
  45.966 +    protected boolean isWhitespace(char ch) {
  45.967 +        return Character.isWhitespace(ch);
  45.968 +    }
  45.969 +
  45.970 +    protected void skipWhitespace() {
  45.971 +        while (isWhitespace(ch))
  45.972 +            nextChar();
  45.973 +    }
  45.974 +
  45.975 +    protected int getSentenceBreak(String s) {
  45.976 +        if (sentenceBreaker != null) {
  45.977 +            sentenceBreaker.setText(s);
  45.978 +            int i = sentenceBreaker.next();
  45.979 +            return (i == s.length()) ? -1 : i;
  45.980 +        }
  45.981 +
  45.982 +        // scan for period followed by whitespace
  45.983 +        boolean period = false;
  45.984 +        for (int i = 0; i < s.length(); i++) {
  45.985 +            switch (s.charAt(i)) {
  45.986 +                case '.':
  45.987 +                    period = true;
  45.988 +                    break;
  45.989 +
  45.990 +                case ' ':
  45.991 +                case '\f':
  45.992 +                case '\n':
  45.993 +                case '\r':
  45.994 +                case '\t':
  45.995 +                    if (period)
  45.996 +                        return i;
  45.997 +                    break;
  45.998 +
  45.999 +                default:
 45.1000 +                    period = false;
 45.1001 +                    break;
 45.1002 +            }
 45.1003 +        }
 45.1004 +        return -1;
 45.1005 +    }
 45.1006 +
 45.1007 +
 45.1008 +    Set<String> htmlBlockTags = new HashSet<String>(Arrays.asList(
 45.1009 +                    "h1", "h2", "h3", "h4", "h5", "h6", "p", "pre"));
 45.1010 +
 45.1011 +    protected boolean isSentenceBreak(Name n) {
 45.1012 +        return htmlBlockTags.contains(n.toString().toLowerCase());
 45.1013 +    }
 45.1014 +
 45.1015 +    protected boolean isSentenceBreak(DCTree t) {
 45.1016 +        switch (t.getKind()) {
 45.1017 +            case START_ELEMENT:
 45.1018 +                return isSentenceBreak(((DCStartElement) t).getName());
 45.1019 +
 45.1020 +            case END_ELEMENT:
 45.1021 +                return isSentenceBreak(((DCEndElement) t).getName());
 45.1022 +        }
 45.1023 +        return false;
 45.1024 +    }
 45.1025 +
 45.1026 +    /**
 45.1027 +     * @param start position of first character of string
 45.1028 +     * @param end position of character beyond last character to be included
 45.1029 +     */
 45.1030 +    String newString(int start, int end) {
 45.1031 +        return new String(buf, start, end - start);
 45.1032 +    }
 45.1033 +
 45.1034 +    static abstract class TagParser {
 45.1035 +        enum Kind { INLINE, BLOCK }
 45.1036 +
 45.1037 +        Kind kind;
 45.1038 +        DCTree.Kind treeKind;
 45.1039 +
 45.1040 +        TagParser(Kind k, DCTree.Kind tk) {
 45.1041 +            kind = k;
 45.1042 +            treeKind = tk;
 45.1043 +        }
 45.1044 +
 45.1045 +        Kind getKind() {
 45.1046 +            return kind;
 45.1047 +        }
 45.1048 +
 45.1049 +        DCTree.Kind getTreeKind() {
 45.1050 +            return treeKind;
 45.1051 +        }
 45.1052 +
 45.1053 +        abstract DCTree parse(int pos) throws ParseException;
 45.1054 +    }
 45.1055 +
 45.1056 +    /**
 45.1057 +     * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a>
 45.1058 +     */
 45.1059 +    private void initTagParsers() {
 45.1060 +        TagParser[] parsers = {
 45.1061 +            // @author name-text
 45.1062 +            new TagParser(Kind.BLOCK, DCTree.Kind.AUTHOR) {
 45.1063 +                public DCTree parse(int pos) {
 45.1064 +                    List<DCTree> name = blockContent();
 45.1065 +                    return m.at(pos).Author(name);
 45.1066 +                }
 45.1067 +            },
 45.1068 +
 45.1069 +            // {@code text}
 45.1070 +            new TagParser(Kind.INLINE, DCTree.Kind.CODE) {
 45.1071 +                public DCTree parse(int pos) throws ParseException {
 45.1072 +                    DCTree text = inlineText();
 45.1073 +                    nextChar();
 45.1074 +                    return m.at(pos).Code((DCText) text);
 45.1075 +                }
 45.1076 +            },
 45.1077 +
 45.1078 +            // @deprecated deprecated-text
 45.1079 +            new TagParser(Kind.BLOCK, DCTree.Kind.DEPRECATED) {
 45.1080 +                public DCTree parse(int pos) {
 45.1081 +                    List<DCTree> reason = blockContent();
 45.1082 +                    return m.at(pos).Deprecated(reason);
 45.1083 +                }
 45.1084 +            },
 45.1085 +
 45.1086 +            // {@docRoot}
 45.1087 +            new TagParser(Kind.INLINE, DCTree.Kind.DOC_ROOT) {
 45.1088 +                public DCTree parse(int pos) throws ParseException {
 45.1089 +                    if (ch == '}') {
 45.1090 +                        nextChar();
 45.1091 +                        return m.at(pos).DocRoot();
 45.1092 +                    }
 45.1093 +                    inlineText(); // skip unexpected content
 45.1094 +                    nextChar();
 45.1095 +                    throw new ParseException("dc.unexpected.content");
 45.1096 +                }
 45.1097 +            },
 45.1098 +
 45.1099 +            // @exception class-name description
 45.1100 +            new TagParser(Kind.BLOCK, DCTree.Kind.EXCEPTION) {
 45.1101 +                public DCTree parse(int pos) throws ParseException {
 45.1102 +                    skipWhitespace();
 45.1103 +                    DCReference ref = reference(false);
 45.1104 +                    List<DCTree> description = blockContent();
 45.1105 +                    return m.at(pos).Exception(ref, description);
 45.1106 +                }
 45.1107 +            },
 45.1108 +
 45.1109 +            // {@inheritDoc}
 45.1110 +            new TagParser(Kind.INLINE, DCTree.Kind.INHERIT_DOC) {
 45.1111 +                public DCTree parse(int pos) throws ParseException {
 45.1112 +                    if (ch == '}') {
 45.1113 +                        nextChar();
 45.1114 +                        return m.at(pos).InheritDoc();
 45.1115 +                    }
 45.1116 +                    inlineText(); // skip unexpected content
 45.1117 +                    nextChar();
 45.1118 +                    throw new ParseException("dc.unexpected.content");
 45.1119 +                }
 45.1120 +            },
 45.1121 +
 45.1122 +            // {@link package.class#member label}
 45.1123 +            new TagParser(Kind.INLINE, DCTree.Kind.LINK) {
 45.1124 +                public DCTree parse(int pos) throws ParseException {
 45.1125 +                    DCReference ref = reference(true);
 45.1126 +                    List<DCTree> label = inlineContent();
 45.1127 +                    return m.at(pos).Link(ref, label);
 45.1128 +                }
 45.1129 +            },
 45.1130 +
 45.1131 +            // {@linkplain package.class#member label}
 45.1132 +            new TagParser(Kind.INLINE, DCTree.Kind.LINK_PLAIN) {
 45.1133 +                public DCTree parse(int pos) throws ParseException {
 45.1134 +                    DCReference ref = reference(true);
 45.1135 +                    List<DCTree> label = inlineContent();
 45.1136 +                    return m.at(pos).LinkPlain(ref, label);
 45.1137 +                }
 45.1138 +            },
 45.1139 +
 45.1140 +            // {@literal text}
 45.1141 +            new TagParser(Kind.INLINE, DCTree.Kind.LITERAL) {
 45.1142 +                public DCTree parse(int pos) throws ParseException {
 45.1143 +                    DCTree text = inlineText();
 45.1144 +                    nextChar();
 45.1145 +                    return m.at(pos).Literal((DCText) text);
 45.1146 +                }
 45.1147 +            },
 45.1148 +
 45.1149 +            // @param parameter-name description
 45.1150 +            new TagParser(Kind.BLOCK, DCTree.Kind.PARAM) {
 45.1151 +                public DCTree parse(int pos) throws ParseException {
 45.1152 +                    skipWhitespace();
 45.1153 +
 45.1154 +                    boolean typaram = false;
 45.1155 +                    if (ch == '<') {
 45.1156 +                        typaram = true;
 45.1157 +                        nextChar();
 45.1158 +                    }
 45.1159 +
 45.1160 +                    DCIdentifier id = identifier();
 45.1161 +
 45.1162 +                    if (typaram) {
 45.1163 +                        if (ch != '>')
 45.1164 +                            throw new ParseException("dc.gt.expected");
 45.1165 +                        nextChar();
 45.1166 +                    }
 45.1167 +
 45.1168 +                    skipWhitespace();
 45.1169 +                    List<DCTree> desc = blockContent();
 45.1170 +                    return m.at(pos).Param(typaram, id, desc);
 45.1171 +                }
 45.1172 +            },
 45.1173 +
 45.1174 +            // @return description
 45.1175 +            new TagParser(Kind.BLOCK, DCTree.Kind.RETURN) {
 45.1176 +                public DCTree parse(int pos) {
 45.1177 +                    List<DCTree> description = blockContent();
 45.1178 +                    return m.at(pos).Return(description);
 45.1179 +                }
 45.1180 +            },
 45.1181 +
 45.1182 +            // @see reference | quoted-string | HTML
 45.1183 +            new TagParser(Kind.BLOCK, DCTree.Kind.SEE) {
 45.1184 +                public DCTree parse(int pos) throws ParseException {
 45.1185 +                    skipWhitespace();
 45.1186 +                    switch (ch) {
 45.1187 +                        case '"':
 45.1188 +                            DCText string = quotedString();
 45.1189 +                            if (string != null) {
 45.1190 +                                skipWhitespace();
 45.1191 +                                if (ch == '@')
 45.1192 +                                    return m.at(pos).See(List.<DCTree>of(string));
 45.1193 +                            }
 45.1194 +                            break;
 45.1195 +
 45.1196 +                        case '<':
 45.1197 +                            List<DCTree> html = blockContent();
 45.1198 +                            if (html != null)
 45.1199 +                                return m.at(pos).See(html);
 45.1200 +                            break;
 45.1201 +
 45.1202 +                        default:
 45.1203 +                            if (isJavaIdentifierStart(ch) || ch == '#') {
 45.1204 +                                DCReference ref = reference(true);
 45.1205 +                                List<DCTree> description = blockContent();
 45.1206 +                                return m.at(pos).See(description.prepend(ref));
 45.1207 +                            }
 45.1208 +                    }
 45.1209 +                    throw new ParseException("dc.unexpected.content");
 45.1210 +                }
 45.1211 +            },
 45.1212 +
 45.1213 +            // @serialData data-description
 45.1214 +            new TagParser(Kind.BLOCK, DCTree.Kind.SERIAL_DATA) {
 45.1215 +                public DCTree parse(int pos) {
 45.1216 +                    List<DCTree> description = blockContent();
 45.1217 +                    return m.at(pos).SerialData(description);
 45.1218 +                }
 45.1219 +            },
 45.1220 +
 45.1221 +            // @serialField field-name field-type description
 45.1222 +            new TagParser(Kind.BLOCK, DCTree.Kind.SERIAL_FIELD) {
 45.1223 +                public DCTree parse(int pos) throws ParseException {
 45.1224 +                    skipWhitespace();
 45.1225 +                    DCIdentifier name = identifier();
 45.1226 +                    skipWhitespace();
 45.1227 +                    DCReference type = reference(false);
 45.1228 +                    List<DCTree> description = null;
 45.1229 +                    if (isWhitespace(ch)) {
 45.1230 +                        skipWhitespace();
 45.1231 +                        description = blockContent();
 45.1232 +                    }
 45.1233 +                    return m.at(pos).SerialField(name, type, description);
 45.1234 +                }
 45.1235 +            },
 45.1236 +
 45.1237 +            // @serial field-description | include | exclude
 45.1238 +            new TagParser(Kind.BLOCK, DCTree.Kind.SERIAL) {
 45.1239 +                public DCTree parse(int pos) {
 45.1240 +                    List<DCTree> description = blockContent();
 45.1241 +                    return m.at(pos).Serial(description);
 45.1242 +                }
 45.1243 +            },
 45.1244 +
 45.1245 +            // @since since-text
 45.1246 +            new TagParser(Kind.BLOCK, DCTree.Kind.SINCE) {
 45.1247 +                public DCTree parse(int pos) {
 45.1248 +                    List<DCTree> description = blockContent();
 45.1249 +                    return m.at(pos).Since(description);
 45.1250 +                }
 45.1251 +            },
 45.1252 +
 45.1253 +            // @throws class-name description
 45.1254 +            new TagParser(Kind.BLOCK, DCTree.Kind.THROWS) {
 45.1255 +                public DCTree parse(int pos) throws ParseException {
 45.1256 +                    skipWhitespace();
 45.1257 +                    DCReference ref = reference(false);
 45.1258 +                    List<DCTree> description = blockContent();
 45.1259 +                    return m.at(pos).Throws(ref, description);
 45.1260 +                }
 45.1261 +            },
 45.1262 +
 45.1263 +            // {@value package.class#field}
 45.1264 +            new TagParser(Kind.INLINE, DCTree.Kind.VALUE) {
 45.1265 +                public DCTree parse(int pos) throws ParseException {
 45.1266 +                    DCReference ref = reference(true);
 45.1267 +                    skipWhitespace();
 45.1268 +                    if (ch == '}') {
 45.1269 +                        nextChar();
 45.1270 +                        return m.at(pos).Value(ref);
 45.1271 +                    }
 45.1272 +                    nextChar();
 45.1273 +                    throw new ParseException("dc.unexpected.content");
 45.1274 +                }
 45.1275 +            },
 45.1276 +
 45.1277 +            // @version version-text
 45.1278 +            new TagParser(Kind.BLOCK, DCTree.Kind.VERSION) {
 45.1279 +                public DCTree parse(int pos) {
 45.1280 +                    List<DCTree> description = blockContent();
 45.1281 +                    return m.at(pos).Version(description);
 45.1282 +                }
 45.1283 +            },
 45.1284 +        };
 45.1285 +
 45.1286 +        tagParsers = new HashMap<Name,TagParser>();
 45.1287 +        for (TagParser p: parsers)
 45.1288 +            tagParsers.put(names.fromString(p.getTreeKind().tagName), p);
 45.1289 +
 45.1290 +    }
 45.1291 +}