X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=437242bd52657798647005180427a1d9dd18d6a8;hp=6f0efe25e26063a8818a57199bc856b86d3c9913;hb=427c09b7f5d932748ee0eee050388c9873bcb6c3;hpb=19d96da7a5ed86b9dc40cf47b5af78fd7c8e425e

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 6f0efe25..437242bd 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -22,13 +22,31 @@
 #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"
 
+/*
+ * TODO: support enum, variant and struct declarations in scopes.
+ */
+
+/* Join two lists, put "add" at the end of "head".  */
+static inline void
+_cds_list_splice_tail (struct cds_list_head *add, struct cds_list_head *head)
+{
+	/* Do nothing if the list which gets added is empty.  */
+	if (add != add->next) {
+		add->next->prev = head->prev;
+		add->prev->next = head;
+		head->prev->next = add->next;
+		head->prev = add->prev;
+	}
+}
+
 #define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, ## args)
 
 int yyparse(struct ctf_scanner *scanner);
@@ -45,6 +63,40 @@ struct gc_string {
 	char s[];
 };
 
+static const char *node_type_to_str[] = {
+	[ NODE_UNKNOWN ] = "NODE_UNKNOWN",
+	[ NODE_ROOT ] = "NODE_ROOT",
+	[ NODE_EVENT ] = "NODE_EVENT",
+	[ NODE_STREAM ] = "NODE_STREAM",
+	[ NODE_TRACE ] = "NODE_TRACE",
+	[ NODE_CTF_EXPRESSION ] = "NODE_CTF_EXPRESSION",
+	[ NODE_UNARY_EXPRESSION ] = "NODE_UNARY_EXPRESSION",
+	[ NODE_TYPEDEF ] = "NODE_TYPEDEF",
+	[ NODE_TYPEALIAS_TARGET ] = "NODE_TYPEALIAS_TARGET",
+	[ 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",
+	[ NODE_INTEGER ] = "NODE_INTEGER",
+	[ NODE_STRING ] = "NODE_STRING",
+	[ NODE_ENUMERATOR ] = "NODE_ENUMERATOR",
+	[ NODE_ENUM ] = "NODE_ENUM",
+	[ NODE_STRUCT_OR_VARIANT_DECLARATION ] = "NODE_STRUCT_OR_VARIANT_DECLARATION",
+	[ NODE_VARIANT ] = "NODE_VARIANT",
+	[ NODE_STRUCT ] = "NODE_STRUCT",
+};
+
+const char *node_type(struct ctf_node *node)
+{
+	if (node->type < NR_NODE_TYPES)
+		return node_type_to_str[node->type];
+	else
+		return NULL;
+}
+
 static struct gc_string *gc_string_alloc(struct ctf_scanner *scanner,
 					 size_t len)
 {
@@ -140,7 +192,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;
 }
@@ -179,8 +231,9 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		return NULL;
 	memset(node, 0, sizeof(*node));
 	node->type = type;
-	CDS_INIT_LIST_HEAD(&node->siblings);
+	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:
@@ -198,20 +251,19 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		break;
 
 	case NODE_CTF_EXPRESSION:
+		CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left);
+		CDS_INIT_LIST_HEAD(&node->u.ctf_expression.right);
 		break;
 	case NODE_UNARY_EXPRESSION:
 		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:
@@ -219,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:
@@ -235,12 +290,12 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 		CDS_INIT_LIST_HEAD(&node->u.string.expressions);
 		break;
 	case NODE_ENUMERATOR:
+		CDS_INIT_LIST_HEAD(&node->u.enumerator.values);
 		break;
 	case NODE_ENUM:
 		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:
