Fix 64-bit warnings

[babeltrace.git] / formats / ctf / metadata / ctf-parser.y

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 6706e3dcbff0df3fa341002ce9306d76d1640792..cbdfa7fd6e2786625a22a7e0ef35f715293ebff1 100644 (file)
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -22,9 +22,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <helpers/list.h>
 #include <glib.h>
 #include <errno.h>
+#include <inttypes.h>
+#include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
 #include "ctf-ast.h"
@@ -153,7 +154,7 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id)
 {
        int ret;
 
-       ret = (int) g_hash_table_lookup(s->types, id);
+       ret = (int) (long) g_hash_table_lookup(s->types, id);
        printf_dbg("lookup %p %s %d\n", s, id, ret);
        return ret;
 }
@@ -194,6 +195,7 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
        node->type = type;
        CDS_INIT_LIST_HEAD(&node->tmp_head);
        cds_list_add(&node->gc, &ast->allocated_nodes);
+       cds_list_add(&node->siblings, &node->tmp_head);
 
        switch (type) {
        case NODE_ROOT:
@@ -906,74 +908,64 @@ postfix_expression:
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = yylval.gs->s;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       ID_TYPE
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = yylval.gs->s;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       keywords
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = yylval.gs->s;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
 
        |       DECIMAL_CONSTANT
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "%llu",
+                       sscanf(yylval.gs->s, "%" PRIu64,
                               &$$->u.unary_expression.u.unsigned_constant);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       OCTAL_CONSTANT
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "0%llo",
+                       sscanf(yylval.gs->s, "0%" PRIo64,
                               &$$->u.unary_expression.u.unsigned_constant);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       HEXADECIMAL_CONSTANT
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "0x%llx",
+                       sscanf(yylval.gs->s, "0x%" PRIx64,
                               &$$->u.unary_expression.u.unsigned_constant);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       STRING_LITERAL_START DQUOTE
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = "";
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       STRING_LITERAL_START s_char_sequence DQUOTE
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = $2->s;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       CHARACTER_CONSTANT_START c_char_sequence SQUOTE
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_STRING;
                        $$->u.unary_expression.u.string = $2->s;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       LPAREN unary_expression RPAREN
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_NESTED;
                        $$->u.unary_expression.u.nested_exp = $2;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       postfix_expression LSBRAC unary_expression RSBRAC
                {
@@ -1110,12 +1102,10 @@ event_declaration:
                event_declaration_begin event_declaration_end
                {
                        $$ = make_node(scanner, NODE_EVENT);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       event_declaration_begin ctf_assignment_expression_list event_declaration_end
                {
                        $$ = make_node(scanner, NODE_EVENT);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                        if (set_parent_node($2, $$))
                                reparent_error(scanner, "event_declaration");
                }
@@ -1136,12 +1126,10 @@ stream_declaration:
                stream_declaration_begin stream_declaration_end
                {
                        $$ = make_node(scanner, NODE_STREAM);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       stream_declaration_begin ctf_assignment_expression_list stream_declaration_end
                {
                        $$ = make_node(scanner, NODE_STREAM);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                        if (set_parent_node($2, $$))
                                reparent_error(scanner, "stream_declaration");
                }
@@ -1162,12 +1150,10 @@ trace_declaration:
                trace_declaration_begin trace_declaration_end
                {
                        $$ = make_node(scanner, NODE_TRACE);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       trace_declaration_begin ctf_assignment_expression_list trace_declaration_end
                {
                        $$ = make_node(scanner, NODE_TRACE);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                        if (set_parent_node($2, $$))
                                reparent_error(scanner, "trace_declaration");
                }
@@ -1188,13 +1174,9 @@ declaration_specifiers:
                {
                        $$ = make_node(scanner, NODE_TYPE_SPECIFIER);
                        $$->u.type_specifier.type = TYPESPEC_CONST;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       type_specifier
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       declaration_specifiers CONST
                {
                        struct ctf_node *node;
@@ -1213,10 +1195,7 @@ declaration_specifiers:
 
 type_declarator_list:
                type_declarator
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       type_declarator_list COMMA type_declarator
                {
                        $$ = $1;
@@ -1226,10 +1205,7 @@ type_declarator_list:
 
 abstract_type_declarator_list:
                abstract_type_declarator
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       abstract_type_declarator_list COMMA abstract_type_declarator
                {
                        $$ = $1;
@@ -1490,21 +1466,21 @@ type_specifier_or_integer_constant:
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "%llu",
+                       sscanf(yylval.gs->s, "%" PRIu64,
                               &$$->u.unary_expression.u.unsigned_constant);
                }
        |       OCTAL_CONSTANT
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "0%llo",
+                       sscanf(yylval.gs->s, "0%" PRIo64,
                               &$$->u.unary_expression.u.unsigned_constant);
                }
        |       HEXADECIMAL_CONSTANT
                {
                        $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
                        $$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
-                       sscanf(yylval.gs->s, "0x%llx",
+                       sscanf(yylval.gs->s, "0x%" PRIx64,
                               &$$->u.unary_expression.u.unsigned_constant);
                }
        ;
@@ -1675,13 +1651,9 @@ specifier_qualifier_list:
                {
                        $$ = make_node(scanner, NODE_TYPE_SPECIFIER);
                        $$->u.type_specifier.type = TYPESPEC_CONST;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       type_specifier
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       specifier_qualifier_list CONST
                {
                        struct ctf_node *node;
@@ -1700,10 +1672,7 @@ specifier_qualifier_list:
 
 struct_or_variant_declarator_list:
                struct_or_variant_declarator
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       struct_or_variant_declarator_list COMMA struct_or_variant_declarator
                {
                        $$ = $1;
@@ -1726,10 +1695,7 @@ struct_or_variant_declarator:
 
 enumerator_list:
                enumerator
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       enumerator_list COMMA enumerator
                {
                        $$ = $1;
@@ -1797,10 +1763,7 @@ enumerator:
 
 abstract_declarator_list:
                abstract_declarator
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       abstract_declarator_list COMMA abstract_declarator
                {
                        $$ = $1;
@@ -1968,20 +1931,17 @@ pointer:
                STAR
                {
                        $$ = make_node(scanner, NODE_POINTER);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       STAR pointer
                {
                        $$ = make_node(scanner, NODE_POINTER);
                        cds_list_splice(&($2)->tmp_head, &($$)->tmp_head);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        |       STAR type_qualifier_list pointer
                {
                        $$ = make_node(scanner, NODE_POINTER);
                        $$->u.pointer.const_qualifier = 1;
                        cds_list_splice(&($3)->tmp_head, &($$)->tmp_head);
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
                }
        ;
 
@@ -1995,10 +1955,7 @@ type_qualifier_list:
 
 ctf_assignment_expression_list:
                ctf_assignment_expression SEMICOLON
-               {
-                       $$ = $1;
-                       cds_list_add(&($$)->siblings, &($$)->tmp_head);
-               }
+               {       $$ = $1;        }
        |       ctf_assignment_expression_list ctf_assignment_expression SEMICOLON
                {
                        $$ = $1;