Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
struct ctf_node *parent;
struct cds_list_head siblings;
*/
struct ctf_node *parent;
struct cds_list_head siblings;
+ struct cds_list_head tmp_head;
struct cds_list_head gc;
enum node_type type;
struct cds_list_head gc;
enum node_type type;
struct cds_list_head declaration_list;
} trace;
struct {
struct cds_list_head declaration_list;
} trace;
struct {
- struct ctf_node *left; /* Should be string */
- struct ctf_node *right; /* Unary exp. or type */
+ struct cds_list_head left; /* Should be string */
+ struct cds_list_head right; /* Unary exp. or type */
} ctf_expression;
struct {
enum {
} ctf_expression;
struct {
enum {
UNARY_SIGNED_CONSTANT,
UNARY_UNSIGNED_CONSTANT,
UNARY_SBRAC,
UNARY_SIGNED_CONSTANT,
UNARY_UNSIGNED_CONSTANT,
UNARY_SBRAC,
int64_t signed_constant;
uint64_t unsigned_constant;
struct ctf_node *sbrac_exp;
int64_t signed_constant;
uint64_t unsigned_constant;
struct ctf_node *sbrac_exp;
+ struct ctf_node *nested_exp;
} u;
enum {
UNARY_LINK_UNKNOWN = 0,
UNARY_DOTLINK,
UNARY_ARROWLINK,
} u;
enum {
UNARY_LINK_UNKNOWN = 0,
UNARY_DOTLINK,
UNARY_ARROWLINK,
} link;
} unary_expression;
struct {
} link;
} unary_expression;
struct {
} string;
struct {
char *id;
} string;
struct {
char *id;
- /* first node of range list or single node */
- struct ctf_node *values;
+ /* range list or single value node */
+ struct cds_list_head values;
} enumerator;
struct {
char *enum_id;
} enumerator;
struct {
char *enum_id;
#include "ctf-parser.h"
#include "ctf-ast.h"
#include "ctf-parser.h"
#include "ctf-ast.h"
+/* 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);
#define printf_dbg(fmt, args...) fprintf(stderr, "%s: " fmt, __func__, ## args)
int yyparse(struct ctf_scanner *scanner);
return NULL;
memset(node, 0, sizeof(*node));
node->type = type;
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);
switch (type) {
cds_list_add(&node->gc, &ast->allocated_nodes);
switch (type) {
break;
case NODE_CTF_EXPRESSION:
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;
break;
case NODE_UNARY_EXPRESSION:
break;
CDS_INIT_LIST_HEAD(&node->u.string.expressions);
break;
case NODE_ENUMERATOR:
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_ENUM:
CDS_INIT_LIST_HEAD(&node->u._enum.enumerator_list);
{
switch (parent->type) {
case NODE_EVENT:
{
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);
- cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
- 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:
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:
break;
case NODE_INTEGER:
- cds_list_add(&node->siblings, &parent->u.integer.expressions);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.integer.expressions);
- cds_list_add(&node->siblings, &parent->u.string.expressions);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.string.expressions);
{
switch (parent->type) {
case NODE_ROOT:
{
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._typedef);
- cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
- cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
- 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:
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);
- 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:
break;
case NODE_FLOATING_POINT:
{
switch (parent->type) {
case NODE_ROOT:
{
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.typealias);
- cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
- cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
- 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:
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);
- 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:
break;
case NODE_FLOATING_POINT:
{
switch (parent->type) {
case NODE_ROOT:
{
switch (parent->type) {
case NODE_ROOT:
- cds_list_add(&node->siblings, &parent->u.root.declaration_specifier);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.root.declaration_specifier);
- cds_list_add(&node->siblings, &parent->u.event.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.event.declaration_list);
- cds_list_add(&node->siblings, &parent->u.stream.declaration_list);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
- 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:
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);
- 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_TYPEDEF:
break;
case NODE_TYPEDEF:
- cds_list_add(&node->siblings, &parent->u._typedef.declaration_specifier);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u._typedef.declaration_specifier);
break;
case NODE_TYPEALIAS_TARGET:
break;
case NODE_TYPEALIAS_TARGET:
- cds_list_add(&node->siblings, &parent->u.typealias_target.declaration_specifier);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_target.declaration_specifier);
break;
case NODE_TYPEALIAS_ALIAS:
break;
case NODE_TYPEALIAS_ALIAS:
- cds_list_add(&node->siblings, &parent->u.typealias_alias.declaration_specifier);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.typealias_alias.declaration_specifier);
break;
case NODE_TYPE_DECLARATOR:
parent->u.type_declarator.type = TYPEDEC_NESTED;
break;
case NODE_TYPE_DECLARATOR:
parent->u.type_declarator.type = TYPEDEC_NESTED;
parent->u._enum.container_type = node;
break;
case NODE_STRUCT_OR_VARIANT_DECLARATION:
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);
+ _cds_list_splice_tail(&node->tmp_head, &parent->u.struct_or_variant_declaration.declaration_specifier);
break;
case NODE_TYPEALIAS:
case NODE_FLOATING_POINT:
break;
case NODE_TYPEALIAS:
case NODE_FLOATING_POINT:
parent->u.type_declarator.u.nested.type_declarator = node;
break;
case NODE_STRUCT_OR_VARIANT_DECLARATION:
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:
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:
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:
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);
- * 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;
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) {
/* Note: Linking to parent will be done only by an external visitor */
switch (node->type) {
return -EINVAL;
case NODE_EVENT:
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:
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:
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 reparent_typealias(node, parent);
case NODE_POINTER:
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 -EPERM;
break;
case NODE_TYPE_DECLARATOR:
return reparent_type_specifier(node, parent);
case NODE_ENUMERATOR:
return reparent_type_specifier(node, parent);
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:
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:
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;
break;
default:
return -EINVAL;
memset(ast, 0, sizeof(*ast));
CDS_INIT_LIST_HEAD(&ast->allocated_nodes);
ast->root.type = NODE_ROOT;
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.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._typedef);
CDS_INIT_LIST_HEAD(&ast->root.u.root.typealias);
CDS_INIT_LIST_HEAD(&ast->root.u.root.declaration_specifier);
- 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
{
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");
}
;
reparent_error(scanner, "error reparenting to root");
}
;
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| ID_TYPE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
}
| ID_TYPE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
| keywords
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
| keywords
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "%llu",
&$$->u.unary_expression.u.unsigned_constant);
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "%llu",
&$$->u.unary_expression.u.unsigned_constant);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "0%llo",
&$$->u.unary_expression.u.unsigned_constant);
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "0%llo",
&$$->u.unary_expression.u.unsigned_constant);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| HEXADECIMAL_CONSTANT
{
}
| HEXADECIMAL_CONSTANT
{
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "0x%llx",
&$$->u.unary_expression.u.unsigned_constant);
$$->u.unary_expression.type = UNARY_UNSIGNED_CONSTANT;
sscanf(yylval.gs->s, "0x%llx",
&$$->u.unary_expression.u.unsigned_constant);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| STRING_LITERAL_START DQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = "";
}
| STRING_LITERAL_START DQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = "";
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| STRING_LITERAL_START s_char_sequence DQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = $2->s;
}
| STRING_LITERAL_START s_char_sequence DQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = $2->s;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| CHARACTER_CONSTANT_START c_char_sequence SQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = $2->s;
}
| CHARACTER_CONSTANT_START c_char_sequence SQUOTE
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = $2->s;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| LPAREN unary_expression RPAREN
{
}
| LPAREN unary_expression RPAREN
{
+ $$ = make_node(scanner, NODE_UNARY_EXPRESSION);
+ $$->u.unary_expression.type = UNARY_NESTED;
+ $$->u.unary_expression.u.nested_exp = $2;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| postfix_expression LSBRAC unary_expression RSBRAC
{
$$ = make_node(scanner, NODE_UNARY_EXPRESSION);
$$->u.unary_expression.type = UNARY_SBRAC;
$$->u.unary_expression.u.sbrac_exp = $3;
}
| 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
{
}
| postfix_expression DOT IDENTIFIER
{
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
$$->u.unary_expression.link = UNARY_DOTLINK;
$$->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
{
}
| postfix_expression DOT ID_TYPE
{
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
$$->u.unary_expression.link = UNARY_DOTLINK;
$$->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
{
}
| postfix_expression RARROW IDENTIFIER
{
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
$$->u.unary_expression.link = UNARY_ARROWLINK;
$$->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
{
}
| postfix_expression RARROW ID_TYPE
{
$$->u.unary_expression.type = UNARY_STRING;
$$->u.unary_expression.u.string = yylval.gs->s;
$$->u.unary_expression.link = UNARY_ARROWLINK;
$$->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);
unary_expression DOTDOTDOT unary_expression
{
$$ = $1;
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; }
}
| unary_expression
{ $$ = $1; }
| declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
| declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
{
$$ = 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);
+ _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 declaration_specifiers type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
+ _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
}
| declaration_specifiers TYPEDEF type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| declaration_specifiers TYPEDEF type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _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
{
$$ = make_node(scanner, NODE_TYPEALIAS);
$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
}
| 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);
+ _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+ _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);
+ _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);
}
| 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_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);
+ _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:
event_declaration_begin event_declaration_end
}
;
event_declaration:
event_declaration_begin event_declaration_end
- { $$ = make_node(scanner, NODE_EVENT); }
+ {
+ $$ = make_node(scanner, NODE_EVENT);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| event_declaration_begin ctf_assignment_expression_list event_declaration_end
{
$$ = make_node(scanner, NODE_EVENT);
| event_declaration_begin ctf_assignment_expression_list event_declaration_end
{
$$ = make_node(scanner, NODE_EVENT);
- if (reparent_node($2, $$))
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ if (set_parent_node($2, $$))
reparent_error(scanner, "event_declaration");
}
;
reparent_error(scanner, "event_declaration");
}
;
stream_declaration:
stream_declaration_begin stream_declaration_end
stream_declaration:
stream_declaration_begin stream_declaration_end
- { $$ = make_node(scanner, NODE_STREAM); }
+ {
+ $$ = make_node(scanner, NODE_STREAM);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| stream_declaration_begin ctf_assignment_expression_list stream_declaration_end
{
$$ = make_node(scanner, NODE_STREAM);
| stream_declaration_begin ctf_assignment_expression_list stream_declaration_end
{
$$ = make_node(scanner, NODE_STREAM);
- if (reparent_node($2, $$))
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ if (set_parent_node($2, $$))
reparent_error(scanner, "stream_declaration");
}
;
reparent_error(scanner, "stream_declaration");
}
;
trace_declaration:
trace_declaration_begin trace_declaration_end
trace_declaration:
trace_declaration_begin trace_declaration_end
- { $$ = make_node(scanner, NODE_TRACE); }
+ {
+ $$ = make_node(scanner, NODE_TRACE);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| trace_declaration_begin ctf_assignment_expression_list trace_declaration_end
{
$$ = make_node(scanner, NODE_TRACE);
| trace_declaration_begin ctf_assignment_expression_list trace_declaration_end
{
$$ = make_node(scanner, NODE_TRACE);
- if (reparent_node($2, $$))
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ if (set_parent_node($2, $$))
reparent_error(scanner, "trace_declaration");
}
;
reparent_error(scanner, "trace_declaration");
}
;
{
$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
$$->u.type_specifier.type = TYPESPEC_CONST;
{
$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
$$->u.type_specifier.type = TYPESPEC_CONST;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| declaration_specifiers CONST
{
struct ctf_node *node;
| declaration_specifiers CONST
{
struct ctf_node *node;
node = make_node(scanner, NODE_TYPE_SPECIFIER);
node->u.type_specifier.type = TYPESPEC_CONST;
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, &($$)->tmp_head);
}
| declaration_specifiers type_specifier
{
$$ = $1;
}
| declaration_specifiers type_specifier
{
$$ = $1;
- cds_list_add(&($2)->siblings, &($1)->siblings);
+ cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
}
;
type_declarator_list:
type_declarator
}
;
type_declarator_list:
type_declarator
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| type_declarator_list COMMA type_declarator
{
$$ = $1;
| type_declarator_list COMMA type_declarator
{
$$ = $1;
- cds_list_add(&($3)->siblings, &($$)->siblings);
+ cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
}
;
abstract_type_declarator_list:
abstract_type_declarator
}
;
abstract_type_declarator_list:
abstract_type_declarator
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| abstract_type_declarator_list COMMA 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);
| FLOATING_POINT LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_FLOATING_POINT);
| FLOATING_POINT LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_FLOATING_POINT);
- if (reparent_node($3, $$))
+ if (set_parent_node($3, $$))
reparent_error(scanner, "floating point reparent error");
}
| INTEGER LBRAC RBRAC
reparent_error(scanner, "floating point reparent error");
}
| INTEGER LBRAC RBRAC
| INTEGER LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_INTEGER);
| INTEGER LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_INTEGER);
- if (reparent_node($3, $$))
+ if (set_parent_node($3, $$))
reparent_error(scanner, "integer reparent error");
}
| STRING LBRAC RBRAC
reparent_error(scanner, "integer reparent error");
}
| STRING LBRAC RBRAC
| STRING LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_STRING);
| STRING LBRAC ctf_assignment_expression_list RBRAC
{
$$ = make_node(scanner, NODE_STRING);
- if (reparent_node($3, $$))
+ if (set_parent_node($3, $$))
reparent_error(scanner, "string reparent error");
}
| ENUM enum_type_specifier
reparent_error(scanner, "string reparent error");
}
| ENUM enum_type_specifier
struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
{
$$ = make_node(scanner, NODE_STRUCT);
struct_declaration_begin struct_or_variant_declaration_list struct_declaration_end
{
$$ = make_node(scanner, NODE_STRUCT);
- if (reparent_node($2, $$))
+ 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.name = $1->s;
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.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.name = $1->s;
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.name = $1->s;
- if (reparent_node($3, $$))
+ if (set_parent_node($3, $$))
reparent_error(scanner, "struct reparent error");
}
| IDENTIFIER
reparent_error(scanner, "struct reparent error");
}
| IDENTIFIER
variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
{
$$ = make_node(scanner, NODE_VARIANT);
variant_declaration_begin struct_or_variant_declaration_list variant_declaration_end
{
$$ = make_node(scanner, NODE_VARIANT);
- if (reparent_node($2, $$))
+ 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.choice = $2->s;
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.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.choice = $2->s;
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.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.name = $1->s;
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.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
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.name = $1->s;
$$->u.variant.choice = $3->s;
$$ = make_node(scanner, NODE_VARIANT);
$$->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
reparent_error(scanner, "variant reparent error");
}
| IDENTIFIER LT IDENTIFIER GT
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.name = $1->s;
$$->u.variant.choice = $3->s;
$$ = make_node(scanner, NODE_VARIANT);
$$->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
reparent_error(scanner, "variant reparent error");
}
| IDENTIFIER LT ID_TYPE GT
{
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.name = $1->s;
{
$$ = make_node(scanner, NODE_VARIANT);
$$->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
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.name = $1->s;
$$->u.variant.choice = $3->s;
$$ = make_node(scanner, NODE_VARIANT);
$$->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
reparent_error(scanner, "variant reparent error");
}
| ID_TYPE LT IDENTIFIER GT
$$ = make_node(scanner, NODE_VARIANT);
$$->u.variant.name = $1->s;
$$->u.variant.choice = $3->s;
$$ = make_node(scanner, NODE_VARIANT);
$$->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
reparent_error(scanner, "variant reparent error");
}
| ID_TYPE LT ID_TYPE GT
LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
- cds_list_add(&($2)->siblings, &($$)->u._enum.enumerator_list);
+ _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.container_type = $2;
}
| LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.container_type = $2;
- cds_list_add(&($5)->siblings, &($$)->u._enum.enumerator_list);
+ _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
| IDENTIFIER LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
}
| IDENTIFIER LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->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
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
}
| IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
- cds_list_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+ _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
}
| ID_TYPE LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
}
| ID_TYPE LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->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
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
}
| ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
- cds_list_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+ _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
}
| LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
}
| LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
- cds_list_add(&($2)->siblings, &($$)->u._enum.enumerator_list);
+ _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.container_type = $2;
}
| LT type_specifier_or_integer_constant 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);
+ _cds_list_splice_tail(&($5)->tmp_head, &($$)->u._enum.enumerator_list);
}
| IDENTIFIER LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
}
| IDENTIFIER LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->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
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
}
| IDENTIFIER LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
- cds_list_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+ _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
{
$$ = make_node(scanner, NODE_ENUM);
$$->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
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
}
| ID_TYPE LT type_specifier_or_integer_constant GT LBRAC enumerator_list COMMA RBRAC
{
$$ = make_node(scanner, NODE_ENUM);
$$->u._enum.enum_id = $1->s;
$$->u._enum.container_type = $3;
- cds_list_add(&($6)->siblings, &($$)->u._enum.enumerator_list);
+ _cds_list_splice_tail(&($6)->tmp_head, &($$)->u._enum.enumerator_list);
- cds_list_add(&($2)->siblings, &($1)->siblings);
+ cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
+ cds_list_add_tail(&($$)->siblings, &($$)->tmp_head);
specifier_qualifier_list struct_or_variant_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_STRUCT_OR_VARIANT_DECLARATION);
specifier_qualifier_list struct_or_variant_declarator_list SEMICOLON
{
$$ = 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);
+ _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
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| specifier_qualifier_list TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON
{
$$ = 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);
+ _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
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| TYPEDEF specifier_qualifier_list type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _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
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| specifier_qualifier_list TYPEDEF type_declarator_list SEMICOLON
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _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
{
$$ = make_node(scanner, NODE_TYPEALIAS);
$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
}
| 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);
+ _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+ _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);
+ _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);
}
| 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_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);
+ _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);
{
$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
$$->u.type_specifier.type = TYPESPEC_CONST;
{
$$ = make_node(scanner, NODE_TYPE_SPECIFIER);
$$->u.type_specifier.type = TYPESPEC_CONST;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| specifier_qualifier_list CONST
{
struct ctf_node *node;
| specifier_qualifier_list CONST
{
struct ctf_node *node;
$$ = $1;
node = make_node(scanner, NODE_TYPE_SPECIFIER);
node->u.type_specifier.type = TYPESPEC_CONST;
$$ = $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, &($$)->tmp_head);
}
| specifier_qualifier_list type_specifier
{
$$ = $1;
}
| specifier_qualifier_list type_specifier
{
$$ = $1;
- cds_list_add(&($2)->siblings, &($$)->siblings);
+ cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
}
;
struct_or_variant_declarator_list:
struct_or_variant_declarator
}
;
struct_or_variant_declarator_list:
struct_or_variant_declarator
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| struct_or_variant_declarator_list COMMA struct_or_variant_declarator
{
$$ = $1;
| 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);
| declarator COLON unary_expression
{
$$ = $1;
| declarator COLON unary_expression
{
$$ = $1;
- if (reparent_node($3, $1))
+ if (set_parent_node($3, $1))
reparent_error(scanner, "struct_or_variant_declarator");
}
;
enumerator_list:
enumerator
reparent_error(scanner, "struct_or_variant_declarator");
}
;
enumerator_list:
enumerator
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| enumerator_list COMMA enumerator
{
$$ = $1;
| enumerator_list COMMA enumerator
{
$$ = $1;
- cds_list_add(&($3)->siblings, &($$)->siblings);
+ cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
{
$$ = make_node(scanner, NODE_ENUMERATOR);
$$->u.enumerator.id = $1->s;
{
$$ = 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;
}
| 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;
}
| 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 = "";
}
| 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;
}
| 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);
}
;
abstract_declarator_list:
abstract_declarator
}
;
abstract_declarator_list:
abstract_declarator
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| abstract_declarator_list COMMA abstract_declarator
{
$$ = $1;
| abstract_declarator_list COMMA abstract_declarator
{
$$ = $1;
- cds_list_add(&($3)->siblings, &($$)->siblings);
+ cds_list_add_tail(&($3)->siblings, &($$)->tmp_head);
| pointer direct_abstract_declarator
{
$$ = $2;
| pointer direct_abstract_declarator
{
$$ = $2;
- cds_list_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+ cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
| pointer direct_declarator
{
$$ = $2;
| pointer direct_declarator
{
$$ = $2;
- cds_list_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+ cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
| pointer direct_type_declarator
{
$$ = $2;
| pointer direct_type_declarator
{
$$ = $2;
- cds_list_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+ cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
| pointer direct_abstract_type_declarator
{
$$ = $2;
| pointer direct_abstract_type_declarator
{
$$ = $2;
- cds_list_add(&($1)->siblings, &($$)->u.type_declarator.pointers);
+ cds_list_splice(&($1)->tmp_head, &($$)->u.type_declarator.pointers);
- { $$ = make_node(scanner, NODE_POINTER); }
+ {
+ $$ = make_node(scanner, NODE_POINTER);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| STAR 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);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
}
| STAR type_qualifier_list pointer
{
$$ = make_node(scanner, NODE_POINTER);
$$->u.pointer.const_qualifier = 1;
}
| 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);
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
ctf_assignment_expression_list:
ctf_assignment_expression SEMICOLON
ctf_assignment_expression_list:
ctf_assignment_expression SEMICOLON
+ {
+ $$ = $1;
+ cds_list_add(&($$)->siblings, &($$)->tmp_head);
+ }
| ctf_assignment_expression_list ctf_assignment_expression SEMICOLON
{
$$ = $1;
| ctf_assignment_expression_list ctf_assignment_expression SEMICOLON
{
$$ = $1;
- cds_list_add(&($2)->siblings, &($1)->siblings);
+ cds_list_add_tail(&($2)->siblings, &($$)->tmp_head);
{
/*
* Because we have left and right, cannot use
{
/*
* Because we have left and right, cannot use
*/
$$ = make_node(scanner, NODE_CTF_EXPRESSION);
*/
$$ = 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");
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
{
/*
* Because we have left and right, cannot use
}
| unary_expression TYPEASSIGN type_specifier
{
/*
* Because we have left and right, cannot use
*/
$$ = make_node(scanner, NODE_CTF_EXPRESSION);
*/
$$ = 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");
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(&($3)->siblings, &($3)->tmp_head);
+ _cds_list_splice_tail(&($3)->tmp_head, &($$)->u.ctf_expression.right);
}
| declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| declaration_specifiers TYPEDEF declaration_specifiers type_declarator_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);
+ _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.declaration_specifier);
+ _cds_list_splice_tail(&($1)->tmp_head, &($$)->u._typedef.declaration_specifier);
+ _cds_list_splice_tail(&($4)->tmp_head, &($$)->u._typedef.type_declarators);
}
| TYPEDEF declaration_specifiers type_declarator_list
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| TYPEDEF declaration_specifiers type_declarator_list
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($2)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _cds_list_splice_tail(&($2)->tmp_head, &($$)->u._typedef.declaration_specifier);
+ _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators);
}
| declaration_specifiers TYPEDEF type_declarator_list
{
$$ = make_node(scanner, NODE_TYPEDEF);
}
| declaration_specifiers TYPEDEF type_declarator_list
{
$$ = make_node(scanner, NODE_TYPEDEF);
- cds_list_add(&($1)->siblings, &($$)->u._typedef.declaration_specifier);
- cds_list_add(&($3)->siblings, &($$)->u._typedef.type_declarators);
+ _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
{
$$ = make_node(scanner, NODE_TYPEALIAS);
$$->u.typealias.target = make_node(scanner, NODE_TYPEALIAS_TARGET);
$$->u.typealias.alias = make_node(scanner, NODE_TYPEALIAS_ALIAS);
}
| 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);
+ _cds_list_splice_tail(&($2)->tmp_head, &($$)->u.typealias.target->u.typealias_target.declaration_specifier);
+ _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);
+ _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);
}
| 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_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);
+ _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);
typedef int rootscopetest;
typedef int rootscopetest;
+event { a.b.c.d.e = f.g.h->i->j; };
+
+ switch (node->u.unary_expression.link) {
+ case UNARY_LINK_UNKNOWN:
+ break;
+ case UNARY_DOTLINK:
+ print_tabs(fd, depth);
+ fprintf(fd, "<dotlink/>\n");
+ break;
+ case UNARY_ARROWLINK:
+ print_tabs(fd, depth);
+ fprintf(fd, "<arrowlink/>\n");
+ break;
+ case UNARY_DOTDOTDOT:
+ print_tabs(fd, depth);
+ fprintf(fd, "<dotdotdot/>\n");
+ break;
+ default:
+ fprintf(stderr, "[error] %s: unknown expression link type %d\n", __func__,
+ (int) node->u.unary_expression.link);
+ return -EINVAL;
+ }
+
switch (node->u.unary_expression.type) {
case UNARY_STRING:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "\"%s\"", node->u.unary_expression.u.string);
switch (node->u.unary_expression.type) {
case UNARY_STRING:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "\"%s\"", node->u.unary_expression.u.string);
break;
case UNARY_SIGNED_CONSTANT:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "%lld", node->u.unary_expression.u.signed_constant);
break;
case UNARY_SIGNED_CONSTANT:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "%lld", node->u.unary_expression.u.signed_constant);
break;
case UNARY_UNSIGNED_CONSTANT:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "%llu", node->u.unary_expression.u.signed_constant);
break;
case UNARY_UNSIGNED_CONSTANT:
print_tabs(fd, depth);
fprintf(fd, "<unary_expression value=");
fprintf(fd, "%llu", node->u.unary_expression.u.signed_constant);
break;
case UNARY_SBRAC:
print_tabs(fd, depth);
break;
case UNARY_SBRAC:
print_tabs(fd, depth);
print_tabs(fd, depth);
fprintf(fd, "</unary_expression_sbrac>");
break;
print_tabs(fd, depth);
fprintf(fd, "</unary_expression_sbrac>");
break;
+ case UNARY_NESTED:
+ print_tabs(fd, depth);
+ fprintf(fd, "<unary_expression_nested>");
+ ret = ctf_visitor_print_unary_expression(fd, depth + 1,
+ node->u.unary_expression.u.nested_exp);
+ if (ret)
+ return ret;
+ print_tabs(fd, depth);
+ fprintf(fd, "</unary_expression_nested>");
+ break;
case UNARY_UNKNOWN:
default:
case UNARY_UNKNOWN:
default:
(int) node->u.unary_expression.type);
return -EINVAL;
}
(int) node->u.unary_expression.type);
return -EINVAL;
}
- switch (node->u.unary_expression.link) {
- case UNARY_LINK_UNKNOWN:
- break;
- case UNARY_DOTLINK:
- print_tabs(fd, depth);
- fprintf(fd, "<dotlink/>\n");
- break;
- case UNARY_ARROWLINK:
- print_tabs(fd, depth);
- fprintf(fd, "<arrowlink/>\n");
- break;
- default:
- fprintf(stderr, "[error] %s: unknown expression link type %d\n", __func__,
- (int) node->u.unary_expression.link);
- return -EINVAL;
- }
return 0;
}
int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
{
print_tabs(fd, depth);
return 0;
}
int ctf_visitor_print_type_specifier(FILE *fd, int depth, struct ctf_node *node)
{
print_tabs(fd, depth);
- fprintf(fd, "<type_specifier =\"");
+ fprintf(fd, "<type_specifier \"");
switch (node->u.type_specifier.type) {
case TYPESPEC_VOID:
switch (node->u.type_specifier.type) {
case TYPESPEC_VOID:
fprintf(fd, "<type_declarator>\n");
depth++;
fprintf(fd, "<type_declarator>\n");
depth++;
- print_tabs(fd, depth);
- fprintf(fd, "<pointers>\n");
- cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
- siblings) {
- ret = ctf_visitor_print_xml(fd, depth + 1, iter);
- if (ret)
- return ret;
+ if (!cds_list_empty(&node->u.type_declarator.pointers)) {
+ print_tabs(fd, depth);
+ fprintf(fd, "<pointers>\n");
+ cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
+ siblings) {
+ ret = ctf_visitor_print_xml(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ print_tabs(fd, depth);
+ fprintf(fd, "</pointers>\n");
- print_tabs(fd, depth);
- fprintf(fd, "</pointers>\n");
switch (node->u.type_declarator.type) {
case TYPEDEC_ID:
print_tabs(fd, depth);
fprintf(fd, "<id \"");
fprintf(fd, "%s", node->u.type_declarator.u.id);
switch (node->u.type_declarator.type) {
case TYPEDEC_ID:
print_tabs(fd, depth);
fprintf(fd, "<id \"");
fprintf(fd, "%s", node->u.type_declarator.u.id);
- fprintf(fd, "<\" />\n");
+ fprintf(fd, "\" />\n");
break;
case TYPEDEC_NESTED:
if (node->u.type_declarator.u.nested.type_declarator) {
break;
case TYPEDEC_NESTED:
if (node->u.type_declarator.u.nested.type_declarator) {
depth++;
print_tabs(fd, depth);
fprintf(fd, "<left>\n");
depth++;
print_tabs(fd, depth);
fprintf(fd, "<left>\n");
- ret = ctf_visitor_print_xml(fd, depth + 1, node->u.ctf_expression.left);
- if (ret)
- return ret;
+ cds_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) {
+ ret = ctf_visitor_print_xml(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+
print_tabs(fd, depth);
fprintf(fd, "</left>\n");
print_tabs(fd, depth);
fprintf(fd, "<right>\n");
print_tabs(fd, depth);
fprintf(fd, "</left>\n");
print_tabs(fd, depth);
fprintf(fd, "<right>\n");
- ret = ctf_visitor_print_xml(fd, depth + 1, node->u.ctf_expression.right);
- if (ret)
- return ret;
+ cds_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) {
+ ret = ctf_visitor_print_xml(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
print_tabs(fd, depth);
fprintf(fd, "</right>\n");
depth--;
print_tabs(fd, depth);
fprintf(fd, "</right>\n");
depth--;
if (node->u.enumerator.id)
fprintf(fd, " id=\"%s\"", node->u.enumerator.id);
fprintf(fd, ">\n");
if (node->u.enumerator.id)
fprintf(fd, " id=\"%s\"", node->u.enumerator.id);
fprintf(fd, ">\n");
- if (node->u.enumerator.values) {
- ret = ctf_visitor_print_xml(fd, depth + 1,
- node->u.enumerator.values);
+ cds_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
+ ret = ctf_visitor_print_xml(fd, depth + 1, iter);
if (ret)
return ret;
}
print_tabs(fd, depth);
if (ret)
return ret;
}
print_tabs(fd, depth);
- fprintf(fd, "</enumerator>");
+ fprintf(fd, "</enumerator>\n");
break;
case NODE_ENUM:
print_tabs(fd, depth);
break;
case NODE_ENUM:
print_tabs(fd, depth);
if (node->u._enum.container_type) {
print_tabs(fd, depth);
if (node->u._enum.container_type) {
print_tabs(fd, depth);
- fprintf(fd, "<container_type>");
+ fprintf(fd, "<container_type>\n");
ret = ctf_visitor_print_xml(fd, depth + 1, node->u._enum.container_type);
if (ret)
return ret;
print_tabs(fd, depth);
ret = ctf_visitor_print_xml(fd, depth + 1, node->u._enum.container_type);
if (ret)
return ret;
print_tabs(fd, depth);
- fprintf(fd, "</container_type>");
+ fprintf(fd, "</container_type>\n");
- fprintf(fd, "<enumerator_list>");
+ fprintf(fd, "<enumerator_list>\n");
cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
ret = ctf_visitor_print_xml(fd, depth + 1, iter);
if (ret)
return ret;
}
print_tabs(fd, depth);
cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
ret = ctf_visitor_print_xml(fd, depth + 1, iter);
if (ret)
return ret;
}
print_tabs(fd, depth);
- fprintf(fd, "</enumerator_list>");
+ fprintf(fd, "</enumerator_list>\n");
depth--;
print_tabs(fd, depth);
depth--;
print_tabs(fd, depth);
projects / babeltrace.git / commitdiff
