X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=f394fda2702cd398506c0091f9922d5af975ad30;hp=66e37923c9315dd482c577912f3f62a75fa5431a;hb=61e9d0cef413869e6ac39ba85b7b4258d8f7fdbc;hpb=2b0a0f95394186acf18c453209e31b028312ecf3

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 66e37923..f394fda2 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -52,7 +52,7 @@ _cds_list_splice_tail (struct cds_list_head *add, struct cds_list_head *head)
 int yyparse(struct ctf_scanner *scanner);
 int yylex(union YYSTYPE *yyval, struct ctf_scanner *scanner);
 int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals);
-int yylex_destroy(yyscan_t yyscanner) ;
+int yylex_destroy(yyscan_t yyscanner);
 void yyset_in(FILE * in_str, yyscan_t scanner);
 
 int yydebug;
@@ -76,6 +76,7 @@ static const char *node_type_to_str[] = {
 	[ NODE_TYPEALIAS_ALIAS ] = "NODE_TYPEALIAS_ALIAS",
 	[ NODE_TYPEALIAS ] = "NODE_TYPEALIAS",
 	[ NODE_TYPE_SPECIFIER ] = "NODE_TYPE_SPECIFIER",
+	[ NODE_TYPE_SPECIFIER_LIST ] = "NODE_TYPE_SPECIFIER_LIST",
 	[ NODE_POINTER ] = "NODE_POINTER",
 	[ NODE_TYPE_DECLARATOR ] = "NODE_TYPE_DECLARATOR",
 	[ NODE_FLOATING_POINT ] = "NODE_FLOATING_POINT",
@@ -257,15 +258,12 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		break;
 
 	case NODE_TYPEDEF:
-		CDS_INIT_LIST_HEAD(&node->u._typedef.declaration_specifier);
 		CDS_INIT_LIST_HEAD(&node->u._typedef.type_declarators);
 		break;
 	case NODE_TYPEALIAS_TARGET:
-		CDS_INIT_LIST_HEAD(&node->u.typealias_target.declaration_specifier);
 		CDS_INIT_LIST_HEAD(&node->u.typealias_target.type_declarators);
 		break;
 	case NODE_TYPEALIAS_ALIAS:
-		CDS_INIT_LIST_HEAD(&node->u.typealias_alias.declaration_specifier);
 		CDS_INIT_LIST_HEAD(&node->u.typealias_alias.type_declarators);
 		break;
 	case NODE_TYPEALIAS:
@@ -273,6 +271,9 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 
 	case NODE_TYPE_SPECIFIER:
 		break;
+	case NODE_TYPE_SPECIFIER_LIST:
+		CDS_INIT_LIST_HEAD(&node->u.type_specifier_list.head);
+		break;
 	case NODE_POINTER:
 		break;
 	case NODE_TYPE_DECLARATOR:
@@ -292,11 +293,9 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		CDS_INIT_LIST_HEAD(&node->u.enumerator.values);
 		break;
 	case NODE_ENUM:
-		CDS_INIT_LIST_HEAD(&node->u._enum.container_type);
 		CDS_INIT_LIST_HEAD(&node->u._enum.enumerator_list);
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
-		CDS_INIT_LIST_HEAD(&node->u.struct_or_variant_declaration.declaration_specifier);
 		CDS_INIT_LIST_HEAD(&node->u.struct_or_variant_declaration.type_declarators);
 		break;
 	case NODE_VARIANT:
@@ -346,6 +345,7 @@ static int reparent_ctf_expression(struct ctf_node *node,
 	case NODE_TYPEALIAS_ALIAS:
 	case NODE_TYPEALIAS:
 	case NODE_TYPE_SPECIFIER:
+	case NODE_TYPE_SPECIFIER_LIST:
 	case NODE_POINTER:
 	case NODE_TYPE_DECLARATOR:
 	case NODE_ENUMERATOR:
@@ -369,7 +369,7 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent)
 {
 	switch (parent->type) {
 	case NODE_ROOT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.root._typedef);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
@@ -396,6 +396,7 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent)
 	case NODE_TYPEALIAS_ALIAS:
 	case NODE_TYPEALIAS:
 	case NODE_TYPE_SPECIFIER:
+	case NODE_TYPE_SPECIFIER_LIST:
 	case NODE_POINTER:
 	case NODE_TYPE_DECLARATOR:
 	case NODE_ENUMERATOR:
@@ -417,7 +418,7 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
 {
 	switch (parent->type) {
 	case NODE_ROOT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.typealias);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
@@ -444,6 +445,7 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
 	case NODE_TYPEALIAS_ALIAS:
 	case NODE_TYPEALIAS:
 	case NODE_TYPE_SPECIFIER:
+	case NODE_TYPE_SPECIFIER_LIST:
 	case NODE_POINTER:
 	case NODE_TYPE_DECLARATOR:
 	case NODE_ENUMERATOR:
@@ -463,52 +465,90 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
 
 static int reparent_type_specifier(struct ctf_node *node,
 				   struct ctf_node *parent)
+{
+	switch (parent->type) {
+	case NODE_TYPE_SPECIFIER_LIST:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.type_specifier_list.head);
+		break;
+
+	case NODE_TYPE_SPECIFIER:
+	case NODE_EVENT:
+	case NODE_STREAM:
+	case NODE_TRACE:
+	case NODE_VARIANT:
+	case NODE_STRUCT:
+	case NODE_TYPEDEF:
+	case NODE_TYPEALIAS_TARGET:
+	case NODE_TYPEALIAS_ALIAS:
+	case NODE_TYPE_DECLARATOR:
+	case NODE_ENUM:
+	case NODE_STRUCT_OR_VARIANT_DECLARATION:
+	case NODE_TYPEALIAS:
+	case NODE_FLOATING_POINT:
+	case NODE_INTEGER:
+	case NODE_STRING:
+	case NODE_CTF_EXPRESSION:
+	case NODE_POINTER:
+	case NODE_ENUMERATOR:
+	case NODE_UNARY_EXPRESSION:
+		return -EPERM;
+
+	case NODE_UNKNOWN:
+	default:
+		fprintf(stderr, "[error] %s: unknown node type %d\n", __func__,
+			(int) parent->type);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int reparent_type_specifier_list(struct ctf_node *node,
+					struct ctf_node *parent)
 {
 	switch (parent->type) {
 	case NODE_ROOT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_specifier);
+		cds_list_add_tail(&node->siblings, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.event.declaration_list);
 		break;
 	case NODE_STREAM:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.stream.declaration_list);
 		break;
 	case NODE_TRACE:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list);
 		break;
 	case NODE_VARIANT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
 		break;
 	case NODE_STRUCT:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u._struct.declaration_list);
 		break;
 	case NODE_TYPEDEF:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u._typedef.declaration_specifier);
