transformed primary expression and sign parsing

Author: wumpz

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -2334,47 +2334,49 @@ Expression PrimaryExpression():
     ColDataType type = null;
 }
 {
+[sign="+" | sign="-"]
 (
     <K_NULL> { retval = new NullValue(); }
 
     | retval=CaseWhenExpression()
 
-    | LOOKAHEAD(3) [sign="+" | sign="-"] "?" { retval = new JdbcParameter(++jdbcParameterIndex, false); } [ LOOKAHEAD(2) token = <S_LONG> { ((JdbcParameter)retval).setUseFixedIndex(true); ((JdbcParameter)retval).setIndex(Integer.valueOf(token.image)); } ]
+    | LOOKAHEAD(2) "?" { retval = new JdbcParameter(++jdbcParameterIndex, false); } 
+		[ LOOKAHEAD(2) token = <S_LONG> { ((JdbcParameter)retval).setUseFixedIndex(true); ((JdbcParameter)retval).setIndex(Integer.valueOf(token.image)); } ]
 
-    | LOOKAHEAD(3) [sign="+" | sign="-"] retval=JdbcNamedParameter()
+    | LOOKAHEAD(2) retval=JdbcNamedParameter()
 
-    | LOOKAHEAD(3) [sign="+" | sign="-"] retval=UserVariable()
+    | LOOKAHEAD(2) retval=UserVariable()
 
-    | LOOKAHEAD(3) [sign="+" | sign="-"] retval=NumericBind()
+    | LOOKAHEAD(2) retval=NumericBind()
 
     | LOOKAHEAD(AnalyticExpression()) retval=AnalyticExpression()
 
     | LOOKAHEAD(3) retval=ExtractExpression()
 
     | retval=MySQLGroupConcat()
 
-    | LOOKAHEAD([sign="+" | sign="-"] JsonExpression()) [sign="+" | sign="-"] retval=JsonExpression()
+    | LOOKAHEAD(JsonExpression()) retval=JsonExpression()
 
-    | LOOKAHEAD(["+" | "-"] Function()) [sign="+" | sign="-"] retval=Function()
+    | LOOKAHEAD(Function()) retval=Function()
 
-    | LOOKAHEAD(2) [sign="+" | sign="-"] token=<S_DOUBLE>  { retval = new DoubleValue(token.image); }
+    | token=<S_DOUBLE>  { retval = new DoubleValue(token.image); }
 
-    | LOOKAHEAD(2) [sign="+" | sign="-"] token=<S_LONG> { retval = new LongValue(token.image); }
+    | token=<S_LONG> { retval = new LongValue(token.image); }
 
-    | LOOKAHEAD(2) [sign="+" | sign="-"] token=<S_HEX>  { retval = new HexValue(token.image); }
+    | token=<S_HEX>  { retval = new HexValue(token.image); }
 
-    | LOOKAHEAD(2) [sign="+" | sign="-"] retval=CastExpression()
+    | LOOKAHEAD(2) retval=CastExpression()
 
     // support timestamp expressions
     | token=<K_TIME_KEY_EXPR> { retval = new TimeKeyExpression(token.image); }
 
     | LOOKAHEAD(2) retval=DateTimeLiteralExpression()
 
-    | LOOKAHEAD(["+" | "-"] Column())         [sign="+" | sign="-"] retval=Column()
+    | LOOKAHEAD(Column()) retval=Column()
 
-    | LOOKAHEAD(["+" | "-"] "(" SimpleExpression() ")") [sign="+" | sign="-"] "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
+    | LOOKAHEAD("(" SimpleExpression() ")") "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
 
-    | LOOKAHEAD(3) [sign="+" | sign="-"] "(" retval=SubSelect() ")" 
+    | LOOKAHEAD(3) "(" retval=SubSelect() ")" 
 
     | token=<S_CHAR_LITERAL> { retval = new StringValue(token.image); }