@@ -265,22 +320,22 @@ static int reparent_ctf_expression(struct ctf_node *node,
 {
 	switch (parent->type) {
 	case NODE_EVENT:
-		cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
 		break;
 	case NODE_STREAM:
-		cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
 	case NODE_TRACE:
-		cds_list_add(&node->siblings, &parent->u.trace.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
 	case NODE_FLOATING_POINT:
-		cds_list_add(&node->siblings, &parent->u.floating_point.expressions);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions);
 		break;
 	case NODE_INTEGER:
-		cds_list_add(&node->siblings, &parent->u.integer.expressions);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.integer.expressions);
 		break;
 	case NODE_STRING:
-		cds_list_add(&node->siblings, &parent->u.string.expressions);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.string.expressions);
 		break;
 
 	case NODE_ROOT:
@@ -290,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:
@@ -313,22 +369,22 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent)
 {
 	switch (parent->type) {
 	case NODE_ROOT:
-		cds_list_add(&node->siblings, &parent->u.root._typedef);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
-		cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
 		break;
 	case NODE_STREAM:
-		cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
 	case NODE_TRACE:
-		cds_list_add(&node->siblings, &parent->u.trace.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
 	case NODE_VARIANT:
-		cds_list_add(&node->siblings, &parent->u.variant.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
 		break;
 	case NODE_STRUCT:
-		cds_list_add(&node->siblings, &parent->u._struct.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list);
 		break;
 
 	case NODE_FLOATING_POINT:
@@ -340,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:
@@ -361,22 +418,22 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
 {
 	switch (parent->type) {
 	case NODE_ROOT:
-		cds_list_add(&node->siblings, &parent->u.root.typealias);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
-		cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
 		break;
 	case NODE_STREAM:
-		cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
 	case NODE_TRACE:
-		cds_list_add(&node->siblings, &parent->u.trace.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
 	case NODE_VARIANT:
-		cds_list_add(&node->siblings, &parent->u.variant.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
 		break;
 	case NODE_STRUCT:
-		cds_list_add(&node->siblings, &parent->u._struct.declaration_list);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list);
 		break;
 
 	case NODE_FLOATING_POINT:
@@ -388,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:
@@ -407,34 +465,73 @@ 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_add(&node->siblings, &parent->u.root.declaration_specifier);
+		cds_list_add_tail(&node->siblings, &parent->u.root.declaration_list);
 		break;
 	case NODE_EVENT:
-		cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.event.declaration_list);
 		break;
 	case NODE_STREAM:
-		cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.stream.declaration_list);
 		break;
 	case NODE_TRACE:
-		cds_list_add(&node->siblings, &parent->u.trace.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list);
 		break;
 	case NODE_VARIANT:
-		cds_list_add(&node->siblings, &parent->u.variant.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
 		break;
 	case NODE_STRUCT:
-		cds_list_add(&node->siblings, &parent->u._struct.declaration_list);
+		cds_list_add_tail(&node->siblings, &parent->u._struct.declaration_list);
 		break;
 	case NODE_TYPEDEF:
-		cds_list_add(&node->siblings, &parent->u._typedef.declaration_specifier);
+		parent->u._typedef.type_specifier_list = node;
 		break;
 	case NODE_TYPEALIAS_TARGET:
-		cds_list_add(&node->siblings, &parent->u.typealias_target.declaration_specifier);
+		parent->u.typealias_target.type_specifier_list = node;
 		break;
 	case NODE_TYPEALIAS_ALIAS:
-		cds_list_add(&node->siblings, &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;
@@ -444,14 +541,14 @@ static int reparent_type_specifier(struct ctf_node *node,
 		parent->u._enum.container_type = node;
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
-		cds_list_add(&node->siblings, &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:
@@ -475,16 +572,16 @@ static int reparent_type_declarator(struct ctf_node *node,
 		parent->u.type_declarator.u.nested.type_declarator = node;
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
-		cds_list_add(&node->siblings, &parent->u.struct_or_variant_declaration.type_declarators);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.type_declarators);
 		break;
 	case NODE_TYPEDEF:
-		cds_list_add(&node->siblings, &parent->u._typedef.type_declarators);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u._typedef.type_declarators);
 		break;
 	case NODE_TYPEALIAS_TARGET:
-		cds_list_add(&node->siblings, &parent->u.typealias_target.type_declarators);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.type_declarators);
 		break;
 	case NODE_TYPEALIAS_ALIAS:
-		cds_list_add(&node->siblings, &parent->u.typealias_alias.type_declarators);
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.type_declarators);
 		break;
 
 	case NODE_ROOT:
@@ -500,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:
@@ -515,21 +613,18 @@ static int reparent_type_declarator(struct ctf_node *node,
 }
 
 /*
- * reparent node
+ * set_parent_node
  *
- * Relink node to new parent. Returns 0 on success, -EPERM if it is not
- * permitted to create the link declared by the input, -ENOENT if node or parent
- * is NULL, -EINVAL if there is an internal structure problem.
+ * Link node to parent. Returns 0 on success, -EPERM if it is not permitted to
+ * create the link declared by the input, -ENOENT if node or parent is NULL,
+ * -EINVAL if there is an internal structure problem.
  */
-static int reparent_node(struct ctf_node *node,
+static int set_parent_node(struct ctf_node *node,
 			 struct ctf_node *parent)
 {
 	if (!node || !parent)
 		return -ENOENT;
 
-	/* Unlink from old parent */
-	cds_list_del(&node->siblings);
-
 	/* Note: Linking to parent will be done only by an external visitor */
 
 	switch (node->type) {
@@ -538,22 +633,25 @@ static int reparent_node(struct ctf_node *node,
 		return -EINVAL;
 
 	case NODE_EVENT:
-		if (parent->type == NODE_ROOT)
-			cds_list_add_tail(&node->siblings, &parent->u.root.event);
-		else
+		if (parent->type == NODE_ROOT) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.event);
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_STREAM:
-		if (parent->type == NODE_ROOT)
-			cds_list_add_tail(&node->siblings, &parent->u.root.stream);
-		else
+		if (parent->type == NODE_ROOT) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.stream);
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_TRACE:
-		if (parent->type == NODE_ROOT)
-			cds_list_add_tail(&node->siblings, &parent->u.root.trace);
-		else
+		if (parent->type == NODE_ROOT) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.trace);
+		} else {
 			return -EPERM;
+		}
 		break;
 
 	case NODE_CTF_EXPRESSION:
@@ -581,36 +679,42 @@ static int reparent_node(struct ctf_node *node,
 		return reparent_typealias(node, parent);
 
 	case NODE_POINTER:
-		if (parent->type == NODE_TYPE_DECLARATOR)
-			cds_list_add_tail(&node->siblings, &parent->u.type_declarator.pointers);
-		else
+		if (parent->type == NODE_TYPE_DECLARATOR) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.type_declarator.pointers);
+		} else
 			return -EPERM;
 		break;
 	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_add_tail(&node->siblings, &parent->u._enum.enumerator_list);
-		else
+		if (parent->type == NODE_ENUM) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u._enum.enumerator_list);
+		} else {
 			return -EPERM;
+		}
 		break;
 	case NODE_STRUCT_OR_VARIANT_DECLARATION:
 		switch (parent->type) {
 		case NODE_STRUCT:
-			cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
+			_cds_list_splice_tail(&node->tmp_head, &parent->u._struct.declaration_list);
 			break;
 		case NODE_VARIANT:
-			cds_list_add_tail(&node->siblings, &parent->u._struct.declaration_list);
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
 			break;
 		default:
 			return -EINVAL;
@@ -660,10 +764,8 @@ static struct ctf_ast *ctf_ast_alloc(void)
 	memset(ast, 0, sizeof(*ast));
 	CDS_INIT_LIST_HEAD(&ast->allocated_nodes);
 	ast->root.type = NODE_ROOT;
-	CDS_INIT_LIST_HEAD(&ast->root.siblings);
-	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.tmp_head);
+	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);
@@ -759,17 +861,16 @@ 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
-%type <n> type_specifier_or_integer_constant
+%type <n> declaration_specifiers_or_integer_constant
 %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
@@ -777,12 +878,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
@@ -792,12 +894,12 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 file:
 		declaration
 		{
-			if (reparent_node($1, &ctf_scanner_get_ast(scanner)->root))
+			if (set_parent_node($1, &ctf_scanner_get_ast(scanner)->root))
 				reparent_error(scanner, "error reparenting to root");
 		}
 	|	file declaration
 		{
-			if (reparent_node($2, &ctf_scanner_get_ast(scanner)->root))
+			if (set_parent_node($2, &ctf_scanner_get_ast(scanner)->root))
 				reparent_error(scanner, "error reparenting to root");
 		}
 	;
@@ -825,6 +927,8 @@ keywords:
 		{	$$ = yylval.gs;		}
 	|	_COMPLEX
 		{	$$ = yylval.gs;		}
+	|	_IMAGINARY
+		{	$$ = yylval.gs;		}
 	|	FLOATING_POINT
 		{	$$ = yylval.gs;		}
 	|	INTEGER
@@ -900,7 +1004,6 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 		}
-
 	|	keywords
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
@@ -912,21 +1015,21 @@ postfix_expression:
 		{
 			$$ = 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);
 		}
 	|	STRING_LITERAL_START DQUOTE