+		parent->u._typedef.type_specifier_list = node;
 		break;
 	case NODE_TYPEALIAS_TARGET:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.declaration_specifier);
+		parent->u.typealias_target.type_specifier_list = node;
 		break;
 	case NODE_TYPEALIAS_ALIAS:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.declaration_specifier);
+		parent->u.typealias_alias.type_specifier_list = node;
 		break;
 	case NODE_TYPE_DECLARATOR:
 		parent->u.type_declarator.type = TYPEDEC_NESTED;
-		CDS_INIT_LIST_HEAD(&parent->u.type_declarator.u.nested.length);
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.type_declarator.u.nested.length);
+		parent->u.type_declarator.u.nested.length = node;
 		break;
 	case NODE_ENUM:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u._enum.container_type);
+		parent->u._enum.container_type = node;
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
-		_cds_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.declaration_specifier);
+		parent->u.struct_or_variant_declaration.type_specifier_list = node;
 		break;
+	case NODE_TYPE_SPECIFIER:
 	case NODE_TYPEALIAS:
 	case NODE_FLOATING_POINT:
 	case NODE_INTEGER:
 	case NODE_STRING:
 	case NODE_CTF_EXPRESSION:
-	case NODE_TYPE_SPECIFIER:
 	case NODE_POINTER:
 	case NODE_ENUMERATOR:
 	case NODE_UNARY_EXPRESSION:
@@ -557,6 +597,7 @@ static int reparent_type_declarator(struct ctf_node *node,
 	case NODE_STRING:
 	case NODE_CTF_EXPRESSION:
 	case NODE_TYPE_SPECIFIER:
+	case NODE_TYPE_SPECIFIER_LIST:
 	case NODE_POINTER:
 	case NODE_ENUMERATOR:
 	case NODE_UNARY_EXPRESSION:
@@ -594,20 +635,23 @@ static int set_parent_node(struct ctf_node *node,
 	case NODE_EVENT:
 		if (parent->type == NODE_ROOT) {
 			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.event);
-		} else
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_STREAM:
 		if (parent->type == NODE_ROOT) {
 			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.stream);
-		} else
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_TRACE:
 		if (parent->type == NODE_ROOT) {
 			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.trace);
-		} else
+		} else {
 			return -EPERM;
+		}
 		break;
 
 	case NODE_CTF_EXPRESSION:
@@ -643,20 +687,26 @@ static int set_parent_node(struct ctf_node *node,
 	case NODE_TYPE_DECLARATOR:
 		return reparent_type_declarator(node, parent);
 
+	case NODE_TYPE_SPECIFIER_LIST:
+		return reparent_type_specifier_list(node, parent);
+
 	case NODE_TYPE_SPECIFIER:
+		return reparent_type_specifier(node, parent);
+
 	case NODE_FLOATING_POINT:
 	case NODE_INTEGER:
 	case NODE_STRING:
 	case NODE_ENUM:
 	case NODE_VARIANT:
 	case NODE_STRUCT:
-		return reparent_type_specifier(node, parent);
+		return -EINVAL;	/* Dealt with internally within grammar */
 
 	case NODE_ENUMERATOR:
 		if (parent->type == NODE_ENUM) {
 			_cds_list_splice_tail(&node->tmp_head, &parent->u._enum.enumerator_list);
-		} else
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
 		switch (parent->type) {
@@ -715,9 +765,7 @@ static struct ctf_ast *ctf_ast_alloc(void)
 	CDS_INIT_LIST_HEAD(&ast->allocated_nodes);
 	ast->root.type = NODE_ROOT;
 	CDS_INIT_LIST_HEAD(&ast->root.tmp_head);
-	CDS_INIT_LIST_HEAD(&ast->root.u.root._typedef);
-	CDS_INIT_LIST_HEAD(&ast->root.u.root.typealias);
-	CDS_INIT_LIST_HEAD(&ast->root.u.root.declaration_specifier);
+	CDS_INIT_LIST_HEAD(&ast->root.u.root.declaration_list);
 	CDS_INIT_LIST_HEAD(&ast->root.u.root.trace);
 	CDS_INIT_LIST_HEAD(&ast->root.u.root.stream);
 	CDS_INIT_LIST_HEAD(&ast->root.u.root.event);
@@ -791,6 +839,15 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 	/* %locations */
 %parse-param {struct ctf_scanner *scanner}
 %lex-param {struct ctf_scanner *scanner}
+/*
+ * Expect two shift-reduce conflicts. Caused by enum name-opt : type {}
+ * vs struct { int :value; } (unnamed bit-field). The default is to
+ * shift, so whenever we encounter an enumeration, we are doing the
+ * proper thing (shift). It is illegal to declare an enumeration
+ * "bit-field", so it is OK if this situation ends up in a parsing
+ * error.
+ */
+%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 <gs> IDENTIFIER ID_TYPE
@@ -812,10 +869,12 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> event_declaration
 %type <n> stream_declaration
 %type <n> trace_declaration
+%type <n> integer_declaration_specifiers
 %type <n> declaration_specifiers
 %type <n> alias_declaration_specifiers
 
 %type <n> type_declarator_list
+%type <n> integer_type_specifier
 %type <n> type_specifier
 %type <n> struct_type_specifier
 %type <n> variant_type_specifier
@@ -962,7 +1021,6 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 		}
-
 	|	DECIMAL_CONSTANT
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
@@ -1101,31 +1159,51 @@ declaration:
 		{	$$ = $1;	}
 	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
+			_cds_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	declaration_specifiers TYPEDEF type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
 			$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.target->u.typealias_target.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.alias->u.typealias_alias.type_specifier_list = list;
+			_cds_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
 	;
@@ -1201,14 +1279,58 @@ trace_declaration_end:
 		{	pop_scope(scanner);	}
 	;
 
+integer_declaration_specifiers:
+		CONST
+		{
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = make_node(scanner, NODE_TYPE_SPECIFIER);
+			node->u.type_specifier.type = TYPESPEC_CONST;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
+		}
+	|	integer_type_specifier
+		{
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = $1;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
+		}
+	|	integer_declaration_specifiers CONST
+		{
+			struct ctf_node *node;
+
+			$$ = $1;
+			node = make_node(scanner, NODE_TYPE_SPECIFIER);
+			node->u.type_specifier.type = TYPESPEC_CONST;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
+		}
+	|	integer_declaration_specifiers integer_type_specifier
+		{
+			$$ = $1;
+			cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head);
+		}
+	;
+
 declaration_specifiers:
 		CONST
 		{
-			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
-			$$->u.type_specifier.type = TYPESPEC_CONST;
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = make_node(scanner, NODE_TYPE_SPECIFIER);
+			node->u.type_specifier.type = TYPESPEC_CONST;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	type_specifier
-		{	$$ = $1;	}
+		{
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = $1;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
+		}
 	|	declaration_specifiers CONST
 		{
 			struct ctf_node *node;
@@ -1216,12 +1338,12 @@ declaration_specifiers:
 			$$ = $1;
 			node = make_node(scanner, NODE_TYPE_SPECIFIER);
 			node->u.type_specifier.type = TYPESPEC_CONST;
-			cds_list_add_tail(&node->siblings, &($$)->tmp_head);
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	declaration_specifiers type_specifier
 		{
 			$$ = $1;
-			cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
+			cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head);
 		}
 	;
 
@@ -1235,6 +1357,64 @@ type_declarator_list:
 		}
 	;
 
