phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove tparam of JjtreeBuilder

Browse Source
This commit is contained in:
Clément Fournier
2020-04-26 20:24:43 +02:00
parent aaceca5574
commit 24c4abd9f4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javacc-wrapper.xml
View File

@ -220,7 +220,7 @@
<!-- The tree builder is generic now --> <!-- The tree builder is generic now -->
<replaceregexp flags="g"> <replaceregexp flags="g">
<regexp pattern="\bJJT${parser-name}State\b" /> <regexp pattern="\bJJT${parser-name}State\b" />
<substitution expression="${ast-impl-package}.JjtreeBuilder&lt;${base-class-name}, ${node-name}&gt;" /> <substitution expression="${ast-impl-package}.JjtreeBuilder&lt;${base-class-name}&gt;" />
<fileset file="${parser-file}" /> <fileset file="${parser-file}" />
</replaceregexp> </replaceregexp>

3
pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/javacc/JjtreeBuilder.java
View File

@ -11,9 +11,8 @@ import java.util.List;
* Shared implementation of the tree builder generated by JJTree. * Shared implementation of the tree builder generated by JJTree.
* *
* @param <N> Internal base class for nodes * @param <N> Internal base class for nodes
* @param <P> Public interface for nodes
*/ */
public final class JjtreeBuilder<N extends AbstractJjtreeNode<N, P>, P extends JjtreeNode<P>> { public final class JjtreeBuilder<N extends AbstractJjtreeNode<N, ?>> {
private final List<N> nodes = new ArrayList<>(); private final List<N> nodes = new ArrayList<>();
private final List<Integer> marks = new ArrayList<>(); private final List<Integer> marks = new ArrayList<>();