X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fparser.y;h=b270a83c5001b89d5b4398398420a55587eed259;hb=9103e903a89377e9cfad13905d4f4b650aecd061;hp=ae5a9f981238d4376f2770701fd923c231b7e1bd;hpb=5084732e40a7925d22f741e4ed08f19d36078fbe;p=babeltrace.git

diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y
index ae5a9f98..b270a83c 100644
--- a/src/plugins/ctf/common/metadata/parser.y
+++ b/src/plugins/ctf/common/metadata/parser.y
@@ -41,16 +41,10 @@
 #include "common/list.h"
 #include "common/assert.h"
 #include "scanner.h"
-#include "parser.h"
 #include "ast.h"
 #include "objstack.h"
 
-#if BT_LOG_ENABLED_TRACE
-# define YYDEBUG 1
-# define YYFPRINTF(_stream, _fmt, args...) BT_LOGT(_fmt, ## args)
-#else
-# define YYDEBUG 0
-#endif
+#include "parser-wrap.h"
 
 /* Join two lists, put "add" at the end of "head".  */
 static inline void
@@ -165,7 +159,7 @@ int parse_base_sequence(const char *src, size_t len, size_t pos,
 			return -1;
 		}
 	}
-	BT_ASSERT(nr_char > 0);
+	BT_ASSERT_DBG(nr_char > 0);
 	buffer[nr_char] = '\0';
 	*buf_len = nr_char;
 	return 0;
@@ -1044,6 +1038,17 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 
 %}
 
+/*
+ * This ends up in parser.h and makes sure those who want to include it pass
+ * through parser-wrap.h.
+ */
+%code requires {
+#ifndef ALLOW_INCLUDE_PARSER_H
+# error "Don't include parser.h directly, include parser-wrap.h instead."
+#endif
+}
+
+
 %define api.pure
 	/* %locations */
 %error-verbose