+integer_type_specifier:
+		CHAR
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_CHAR;
+		}
+	|	SHORT
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_SHORT;
+		}
+	|	INT
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_INT;
+		}
+	|	LONG
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_LONG;
+		}
+	|	SIGNED
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_SIGNED;
+		}
+	|	UNSIGNED
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_UNSIGNED;
+		}
+	|	_BOOL
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_BOOL;
+		}
+	|	ID_TYPE
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_ID_TYPE;
+			$$->u.type_specifier.id_type = yylval.gs->s;
+		}
+	|	INTEGER LBRAC RBRAC
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_INTEGER;
+			$$->u.type_specifier.node = make_node(scanner, NODE_INTEGER);
+		}
+	|	INTEGER LBRAC ctf_assignment_expression_list RBRAC
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_INTEGER;
+			$$->u.type_specifier.node = make_node(scanner, NODE_INTEGER);
+			if (set_parent_node($3, $$->u.type_specifier.node))
+				reparent_error(scanner, "integer reparent error");
+		}
+	;
+
 type_specifier:
 		VOID
 		{
@@ -1304,40 +1484,64 @@ type_specifier:
 		}
 	|	FLOATING_POINT LBRAC RBRAC
 		{
-			$$ = make_node(scanner, NODE_FLOATING_POINT);
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_FLOATING_POINT;
+			$$->u.type_specifier.node = make_node(scanner, NODE_FLOATING_POINT);
 		}
 	|	FLOATING_POINT LBRAC ctf_assignment_expression_list RBRAC
 		{
-			$$ = make_node(scanner, NODE_FLOATING_POINT);
-			if (set_parent_node($3, $$))
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_FLOATING_POINT;
+			$$->u.type_specifier.node = make_node(scanner, NODE_FLOATING_POINT);
+			if (set_parent_node($3, $$->u.type_specifier.node))
 				reparent_error(scanner, "floating point reparent error");
 		}
 	|	INTEGER LBRAC RBRAC
 		{
-			$$ = make_node(scanner, NODE_INTEGER);
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_INTEGER;
+			$$->u.type_specifier.node = make_node(scanner, NODE_INTEGER);
 		}
 	|	INTEGER LBRAC ctf_assignment_expression_list RBRAC
 		{
-			$$ = make_node(scanner, NODE_INTEGER);
-			if (set_parent_node($3, $$))
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_INTEGER;
+			$$->u.type_specifier.node = make_node(scanner, NODE_INTEGER);
+			if (set_parent_node($3, $$->u.type_specifier.node))
 				reparent_error(scanner, "integer reparent error");
 		}
 	|	STRING LBRAC RBRAC
 		{
-			$$ = make_node(scanner, NODE_STRING);
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_STRING;
+			$$->u.type_specifier.node = make_node(scanner, NODE_STRING);
 		}
 	|	STRING LBRAC ctf_assignment_expression_list RBRAC
 		{
-			$$ = make_node(scanner, NODE_STRING);
-			if (set_parent_node($3, $$))
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_STRING;
+			$$->u.type_specifier.node = make_node(scanner, NODE_STRING);
+			if (set_parent_node($3, $$->u.type_specifier.node))
 				reparent_error(scanner, "string reparent error");
 		}
 	|	ENUM enum_type_specifier