@@ -949,14 +1052,17 @@ postfix_expression:
 		}
 	|	LPAREN unary_expression RPAREN
 		{
-			$$ = $2;
+			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
+			$$->u.unary_expression.type = UNARY_NESTED;
+			$$->u.unary_expression.u.nested_exp = $2;
 		}
 	|	postfix_expression LSBRAC unary_expression RSBRAC
 		{
 			$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
 			$$->u.unary_expression.type = UNARY_SBRAC;
 			$$->u.unary_expression.u.sbrac_exp = $3;
-			cds_list_add(&($$)->siblings, &($1)->siblings);
+			cds_list_splice(&($1)->tmp_head, &($$)->tmp_head);
+			cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 		}
 	|	postfix_expression DOT IDENTIFIER
 		{
@@ -964,7 +1070,8 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 			$$->u.unary_expression.link = UNARY_DOTLINK;
-			cds_list_add(&($$)->siblings, &($1)->siblings);
+			cds_list_splice(&($1)->tmp_head, &($$)->tmp_head);
+			cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 		}
 	|	postfix_expression DOT ID_TYPE
 		{
@@ -972,7 +1079,8 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 			$$->u.unary_expression.link = UNARY_DOTLINK;
-			cds_list_add(&($$)->siblings, &($1)->siblings);
+			cds_list_splice(&($1)->tmp_head, &($$)->tmp_head);
+			cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 		}
 	|	postfix_expression RARROW IDENTIFIER
 		{
@@ -980,7 +1088,8 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 			$$->u.unary_expression.link = UNARY_ARROWLINK;
-			cds_list_add(&($$)->siblings, &($1)->siblings);
+			cds_list_splice(&($1)->tmp_head, &($$)->tmp_head);
+			cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 		}
 	|	postfix_expression RARROW ID_TYPE
 		{
@@ -988,7 +1097,8 @@ postfix_expression:
 			$$->u.unary_expression.type = UNARY_STRING;
 			$$->u.unary_expression.u.string = yylval.gs->s;
 			$$->u.unary_expression.link = UNARY_ARROWLINK;
-			cds_list_add(&($$)->siblings, &($1)->siblings);
+			cds_list_splice(&($1)->tmp_head, &($$)->tmp_head);
+			cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1019,7 +1129,8 @@ unary_expression_or_range:
 		unary_expression DOTDOTDOT unary_expression
 		{
 			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			_cds_list_splice_tail(&($3)->tmp_head, &($$)->tmp_head);
+			$3->u.unary_expression.link = UNARY_DOTDOTDOT;
 		}
 	|	unary_expression
 		{	$$ = $1;		}
@@ -1038,51 +1149,64 @@ declaration:
 		{	$$ = $1;	}
 	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($4)->siblings, &($$)->u._typedef.type_declarators);
