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

Merge pull request #3783 from oowekyala:issue3746-plsql-tokens

Browse Source 
[plsql] Fix #3746 - Parsing exception with operators containing spaces #3783
This commit is contained in:
Andreas Dangel
2022-02-19 09:59:21 +01:00
parent 84b026d83f 9d349dbcc7
commit a6e55845f7
5 changed files with 90 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pages/release_notes.md
View File

@ -26,6 +26,8 @@ This is a {{ site.pmd.release_type }} release.
* [#3374](https://github.com/pmd/pmd/issues/3374): \[java] UseStringBufferForStringAppends: Wrong example in documentation
* misc
* [#3759](https://github.com/pmd/pmd/issues/3759): \[lang-test] Upgrade dokka maven plugin to 1.4.32
* plsql
* [#3746](https://github.com/pmd/pmd/issues/3746): \[plsql] Parsing exception "Less than or equal to/Greater than or equal to" operators in DML statements
### API Changes

91
pmd-plsql/etc/grammar/PldocAST.jjt
View File

@ -257,6 +257,34 @@ TOKEN_MGR_DECLS : {
List<ParsingExclusion> exclusions = new ArrayList<ParsingExclusion>();
}
// add names to SINGLE CHARACTER tokens
// multiple character operators are sequences of tokens.
TOKEN: {
< LPAREN: "(" >
| < RPAREN: ")" >
| < LBRACE: "{" >
| < RBRACE: "}" >
| < LBRACKET: "[" >
| < RBRACKET: "]" >
| < SEMICOLON: ";" >
| < COMMA: "," >
| < DOT: "." >
| < AROBASE: "@" >
| < ASSIGN: "=" >
| < LT: "<" >
| < BANG: "!" >
| < TILDE: "~" >
| < HOOK: "?" >
| < COLON: ":" >
| < PLUSSIGN: "+" >
| < MINUSSIGN: "-" >
| < STAR: "*" >
| < SLASH: "/" >
| < BIT_AND: "&" >
| < BIT_OR: "|" >
| < XOR: "^" >
| < REM: "%" >
}
/**
* 2006-05-22 - Matthias Hendler - Added parsing of triggers and global functions/procedures
@ -1603,18 +1631,26 @@ ASTInCondition InCondition() :
{ return jjtThis; }
}
ASTComparisonCondition ComparisonCondition() :
private String ComparisonOp() #void :
{}
{
(
// SimpleComparisonCondition
LOOKAHEAD(3) (SqlExpression() ( "=" | "!=" | "^=" | "<>" | ">" | "<" | ">=" | "<=" ) { jjtThis.setOperator(token.getImage()); } SqlExpression() )
| LOOKAHEAD(3) ( "(" SqlExpression() ("," SqlExpression())* ")" ( "=" | "!=" | "^=" | "<>" ) { jjtThis.setOperator(token.getImage()); } "(" ( LOOKAHEAD(3) ExpressionList() | LOOKAHEAD(3) Subquery() ) ")" )
"=" {return "=";}
| "!" "=" {return "!=";}
| "^" "=" {return "^=";}
| "<" ( "=" {return "<=";} | ">" {return "<>";} )? {return "<";}
| ">" ( "=" {return ">=";} )? {return ">";}
}
// GroupComparisonCondition
| LOOKAHEAD(3) (SqlExpression() ( "=" | "!=" | "^=" | "<>" | ">" | "<" | ">=" | "<=" ) { jjtThis.setOperator(token.getImage()); } ( <ANY> | <SOME> | <ALL> ) "(" ( LOOKAHEAD(3) ExpressionListSingle() | LOOKAHEAD(3) Subquery() ) ")" )
| LOOKAHEAD(3) ( "(" SqlExpression() ("," SqlExpression())* ")" ( "=" | "!=" | "^=" | "<>" ) { jjtThis.setOperator(token.getImage()); } ( <ANY> | <SOME> | <ALL> ) "(" ( LOOKAHEAD(3) ExpressionListMultiple() ("," ExpressionListMultiple())* | LOOKAHEAD(3) Subquery() ) ")" )
)
ASTComparisonCondition ComparisonCondition() :
{String op;}
{
(LOOKAHEAD(3) SqlExpression() | ExpressionListMultiple() )
op=ComparisonOp() { jjtThis.setOperator(op); }
( <ANY> | <SOME> | <ALL> )?
(LOOKAHEAD(3) "(" Subquery() ")"
|LOOKAHEAD(3) "(" ExpressionListSingle() ")"
|LOOKAHEAD(3) "(" ExpressionListMultiple() ("," ExpressionListMultiple())* ")"
|LOOKAHEAD(3) SqlExpression())
{ return jjtThis; }
}
@ -3179,17 +3215,17 @@ ASTEqualityExpression EqualityExpression() #EqualityExpression(>1) :
{
//RelationalExpression() ( ( "=" | "!=" | "<>" | <IS>) RelationalExpression() )*
(
simpleNode=RelationalExpression()
{sb.append(simpleNode.getImage());}
(
simpleNode = RelationalExpression()
) {sb.append(simpleNode.getImage());}
(
( ("=" ) {sb.append(" = ");}
| ("!" "=" ) {sb.append(" != ");}
( "=" {sb.append(" = ");}
| "!" "=" {sb.append(" != ");}
// Now unde RelationalExpression | ("<" ">" ) {sb.append(" <> ");}
| (<IS>) {sb.append(" IS ");})
(
simpleNode = RelationalExpression()
) {sb.append(simpleNode.getImage());}
| <IS> {sb.append(" IS ");}
)
simpleNode=RelationalExpression()
{sb.append(simpleNode.getImage());}
)*
)
{
@ -3209,17 +3245,16 @@ ASTRelationalExpression RelationalExpression() #RelationalExpression(>1) :
(
(
(
("<>" { sb.append(" <> "); } )
| ("<=" { sb.append(" <= "); } )
| (">=" { sb.append(" >= "); } )
| ("!=" { sb.append(" != "); } )
| ("~=" { sb.append(" ~= "); } )
| ("^=" { sb.append(" ^= "); } )
| ("<" { sb.append(" < "); } )
| (">" { sb.append(" > "); } )
( LOOKAHEAD(2) "<" ">" { sb.append(" <> "); }
|LOOKAHEAD(2) "<" "=" { sb.append(" <= "); }
|LOOKAHEAD(2) ">" "=" { sb.append(" >= "); }
// then lookahead(1) is enough
| "<" { sb.append(" < "); }
| ">" { sb.append(" > "); }
| "!" "=" { sb.append(" != "); }
| "~" "=" { sb.append(" ~= "); }
| "^" "=" { sb.append(" ^= "); }
)
{ sb.append(" "); }
| [(<NOT>) { sb.append(" NOT "); }]
(

1
pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java
View File

@ -69,3 +69,4 @@ public class PLSQLParser extends AbstractParser {
return new HashMap<>(); // FIXME
}
}

6
pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLParserTest.java
View File

@ -74,6 +74,12 @@ public class PLSQLParserTest extends AbstractPLSQLParserTst {
plsql.parseResource("CaseIssue1454.pls");
}
@Test
public void testRelationalOperators() {
// https://github.com/pmd/pmd/issues/3746
plsql.parseResource("RelationalOperators.pls");
}
@Test
public void testExecuteImmediateIssue3106() {
plsql.parseResource("ExecuteImmediateIssue3106.pls");

18
pmd-plsql/src/test/resources/net/sourceforge/pmd/lang/plsql/ast/RelationalOperators.pls Normal file
View File

@ -0,0 +1,18 @@
CREATE OR REPLACE PROCEDURE EXAMPLE_PROCEDURE IS
--
l_total_objects NUMBER(10);
--
BEGIN
--
SELECT COUNT(1)
INTO l_total_objects
FROM USER_OBJECTS
WHERE namespace < = 1
OR namespace > = 0
OR namespace >
= 0
;
--
DBMS_OUTPUT.Put_Line('Total number of objects: ' || l_total_objects);
--
END EXAMPLE_PROCEDURE;