-		{	$$ = $2;		}
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_ENUM;
+			$$->u.type_specifier.node = $2;
+		}
 	|	VARIANT variant_type_specifier
-		{	$$ = $2;		}
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_VARIANT;
+			$$->u.type_specifier.node = $2;
+		}
 	|	STRUCT struct_type_specifier
-		{	$$ = $2;		}
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_STRUCT;
+			$$->u.type_specifier.node = $2;
+		}
 	;
 
 struct_type_specifier:
@@ -1345,7 +1549,7 @@ struct_type_specifier:
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
 			$$->u._struct.has_body = 1;
-			if (set_parent_node($2, $$))
+			if ($2 && set_parent_node($2, $$))
 				reparent_error(scanner, "struct reparent error");
 		}
 	|	IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
@@ -1353,7 +1557,7 @@ struct_type_specifier:
 			$$ = make_node(scanner, NODE_STRUCT);
 			$$->u._struct.has_body = 1;
 			$$->u._struct.name = $1->s;
-			if (set_parent_node($3, $$))
+			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
@@ -1361,7 +1565,7 @@ struct_type_specifier:
 			$$ = make_node(scanner, NODE_STRUCT);
 			$$->u._struct.has_body = 1;
 			$$->u._struct.name = $1->s;
-			if (set_parent_node($3, $$))
+			if ($3 && set_parent_node($3, $$))
 				reparent_error(scanner, "struct reparent error");
 		}
 	|	IDENTIFIER
@@ -1393,7 +1597,7 @@ variant_type_specifier:
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
 			$$->u.variant.has_body = 1;
