Merge branch 'plsql-javacc' into 7.0.x

This commit is contained in:
Clément Fournier
2020-03-20 14:52:33 +01:00
54 changed files with 255 additions and 2836 deletions

View File

@ -330,8 +330,11 @@
<move file="${constants-itf-file}" tofile="${token-constants-file}" />
<replaceregexp>
<regexp pattern="(public )?interface ${constants-itf-name}" />
<substitution expression="/** Token kinds ({@link ${ast-impl-package}.JavaccToken#kind}) for this language. */ public final class ${token-constants-name}"/>
<regexp pattern="(public )?interface ${constants-itf-name} \{" />
<substitution expression="/** Token kinds ({@link ${ast-impl-package}.JavaccToken#kind}) for this language. */${line.separator}
public final class ${token-constants-name} \{${line.separator}
private ${token-constants-name}() { /* Utility class */ }${line.separator}
"/>
<fileset file="${token-constants-file}" />
</replaceregexp>
@ -342,8 +345,8 @@
</replaceregexp>
<replaceregexp flags="s">
<regexp pattern="/\*\* End of File.*?;" />
<substitution expression="private ${token-constants-name}() { /* Utility class */ }" />
<regexp pattern="/\*\* End of File. \*/\R" />
<substitution expression="public static final " />
<fileset file="${token-constants-file}" />
</replaceregexp>

View File

@ -101,41 +101,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Sergey Yanzin 11/2016
*/
//
options {
DEBUG_PARSER = false;
DEBUG_TOKEN_MANAGER = false;
DEBUG_LOOKAHEAD = false;
IGNORE_CASE = true;
STATIC = false;
LOOKAHEAD = 1;
// set the ambiguity checks to higher values, if you need more extensive checks of the grammar
// this however make the parser generation very slow, so should only be done once after
// modifying the grammar to make sure there are no grammar errors.
// Default value is 2.
CHOICE_AMBIGUITY_CHECK = 2;
OTHER_AMBIGUITY_CHECK = 1;
ERROR_REPORTING = true;
JAVA_UNICODE_ESCAPE = false; //true
UNICODE_INPUT = true;
USER_TOKEN_MANAGER = false;
USER_CHAR_STREAM = true;
BUILD_PARSER = true;
BUILD_TOKEN_MANAGER = true;
SANITY_CHECK = true;
FORCE_LA_CHECK = false;
DEBUG_PARSER = false;
DEBUG_TOKEN_MANAGER = false;
DEBUG_LOOKAHEAD = false;
IGNORE_CASE = true;
STATIC = false;
TRACK_TOKENS = true;
LOOKAHEAD= 1;
// set the ambiguity checks to higher values, if you need more extensive checks of the grammar
// this however make the parser generation very slow, so should only be done once after
// modifying the grammar to make sure there are no grammar errors.
// Default value is 2.
CHOICE_AMBIGUITY_CHECK = 2;
OTHER_AMBIGUITY_CHECK = 1;
ERROR_REPORTING = true;
JAVA_UNICODE_ESCAPE = false;
UNICODE_INPUT = true;
USER_TOKEN_MANAGER = false;
USER_CHAR_STREAM = true;
BUILD_PARSER = true;
BUILD_TOKEN_MANAGER = true;
SANITY_CHECK = true;
TRACK_TOKENS = false;
CACHE_TOKENS = true;
MULTI = true;
VISITOR = true;
NODE_USES_PARSER = true;
NODE_PACKAGE="net.sourceforge.pmd.lang.plsql.ast";
NODE_CLASS = "net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode";
}
PARSER_BEGIN(PLSQLParser)
PARSER_BEGIN(PLSQLParserImpl)
/* Copyright (C) 2002 Albert Tumanov
@ -162,12 +157,12 @@ import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.ast.CharStream;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
public class PLSQLParser {
public class PLSQLParserImpl {
/**
Return canonical version of the Oracle
*/
public static String canonicalName(String name)
static String canonicalName(String name)
{
StringBuilder s = null ;
@ -219,7 +214,7 @@ public class PLSQLParser {
}
}
PARSER_END(PLSQLParser)
PARSER_END(PLSQLParserImpl)
/**
* 2006-05-22 - Matthias Hendler - Added parsing of triggers and global functions/procedures
* Refactored printing of custom tags into the XML/DOM.
@ -230,7 +225,7 @@ PARSER_END(PLSQLParser)
/**
* 2006-05-22 - Matthias Hendler - added globalBody()
*/
ASTInput Input(String sourcecode) : {}
ASTInput Input() : {}
{
// SRT 2011-04-17 This syntax breaks the parser when fields of record.attach* are referenced (attachLibrary())*
(
@ -256,7 +251,7 @@ ASTInput Input(String sourcecode) : {}
("/")*
)*
<EOF>
{ jjtThis.setSourcecode(sourcecode); return jjtThis ; }
{ return jjtThis; }
}
ASTDDLCommand DDLCommand() :

View File

@ -38,9 +38,10 @@
<phase>generate-sources</phase>
<configuration>
<target>
<ant antfile="src/main/ant/alljavacc.xml">
<property name="target" value="${project.build.directory}/generated-sources/javacc" />
<ant antfile="${javacc.ant.wrapper}" target="alljavacc">
<property name="javacc.jar" value="${javacc.jar}" />
<property name="lang-name" value="PLSQL" />
<property name="lang-terse-name" value="plsql" />
</ant>
</target>
</configuration>

View File

@ -1,18 +1,19 @@
/**
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
import java.io.StringReader;
import java.util.Properties;
import org.apache.commons.io.input.CharSequenceReader;
import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.GenericToken;
import net.sourceforge.pmd.lang.plsql.PLSQLTokenManager;
import net.sourceforge.pmd.lang.plsql.ast.PLSQLParserConstants;
import net.sourceforge.pmd.lang.plsql.ast.Token;
import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;
import net.sourceforge.pmd.lang.plsql.ast.PLSQLTokenKinds;
import net.sourceforge.pmd.lang.plsql.ast.PLSQLTokenManager;
import net.sourceforge.pmd.util.IOUtil;
public class PLSQLTokenizer extends JavaCCTokenizer {
@ -53,18 +54,18 @@ public class PLSQLTokenizer extends JavaCCTokenizer {
protected TokenEntry processToken(Tokens tokenEntries, GenericToken currentToken, String fileName) {
String image = currentToken.getImage();
Token plsqlToken = (Token) currentToken;
JavaccToken plsqlToken = (JavaccToken) currentToken;
if (ignoreIdentifiers && plsqlToken.kind == PLSQLParserConstants.IDENTIFIER) {
if (ignoreIdentifiers && plsqlToken.kind == PLSQLTokenKinds.IDENTIFIER) {
image = String.valueOf(plsqlToken.kind);
}
if (ignoreLiterals && (plsqlToken.kind == PLSQLParserConstants.UNSIGNED_NUMERIC_LITERAL
|| plsqlToken.kind == PLSQLParserConstants.FLOAT_LITERAL
|| plsqlToken.kind == PLSQLParserConstants.INTEGER_LITERAL
|| plsqlToken.kind == PLSQLParserConstants.CHARACTER_LITERAL
|| plsqlToken.kind == PLSQLParserConstants.STRING_LITERAL
|| plsqlToken.kind == PLSQLParserConstants.QUOTED_LITERAL)) {
if (ignoreLiterals && (plsqlToken.kind == PLSQLTokenKinds.UNSIGNED_NUMERIC_LITERAL
|| plsqlToken.kind == PLSQLTokenKinds.FLOAT_LITERAL
|| plsqlToken.kind == PLSQLTokenKinds.INTEGER_LITERAL
|| plsqlToken.kind == PLSQLTokenKinds.CHARACTER_LITERAL
|| plsqlToken.kind == PLSQLTokenKinds.STRING_LITERAL
|| plsqlToken.kind == PLSQLTokenKinds.QUOTED_LITERAL)) {
image = String.valueOf(plsqlToken.kind);
}
@ -74,7 +75,6 @@ public class PLSQLTokenizer extends JavaCCTokenizer {
@Override
protected TokenManager getLexerForSource(SourceCode sourceCode) {
StringBuilder stringBuilder = sourceCode.getCodeBuffer();
return new PLSQLTokenManager(IOUtil.skipBOM(new StringReader(stringBuilder.toString())));
return new PLSQLTokenManager(IOUtil.skipBOM(new CharSequenceReader(sourceCode.getCodeBuffer())));
}
}

View File

@ -7,6 +7,7 @@ package net.sourceforge.pmd.lang.plsql;
import net.sourceforge.pmd.lang.AbstractPmdLanguageVersionHandler;
import net.sourceforge.pmd.lang.Parser;
import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.lang.plsql.ast.PLSQLParser;
/**
* Implementation of LanguageVersionHandler for the PLSQL AST. It uses anonymous

View File

@ -1,60 +0,0 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.plsql;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import org.apache.commons.io.IOUtils;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.AbstractParser;
import net.sourceforge.pmd.lang.LanguageVersionHandler;
import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.AbstractTokenManager;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.ast.ParseException;
import net.sourceforge.pmd.lang.ast.impl.javacc.CharStreamFactory;
import net.sourceforge.pmd.util.IOUtil;
/**
* Adapter for the PLSQLParser.
*
* @deprecated This is internal API, use {@link LanguageVersionHandler#getParser(ParserOptions)}.
*/
@InternalApi
@Deprecated
public class PLSQLParser extends AbstractParser {
public PLSQLParser(ParserOptions parserOptions) {
super(parserOptions);
}
@Override
public TokenManager createTokenManager(Reader source) {
return new PLSQLTokenManager(IOUtil.skipBOM(source));
}
/**
* Subclass should override this method to modify the PLSQLParser as needed.
*/
protected net.sourceforge.pmd.lang.plsql.ast.PLSQLParser createPLSQLParser(Reader source) throws ParseException {
// Wrapped PLSQL AST Parser
return new net.sourceforge.pmd.lang.plsql.ast.PLSQLParser(CharStreamFactory.simpleCharStream(IOUtil.skipBOM(source)));
}
@Override
public Node parse(String fileName, Reader source) throws ParseException {
try {
String sourcecode = IOUtils.toString(source);
AbstractTokenManager.setFileName(fileName);
return createPLSQLParser(new StringReader(sourcecode)).Input(sourcecode);
} catch (IOException e) {
throw new ParseException(e);
}
}
}

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTArguments extends AbstractPLSQLNode {
public class ASTArguments extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTArguments(int id) {
ASTArguments(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTArguments(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,23 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTComparisonCondition extends AbstractPLSQLNode {
public final class ASTComparisonCondition extends AbstractPLSQLNode {
private String operator;
@Deprecated
@InternalApi
public ASTComparisonCondition(int id) {
ASTComparisonCondition(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTComparisonCondition(PLSQLParser p, int id) {
super(p, id);
}
void setOperator(String operator) {
this.operator = operator;
}

View File

@ -6,23 +6,13 @@ package net.sourceforge.pmd.lang.plsql.ast;
import java.util.Locale;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTCompoundCondition extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTCompoundCondition extends AbstractPLSQLNode {
private String type;
@Deprecated
@InternalApi
public ASTCompoundCondition(int id) {
ASTCompoundCondition(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTCompoundCondition(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTDatatype extends AbstractPLSQLNode {
public class ASTDatatype extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTDatatype(int id) {
ASTDatatype(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTDatatype(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -6,26 +6,14 @@ package net.sourceforge.pmd.lang.plsql.ast;
import java.util.List;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTExtractExpression extends AbstractPLSQLNode {
private boolean xml;
@InternalApi
@Deprecated
public ASTExtractExpression(int id) {
ASTExtractExpression(int id) {
super(id);
}
@InternalApi
@Deprecated
public ASTExtractExpression(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTFormalParameter extends AbstractPLSQLNode {
public class ASTFormalParameter extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTFormalParameter(int id) {
ASTFormalParameter(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTFormalParameter(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,26 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTIfStatement extends AbstractPLSQLNode {
private boolean hasElse;
public class ASTIfStatement extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTIfStatement(int id) {
ASTIfStatement(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTIfStatement(PLSQLParser p, int id) {
super(p, id);
}
private boolean hasElse;
@Deprecated
@InternalApi
public void setHasElse() {
void setHasElse() {
this.hasElse = true;
}

View File

@ -4,17 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
public class ASTInlineConstraint extends AbstractPLSQLNode {
public final class ASTInlineConstraint extends AbstractPLSQLNode {
private ConstraintType type;
ASTInlineConstraint(int id) {
super(id);
}
ASTInlineConstraint(PLSQLParser p, int id) {
super(p, id);
}
void setType(ConstraintType type) {
this.type = type;
}

View File

@ -4,24 +4,14 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTInnerCrossJoinClause extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTInnerCrossJoinClause extends AbstractPLSQLNode {
private boolean cross;
private boolean natural;
@Deprecated
@InternalApi
public ASTInnerCrossJoinClause(int id) {
ASTInnerCrossJoinClause(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTInnerCrossJoinClause(PLSQLParser p, int id) {
super(p, id);
}
public boolean isCross() {
return cross;
}

View File

@ -4,34 +4,20 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.ast.RootNode;
public class ASTInput extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode implements RootNode {
private String sourcecode;
public final class ASTInput extends AbstractPLSQLNode implements RootNode {
@Deprecated
@InternalApi
public ASTInput(int id) {
ASTInput(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTInput(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
void setSourcecode(String sourcecode) {
this.sourcecode = sourcecode;
}
public String getSourcecode() {
return sourcecode;
return new StringBuilder(getText()).toString();
}
}

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTMethodDeclaration extends AbstractPLSQLNode implements ExecutableCode {
public class ASTMethodDeclaration extends AbstractPLSQLNode implements ExecutableCode {
@Deprecated
@InternalApi
public ASTMethodDeclaration(int id) {
ASTMethodDeclaration(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTMethodDeclaration(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTMethodDeclarator extends AbstractPLSQLNode {
public class ASTMethodDeclarator extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTMethodDeclarator(int id) {
ASTMethodDeclarator(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTMethodDeclarator(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,20 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
public class ASTName extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTName(int id) {
super(id);
}
public final class ASTName extends AbstractPLSQLNode {
private NameDeclaration nd;
@Deprecated
@InternalApi
public ASTName(PLSQLParser p, int id) {
super(p, id);
ASTName(int id) {
super(id);
}
@Override
@ -25,11 +18,7 @@ public class ASTName extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNod
return visitor.visit(this, data);
}
private NameDeclaration nd;
@Deprecated
@InternalApi
public void setNameDeclaration(NameDeclaration nd) {
void setNameDeclaration(NameDeclaration nd) {
this.nd = nd;
}

View File

@ -4,23 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTOutOfLineConstraint extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTOutOfLineConstraint extends AbstractPLSQLNode {
private ConstraintType type;
@Deprecated
@InternalApi
public ASTOutOfLineConstraint(int id) {
ASTOutOfLineConstraint(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTOutOfLineConstraint(PLSQLParser p, int id) {
super(p, id);
}
void setType(ConstraintType type) {
this.type = type;
}

View File

@ -4,23 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTOuterJoinClause extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTOuterJoinClause extends AbstractPLSQLNode {
private boolean natural;
@Deprecated
@InternalApi
public ASTOuterJoinClause(int id) {
ASTOuterJoinClause(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTOuterJoinClause(PLSQLParser p, int id) {
super(p, id);
}
public boolean isNatural() {
return natural;
}

View File

@ -1,29 +1,16 @@
/**
/*
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
/* Generated By:JJTree: Do not edit this line. ASTOuterJoinType.java Version 4.3 */
/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=true,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTOuterJoinType extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTOuterJoinType extends AbstractPLSQLNode {
private Type type;
@Deprecated
@InternalApi
public ASTOuterJoinType(int id) {
ASTOuterJoinType(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTOuterJoinType(PLSQLParser p, int id) {
super(p, id);
}
void setType(Type type) {
this.type = type;
}

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTPackageBody extends AbstractPLSQLNode implements OracleObject {
public class ASTPackageBody extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode implements OracleObject {
@Deprecated
@InternalApi
public ASTPackageBody(int id) {
ASTPackageBody(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTPackageBody(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,22 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTPackageSpecification extends AbstractPLSQLNode implements OracleObject {
public class ASTPackageSpecification extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode
implements OracleObject {
@Deprecated
@InternalApi
public ASTPackageSpecification(int id) {
ASTPackageSpecification(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTPackageSpecification(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,36 +4,23 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTPrimaryPrefix extends AbstractPLSQLNode {
private boolean usesSelfModifier;
public class ASTPrimaryPrefix extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTPrimaryPrefix(int id) {
ASTPrimaryPrefix(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTPrimaryPrefix(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
private boolean usesSelfModifier;
@Deprecated
@InternalApi
public void setUsesSelfModifier() {
void setUsesSelfModifier() {
usesSelfModifier = true;
}
public boolean usesSelfModifier() {
return this.usesSelfModifier;
}
}

View File

@ -4,32 +4,21 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTPrimarySuffix extends AbstractPLSQLNode {
private boolean isArguments;
private boolean isArrayDereference;
public class ASTPrimarySuffix extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
@Deprecated
@InternalApi
public ASTPrimarySuffix(int id) {
ASTPrimarySuffix(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTPrimarySuffix(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
private boolean isArguments;
private boolean isArrayDereference;
@Deprecated
@InternalApi
public void setIsArrayDereference() {
void setIsArrayDereference() {
isArrayDereference = true;
}
@ -37,9 +26,7 @@ public class ASTPrimarySuffix extends net.sourceforge.pmd.lang.plsql.ast.Abstrac
return isArrayDereference;
}
@Deprecated
@InternalApi
public void setIsArguments() {
void setIsArguments() {
this.isArguments = true;
}

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTProgramUnit extends AbstractPLSQLNode implements ExecutableCode, OracleObject {
public class ASTProgramUnit extends AbstractPLSQLNode implements ExecutableCode, OracleObject {
@Deprecated
@InternalApi
public ASTProgramUnit(int id) {
ASTProgramUnit(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTProgramUnit(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTQueryBlock extends AbstractSelectStatement {
public class ASTQueryBlock extends AbstractSelectStatement {
@Deprecated
@InternalApi
public ASTQueryBlock(int id) {
ASTQueryBlock(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTQueryBlock(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,23 +4,13 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public class ASTRegexpLikeCondition extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNode {
public final class ASTRegexpLikeCondition extends AbstractPLSQLNode {
private String matchParam;
@Deprecated
@InternalApi
public ASTRegexpLikeCondition(int id) {
ASTRegexpLikeCondition(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTRegexpLikeCondition(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

View File

@ -4,21 +4,12 @@
package net.sourceforge.pmd.lang.plsql.ast;
import net.sourceforge.pmd.annotation.InternalApi;
public final class ASTSelectIntoStatement extends AbstractSelectStatement {
public class ASTSelectIntoStatement extends AbstractSelectStatement {
@Deprecated
@InternalApi
public ASTSelectIntoStatement(int id) {
ASTSelectIntoStatement(int id) {
super(id);
}
@Deprecated
@InternalApi
public ASTSelectIntoStatement(PLSQLParser p, int id) {
super(p, id);
}
@Override
public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
return visitor.visit(this, data);

Some files were not shown because too many files have changed in this diff Show More