X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=1a76c65537457c26d2988532167a6ff0b1daca6c;hb=ab4cf05887a402e53396db43b5958918d0d2d022;hp=8d8c29ce1e4826841f819c8438a5f8f78f5d1afa;hpb=05628561ca57ff5d269571a72a12cb86854c5f70;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 8d8c29ce..1a76c655 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -811,9 +811,9 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> stream_declaration
 %type <n> trace_declaration
 %type <n> declaration_specifiers
+%type <n> alias_declaration_specifiers
 
 %type <n> type_declarator_list
-%type <n> abstract_type_declarator_list
 %type <n> type_specifier
 %type <n> struct_type_specifier
 %type <n> variant_type_specifier
@@ -821,7 +821,6 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> enum_type_specifier
 %type <n> struct_or_variant_declaration_list
 %type <n> struct_or_variant_declaration
-%type <n> specifier_qualifier_list
 %type <n> struct_or_variant_declarator_list
 %type <n> struct_or_variant_declarator
 %type <n> enumerator_list
@@ -829,12 +828,13 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> abstract_declarator_list
 %type <n> abstract_declarator
 %type <n> direct_abstract_declarator
+%type <n> alias_abstract_declarator_list
+%type <n> alias_abstract_declarator
+%type <n> direct_alias_abstract_declarator
 %type <n> declarator
 %type <n> direct_declarator
 %type <n> type_declarator
 %type <n> direct_type_declarator
-%type <n> abstract_type_declarator
-%type <n> direct_abstract_type_declarator
 %type <n> pointer	
 %type <n> ctf_assignment_expression_list
 %type <n> ctf_assignment_expression
@@ -877,6 +877,8 @@ keywords:
 		{	$$ = yylval.gs;		}
 	|	_COMPLEX
 		{	$$ = yylval.gs;		}
+	|	_IMAGINARY
+		{	$$ = yylval.gs;		}
 	|	FLOATING_POINT
 		{	$$ = yylval.gs;		}
 	|	INTEGER
@@ -1114,7 +1116,7 @@ declaration:
 			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON declaration_specifiers abstract_type_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
 		{
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
@@ -1124,15 +1126,6 @@ declaration:
 			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON type_declarator_list SEMICOLON
-		{
-			$$ = 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);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
-		}
 	;
 
 event_declaration:
@@ -1240,16 +1233,6 @@ type_declarator_list:
 		}
 	;
 
-abstract_type_declarator_list:
-		abstract_type_declarator
-		{	$$ = $1;	}
-	|	abstract_type_declarator_list COMMA abstract_type_declarator
-		{
-			$$ = $1;
-			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
-		}
-	;
-
 type_specifier:
 		VOID
 		{
@@ -1306,6 +1289,11 @@ type_specifier:
 			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
 			$$->u.type_specifier.type = TYPESPEC_COMPLEX;
 		}
+	|	_IMAGINARY
+		{
+			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
+			$$->u.type_specifier.type = TYPESPEC_IMAGINARY;
+		}
 	|	ID_TYPE
 		{
 			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
@@ -1354,12 +1342,14 @@ struct_type_specifier:
 		struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
 			if (set_parent_node($2, $$))
 				reparent_error(scanner, "struct reparent error");
 		}
 	|	IDENTIFIER struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
 			$$->u._struct.name = $1->s;
 			if (set_parent_node($3, $$))
 				reparent_error(scanner, "struct reparent error");
@@ -1367,6 +1357,7 @@ struct_type_specifier:
 	|	ID_TYPE struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 1;
 			$$->u._struct.name = $1->s;
 			if (set_parent_node($3, $$))
 				reparent_error(scanner, "struct reparent error");
@@ -1374,11 +1365,13 @@ struct_type_specifier:
 	|	IDENTIFIER
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 0;
 			$$->u._struct.name = $1->s;
 		}
 	|	ID_TYPE
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
+			$$->u._struct.has_body = 0;
 			$$->u._struct.name = $1->s;
 		}
 	;