-			if (set_parent_node($2, $$))
+			if ($2 && set_parent_node($2, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
@@ -1401,7 +1605,7 @@ variant_type_specifier:
 			$$ = make_node(scanner, NODE_VARIANT);
 			$$->u.variant.has_body = 1;
 			$$->u.variant.choice = $2->s;
-			if (set_parent_node($5, $$))
+			if ($5 && set_parent_node($5, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
@@ -1409,7 +1613,7 @@ variant_type_specifier:
 			$$ = make_node(scanner, NODE_VARIANT);
 			$$->u.variant.has_body = 1;
 			$$->u.variant.choice = $2->s;
-			if (set_parent_node($5, $$))
+			if ($5 && set_parent_node($5, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	IDENTIFIER variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
@@ -1417,7 +1621,7 @@ variant_type_specifier:
 			$$ = make_node(scanner, NODE_VARIANT);
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
-			if (set_parent_node($3, $$))
+			if ($3 && set_parent_node($3, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	IDENTIFIER LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
@@ -1426,7 +1630,7 @@ variant_type_specifier:
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (set_parent_node($6, $$))
+			if ($6 && set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	IDENTIFIER LT IDENTIFIER GT
@@ -1442,7 +1646,7 @@ variant_type_specifier:
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (set_parent_node($6, $$))
+			if ($6 && set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	IDENTIFIER LT ID_TYPE GT
@@ -1457,7 +1661,7 @@ variant_type_specifier:
 			$$ = make_node(scanner, NODE_VARIANT);
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
-			if (set_parent_node($3, $$))
+			if ($3 && set_parent_node($3, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	ID_TYPE LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
@@ -1466,7 +1670,7 @@ variant_type_specifier:
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (set_parent_node($6, $$))
+			if ($6 && set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	ID_TYPE LT IDENTIFIER GT
@@ -1482,7 +1686,7 @@ variant_type_specifier:
 			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (set_parent_node($6, $$))
+			if ($6 && set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	ID_TYPE LT ID_TYPE GT
@@ -1537,12 +1741,12 @@ enum_type_specifier:
 			$$->u._enum.has_body = 1;
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	LT declaration_specifiers GT LBRAC enumerator_list RBRAC
+	|	COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $2;
+			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	IDENTIFIER LBRAC enumerator_list RBRAC
 		{
@@ -1551,13 +1755,13 @@ enum_type_specifier:
 			$$->u._enum.enum_id = $1->s;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	IDENTIFIER LT declaration_specifiers GT LBRAC enumerator_list RBRAC
+	|	IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	ID_TYPE LBRAC enumerator_list RBRAC
 		{
@@ -1566,13 +1770,13 @@ enum_type_specifier:
 			$$->u._enum.enum_id = $1->s;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	ID_TYPE LT declaration_specifiers GT LBRAC enumerator_list RBRAC
+	|	ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	LBRAC enumerator_list COMMA RBRAC
 		{
@@ -1580,12 +1784,12 @@ enum_type_specifier:
 			$$->u._enum.has_body = 1;
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC
+	|	COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $2;
+			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	IDENTIFIER LBRAC enumerator_list COMMA RBRAC
 		{
@@ -1594,13 +1798,13 @@ enum_type_specifier:
 			$$->u._enum.enum_id = $1->s;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	IDENTIFIER LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC
+	|	IDENTIFIER COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	IDENTIFIER
 		{
@@ -1608,13 +1812,6 @@ enum_type_specifier:
 			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 		}
-	|	IDENTIFIER LT declaration_specifiers GT
-		{
-			$$ = make_node(scanner, NODE_ENUM);
-			$$->u._enum.has_body = 0;
-			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-		}
 	|	ID_TYPE LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
@@ -1622,13 +1819,13 @@ enum_type_specifier:
 			$$->u._enum.enum_id = $1->s;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	ID_TYPE LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC
+	|	ID_TYPE COLON integer_declaration_specifiers LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
 			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	ID_TYPE
 		{
@@ -1636,13 +1833,6 @@ enum_type_specifier:
 			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 		}
-	|	ID_TYPE LT declaration_specifiers GT
-		{
-			$$ = make_node(scanner, NODE_ENUM);
-			$$->u._enum.has_body = 0;
-			$$->u._enum.enum_id = $1->s;
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.container_type);
-		}
 	;
 
 struct_or_variant_declaration_list:
@@ -1663,37 +1853,61 @@ struct_or_variant_declaration_list:
 struct_or_variant_declaration:
 		declaration_specifiers struct_or_variant_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			$$ = make_node(scanner, NODE_STRUCT_OR_VARIANT_DECLARATION);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u.struct_or_variant_declaration.declaration_specifier);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u.struct_or_variant_declaration.type_declarators);
 		}
 	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
+			_cds_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	declaration_specifiers TYPEDEF type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
 			$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.target->u.typealias_target.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.alias->u.typealias_alias.type_specifier_list = list;
+			_cds_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
 	;
@@ -1701,17 +1915,31 @@ struct_or_variant_declaration:
 alias_declaration_specifiers:
 		CONST
 		{
-			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
-			$$->u.type_specifier.type = TYPESPEC_CONST;
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = make_node(scanner, NODE_TYPE_SPECIFIER);
+			node->u.type_specifier.type = TYPESPEC_CONST;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	type_specifier
-		{	$$ = $1;	}
+		{
+			struct ctf_node *node;
+
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = $1;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
+		}
 	|	IDENTIFIER
 		{
+			struct ctf_node *node;
+
 			add_type(scanner, $1);
-			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
-			($$)->u.type_specifier.type = TYPESPEC_ID_TYPE;
-			($$)->u.type_specifier.id_type = yylval.gs->s;
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			node = make_node(scanner, NODE_TYPE_SPECIFIER);
+			node->u.type_specifier.type = TYPESPEC_ID_TYPE;
+			node->u.type_specifier.id_type = yylval.gs->s;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	alias_declaration_specifiers CONST
 		{
@@ -1720,12 +1948,12 @@ alias_declaration_specifiers:
 			$$ = $1;
 			node = make_node(scanner, NODE_TYPE_SPECIFIER);
 			node->u.type_specifier.type = TYPESPEC_CONST;
-			cds_list_add_tail(&node->siblings, &($$)->tmp_head);
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	alias_declaration_specifiers type_specifier
 		{
 			$$ = $1;
-			cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
+			cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	alias_declaration_specifiers IDENTIFIER
 		{
@@ -1736,7 +1964,7 @@ alias_declaration_specifiers:
 			node = make_node(scanner, NODE_TYPE_SPECIFIER);
 			node->u.type_specifier.type = TYPESPEC_ID_TYPE;
 			node->u.type_specifier.id_type = yylval.gs->s;
-			cds_list_add_tail(&node->siblings, &($$)->tmp_head);
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	;
 
@@ -1875,8 +2103,7 @@ direct_abstract_declarator:
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
-			CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length);
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	|	direct_abstract_declarator LSBRAC RSBRAC
 		{
@@ -1925,8 +2152,7 @@ direct_alias_abstract_declarator:
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
-			CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length);
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	|	direct_alias_abstract_declarator LSBRAC RSBRAC
 		{
@@ -1965,8 +2191,7 @@ direct_declarator:
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
-			CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length);
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	;
 
@@ -1999,8 +2224,7 @@ direct_type_declarator:
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
-			CDS_INIT_LIST_HEAD(&($$)->u.type_declarator.u.nested.length);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.type_declarator.u.nested.length);
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	;
 
@@ -2053,7 +2277,7 @@ ctf_assignment_expression:
 				reparent_error(scanner, "ctf_assignment_expression left expects string");
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right);
 		}
-	|	unary_expression TYPEASSIGN type_specifier
+	|	unary_expression TYPEASSIGN declaration_specifiers	/* Only allow struct */
 		{
 			/*
 			 * Because we have left and right, cannot use
@@ -2063,36 +2287,55 @@ ctf_assignment_expression:
 			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u.ctf_expression.left);
 			if ($1->u.unary_expression.type != UNARY_STRING)
 				reparent_error(scanner, "ctf_assignment_expression left expects string");
-			cds_list_add(&($3)->siblings, &($3)->tmp_head);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right);
+			cds_list_add_tail(&($3)->siblings, &($$)->u.ctf_expression.right);
 		}
 	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list
 		{
+			struct ctf_node *list;
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
+			_cds_list_splice_tail(&($3)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
 			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	TYPEDEF declaration_specifiers type_declarator_list
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u._typedef.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
 	|	declaration_specifiers TYPEDEF type_declarator_list
 		{
+			struct ctf_node *list;
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			_cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
 			$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
-			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.target->u.typealias_target.type_specifier_list = list;
+			_cds_list_splice_tail(&($2)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
+
+			list = make_node(scanner, NODE_TYPE_SPECIFIER_LIST);
+			$$->u.typealias.alias->u.typealias_alias.type_specifier_list = list;
+			_cds_list_splice_tail(&($5)->u.type_specifier_list.head, &list->u.type_specifier_list.head);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
 	;