diff options
| -rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/parser/querytransformparser.ypp | 6 |
2 files changed, 4 insertions, 4 deletions
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; 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 |