ctf: append error causes when returning errors

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

diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y
index f75e577b42b18559afd01f96b6b917a8c5731ecf..cb4eb74f42fbfbf7f1416a58cb7fe4a18a72443b 100644 (file)
--- a/src/plugins/ctf/common/metadata/parser.y
+++ b/src/plugins/ctf/common/metadata/parser.y
@@ -1,28 +1,10 @@
 %{
 /*
- * ctf-parser.y
- *
- * Common Trace Format Metadata Grammar.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Common Trace Format Metadata Grammar.
  */
 
 #define BT_LOG_OUTPUT_LEVEL ctf_plugin_metadata_log_level
@@ -284,7 +266,7 @@ int import_string(struct ctf_scanner *scanner, YYSTYPE *lvalp,
        lvalp->s = objstack_alloc(scanner->objstack, len);
        if (src[0] == 'L') {
                // TODO: import wide string
-               _BT_LOGE_LINENO(yyget_lineno(scanner),
+               _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner),
                        "wide characters are not supported as of this version: "
                        "scanner-addr=%p", scanner);
                return -1;
@@ -370,7 +352,7 @@ static struct ctf_node *make_node(struct ctf_scanner *scanner,
 
        node = objstack_alloc(scanner->objstack, sizeof(*node));
        if (!node) {
-               _BT_LOGE_LINENO(yyget_lineno(scanner->scanner),
+               _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner->scanner),
                        "failed to allocate one stack entry: "
                        "scanner-addr=%p", scanner);
                return &error_node;
@@ -940,7 +922,7 @@ static int set_parent_node(struct ctf_node *node,
 static
 void yyerror(struct ctf_scanner *scanner, yyscan_t yyscanner, const char *str)
 {
-       _BT_LOGE_LINENO(yyget_lineno(scanner->scanner),
+       _BT_LOGE_APPEND_CAUSE_LINENO(yyget_lineno(scanner->scanner),
                "%s: token=\"%s\"", str, yyget_text(scanner->scanner));
 }
 
@@ -1019,7 +1001,24 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 
        if (!scanner)
                return;
-       finalize_scope(&scanner->root_scope);
+
+       struct ctf_scanner_scope *scope = scanner->cs;
+
+       do {
+               struct ctf_scanner_scope *parent = scope->parent;
+               finalize_scope(scope);
+
+               /*
+                * The root scope is allocated within the ctf_scanner structure,
+                * do doesn't need freeing.  All others are allocated on their
+                * own.
+                */
+               if (scope != &scanner->root_scope)
+                       free(scope);
+
+               scope = parent;
+       } while (scope);
+
        objstack_destroy(scanner->objstack);
        ret = yylex_destroy(scanner->scanner);
        if (ret)
@@ -1054,7 +1053,7 @@ 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);
 }