X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-parser.y;h=757af5d53f74ddd81ecfe634f8f6fdedb249fddb;hp=d216cd0e6479acd1cb65a626336bf59b85539d2b;hb=d2ea163bc5534c67811ac131dedfa864cb3959c1;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48

diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index d216cd0e..757af5d5 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -64,8 +64,10 @@ static const char *node_type_to_str[] = {
 	[ NODE_UNKNOWN ] = "NODE_UNKNOWN",
 	[ NODE_ROOT ] = "NODE_ROOT",
 	[ NODE_EVENT ] = "NODE_EVENT",
+	[ NODE_ENV ] = "NODE_ENV",
 	[ NODE_STREAM ] = "NODE_STREAM",
 	[ NODE_TRACE ] = "NODE_TRACE",
+	[ NODE_CLOCK ] = "NODE_CLOCK",
 	[ NODE_CTF_EXPRESSION ] = "NODE_CTF_EXPRESSION",
 	[ NODE_UNARY_EXPRESSION ] = "NODE_UNARY_EXPRESSION",
 	[ NODE_TYPEDEF ] = "NODE_TYPEDEF",
@@ -243,9 +245,15 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 	case NODE_STREAM:
 		CDS_INIT_LIST_HEAD(&node->u.stream.declaration_list);
 		break;
+	case NODE_ENV:
+		CDS_INIT_LIST_HEAD(&node->u.env.declaration_list);
+		break;
 	case NODE_TRACE:
 		CDS_INIT_LIST_HEAD(&node->u.trace.declaration_list);
 		break;
+	case NODE_CLOCK:
+		CDS_INIT_LIST_HEAD(&node->u.clock.declaration_list);
+		break;
 
 	case NODE_CTF_EXPRESSION:
 		CDS_INIT_LIST_HEAD(&node->u.ctf_expression.left);
@@ -323,9 +331,15 @@ static int reparent_ctf_expression(struct ctf_node *node,
 	case NODE_STREAM:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
+	case NODE_ENV:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list);
+		break;
 	case NODE_TRACE:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
+	case NODE_CLOCK:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+		break;
 	case NODE_FLOATING_POINT:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.floating_point.expressions);
 		break;
@@ -375,9 +389,15 @@ static int reparent_typedef(struct ctf_node *node, struct ctf_node *parent)
 	case NODE_STREAM:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
+	case NODE_ENV:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list);
+		break;
 	case NODE_TRACE:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
+	case NODE_CLOCK:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+		break;
 	case NODE_VARIANT:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
 		break;
@@ -424,9 +444,15 @@ static int reparent_typealias(struct ctf_node *node, struct ctf_node *parent)
 	case NODE_STREAM:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.stream.declaration_list);
 		break;
+	case NODE_ENV:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.env.declaration_list);
+		break;
 	case NODE_TRACE:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.trace.declaration_list);
 		break;
+	case NODE_CLOCK:
+		_cds_list_splice_tail(&node->tmp_head, &parent->u.clock.declaration_list);
+		break;
 	case NODE_VARIANT:
 		_cds_list_splice_tail(&node->tmp_head, &parent->u.variant.declaration_list);
 		break;
@@ -472,7 +498,9 @@ static int reparent_type_specifier(struct ctf_node *node,
 	case NODE_TYPE_SPECIFIER:
 	case NODE_EVENT:
 	case NODE_STREAM:
+	case NODE_ENV:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_VARIANT:
 	case NODE_STRUCT:
 	case NODE_TYPEDEF:
@@ -513,9 +541,15 @@ static int reparent_type_specifier_list(struct ctf_node *node,
 	case NODE_STREAM:
 		cds_list_add_tail(&node->siblings, &parent->u.stream.declaration_list);
 		break;
+	case NODE_ENV:
+		cds_list_add_tail(&node->siblings, &parent->u.env.declaration_list);
+		break;
 	case NODE_TRACE:
 		cds_list_add_tail(&node->siblings, &parent->u.trace.declaration_list);
 		break;
+	case NODE_CLOCK:
+		cds_list_add_tail(&node->siblings, &parent->u.clock.declaration_list);
+		break;
 	case NODE_VARIANT:
 		cds_list_add_tail(&node->siblings, &parent->u.variant.declaration_list);
 		break;
@@ -582,7 +616,9 @@ static int reparent_type_declarator(struct ctf_node *node,
 	case NODE_ROOT:
 	case NODE_EVENT:
 	case NODE_STREAM:
+	case NODE_ENV:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_VARIANT:
 	case NODE_STRUCT:
 	case NODE_TYPEALIAS:
@@ -641,6 +677,13 @@ static int set_parent_node(struct ctf_node *node,
 			return -EPERM;
 		}
 		break;
+	case NODE_ENV:
+		if (parent->type == NODE_ROOT) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.env);
+		} else {
+			return -EPERM;
+		}
+		break;
 	case NODE_TRACE:
 		if (parent->type == NODE_ROOT) {
 			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.trace);
@@ -648,6 +691,13 @@ static int set_parent_node(struct ctf_node *node,
 			return -EPERM;
 		}
 		break;
+	case NODE_CLOCK:
+		if (parent->type == NODE_ROOT) {
+			_cds_list_splice_tail(&node->tmp_head, &parent->u.root.clock);
+		} else {
+			return -EPERM;
+		}
+		break;
 
 	case NODE_CTF_EXPRESSION:
 		return reparent_ctf_expression(node, parent);
@@ -762,8 +812,10 @@ static struct ctf_ast *ctf_ast_alloc(void)
 	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.env);
 	CDS_INIT_LIST_HEAD(&ast->root.u.root.stream);
 	CDS_INIT_LIST_HEAD(&ast->root.u.root.event);