+			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_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+			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_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+			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 declaration_specifiers abstract_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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			cds_list_add(&($6)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
-		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON type_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON 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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
+
+			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);
+
+			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);
 		}
 	;
 
 event_declaration:
 		event_declaration_begin event_declaration_end
-		{	$$ = make_node(scanner, NODE_EVENT);	}
+		{
+			$$ = make_node(scanner, NODE_EVENT);
+		}
 	|	event_declaration_begin ctf_assignment_expression_list event_declaration_end
 		{
 			$$ = make_node(scanner, NODE_EVENT);
-			if (reparent_node($2, $$))
+			if (set_parent_node($2, $$))
 				reparent_error(scanner, "event_declaration");
 		}
 	;
@@ -1100,11 +1224,13 @@ event_declaration_end:
 
 stream_declaration:
 		stream_declaration_begin stream_declaration_end
-		{	$$ = make_node(scanner, NODE_STREAM);	}
+		{
+			$$ = make_node(scanner, NODE_STREAM);
+		}
 	|	stream_declaration_begin ctf_assignment_expression_list stream_declaration_end
 		{
 			$$ = make_node(scanner, NODE_STREAM);
-			if (reparent_node($2, $$))
+			if (set_parent_node($2, $$))
 				reparent_error(scanner, "stream_declaration");
 		}
 	;
