diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-11-28 20:55:11 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-06 08:00:48 +0100 |
| commit | e382b722fa853e0241b396a13831bcdc9dd840b2 (patch) | |
| tree | 6142b8f2f08d63e59164ff9c228844c8cfdf672c /src/xmlpatterns/parser/querytransformparser.ypp | |
| parent | 624e7d7bcdcd1f5e5f73faf07f7c19c6f0e04160 (diff) | |
| download | qtxmlpatterns-e382b722fa853e0241b396a13831bcdc9dd840b2.tar.gz | |
Sync source and generated versions of the query parser.
The following manual changes to qquerytransformparser.cpp were not
reflected in the .ypp source, but they are now:
c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (Nov 2009)
c1623a0d42c9869e5a1d04081e7660722a863de5 (Apr 2012)
The following change is lost because it modified code generated by
bison (not from .ypp) and needs to be re-applied:
e7a51b138772cb453555d27f44e6a2c0e79e799c
Change-Id: I72e76732acd1c370394c9fc373522b43ace6e009
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/xmlpatterns/parser/querytransformparser.ypp')
| -rw-r--r-- | src/xmlpatterns/parser/querytransformparser.ypp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index 25d3bb6..f115aa8 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -406,7 +406,7 @@ static void registerNamedTemplate(const QXmlName &name, if(e) { - parseInfo->staticContext->error(QtXmlPatterns::tr("A template by name %1 " + parseInfo->staticContext->error(QtXmlPatterns::tr("A template with name %1 " "has already been declared.") .arg(formatKeyword(parseInfo->staticContext->namePool(), name)), @@ -1470,7 +1470,7 @@ VersionDecl: /* empty */ Encoding: /* empty */ /* [X] */ | ENCODING StringLiteral { - QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*")); + const QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*")); if(!encNameRegExp.exactMatch($2)) { @@ -2063,7 +2063,7 @@ VarDecl: DECLARE VARIABLE IsInternal DOLLAR VarName TypeDeclaration allowedIn(QXmlQuery::XQuery10, parseInfo, @$, $3); if(variableByName($5, parseInfo)) { - parseInfo->staticContext->error(QtXmlPatterns::tr("A variable by name %1 has already " + parseInfo->staticContext->error(QtXmlPatterns::tr("A variable with name %1 has already " "been declared.") .arg(formatKeyword(parseInfo->staticContext->namePool()->toLexical($5))), parseInfo->isXSLT() ? ReportContext::XTSE0630 : ReportContext::XQST0049, @@ -2103,7 +2103,7 @@ VarDecl: DECLARE VARIABLE IsInternal DOLLAR VarName TypeDeclaration else { parseInfo->staticContext->error(QtXmlPatterns::tr("No value is available for the external " - "variable by name %1.") + "variable with name %1.") .arg(formatKeyword(parseInfo->staticContext->namePool(), $5)), parseInfo->isXSLT() ? ReportContext::XTDE0050 : ReportContext::XPDY0002, fromYYLTYPE(@$, parseInfo)); @@ -2280,7 +2280,7 @@ ParamList: /* empty */ { if((*it)->name() == $3->name()) { - parseInfo->staticContext->error(QtXmlPatterns::tr("An argument by name %1 has already " + parseInfo->staticContext->error(QtXmlPatterns::tr("An argument with name %1 has already " "been declared. Every argument name " "must be unique.") .arg(formatKeyword(parseInfo->staticContext->namePool(), $3->name())), @@ -3710,7 +3710,7 @@ FunctionCallExpr: FunctionName LPAREN FunctionArguments RPAREN $$ = create(func, @$, parseInfo); else { - parseInfo->staticContext->error(QtXmlPatterns::tr("No function by name %1 is available.") + parseInfo->staticContext->error(QtXmlPatterns::tr("No function with name %1 is available.") .arg(formatKeyword(parseInfo->staticContext->namePool(), $1)), ReportContext::XPST0017, fromYYLTYPE(@$, parseInfo)); } @@ -3987,7 +3987,7 @@ DirElemConstructor: G_LT &ryy, true); if(declaredAttributes.contains(att)) { - parseInfo->staticContext->error(QtXmlPatterns::tr("An attribute by name %1 has already appeared on this element.") + parseInfo->staticContext->error(QtXmlPatterns::tr("An attribute with name %1 has already appeared on this element.") .arg(formatKeyword(parseInfo->staticContext->namePool(), att)), ReportContext::XQST0040, fromYYLTYPE(@$, parseInfo)); |