Reduce the number of Makefiles in 'src/' even MOAR!

[babeltrace.git] / src / plugins / ctf / common / metadata / parser.ypp

diff --git a/src/plugins/ctf/common/metadata/parser.ypp b/src/plugins/ctf/common/metadata/parser.ypp
index b644b5d1ec68713f10bb68b5ac644d1748f8bc79..82dd8ccd3fa06921c4a16af77e934d65cfafa857 100644 (file)
--- a/src/plugins/ctf/common/metadata/parser.ypp
+++ b/src/plugins/ctf/common/metadata/parser.ypp
@@ -9,7 +9,7 @@
 
 #define BT_LOG_OUTPUT_LEVEL ctf_plugin_metadata_log_level
 #define BT_LOG_TAG "PLUGIN/CTF/META/PARSER"
-#include "logging.hpp"
+#include "plugins/ctf/common/metadata/logging.hpp"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -22,11 +22,17 @@
 #include <inttypes.h>
 #include "common/list.h"
 #include "common/assert.h"
-#include "scanner.hpp"
-#include "ast.hpp"
-#include "objstack.hpp"
+#include "plugins/ctf/common/metadata/scanner.hpp"
+#include "plugins/ctf/common/metadata/ast.hpp"
+#include "plugins/ctf/common/metadata/objstack.hpp"
 
-#include "parser-wrap.hpp"
+#include "plugins/ctf/common/metadata/parser-wrap.hpp"
+
+/*
+ * Avoid warning about "yynerrs" being unused, seen with bison 3.5.1 + clang 15
+ * on Ubuntu 20.04.
+ */
+BT_DIAG_IGNORE_UNUSED_BUT_SET_VARIABLE
 
 /* Join two lists, put "add" at the end of "head".  */
 static inline void
@@ -41,17 +47,11 @@ _bt_list_splice_tail (struct bt_list_head *add, struct bt_list_head *head)
        }
 }
 
-BT_HIDDEN
 int yylex(union YYSTYPE *yyval, yyscan_t yyscanner);
-BT_HIDDEN
 int yylex_init_extra(struct ctf_scanner *scanner, yyscan_t * ptr_yy_globals);
-BT_HIDDEN
 int yylex_destroy(yyscan_t yyscanner);
-BT_HIDDEN
 void yyrestart(FILE * in_str, yyscan_t yyscanner);
-BT_HIDDEN
 int yyget_lineno(yyscan_t yyscanner);
-BT_HIDDEN
 char *yyget_text(yyscan_t yyscanner);
 
 /*
@@ -68,7 +68,6 @@ static struct ctf_node error_node = {
        .type = NODE_ERROR,
 };
 
-BT_HIDDEN
 const char *node_type(struct ctf_node *node)
 {
        switch (node->type) {
@@ -321,7 +320,6 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id)
        return ret;
 }
 
-BT_HIDDEN
 int is_type(struct ctf_scanner *scanner, const char *id)
 {
        struct ctf_scanner_scope *it;
@@ -1053,10 +1051,8 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 }
 
 %code provides {
-       BT_HIDDEN
        void setstring(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src);
 
-       BT_HIDDEN
        int import_string(struct ctf_scanner *scanner, YYSTYPE *lvalp, const char *src, char delim);
 }