Skip to content

fix for escaped and grouping parentheses in like/regex operations #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
javierlores wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix for escaped and grouping parentheses in like/regex operations #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 36 additions & 23 deletions grammar/grammar.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ SKIP :
"\t"
}

TOKEN : { < ESCAPED_OPEN_PARENTHESES : "\\(" > }
TOKEN : { < ESCAPED_CLOSE_PARENTHESES : "\\)" > }
TOKEN : { < ESCAPED_LOCAL_RESOLUTION : "\\$" > }
TOKEN : { < ESCAPED_LINK : "\\@" > }
TOKEN : { < OPEN_PARENTHESES : "(" > }
TOKEN : { < CLOSE_PARENTHESES : ")" > }
TOKEN : { < OPEN_BRACKET : "[" > }
Expand All @@ -117,6 +121,7 @@ TOKEN [IGNORE_CASE]: { < TIMESTAMP: "at" | "on" | "during" | "in" > }
TOKEN [IGNORE_CASE]: { < WHERE: "where" > }
TOKEN [IGNORE_CASE]: { < RESERVED_IDENTIFIER: "$id$" > }


TOKEN [IGNORE_CASE]:
{
< CONJUNCTION: "and" | "&&" | "&" >
Expand Down Expand Up @@ -193,7 +198,7 @@ TOKEN :
|
< NON_ALPHANUMERIC_AND_ALPHANUMERIC: (<NON_ALPHANUMERIC>|<ALPHANUMERIC>)+ >
|
< #NON_ALPHANUMERIC: ~[",", "_","a"-"z","A"-"Z", "\n", "\t", "\r", " ", "(", ")", "[", "]", "="] >
< #NON_ALPHANUMERIC: ~[",", "_","a"-"z","A"-"Z", "\n", "\t", "\r", " ", "(", ")", "[", "]", "=", "\\"] >
|
< #LETTER: ["_","a"-"z","A"-"Z"] >
|
Expand Down Expand Up @@ -252,7 +257,9 @@ void ConjunctionExpression() : {}

void UnaryExpression() : {}
{
(<OPEN_PARENTHESES>) DisjunctionExpression() (<CLOSE_PARENTHESES>) | RelationalExpression()
<OPEN_PARENTHESES> DisjunctionExpression() <CLOSE_PARENTHESES>
|
RelationalExpression()
}

void RelationalExpression() #Expression :
Expand Down Expand Up @@ -304,6 +311,7 @@ KeyTokenSymbol Key() :
ValueTokenSymbol UnaryValue() :
{
FunctionValueSymbol function;
Token escape = null;
Token key;
Token word;
String value = "";
Expand All @@ -316,8 +324,10 @@ ValueTokenSymbol UnaryValue() :
(function=ValueFunction())
{ return function; }
|
( LOOKAHEAD(2) (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING>) { value += (value.equals("")) ? word.image : " " + word.image; })+
(LOOKAHEAD(2) (escape=<ESCAPED_LINK> | escape=<ESCAPED_LOCAL_RESOLUTION>))? ( LOOKAHEAD(2) (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING> | word=<ESCAPED_LOCAL_RESOLUTION> | word=<ESCAPED_LINK>) { value += (value.equals("")) ? word.image : " " + word.image; })+
{
value = escape != null ? escape.image + value : value;

if(value.charAt(0) == '$') {
String var = value.substring(1);
try {
Expand Down Expand Up @@ -359,24 +369,28 @@ ValueTokenSymbol RegexValue() :
{
Token word;
String value = "";
}
{
(word=<QUOTED_STRING>)
{ return new ValueSymbol(transformValue(word.image.replace("\\\"", "\""))); }
|
value=RegexBaseValue()
{ return new ValueSymbol(transformValue(value)); }
}

String RegexBaseValue() :
{
Token word;
String base = "";
String baseOp = "";
String value = "";
}
{
<OPEN_PARENTHESES> (LOOKAHEAD(4) (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING> | word="_" | word="=")
{
if (value.equals("") |
value.endsWith("(") | word.image.equals(")") |
value.endsWith("=") | word.image.equals("=") |
value.endsWith("_") | word.image.equals("_")) {
value += word.image;
}
else {
value += " " + word.image;
}
})+ <CLOSE_PARENTHESES>
{ return new ValueSymbol(transformValue("(" + value + ")")); }
(LOOKAHEAD(3) <OPEN_PARENTHESES> base=RegexBaseValue() <CLOSE_PARENTHESES> (LOOKAHEAD(3)baseOp=RegexBaseValue())?
{ value += "(" + base + ")" + baseOp; })+
{ return value; }
|
(LOOKAHEAD(3) (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING> | word="_" | word="=")
(LOOKAHEAD(2) (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING> | word=<UNARY_OPERATOR> | word="_" | word = "," | word=<OPEN_BRACKET> | word=<CLOSE_BRACKET> | word=<ESCAPED_OPEN_PARENTHESES> | word=<ESCAPED_CLOSE_PARENTHESES>)
{
if (value.equals("") |
value.endsWith("(") | word.image.equals(")") |
Expand All @@ -388,15 +402,13 @@ ValueTokenSymbol RegexValue() :
value += " " + word.image;
}
})+
{ return new ValueSymbol(transformValue(value)); }
|
(word=<QUOTED_STRING>)
{ return new ValueSymbol(transformValue(word.image.replace("\\\"", "\""))); }
{ return value; }
}

ValueTokenSymbol BinaryValue() :
{
FunctionValueSymbol function;
Token escape = null;
Token key;
Token word;
String value = "";
Expand All @@ -409,9 +421,10 @@ ValueTokenSymbol BinaryValue() :
(function=ValueFunction())
{ return function; }
|
(word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING>)
(escape=<ESCAPED_LINK> | escape=<ESCAPED_LOCAL_RESOLUTION>)? (word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC> | word=<PERIOD_SEPARATED_STRING>)
{
value = word.image;
value = escape != null ? escape.image + word.image : word.image;

if(value.charAt(0) == '$') {
String var = value.substring(1);
try {
Expand Down
Loading