+	CDS_INIT_LIST_HEAD(&ast->root.u.root.clock);
 	return ast;
 }
 
@@ -852,7 +904,7 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
  */
 %expect 2
 %start file
-%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN
+%token CHARACTER_CONSTANT_START SQUOTE STRING_LITERAL_START DQUOTE ESCSEQ CHAR_STRING_TOKEN LSBRAC RSBRAC LPAREN RPAREN LBRAC RBRAC RARROW STAR PLUS MINUS LT GT TYPEASSIGN COLON SEMICOLON DOTDOTDOT DOT EQUAL COMMA CONST CHAR DOUBLE ENUM ENV EVENT FLOATING_POINT FLOAT INTEGER INT LONG SHORT SIGNED STREAM STRING STRUCT TRACE CLOCK TYPEALIAS TYPEDEF UNSIGNED VARIANT VOID _BOOL _COMPLEX _IMAGINARY DECIMAL_CONSTANT OCTAL_CONSTANT HEXADECIMAL_CONSTANT TOK_ALIGN
 %token <gs> IDENTIFIER ID_TYPE
 %token ERROR
 %union
@@ -871,7 +923,9 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 %type <n> declaration
 %type <n> event_declaration
 %type <n> stream_declaration
+%type <n> env_declaration
 %type <n> trace_declaration
+%type <n> clock_declaration
 %type <n> integer_declaration_specifiers
 %type <n> declaration_specifiers
 %type <n> alias_declaration_specifiers
@@ -962,8 +1016,12 @@ keywords:
 		{	$$ = yylval.gs;		}
 	|	STREAM
 		{	$$ = yylval.gs;		}
+	|	ENV
+		{	$$ = yylval.gs;		}
 	|	TRACE
 		{	$$ = yylval.gs;		}
+	|	CLOCK
+		{	$$ = yylval.gs;		}
 	|	TOK_ALIGN
 		{	$$ = yylval.gs;		}
 	;
@@ -1159,8 +1217,12 @@ declaration:
 		{	$$ = $1;	}
 	|	stream_declaration
 		{	$$ = $1;	}
+	|	env_declaration
+		{	$$ = $1;	}
 	|	trace_declaration
 		{	$$ = $1;	}
+	|	clock_declaration
+		{	$$ = $1;	}
 	|	declaration_specifiers TYPEDEF declaration_specifiers type_declarator_list SEMICOLON
 		{
 			struct ctf_node *list;
@@ -1259,6 +1321,28 @@ stream_declaration_end:
 		{	pop_scope(scanner);	}
 	;
 
+env_declaration:
+		env_declaration_begin env_declaration_end
+		{
+			$$ = make_node(scanner, NODE_ENV);
+		}
+	|	env_declaration_begin ctf_assignment_expression_list env_declaration_end
+		{
+			$$ = make_node(scanner, NODE_ENV);
+			if (set_parent_node($2, $$))
+				reparent_error(scanner, "env declaration");
+		}
+	;
+
+env_declaration_begin:
+		ENV LBRAC
+		{	push_scope(scanner);	}
+	;
+
+env_declaration_end:
+		RBRAC SEMICOLON
+		{	pop_scope(scanner);	}
+	;
 
 trace_declaration:
 		trace_declaration_begin trace_declaration_end
@@ -1283,6 +1367,29 @@ trace_declaration_end:
 		{	pop_scope(scanner);	}
 	;
 
+clock_declaration:
+		CLOCK clock_declaration_begin clock_declaration_end
+		{
+			$$ = make_node(scanner, NODE_CLOCK);
+		}
+	|	CLOCK clock_declaration_begin ctf_assignment_expression_list clock_declaration_end
+		{
+			$$ = make_node(scanner, NODE_CLOCK);
+			if (set_parent_node($3, $$))
+				reparent_error(scanner, "trace_declaration");
+		}
+	;
+
+clock_declaration_begin:
+		LBRAC
+		{	push_scope(scanner);	}
+	;
+
+clock_declaration_end:
+		RBRAC SEMICOLON
+		{	pop_scope(scanner);	}
+	;
+
 integer_declaration_specifiers:
 		CONST
 		{