@@ -1122,11 +1248,13 @@ stream_declaration_end:
 
 trace_declaration:
 		trace_declaration_begin trace_declaration_end
-		{	$$ = make_node(scanner, NODE_TRACE);	}
+		{
+			$$ = make_node(scanner, NODE_TRACE);
+		}
 	|	trace_declaration_begin ctf_assignment_expression_list trace_declaration_end
 		{
 			$$ = make_node(scanner, NODE_TRACE);
-			if (reparent_node($2, $$))
+			if (set_parent_node($2, $$))
 				reparent_error(scanner, "trace_declaration");
 		}
 	;
@@ -1144,24 +1272,34 @@ trace_declaration_end:
 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;
 
+			$$ = $1;
 			node = make_node(scanner, NODE_TYPE_SPECIFIER);
 			node->u.type_specifier.type = TYPESPEC_CONST;
-			cds_list_add(&node->siblings, &($1)->siblings);
-			$$ = $1;
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
 	|	declaration_specifiers type_specifier
 		{
 			$$ = $1;
-			cds_list_add(&($2)->siblings, &($1)->siblings);
+			cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.head);
 		}
 	;
 
@@ -1171,17 +1309,7 @@ type_declarator_list:
 	|	type_declarator_list COMMA type_declarator
 		{
 			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
-		}
-	;
-
-abstract_type_declarator_list:
-		abstract_type_declarator
-		{	$$ = $1;	}
-	|	abstract_type_declarator_list COMMA abstract_type_declarator
-		{
-			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1241,6 +1369,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);
@@ -1249,71 +1382,100 @@ 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 (reparent_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 (reparent_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 (reparent_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:
 		struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
 		{
 			$$ = make_node(scanner, NODE_STRUCT);
-			if (reparent_node($2, $$))
+			$$->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 (reparent_node($3, $$))
+			if (set_parent_node($3, $$))
 				reparent_error(scanner, "struct reparent error");
 		}
 	|	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 (reparent_node($3, $$))
+			if (set_parent_node($3, $$))
 				reparent_error(scanner, "struct reparent error");
 		}
 	|	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;
 		}
 	;
@@ -1332,90 +1494,103 @@ variant_type_specifier:
 		variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
-			if (reparent_node($2, $$))
+			$$->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 (reparent_node($5, $$))
+			if (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
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.choice = $2->s;
-			if (reparent_node($5, $$))
+			if (set_parent_node($5, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	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 (reparent_node($3, $$))
+			if (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
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (reparent_node($6, $$))
+			if (set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	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 (reparent_node($6, $$))
+			if (set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	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 (reparent_node($3, $$))
+			if (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
 		{
 			$$ = make_node(scanner, NODE_VARIANT);
+			$$->u.variant.has_body = 1;
 			$$->u.variant.name = $1->s;
 			$$->u.variant.choice = $3->s;
-			if (reparent_node($6, $$))
+			if (set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	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 (reparent_node($6, $$))
+			if (set_parent_node($6, $$))
 				reparent_error(scanner, "variant reparent error");
 		}
 	|	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;
 		}
@@ -1431,28 +1606,28 @@ variant_declaration_end:
 		{	pop_scope(scanner);	}
 	;
 
-type_specifier_or_integer_constant:
+declaration_specifiers_or_integer_constant:
 		declaration_specifiers
 		{	$$ = $1;		}
 	|	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);
 		}
 	|	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);
 		}
 	;
@@ -1461,98 +1636,114 @@ enum_type_specifier:
 		LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
-			cds_list_add(&($2)->siblings, &($$)->u._enum.enumerator_list);
+			$$->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
+	|	LT declaration_specifiers GT LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
-			$$->u._enum.container_type = $2;
-			cds_list_add(&($5)->siblings, &($$)->u._enum.enumerator_list);
+			$$->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_add(&($3)->siblings, &($$)->u._enum.enumerator_list);
+			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
+	|	IDENTIFIER LT declaration_specifiers 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_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	ID_TYPE LBRAC enumerator_list RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 1;
 			$$->u._enum.enum_id = $1->s;
-			cds_list_add(&($3)->siblings, &($$)->u._enum.enumerator_list);
+			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
+	|	ID_TYPE LT declaration_specifiers 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_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
-			cds_list_add(&($2)->siblings, &($$)->u._enum.enumerator_list);
+			$$->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
+	|	LT declaration_specifiers GT LBRAC enumerator_list COMMA RBRAC
 		{
 			$$ = make_node(scanner, NODE_ENUM);
-			$$->u._enum.container_type = $2;
-			cds_list_add(&($5)->siblings, &($$)->u._enum.enumerator_list);
+			$$->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_add(&($3)->siblings, &($$)->u._enum.enumerator_list);
+			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
-	|	IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
+	|	IDENTIFIER LT declaration_specifiers 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_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	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
+	|	IDENTIFIER LT declaration_specifiers GT
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
-			$$->u._enum.container_type = $3;
+			($$)->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_add(&($3)->siblings, &($$)->u._enum.enumerator_list);
+			_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
+	|	ID_TYPE LT declaration_specifiers 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_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+			($$)->u._enum.container_type = $3;
+			_cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
 		}
 	|	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
+	|	ID_TYPE LT declaration_specifiers GT
 		{
 			$$ = make_node(scanner, NODE_ENUM);
+			$$->u._enum.has_body = 0;
 			$$->u._enum.enum_id = $1->s;
-			$$->u._enum.container_type = $3;
+			($$)->u._enum.container_type = $3;
 		}
 	;
 
@@ -1563,81 +1754,129 @@ struct_or_variant_declaration_list:
 		{
 			if ($1) {
 				$$ = $1;
-				cds_list_add(&($2)->siblings, &($1)->siblings);
+				cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
 			} else {
 				$$ = $2;
+				cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
 			}
 		}
 	;
 
 struct_or_variant_declaration:
-		specifier_qualifier_list struct_or_variant_declarator_list SEMICOLON
+		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_add(&($1)->siblings, &($$)->u.struct_or_variant_declaration.declaration_specifier);
-			cds_list_add(&($2)->siblings, &($$)->u.struct_or_variant_declaration.type_declarators);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
+			_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
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($4)->siblings, &($$)->u._typedef.type_declarators);
+			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 specifier_qualifier_list type_declarator_list SEMICOLON
+	|	TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
+			struct ctf_node *list;
+
 			$$ = make_node(scanner, NODE_TYPEDEF);
-			cds_list_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+			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);
 		}
-	|	specifier_qualifier_list TYPEDEF type_declarator_list SEMICOLON
+	|	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_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
-		}
-	|	TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON specifier_qualifier_list abstract_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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			cds_list_add(&($6)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
+			($$)->u.struct_or_variant_declaration.type_specifier_list = list;
+			_cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
 		}
