X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-ast.h;h=4bf42fd3fa915f0abf93a7c083a6c15c8fff9183;hp=067624906d7ad5cd1fa8cc382c095dcd7e1f5387;hb=bff988fac4f8d1ffab3f85f0eec9546c76e57706;hpb=661dfdd190c65bad5a044e21c1d5f9ad59144bf8

diff --git a/src/lib/lttng-ctl/filter/filter-ast.h b/src/lib/lttng-ctl/filter/filter-ast.h
index 067624906..4bf42fd3f 100644
--- a/src/lib/lttng-ctl/filter/filter-ast.h
+++ b/src/lib/lttng-ctl/filter/filter-ast.h
@@ -71,9 +71,9 @@ enum op_type {
 	AST_OP_LSHIFT,
 	AST_OP_AND,
 	AST_OP_OR,
-	AST_OP_BIN_AND,
-	AST_OP_BIN_OR,
-	AST_OP_BIN_XOR,
+	AST_OP_BIT_AND,
+	AST_OP_BIT_OR,
+	AST_OP_BIT_XOR,
 
 	AST_OP_EQ,
 	AST_OP_NE,
@@ -88,7 +88,7 @@ enum unary_op_type {
 	AST_UNARY_PLUS,
 	AST_UNARY_MINUS,
 	AST_UNARY_NOT,
-	AST_UNARY_BIN_NOT,
+	AST_UNARY_BIT_NOT,
 };
 
 enum ast_link_type {
@@ -134,10 +134,12 @@ struct filter_node {
 				 */
 				struct filter_node *child;
 			} u;
-			/* prev: linked dot/arrow chain (postfix expression) */
+			/* prev: backward dot/arrow chain (postfix expression) */
 			struct filter_node *prev;
-			/* next: linked bracket chain (prefix expression) */
+			/* next: forward dot/arrow chain, generated by a visitor. */
 			struct filter_node *next;
+			/* next_bracket: linked bracket chain (prefix expression) */
+			struct filter_node *next_bracket;
 		} expression;
 		struct {
 			enum op_type type;
@@ -179,7 +181,6 @@ struct filter_ast *filter_parser_get_ast(struct filter_parser_ctx *parser_ctx)
 	return parser_ctx->ast;
 }
 
-int filter_visitor_set_parent(struct filter_parser_ctx *ctx);
 int filter_visitor_print_xml(struct filter_parser_ctx *ctx, FILE *stream,
 			int indent);
 int filter_visitor_ir_generate(struct filter_parser_ctx *ctx);