X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fparser.y;h=cb4eb74f42fbfbf7f1416a58cb7fe4a18a72443b;hb=516bf0a77e025cfccce2fa400b757e94dc0bf1d8;hp=71f2d5fefc62eb453fa5d655ce7cb1424b096baa;hpb=f82819ab5928febed746913168ac5d95909007d1;p=babeltrace.git

diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y
index 71f2d5fe..cb4eb74f 100644
--- 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
@@ -59,8 +41,6 @@ _bt_list_splice_tail (struct bt_list_head *add, struct bt_list_head *head)
 	}
 }
 
-BT_HIDDEN
-int yyparse(struct ctf_scanner *scanner, yyscan_t yyscanner);
 BT_HIDDEN
 int yylex(union YYSTYPE *yyval, yyscan_t yyscanner);
 BT_HIDDEN
@@ -286,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;
@@ -372,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;
@@ -939,19 +919,13 @@ static int set_parent_node(struct ctf_node *node,
 	return 0;
 }
 
-BT_HIDDEN
+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));
 }
 
-BT_HIDDEN
-int yywrap(void)
-{
-	return 1;
-}
-
 #define reparent_error(scanner, str)				\
 do {								\
 	yyerror(scanner, scanner->scanner, YY_("reparent_error: " str)); \
@@ -1027,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)
@@ -1059,6 +1050,13 @@ void ctf_scanner_free(struct ctf_scanner *scanner)
 #endif
 }
 
+%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);
+}
 
 %define api.pure
 	/* %locations */