-	|	TYPEALIAS specifier_qualifier_list abstract_declarator_list COLON type_declarator_list SEMICOLON
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON 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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
+
+			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);
+
+			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);
 		}
 	;
 
-specifier_qualifier_list:
+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;	}
-	|	specifier_qualifier_list CONST
+		{
+			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_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
 		{
 			struct ctf_node *node;
 
 			$$ = $1;
 			node = make_node(scanner, NODE_TYPE_SPECIFIER);
 			node->u.type_specifier.type = TYPESPEC_CONST;
-			cds_list_add(&node->siblings, &($$)->siblings);
+			cds_list_add_tail(&node->siblings, &($$)->u.type_specifier_list.head);
 		}
-	|	specifier_qualifier_list type_specifier
+	|	alias_declaration_specifiers type_specifier
 		{
 			$$ = $1;
-			cds_list_add(&($2)->siblings, &($$)->siblings);
+			cds_list_add_tail(&($2)->siblings, &($$)->u.type_specifier_list.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, &($$)->u.type_specifier_list.head);
 		}
 	;
 
@@ -1647,7 +1886,7 @@ struct_or_variant_declarator_list:
 	|	struct_or_variant_declarator_list COMMA struct_or_variant_declarator
 		{
 			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1659,7 +1898,7 @@ struct_or_variant_declarator:
 	|	declarator COLON unary_expression
 		{
 			$$ = $1;
-			if (reparent_node($3, $1))
+			if (set_parent_node($3, $1))
 				reparent_error(scanner, "struct_or_variant_declarator");
 		}
 	;
@@ -1670,7 +1909,7 @@ enumerator_list:
 	|	enumerator_list COMMA enumerator
 		{
 			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1704,31 +1943,31 @@ enumerator:
 		{
 			$$ = make_node(scanner, NODE_ENUMERATOR);
 			$$->u.enumerator.id = $1->s;
-			$$->u.enumerator.values = $3;
+			cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values);
 		}
 	|	ID_TYPE EQUAL unary_expression_or_range
 		{
 			$$ = make_node(scanner, NODE_ENUMERATOR);
 			$$->u.enumerator.id = $1->s;
-			$$->u.enumerator.values = $3;
+			cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values);
 		}
 	|	keywords EQUAL unary_expression_or_range
 		{
 			$$ = make_node(scanner, NODE_ENUMERATOR);
 			$$->u.enumerator.id = $1->s;
-			$$->u.enumerator.values = $3;
+			cds_list_splice(&($3)->tmp_head, &($$)->u.enumerator.values);
 		}
 	|	STRING_LITERAL_START DQUOTE EQUAL unary_expression_or_range
 		{
 			$$ = make_node(scanner, NODE_ENUMERATOR);
 			$$->u.enumerator.id = "";
-			$$->u.enumerator.values = $4;
+			cds_list_splice(&($4)->tmp_head, &($$)->u.enumerator.values);
 		}
 	|	STRING_LITERAL_START s_char_sequence DQUOTE EQUAL unary_expression_or_range
 		{
 			$$ = make_node(scanner, NODE_ENUMERATOR);
 			$$->u.enumerator.id = $2->s;
-			$$->u.enumerator.values = $5;
+			cds_list_splice(&($5)->tmp_head, &($$)->u.enumerator.values);
 		}
 	;
 
@@ -1738,7 +1977,7 @@ abstract_declarator_list:
 	|	abstract_declarator_list COMMA abstract_declarator
 		{
 			$$ = $1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1748,7 +1987,7 @@ abstract_declarator:
 	|	pointer direct_abstract_declarator
 		{
 			$$ = $2;
-			cds_list_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+			cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
 		}
 	;
 
@@ -1771,12 +2010,12 @@ direct_abstract_declarator:
 			$$->u.type_declarator.type = TYPEDEC_NESTED;
 			$$->u.type_declarator.u.nested.type_declarator = $2;
 		}
-	|	direct_abstract_declarator LSBRAC type_specifier_or_integer_constant RSBRAC
+	|	direct_abstract_declarator LSBRAC declaration_specifiers_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;
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	|	direct_abstract_declarator LSBRAC RSBRAC
 		{
@@ -1787,130 +2026,135 @@ 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_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+			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 declaration_specifiers_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;
+			($$)->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_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+			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 declaration_specifiers_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;
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	;
 
-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_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+			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 declaration_specifiers_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;
+			($$)->u.type_declarator.u.nested.length = $3;
 		}
 	;
 
 pointer:	
 		STAR
-		{	$$ = make_node(scanner, NODE_POINTER);		}
+		{
+			$$ = make_node(scanner, NODE_POINTER);
+		}
 	|	STAR pointer
 		{
 			$$ = make_node(scanner, NODE_POINTER);
-			cds_list_add(&($2)->siblings, &($$)->siblings);
+			cds_list_splice(&($2)->tmp_head, &($$)->tmp_head);
 		}
 	|	STAR type_qualifier_list pointer
 		{
 			$$ = make_node(scanner, NODE_POINTER);
 			$$->u.pointer.const_qualifier = 1;
-			cds_list_add(&($3)->siblings, &($$)->siblings);
+			cds_list_splice(&($3)->tmp_head, &($$)->tmp_head);
 		}
 	;
 
@@ -1928,7 +2172,7 @@ ctf_assignment_expression_list:
 	|	ctf_assignment_expression_list ctf_assignment_expression SEMICOLON
 		{
 			$$ = $1;
-			cds_list_add(&($2)->siblings, &($1)->siblings);
+			cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
 		}
 	;
 
@@ -1937,62 +2181,73 @@ ctf_assignment_expression:
 		{
 			/*
 			 * Because we have left and right, cannot use
-			 * reparent_node.
+			 * set_parent_node.
 			 */
 			$$ = make_node(scanner, NODE_CTF_EXPRESSION);
-			$$->u.ctf_expression.left = $1;
+			_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");
-			$$->u.ctf_expression.right = $3;
+			_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
-			 * reparent_node.
+			 * set_parent_node.
 			 */
 			$$ = make_node(scanner, NODE_CTF_EXPRESSION);
-			$$->u.ctf_expression.left = $1;
+			_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");
-			$$->u.ctf_expression.right = $3;
+			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_add(&($3)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($4)->siblings, &($$)->u._typedef.type_declarators);
+			($$)->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_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+			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_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
-		}
-	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON declaration_specifiers abstract_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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.declaration_specifier);
-			cds_list_add(&($6)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
+			($$)->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 type_declarator_list
+	|	TYPEALIAS declaration_specifiers abstract_declarator_list COLON 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_add(&($2)->siblings, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
-			cds_list_add(&($3)->siblings, &($$)->u.typealias.target->u.typealias_target.type_declarators);
-			cds_list_add(&($5)->siblings, &($$)->u.typealias.alias->u.typealias_alias.type_declarators);
+
+			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);
+
+			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);
 		}
 	;