@@ -222,6 +222,7 @@ public void AbstracrSyntaxTree()
222222 /// </summary>
223223 [ Theory ]
224224 [ InlineData ( "" , true , 0 , WqlExpressionType . None , WqlExpressionType . Attribute , WqlExpressionType . OpenParenthesis ) ]
225+ [ InlineData ( "(" , false , 1 , WqlExpressionType . OpenParenthesis , WqlExpressionType . Attribute , WqlExpressionType . OpenParenthesis ) ]
225226 [ InlineData ( "text" , false , 1 , WqlExpressionType . Attribute , WqlExpressionType . Operator ) ]
226227 [ InlineData ( "text " , false , 1 , WqlExpressionType . Attribute , WqlExpressionType . Operator ) ]
227228 [ InlineData ( "text #" , false , 2 , WqlExpressionType . Operator , WqlExpressionType . Operator ) ]
@@ -233,17 +234,16 @@ public void AbstracrSyntaxTree()
233234 [ InlineData ( "text ~ or" , false , 2 , WqlExpressionType . Operator , WqlExpressionType . Parameter ) ]
234235 [ InlineData ( "text ~ &" , false , 2 , WqlExpressionType . Operator , WqlExpressionType . Parameter ) ]
235236 [ InlineData ( "text ~ ||" , false , 2 , WqlExpressionType . Operator , WqlExpressionType . Parameter ) ]
236- [ InlineData ( "text ~ '" , false , 3 , WqlExpressionType . Parameter , WqlExpressionType . Parameter ) ]
237- [ InlineData ( "text ~ \" " , false , 3 , WqlExpressionType . Parameter , WqlExpressionType . Parameter ) ]
238- [ InlineData ( "text ~ Helena" , true , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator ) ]
239- [ InlineData ( "text ~ 'Helena'" , true , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator ) ]
240- [ InlineData ( "text ~ \" Helena\" " , true , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator ) ]
241- [ InlineData ( "text ~ day(" , false , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator ) ]
242- [ InlineData ( "text ~ day()" , true , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator ) ]
243- //[InlineData("text ~ day(\"param1\")", true, 3, WqlExpressionType.Parameter, WqlExpressionType.LogicalOperator)]
244- [ InlineData ( "text ~ Helena and" , false , 4 , WqlExpressionType . LogicalOperator , WqlExpressionType . Attribute ) ]
245-
246- //[InlineData("text in ('Helena', 'Hans')", true, 2, WqlExpressionType.Operator, WqlExpressionType.Parameter, WqlExpressionType.OpenParenthesis)]
237+ [ InlineData ( "text ~ '" , false , 3 , WqlExpressionType . Quotation , WqlExpressionType . Parameter ) ]
238+ [ InlineData ( "text ~ \" " , false , 3 , WqlExpressionType . Quotation , WqlExpressionType . Parameter ) ]
239+ [ InlineData ( "text ~ Helena" , true , 3 , WqlExpressionType . Parameter , WqlExpressionType . LogicalOperator , WqlExpressionType . Order , WqlExpressionType . Partitioning ) ]
240+ [ InlineData ( "text ~ 'Helena'" , true , 5 , WqlExpressionType . Quotation , WqlExpressionType . LogicalOperator , WqlExpressionType . Order , WqlExpressionType . Partitioning ) ]
241+ [ InlineData ( "text ~ \" Helena\" " , true , 5 , WqlExpressionType . Quotation , WqlExpressionType . LogicalOperator , WqlExpressionType . Order , WqlExpressionType . Partitioning ) ]
242+ [ InlineData ( "text ~ day(" , false , 4 , WqlExpressionType . OpenParenthesis , WqlExpressionType . Parameter , WqlExpressionType . Quotation , WqlExpressionType . CloseParenthesis ) ]
243+ [ InlineData ( "text ~ day()" , true , 5 , WqlExpressionType . CloseParenthesis , WqlExpressionType . LogicalOperator , WqlExpressionType . Order , WqlExpressionType . Partitioning ) ]
244+ [ InlineData ( "text ~ day(\" " , false , 5 , WqlExpressionType . Quotation , WqlExpressionType . Parameter , WqlExpressionType . CloseParenthesis ) ]
245+ [ InlineData ( "text ~ Helena and" , false , 4 , WqlExpressionType . LogicalOperator , WqlExpressionType . Attribute , WqlExpressionType . OpenParenthesis ) ]
246+ [ InlineData ( "text in ('Helena', 'Hans')" , true , 11 , WqlExpressionType . CloseParenthesis , WqlExpressionType . LogicalOperator , WqlExpressionType . Order , WqlExpressionType . Partitioning ) ]
247247 public void Analyze ( string wql , bool valid , int count , WqlExpressionType type , params WqlExpressionType [ ] expectedNextTokens )
248248 {
249249 // arrange
0 commit comments