X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-semantic-validator.c;h=da813e0a50acf6ce1b9eacde0e6caaaf81b15fde;hp=5f72e0b42b1652c9a9929ceeb59b91733d282988;hb=73d159163aa1c2b8e9da78ade3ded6ef1c81513f;hpb=e4e9b4715098b1183895c8c09e97eff790a8cda7

diff --git a/formats/ctf/metadata/ctf-visitor-semantic-validator.c b/formats/ctf/metadata/ctf-visitor-semantic-validator.c
index 5f72e0b4..da813e0a 100644
--- a/formats/ctf/metadata/ctf-visitor-semantic-validator.c
+++ b/formats/ctf/metadata/ctf-visitor-semantic-validator.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
@@ -108,6 +108,7 @@ int ctf_visitor_unary_expression(FILE *fd, int depth, struct ctf_node *node)
 	case NODE_EVENT:
 	case NODE_STREAM:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_TYPEDEF:
 	case NODE_TYPEALIAS_TARGET:
 	case NODE_TYPEALIAS_ALIAS:
@@ -210,6 +211,7 @@ int ctf_visitor_type_specifier_list(FILE *fd, int depth, struct ctf_node *node)
 	case NODE_EVENT:
 	case NODE_STREAM:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_UNARY_EXPRESSION:
 	case NODE_TYPEALIAS:
 	case NODE_TYPE_SPECIFIER:
@@ -249,6 +251,7 @@ int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 	case NODE_EVENT:
 	case NODE_STREAM:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_UNARY_EXPRESSION:
 	case NODE_TYPEALIAS:
 	case NODE_TYPE_SPECIFIER:
@@ -329,6 +332,7 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 	case NODE_EVENT:
 	case NODE_STREAM:
 	case NODE_TRACE:
+	case NODE_CLOCK:
 	case NODE_CTF_EXPRESSION:
 	case NODE_UNARY_EXPRESSION:
 	case NODE_TYPEALIAS:
@@ -363,15 +367,22 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
-		cds_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
-					siblings) {
-			if (iter->type != NODE_UNARY_EXPRESSION) {
-				fprintf(fd, "[error] %s: expecting unary expression as length\n", __func__);
+		if (!node->u.type_declarator.u.nested.abstract_array) {
+			cds_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
+						siblings) {
+				if (iter->type != NODE_UNARY_EXPRESSION) {
+					fprintf(fd, "[error] %s: expecting unary expression as length\n", __func__);
+					return -EINVAL;
+				}
+				ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
+				if (ret)
+					return ret;
+			}
+		} else {
+			if (node->parent->type == NODE_TYPEALIAS_TARGET) {
+				fprintf(fd, "[error] %s: abstract array declarator not permitted as target of typealias\n", __func__);
 				return -EINVAL;
 			}
-			ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
-			if (ret)
-				return ret;
 		}
 		if (node->u.type_declarator.bitfield_len) {
 			ret = _ctf_visitor_semantic_check(fd, depth + 1,
@@ -473,6 +484,21 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
 				return ret;
 		}
 		break;
+	case NODE_CLOCK:
+		switch (node->parent->type) {
+		case NODE_ROOT:
+			break;			/* OK */
+		default:
+			goto errinval;
+		}
+
+		cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+			ret = _ctf_visitor_semantic_check(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
+		break;
+
 
 	case NODE_CTF_EXPRESSION:
 		switch (node->parent->type) {
@@ -480,6 +506,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
 		case NODE_EVENT:
 		case NODE_STREAM:
 		case NODE_TRACE:
+		case NODE_CLOCK:
 		case NODE_FLOATING_POINT:
 		case NODE_INTEGER:
 		case NODE_STRING:
@@ -546,6 +573,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
 		case NODE_STRING:
 		case NODE_ENUMERATOR:
 		case NODE_ENUM:
+		case NODE_CLOCK:
 		default:
 			goto errinval;
 		}
@@ -650,6 +678,7 @@ int _ctf_visitor_semantic_check(FILE *fd, int depth, struct ctf_node *node)
 		case NODE_STRING:
 		case NODE_ENUMERATOR:
 		case NODE_ENUM:
+		case NODE_CLOCK:
 		default:
 			goto errinval;
 		}