X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-parser.y;h=7c4aebe8db3807ed4a2034bbccd95da625e0544d;hp=12605cd382b8af4d65c3d59b7076b3d982870af5;hb=bff988fac4f8d1ffab3f85f0eec9546c76e57706;hpb=661dfdd190c65bad5a044e21c1d5f9ad59144bf8

diff --git a/src/lib/lttng-ctl/filter/filter-parser.y b/src/lib/lttng-ctl/filter/filter-parser.y
index 12605cd38..7c4aebe8d 100644
--- a/src/lib/lttng-ctl/filter/filter-parser.y
+++ b/src/lib/lttng-ctl/filter/filter-parser.y
@@ -336,6 +336,8 @@ void filter_parser_ctx_free(struct filter_parser_ctx *parser_ctx)
 %type <gs> s_char s_char_sequence c_char c_char_sequence
 
 %type <n> primary_expression
+%type <n> prefix_expression
+%type <n> prefix_expression_rec
 %type <n> postfix_expression
 %type <n> unary_expression
 %type <n> unary_operator
@@ -350,6 +352,7 @@ void filter_parser_ctx_free(struct filter_parser_ctx *parser_ctx)
 %type <n> logical_and_expression
 %type <n> logical_or_expression
 %type <n> expression
+%type <n> identifiers
 
 %%
 
@@ -390,21 +393,8 @@ s_char:
 		}
 	;
 
-primary_expression
-	:	IDENTIFIER
-		{
-			$$ = make_node(parser_ctx, NODE_EXPRESSION);
-			$$->u.expression.type = AST_EXP_IDENTIFIER;
-			$$->u.expression.u.identifier = yylval.gs->s;
-		}
-	|	GLOBAL_IDENTIFIER
-		{
-			$$ = make_node(parser_ctx, NODE_EXPRESSION);
-			$$->u.expression.type = AST_EXP_GLOBAL_IDENTIFIER;
-			$$->u.expression.u.identifier = yylval.gs->s;
-		}
-
-	|	DECIMAL_CONSTANT
+primary_expression:
+		DECIMAL_CONSTANT
 		{
 			$$ = make_node(parser_ctx, NODE_EXPRESSION);
 			$$->u.expression.type = AST_EXP_CONSTANT;
@@ -468,29 +458,62 @@ primary_expression
 		}
 	;
 
-postfix_expression
-	: primary_expression
-		{	$$ = $1;					}
-	| postfix_expression LSBRAC unary_expression RSBRAC
+identifiers
+	:	IDENTIFIER
+		{
+			$$ = make_node(parser_ctx, NODE_EXPRESSION);
+			$$->u.expression.type = AST_EXP_IDENTIFIER;
+			$$->u.expression.u.identifier = yylval.gs->s;
+		}
+	|	GLOBAL_IDENTIFIER
+		{
+			$$ = make_node(parser_ctx, NODE_EXPRESSION);
+			$$->u.expression.type = AST_EXP_GLOBAL_IDENTIFIER;
+			$$->u.expression.u.identifier = yylval.gs->s;
+		}
+	;
+
+prefix_expression_rec
+	: LSBRAC unary_expression RSBRAC
+		{
+			$$ = $2;
+		}
+	| LSBRAC unary_expression RSBRAC prefix_expression_rec
+		{
+			$$ = $2;
+			$$->u.expression.pre_op = AST_LINK_BRACKET;
+			$$->u.expression.prev = $4;
+		}
+	;
+
+prefix_expression
+	: identifiers
+		{
+			$$ = $1;
+		}
+	| identifiers prefix_expression_rec
 		{
 			$$ = $1;
 			$$->u.expression.pre_op = AST_LINK_BRACKET;
-			$$->u.expression.next = $3;
+			$$->u.expression.next_bracket = $2;
 		}
-	| postfix_expression DOT IDENTIFIER
+	;
+
+postfix_expression
+	: prefix_expression
 		{
-			$$ = make_node(parser_ctx, NODE_EXPRESSION);
-			$$->u.expression.type = AST_EXP_IDENTIFIER;
+			$$ = $1;
+		}
+	| postfix_expression DOT prefix_expression
+		{
+			$$ = $3;
 			$$->u.expression.post_op = AST_LINK_DOT;
-			$$->u.expression.u.identifier = $3->s;
 			$$->u.expression.prev = $1;
 		}
-	| postfix_expression RARROW IDENTIFIER
+	| postfix_expression RARROW prefix_expression
 		{
-			$$ = make_node(parser_ctx, NODE_EXPRESSION);
-			$$->u.expression.type = AST_EXP_IDENTIFIER;
+			$$ = $3;
 			$$->u.expression.post_op = AST_LINK_RARROW;
-			$$->u.expression.u.identifier = $3->s;
 			$$->u.expression.prev = $1;
 		}
 	;
@@ -498,6 +521,8 @@ postfix_expression
 unary_expression
 	: postfix_expression
 		{	$$ = $1;					}
+	| primary_expression
+		{	$$ = $1;					}
 	| unary_operator unary_expression
 		{
 			$$ = $1;
@@ -524,7 +549,7 @@ unary_operator
 	| NOT_BIN
 		{
 			$$ = make_node(parser_ctx, NODE_UNARY_OP);
-			$$->u.unary_op.type = AST_UNARY_BIN_NOT;
+			$$->u.unary_op.type = AST_UNARY_BIT_NOT;
 		}
 	;
 
@@ -610,7 +635,7 @@ and_expression
 		{	$$ = $1;					}
 	| and_expression AND_BIN equality_expression
 		{
-			$$ = make_op_node(parser_ctx, AST_OP_BIN_AND, $1, $3);
+			$$ = make_op_node(parser_ctx, AST_OP_BIT_AND, $1, $3);
 		}
 	;
 
@@ -619,7 +644,7 @@ exclusive_or_expression
 		{	$$ = $1;					}
 	| exclusive_or_expression XOR_BIN and_expression
 		{
-			$$ = make_op_node(parser_ctx, AST_OP_BIN_XOR, $1, $3);
+			$$ = make_op_node(parser_ctx, AST_OP_BIT_XOR, $1, $3);
 		}
 	;
 
@@ -628,7 +653,7 @@ inclusive_or_expression
 		{	$$ = $1;					}
 	| inclusive_or_expression OR_BIN exclusive_or_expression
 		{
-			$$ = make_op_node(parser_ctx, AST_OP_BIN_OR, $1, $3);
+			$$ = make_op_node(parser_ctx, AST_OP_BIT_OR, $1, $3);
 		}
 	;