@@ -1397,12 +1390,14 @@ variant_type_specifier:
 		variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			if (set_parent_node($2, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.choice = $2->s;
 			if (set_parent_node($5, $$))
 				reparent_error(scanner, "variant reparent error");
@@ -1410,6 +1405,7 @@ variant_type_specifier:
 	|	LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.choice = $2->s;
 			if (set_parent_node($5, $$))
 				reparent_error(scanner, "variant reparent error");
@@ -1417,6 +1413,7 @@ variant_type_specifier:
 	|	IDENTIFIER variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			if (set_parent_node($3, $$))
 				reparent_error(scanner, "variant reparent error");
@@ -1424,6 +1421,7 @@ variant_type_specifier:
 	|	IDENTIFIER LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 			if (set_parent_node($6, $$))
@@ -1432,12 +1430,14 @@ variant_type_specifier:
 	|	IDENTIFIER LT IDENTIFIER GT
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 0;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 		}
 	|	IDENTIFIER LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 			if (set_parent_node($6, $$))
@@ -1446,12 +1446,14 @@ variant_type_specifier:
 	|	IDENTIFIER LT ID_TYPE GT
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 0;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 		}
 	|	ID_TYPE variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			if (set_parent_node($3, $$))
 				reparent_error(scanner, "variant reparent error");
@@ -1459,6 +1461,7 @@ variant_type_specifier:
 	|	ID_TYPE LT IDENTIFIER GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 			if (set_parent_node($6, $$))
@@ -1467,12 +1470,14 @@ variant_type_specifier:
 	|	ID_TYPE LT IDENTIFIER GT
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 0;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 		}
 	|	ID_TYPE LT ID_TYPE GT variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 			if (set_parent_node($6, $$))
@@ -1481,6 +1486,7 @@ variant_type_specifier:
 	|	ID_TYPE LT ID_TYPE GT
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 0;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
 		}
@@ -1526,23 +1532,27 @@ enum_type_specifier:
 		LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.container_type = $2;
 			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	IDENTIFIER 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.enumerator_list);
 		}
 	|	IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
@@ -1550,12 +1560,14 @@ enum_type_specifier:
 	|	ID_TYPE 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.enumerator_list);
 		}
 	|	ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
@@ -1563,23 +1575,27 @@ enum_type_specifier:
 	|	LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.container_type = $2;
 			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	IDENTIFIER 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.enumerator_list);
 		}
 	|	IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
@@ -1587,23 +1603,27 @@ enum_type_specifier:
 	|	IDENTIFIER
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 		}
 	|	IDENTIFIER LT type_specifier_or_integer_constant GT
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 		}
 	|	ID_TYPE 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.enumerator_list);
 		}
 	|	ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
@@ -1611,11 +1631,13 @@ enum_type_specifier:
 	|	ID_TYPE
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 		}
 	|	ID_TYPE LT type_specifier_or_integer_constant GT
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
 			$$->u._enum.container_type = $3;
 		}
@@ -1637,32 +1659,32 @@ struct_or_variant_declaration_list:
 	;
 
 struct_or_variant_declaration:
-		specifier_qualifier_list struct_or_variant_declarator_list SEMICOLON
+		declaration_specifiers struct_or_variant_declarator_list SEMICOLON
 		{
 			$$ = make_node(scanner, NODE_STRUCT_OR_VARIANT_DECLARATION);
 			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u.struct_or_variant_declaration.declaration_specifier);
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u.struct_or_variant_declaration.type_declarators);
 		}
-	|	specifier_qualifier_list TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON
+	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
 			$$ = 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);
 			_cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON
+	|	TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
 			$$ = make_node(scanner, NODE_TYPEDEF);
 			_cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	specifier_qualifier_list TYPEDEF type_declarator_list SEMICOLON
+	|	declaration_specifiers TYPEDEF type_declarator_list SEMICOLON
 		{
 			$$ = 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.type_declarators);
 		}
-	|	TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON specifier_qualifier_list abstract_type_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON
 		{
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
@@ -1672,18 +1694,9 @@ struct_or_variant_declaration:
 			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
-	|	TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON type_declarator_list SEMICOLON
-		{
-			$$ = 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);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
-		}
 	;
 
-specifier_qualifier_list:
+alias_declaration_specifiers:
 		CONST
 		{
 			$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
@@ -1691,7 +1704,14 @@ specifier_qualifier_list:
 		}
 	|	type_specifier
 		{	$$ = $1;	}
-	|	specifier_qualifier_list CONST
+	|	IDENTIFIER
+		{
+			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;
+		}
+	|	alias_declaration_specifiers CONST
 		{
 			struct ctf_node *node;
 
@@ -1700,11 +1720,22 @@ specifier_qualifier_list:
 			node->u.type_specifier.type = TYPESPEC_CONST;
 			cds_list_add_tail(&node->siblings, &($$)->tmp_head);
 		}
-	|	specifier_qualifier_list type_specifier
+	|	alias_declaration_specifiers type_specifier
 		{
 			$$ = $1;
 			cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
 		}
