X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=ed766952c175d32ad4412398d27e6431db14c4df;hp=8fc83dfad49c154f4ad756da4e7f73a3a72de60a;hb=b7e35badc2eac52e27b802a9078bfb7c8f3b04a7;hpb=71444c467e00f96d6b0efaa0eeaaefc4bde615de

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 8fc83dfa..ed766952 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -304,6 +304,7 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		break;
 	case NODE_STRUCT:
 		CDS_INIT_LIST_HEAD(&node->u._struct.declaration_list);
+		CDS_INIT_LIST_HEAD(&node->u._struct.min_align);
 		break;
 
 	case NODE_UNKNOWN:
@@ -858,7 +859,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
  */
 %expect 2
 %start file
-%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT
+%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN
 %token <gs> IDENTIFIER ID_TYPE
 %token ERROR
 %union
@@ -971,6 +972,8 @@ keywords:
 		{	$$ = yylval.gs;		}
 	|	TRACE
 		{	$$ = yylval.gs;		}
+	|	TOK_ALIGN
+		{	$$ = yylval.gs;		}
 	;
 
 /* 1.5 Constants */
@@ -1595,6 +1598,32 @@ struct_type_specifier:
 			$$->u._struct.has_body = 0;
 			$$->u._struct.name = $1->s;
 		}
+	|	struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN
+		{
+			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
+			cds_list_add_tail(&($6)->siblings, &$$->u._struct.min_align);
+			if ($2 && set_parent_node($2, $$))
+				reparent_error(scanner, "struct reparent error");
+		}
+	|	IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN
+		{
+			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
+			$$->u._struct.name = $1->s;
+			cds_list_add_tail(&($7)->siblings, &$$->u._struct.min_align);
+			if ($3 && set_parent_node($3, $$))
+				reparent_error(scanner, "struct reparent error");
+		}
+	|	ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end TOK_ALIGN LPAREN unary_expression RPAREN
+		{
+			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
+			$$->u._struct.name = $1->s;
+			cds_list_add_tail(&($7)->siblings, &$$->u._struct.min_align);
+			if ($3 && set_parent_node($3, $$))
+				reparent_error(scanner, "struct reparent error");
+		}
 	;
 
 struct_declaration_begin: