From 85bec28aafc05c9b1fe3428832ee18af82747123 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 24 Aug 2017 14:32:18 +0200 Subject: Change a fall-through comment to Q_FALLTHROUGH() Calms gcc 7, which makes unannounced fall-through part of our standard warnings (which are handled as error in developer builds). Change-Id: Idc8cbb91d2fc5530a979b0ff06adde13f7c1b675 Reviewed-by: Thiago Macieira --- src/xmlpatterns/parser/qquerytransformparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index ea28c693..d7d642c3 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -3070,7 +3070,7 @@ yytnamerr (char *yyres, const char *yystr) case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + Q_FALLTHROUGH(); default: if (yyres) yyres[yyn] = *yyp; -- cgit v1.2.3 From 1a368dd724d97ba25ab360441c75654f0dcf9195 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 9 Sep 2019 18:55:55 +0200 Subject: Fix three warnings from bison We were using directives that are now deprecated. Replaved them with the modern equivalents bison suggested when run. These changes *do* change the output. Change-Id: I18064e60c86d1782490ab5896ab9233593198caf Reviewed-by: Edward Welbourne --- src/xmlpatterns/parser/querytransformparser.ypp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index 3a26b0d2..658d4b25 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -1107,16 +1107,16 @@ static Expression::Ptr createReturnOrderBy(const OrderSpecTransfer::List &orderS * specified below. This '%require' directive was introduced in Bison 2.2. */ %require "2.3a" -%name-prefix="XPath" +%define api.prefix {XPath} /* Specifies the name of the generated parser. */ -%output="qquerytransformparser.cpp" +%output "qquerytransformparser.cpp" /* Output the .output file. */ %verbose /* Yes, we want descriptive error messages. */ -%error-verbose +%define parse.error verbose /* We'd like to be reentrant/thread-safe */ %pure-parser -- cgit v1.2.3