+	|	alias_declaration_specifiers IDENTIFIER
+		{
+			struct ctf_node *node;
+
+			add_type(scanner, $2);
+			$$ = $1;
+			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);
+		}
 	;
 
 struct_or_variant_declarator_list:
@@ -1853,63 +1884,79 @@ direct_abstract_declarator:
 		}
 	;
 
-declarator:
-		direct_declarator
+alias_abstract_declarator_list:
+		alias_abstract_declarator
 		{	$$ = $1;	}
-	|	pointer direct_declarator
+	|	alias_abstract_declarator_list COMMA alias_abstract_declarator
+		{
+			$$ = $1;
+			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
+		}
+	;
+
+alias_abstract_declarator:
+		direct_alias_abstract_declarator
+		{	$$ = $1;	}
+	|	pointer direct_alias_abstract_declarator
 		{
 			$$ = $2;
 			cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
 		}
 	;
 
-direct_declarator:
-		IDENTIFIER
+direct_alias_abstract_declarator:
+		/* empty */
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
-			$$->u.type_declarator.type = TYPEDEC_ID;
-			$$->u.type_declarator.u.id = $1->s;
+                        $$->u.type_declarator.type = TYPEDEC_ID;
+			/* id is NULL */
 		}
-	|	LPAREN declarator RPAREN
+	|	LPAREN alias_abstract_declarator RPAREN
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $2;
 		}
-	|	direct_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
+	|	direct_alias_abstract_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
 			$$->u.type_declarator.u.nested.length = $3;
 		}
+	|	direct_alias_abstract_declarator LSBRAC RSBRAC
+		{
+			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
+			$$->u.type_declarator.type = TYPEDEC_NESTED;
+			$$->u.type_declarator.u.nested.type_declarator = $1;
+			$$->u.type_declarator.u.nested.abstract_array = 1;
+		}
 	;
 
-type_declarator:
-		direct_type_declarator
+declarator:
+		direct_declarator
 		{	$$ = $1;	}
-	|	pointer direct_type_declarator
+	|	pointer direct_declarator
 		{
 			$$ = $2;
 			cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
 		}
 	;
 
-direct_type_declarator:
+direct_declarator:
 		IDENTIFIER
 		{
-			add_type(scanner, $1);
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_ID;
 			$$->u.type_declarator.u.id = $1->s;
 		}
-	|	LPAREN type_declarator RPAREN
+	|	LPAREN declarator RPAREN
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $2;
 		}
-	|	direct_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
+	|	direct_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
@@ -1918,50 +1965,37 @@ direct_type_declarator:
 		}
 	;
 
-abstract_type_declarator:
-		direct_abstract_type_declarator
+type_declarator:
+		direct_type_declarator
 		{	$$ = $1;	}
-	|	pointer direct_abstract_type_declarator
+	|	pointer direct_type_declarator
 		{
 			$$ = $2;
 			cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
 		}
 	;
 
-direct_abstract_type_declarator:
-		/* empty */
-		{
-			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
-                        $$->u.type_declarator.type = TYPEDEC_ID;
-			/* id is NULL */
-		}
-	|	IDENTIFIER
+direct_type_declarator:
+		IDENTIFIER
 		{
 			add_type(scanner, $1);
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_ID;
 			$$->u.type_declarator.u.id = $1->s;
 		}
-	|	LPAREN abstract_type_declarator RPAREN
+	|	LPAREN type_declarator RPAREN
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $2;
 		}
-	|	direct_abstract_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
+	|	direct_type_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
 		{
 			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $1;
 			$$->u.type_declarator.u.nested.length = $3;
 		}
-	|	direct_abstract_type_declarator LSBRAC RSBRAC
-		{
-			$$ = make_node(scanner, NODE_TYPE_DECLARATOR);
-			$$->u.type_declarator.type = TYPEDEC_NESTED;
-			$$->u.type_declarator.u.nested.type_declarator = $1;
-			$$->u.type_declarator.u.nested.abstract_array = 1;
-		}
 	;
 
 pointer:	
@@ -2045,7 +2079,7 @@ ctf_assignment_expression:
 			_cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
 			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON declaration_specifiers abstract_type_declarator_list
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list
 		{
 			$$ = make_node(scanner, NODE_TYPEALIAS);
 			$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
@@ -2055,13 +2089,4 @@ ctf_assignment_expression:
 			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
 			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
 		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON type_declarator_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);
-			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			_cds_list_splice_tail(&($5)->tmp_head, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
-		}
 	;