projects / lttng-tools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Filter: index array, sequences, implement bitwise binary operators
[lttng-tools.git] / src / lib / lttng-ctl / filter / filter-parser.y
diff --git a/src/lib/lttng-ctl/filter/filter-parser.y b/src/lib/lttng-ctl/filter/filter-parser.y
index 29e2866a7b0990979703ad5bc0a7434786e20c91..7c4aebe8db3807ed4a2034bbccd95da625e0544d 100644 (file)
--- a/src/lib/lttng-ctl/filter/filter-parser.y
+++ b/src/lib/lttng-ctl/filter/filter-parser.y
@@ -34,6 +34,11 @@
 
 #include <common/macros.h>
 
+#define WIDTH_u64_SCANF_IS_A_BROKEN_API        "20"
+#define WIDTH_o64_SCANF_IS_A_BROKEN_API        "22"
+#define WIDTH_x64_SCANF_IS_A_BROKEN_API        "17"
+#define WIDTH_lg_SCANF_IS_A_BROKEN_API "4096"  /* Hugely optimistic approximation */
+
 LTTNG_HIDDEN
 int yydebug;
 LTTNG_HIDDEN
@@ -84,9 +89,13 @@ static struct gc_string *gc_string_alloc(struct filter_parser_ctx *parser_ctx,
        for (alloclen = 8; alloclen < sizeof(long) + sizeof(*gstr) + len;
             alloclen *= 2);
 
-       gstr = malloc(alloclen);
+       gstr = zmalloc(alloclen);
+       if (!gstr) {
+               goto end;
+       }
        cds_list_add(&gstr->gc, &parser_ctx->allocated_strings);
        gstr->alloclen = alloclen;
+end:
        return gstr;
 }
 
@@ -138,7 +147,7 @@ static struct filter_node *make_node(struct filter_parser_ctx *scanner,
        struct filter_ast *ast = filter_parser_get_ast(scanner);
        struct filter_node *node;
 
-       node = malloc(sizeof(*node));
+       node = zmalloc(sizeof(*node));
        if (!node)
                return NULL;
        memset(node, 0, sizeof(*node));
@@ -175,7 +184,7 @@ static struct filter_node *make_op_node(struct filter_parser_ctx *scanner,
        struct filter_ast *ast = filter_parser_get_ast(scanner);
        struct filter_node *node;
 
-       node = malloc(sizeof(*node));
+       node = zmalloc(sizeof(*node));
        if (!node)
                return NULL;
        memset(node, 0, sizeof(*node));
@@ -217,7 +226,7 @@ static struct filter_ast *filter_ast_alloc(void)
 {
        struct filter_ast *ast;
 
-       ast = malloc(sizeof(*ast));
+       ast = zmalloc(sizeof(*ast));
        if (!ast)
                return NULL;
        memset(ast, 0, sizeof(*ast));
@@ -249,7 +258,7 @@ struct filter_parser_ctx *filter_parser_ctx_alloc(FILE *input)
 
        yydebug = filter_parser_debug;
 
-       parser_ctx = malloc(sizeof(*parser_ctx));
+       parser_ctx = zmalloc(sizeof(*parser_ctx));
        if (!parser_ctx)
                return NULL;
        memset(parser_ctx, 0, sizeof(*parser_ctx));
@@ -327,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
@@ -341,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
 
 %%
 
@@ -381,47 +393,44 @@ 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;
-                       sscanf(yylval.gs->s, "%" PRIu64,
-                              &$$->u.expression.u.constant);
+                       if (sscanf(yylval.gs->s, "%" WIDTH_u64_SCANF_IS_A_BROKEN_API SCNu64,
+                                       &$$->u.expression.u.constant) != 1) {
+                               parse_error(parser_ctx, "cannot scanf decimal constant");
+                       }
                }
        |       OCTAL_CONSTANT
                {
                        $$ = make_node(parser_ctx, NODE_EXPRESSION);
                        $$->u.expression.type = AST_EXP_CONSTANT;
-                       sscanf(yylval.gs->s, "0%" PRIo64,
-                              &$$->u.expression.u.constant);
+                       if (!strcmp(yylval.gs->s, "0")) {
+                               $$->u.expression.u.constant = 0;
+                       } else if (sscanf(yylval.gs->s, "0%" WIDTH_o64_SCANF_IS_A_BROKEN_API SCNo64,
+                                       &$$->u.expression.u.constant) != 1) {
+                               parse_error(parser_ctx, "cannot scanf octal constant");
+                       }
                }
        |       HEXADECIMAL_CONSTANT
                {
                        $$ = make_node(parser_ctx, NODE_EXPRESSION);
                        $$->u.expression.type = AST_EXP_CONSTANT;
-                       sscanf(yylval.gs->s, "0x%" PRIx64,
-                              &$$->u.expression.u.constant);
+                       if (sscanf(yylval.gs->s, "0x%" WIDTH_x64_SCANF_IS_A_BROKEN_API SCNx64,
+                                       &$$->u.expression.u.constant) != 1) {
+                               parse_error(parser_ctx, "cannot scanf hexadecimal constant");
+                       }
                }
        |       FLOAT_CONSTANT
                {
                        $$ = make_node(parser_ctx, NODE_EXPRESSION);
                        $$->u.expression.type = AST_EXP_FLOAT_CONSTANT;
-                       sscanf(yylval.gs->s, "%lg",
-                              &$$->u.expression.u.float_constant);
+                       if (sscanf(yylval.gs->s, "%" WIDTH_lg_SCANF_IS_A_BROKEN_API "lg",
+                                       &$$->u.expression.u.float_constant) != 1) {
+                               parse_error(parser_ctx, "cannot scanf float constant");
+                       }
                }
        |       STRING_LITERAL_START DQUOTE
                {
@@ -449,23 +458,62 @@ primary_expression
                }
        ;
 
-postfix_expression
-       : primary_expression
-               {       $$ = $1;                                        }
-       | postfix_expression DOT IDENTIFIER
+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_bracket = $2;
+               }
+       ;
+
+postfix_expression
+       : prefix_expression
+               {
+                       $$ = $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;
                }
        ;
@@ -473,6 +521,8 @@ postfix_expression
 unary_expression
        : postfix_expression
                {       $$ = $1;                                        }
+       | primary_expression
+               {       $$ = $1;                                        }
        | unary_operator unary_expression
                {
                        $$ = $1;
@@ -499,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;
                }
        ;
 
@@ -585,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);
                }
        ;
 
@@ -594,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);
                }
        ;
 
@@ -603,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);
                }
        ;
 
LTTng 2.0 tools and control repository
This page took 0.027038 seconds and 4 git commands to generate.