Changeset 561 for trunk/src/xmlpatterns/parser/qquerytransformparser.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xmlpatterns/parser/qquerytransformparser.cpp (modified) (346 diffs)

trunk/src/xmlpatterns/parser/qquerytransformparser.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
 
 /* A Bison parser, made by GNU Bison 2.3a.  */
@@ -123 +113 @@
 /* Line 164 of yacc.c.  */
 #line 22 "querytransformparser.ypp"
-
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the QtXmlPatterns module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
 
 #include <limits>
@@ -301 +240 @@
 
 /**
+ * @internal
+ * @relates QXmlQuery
+ */
+typedef QFlags<QXmlQuery::QueryLanguage> QueryLanguages;
+
+/**
  * @short Flags invalid expressions and declarations in the currently
  * parsed language.
  *
- * Since this grammar is used for several languages: XQuery 1.0, XSL-T 2.0 and
- * XPath 2.0 inside XSL-T, it is the union of all the constructs in these
+ * Since this grammar is used for several languages: XQuery 1.0, XSL-T 2.0, and
+ * XPath 2.0 inside XSL-T, and field and selector patterns in W3C XML Schema's
+ * identity constraints, it is the union of all the constructs in these
  * languages. However, when dealing with each language individually, we
  * regularly need to disallow some expressions, such as direct element
@@ -316 +262 @@
  * used for internal purposes.
  *
- * Hence, this function is called from each expression and declaration which is
- * unavailable in XPath.
+ * Hence, this function is called from each expression and declaration with @p
+ * allowedLanguages stating what languages it is allowed in.
  *
  * If @p isInternal is @c true, no error is raised. Otherwise, if the current
- * language is not XQuery, an error is raised.
+ * language is not in @p allowedLanguages, an error is raised.
  */
-static void disallowedConstruct(const ParserContext *const parseInfo,
-                                const YYLTYPE &sourceLocator,
-                                const bool isInternal = false)
+static void allowedIn(const QueryLanguages allowedLanguages,
+                      const ParserContext *const parseInfo,
+                      const YYLTYPE &sourceLocator,
+                      const bool isInternal = false)
 {
-    if(!isInternal && parseInfo->languageAccent != QXmlQuery::XQuery10)
-    {
-        parseInfo->staticContext->error(QtXmlPatterns::tr("A construct was encountered which only is allowed in XQuery."),
+    /* We treat XPath 2.0 as a subset of XSL-T 2.0, so if XPath 2.0 is allowed
+     * and XSL-T is the language, it's ok. */
+    if(!isInternal &&
+       (!allowedLanguages.testFlag(parseInfo->languageAccent) && !(allowedLanguages.testFlag(QXmlQuery::XPath20) && parseInfo->languageAccent == QXmlQuery::XSLT20)))
+    {
+
+        QString langName;
+
+        switch(parseInfo->languageAccent)
+        {
+            case QXmlQuery::XPath20:
+                langName = QLatin1String("XPath 2.0");
+                break;
+            case QXmlQuery::XSLT20:
+                langName = QLatin1String("XSL-T 2.0");
+                break;
+            case QXmlQuery::XQuery10:
+                langName = QLatin1String("XQuery 1.0");
+                break;
+            case QXmlQuery::XmlSchema11IdentityConstraintSelector:
+                langName = QtXmlPatterns::tr("W3C XML Schema identity constraint selector");
+                break;
+            case QXmlQuery::XmlSchema11IdentityConstraintField:
+                langName = QtXmlPatterns::tr("W3C XML Schema identity constraint field");
+                break;
+        }
+
+        parseInfo->staticContext->error(QtXmlPatterns::tr("A construct was encountered "
+                                                          "which is disallowed in the current language(%1).").arg(langName),
                                         ReportContext::XPST0003,
                                         fromYYLTYPE(sourceLocator, parseInfo));
@@ -446 +419 @@
     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(),
@@ -910 +883 @@
                                 const YYLTYPE &location)
 {
-    parseInfo->staticContext->error(QtXmlPatterns::tr("No variable by name %1 exists")
+    parseInfo->staticContext->error(QtXmlPatterns::tr("No variable with name %1 exists")
                                        .arg(formatKeyword(parseInfo->staticContext->namePool(), variableName)),
                                     ReportContext::XPST0008, fromYYLTYPE(location, parseInfo));
@@ -1367 +1340 @@
 
 /* Line 221 of yacc.c.  */
-#line 1289 "qquerytransformparser.cpp"
+#line 1323 "qquerytransformparser.cpp"
 
 #ifdef short
@@ -1851 +1824 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,  1341,  1341,  1342,  1344,  1345,  1376,  1377,  1393,  1491,
-    1493,  1499,  1501,  1508,  1514,  1520,  1527,  1530,  1534,  1538,
-    1558,  1572,  1576,  1570,  1639,  1643,  1660,  1663,  1665,  1670,
-    1671,  1675,  1676,  1680,  1684,  1688,  1690,  1691,  1693,  1695,
-    1741,  1755,  1760,  1765,  1766,  1768,  1783,  1798,  1808,  1823,
-    1827,  1832,  1846,  1850,  1855,  1869,  1874,  1879,  1884,  1889,
-    1905,  1928,  1936,  1937,  1938,  1940,  1957,  1958,  1960,  1961,
-    1963,  1964,  1966,  2021,  2025,  2031,  2034,  2039,  2053,  2057,
-    2063,  2062,  2171,  2174,  2180,  2201,  2207,  2211,  2213,  2218,
-    2228,  2229,  2234,  2235,  2244,  2314,  2325,  2326,  2330,  2335,
-    2404,  2405,  2409,  2414,  2458,  2459,  2464,  2471,  2477,  2478,
-    2479,  2480,  2481,  2482,  2488,  2493,  2499,  2502,  2507,  2513,
-    2519,  2523,  2548,  2549,  2553,  2557,  2551,  2598,  2601,  2596,
-    2617,  2618,  2619,  2622,  2626,  2634,  2633,  2647,  2646,  2655,
-    2656,  2657,  2659,  2667,  2678,  2681,  2683,  2688,  2695,  2702,
-    2708,  2728,  2733,  2739,  2742,  2744,  2745,  2752,  2758,  2762,
-    2767,  2768,  2771,  2775,  2770,  2784,  2788,  2783,  2796,  2799,
-    2803,  2798,  2812,  2816,  2811,  2824,  2826,  2854,  2853,  2865,
-    2873,  2864,  2884,  2885,  2888,  2892,  2897,  2902,  2901,  2917,
-    2922,  2923,  2928,  2929,  2934,  2935,  2936,  2937,  2939,  2940,
-    2945,  2946,  2951,  2952,  2954,  2955,  2960,  2961,  2962,  2963,
-    2965,  2966,  2971,  2972,  2977,  2978,  2980,  2984,  2989,  2990,
-    2996,  2997,  3002,  3003,  3008,  3009,  3014,  3015,  3020,  3024,
-    3029,  3030,  3031,  3033,  3038,  3039,  3040,  3041,  3042,  3043,
-    3045,  3050,  3051,  3052,  3053,  3054,  3055,  3057,  3062,  3063,
-    3064,  3066,  3080,  3081,  3082,  3084,  3100,  3104,  3109,  3110,
-    3112,  3117,  3118,  3120,  3126,  3130,  3136,  3139,  3140,  3144,
-    3153,  3158,  3162,  3163,  3168,  3167,  3182,  3189,  3188,  3203,
-    3211,  3211,  3220,  3222,  3225,  3230,  3232,  3236,  3302,  3305,
-    3311,  3314,  3323,  3327,  3331,  3336,  3337,  3342,  3343,  3346,
-    3345,  3375,  3377,  3378,  3380,  3394,  3395,  3396,  3397,  3398,
-    3399,  3400,  3401,  3402,  3403,  3404,  3405,  3408,  3407,  3417,
-    3428,  3433,  3435,  3440,  3441,  3443,  3447,  3449,  3453,  3462,
-    3468,  3469,  3474,  3475,  3476,  3477,  3478,  3479,  3480,  3481,
-    3491,  3492,  3497,  3501,  3506,  3511,  3516,  3521,  3525,  3530,
-    3535,  3540,  3569,  3573,  3580,  3582,  3586,  3588,  3589,  3590,
-    3624,  3633,  3622,  3874,  3878,  3898,  3901,  3907,  3912,  3917,
-    3923,  3926,  3936,  3943,  3947,  3953,  3967,  3973,  3990,  3995,
-    4008,  4009,  4010,  4011,  4012,  4013,  4014,  4016,  4024,  4023,
-    4063,  4066,  4071,  4086,  4091,  4098,  4110,  4114,  4110,  4120,
-    4122,  4126,  4128,  4143,  4147,  4156,  4161,  4165,  4171,  4174,
-    4179,  4184,  4189,  4190,  4191,  4192,  4194,  4195,  4196,  4197,
-    4202,  4238,  4239,  4240,  4241,  4242,  4243,  4244,  4246,  4251,
-    4256,  4262,  4263,  4265,  4270,  4275,  4280,  4285,  4301,  4302,
-    4304,  4309,  4314,  4318,  4330,  4343,  4353,  4358,  4363,  4368,
-    4382,  4396,  4397,  4399,  4409,  4411,  4416,  4423,  4430,  4432,
-    4434,  4435,  4437,  4441,  4446,  4447,  4449,  4455,  4457,  4459,
-    4460,  4462,  4474
+       0,  1375,  1375,  1376,  1378,  1379,  1410,  1411,  1427,  1525,
+    1527,  1533,  1535,  1542,  1548,  1554,  1561,  1564,  1568,  1572,
+    1592,  1606,  1610,  1604,  1673,  1677,  1694,  1697,  1699,  1704,
+    1705,  1709,  1710,  1714,  1718,  1722,  1724,  1725,  1727,  1729,
+    1775,  1789,  1794,  1799,  1800,  1802,  1817,  1832,  1842,  1857,
+    1861,  1866,  1880,  1884,  1889,  1903,  1908,  1913,  1918,  1923,
+    1939,  1962,  1970,  1971,  1972,  1974,  1991,  1992,  1994,  1995,
+    1997,  1998,  2000,  2055,  2059,  2065,  2068,  2073,  2087,  2091,
+    2097,  2096,  2205,  2208,  2214,  2235,  2241,  2245,  2247,  2252,
+    2262,  2263,  2268,  2269,  2278,  2348,  2359,  2360,  2364,  2369,
+    2438,  2439,  2443,  2448,  2492,  2493,  2498,  2505,  2511,  2512,
+    2513,  2514,  2515,  2516,  2522,  2527,  2533,  2536,  2541,  2547,
+    2553,  2557,  2582,  2583,  2587,  2591,  2585,  2632,  2635,  2630,
+    2651,  2652,  2653,  2656,  2660,  2668,  2667,  2681,  2680,  2689,
+    2690,  2691,  2693,  2701,  2712,  2715,  2717,  2722,  2729,  2736,
+    2742,  2762,  2767,  2773,  2776,  2778,  2779,  2786,  2792,  2796,
+    2801,  2802,  2805,  2809,  2804,  2819,  2823,  2818,  2831,  2834,
+    2838,  2833,  2848,  2852,  2847,  2860,  2862,  2890,  2889,  2901,
+    2909,  2900,  2920,  2921,  2924,  2928,  2933,  2938,  2937,  2953,
+    2959,  2960,  2966,  2967,  2973,  2974,  2975,  2976,  2978,  2979,
+    2985,  2986,  2992,  2993,  2995,  2996,  3002,  3003,  3004,  3005,
+    3007,  3008,  3018,  3019,  3025,  3026,  3028,  3032,  3037,  3038,
+    3045,  3046,  3052,  3053,  3059,  3060,  3066,  3067,  3073,  3077,
+    3082,  3083,  3084,  3086,  3092,  3093,  3094,  3095,  3096,  3097,
+    3099,  3104,  3105,  3106,  3107,  3108,  3109,  3111,  3116,  3117,
+    3118,  3120,  3134,  3135,  3136,  3138,  3155,  3159,  3164,  3165,
+    3167,  3172,  3173,  3175,  3181,  3185,  3191,  3194,  3195,  3199,
+    3208,  3213,  3217,  3218,  3223,  3222,  3237,  3245,  3244,  3260,
+    3268,  3268,  3277,  3279,  3282,  3287,  3289,  3293,  3359,  3362,
+    3368,  3371,  3380,  3384,  3388,  3393,  3394,  3399,  3400,  3403,
+    3402,  3432,  3434,  3435,  3437,  3481,  3482,  3483,  3484,  3485,
+    3486,  3487,  3488,  3489,  3490,  3491,  3492,  3495,  3494,  3505,
+    3516,  3521,  3523,  3528,  3529,  3534,  3538,  3540,  3544,  3553,
+    3560,  3561,  3567,  3568,  3569,  3570,  3571,  3572,  3573,  3574,
+    3584,  3585,  3590,  3595,  3601,  3607,  3612,  3617,  3622,  3628,
+    3633,  3638,  3668,  3672,  3679,  3681,  3685,  3690,  3691,  3692,
+    3726,  3735,  3724,  3976,  3980,  4000,  4003,  4009,  4014,  4019,
+    4025,  4028,  4038,  4045,  4049,  4055,  4069,  4075,  4092,  4097,
+    4110,  4111,  4112,  4113,  4114,  4115,  4116,  4118,  4126,  4125,
+    4165,  4168,  4173,  4188,  4193,  4200,  4212,  4216,  4212,  4222,
+    4224,  4228,  4230,  4245,  4249,  4258,  4263,  4267,  4273,  4276,
+    4281,  4286,  4291,  4292,  4293,  4294,  4296,  4297,  4298,  4299,
+    4304,  4340,  4341,  4342,  4343,  4344,  4345,  4346,  4348,  4353,
+    4358,  4364,  4365,  4367,  4372,  4377,  4382,  4387,  4403,  4404,
+    4406,  4411,  4416,  4420,  4432,  4445,  4455,  4460,  4465,  4470,
+    4484,  4498,  4499,  4501,  4511,  4513,  4518,  4525,  4532,  4534,
+    4536,  4537,  4539,  4543,  4548,  4549,  4551,  4557,  4559,  4561,
+    4565,  4570,  4582
 };
 #endif
@@ -3730 +3703 @@
         case 5:
 /* Line 1269 of yacc.c.  */
-#line 1346 "querytransformparser.ypp"
+#line 1380 "querytransformparser.ypp"
     {
 
@@ -3764 +3737 @@
   case 7:
 /* Line 1269 of yacc.c.  */
-#line 1378 "querytransformparser.ypp"
+#line 1412 "querytransformparser.ypp"
     {
         const QRegExp encNameRegExp(QLatin1String("[A-Za-z][A-Za-z0-9._\\-]*"));
@@ -3783 +3756 @@
   case 8:
 /* Line 1269 of yacc.c.  */
-#line 1394 "querytransformparser.ypp"
+#line 1428 "querytransformparser.ypp"
     {
         /* In XSL-T, we can have dangling variable references, so resolve them
@@ -3884 +3857 @@
   case 10:
 /* Line 1269 of yacc.c.  */
-#line 1494 "querytransformparser.ypp"
+#line 1528 "querytransformparser.ypp"
     {
         // TODO add to namespace context
@@ -3893 +3866 @@
   case 12:
 /* Line 1269 of yacc.c.  */
-#line 1502 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1536 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         if(parseInfo->hasSecondPrologPart)
             parseInfo->staticContext->error(QtXmlPatterns::tr("A default namespace declaration must occur before function, "
@@ -3904 +3877 @@
   case 13:
 /* Line 1269 of yacc.c.  */
-#line 1509 "querytransformparser.ypp"
+#line 1543 "querytransformparser.ypp"
     {
         if(parseInfo->hasSecondPrologPart)
@@ -3914 +3887 @@
   case 14:
 /* Line 1269 of yacc.c.  */
-#line 1515 "querytransformparser.ypp"
+#line 1549 "querytransformparser.ypp"
     {
         if(parseInfo->hasSecondPrologPart)
@@ -3924 +3897 @@
   case 15:
 /* Line 1269 of yacc.c.  */
-#line 1521 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1555 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         if(parseInfo->hasSecondPrologPart)
             parseInfo->staticContext->error(QtXmlPatterns::tr("Module imports must occur before function, "
@@ -3935 +3908 @@
   case 17:
 /* Line 1269 of yacc.c.  */
-#line 1531 "querytransformparser.ypp"
+#line 1565 "querytransformparser.ypp"
     {
         parseInfo->hasSecondPrologPart = true;
@@ -3943 +3916 @@
   case 18:
 /* Line 1269 of yacc.c.  */
-#line 1535 "querytransformparser.ypp"
+#line 1569 "querytransformparser.ypp"
     {
         parseInfo->hasSecondPrologPart = true;
@@ -3951 +3924 @@
   case 19:
 /* Line 1269 of yacc.c.  */
-#line 1539 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1573 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         parseInfo->hasSecondPrologPart = true;
     }
@@ -3960 +3933 @@
   case 20:
 /* Line 1269 of yacc.c.  */
-#line 1562 "querytransformparser.ypp"
+#line 1596 "querytransformparser.ypp"
     {
         Template::Ptr temp(create(new Template(parseInfo->currentImportPrecedence, (yyvsp[(5) - (7)].sequenceType)), (yyloc), parseInfo));
@@ -3973 +3946 @@
   case 21:
 /* Line 1269 of yacc.c.  */
-#line 1572 "querytransformparser.ypp"
+#line 1606 "querytransformparser.ypp"
     {
     parseInfo->isParsingPattern = true;
@@ -3981 +3954 @@
   case 22:
 /* Line 1269 of yacc.c.  */
-#line 1576 "querytransformparser.ypp"
+#line 1610 "querytransformparser.ypp"
     {
     parseInfo->isParsingPattern = false;
@@ -3989 +3962 @@
   case 23:
 /* Line 1269 of yacc.c.  */
-#line 1585 "querytransformparser.ypp"
+#line 1619 "querytransformparser.ypp"
     {
         /* In this grammar branch, we're guaranteed to be a template rule, but
@@ -4046 +4019 @@
   case 24:
 /* Line 1269 of yacc.c.  */
-#line 1639 "querytransformparser.ypp"
+#line 1673 "querytransformparser.ypp"
     {
         (yyval.enums.Double) = std::numeric_limits<xsDouble>::quiet_NaN();
@@ -4054 +4027 @@
   case 25:
 /* Line 1269 of yacc.c.  */
-#line 1644 "querytransformparser.ypp"
+#line 1678 "querytransformparser.ypp"
     {
         const AtomicValue::Ptr val(Decimal::fromLexical((yyvsp[(2) - (2)].sval)));
         if(val->hasError())
         {
-            parseInfo->staticContext->error(QtXmlPatterns::tr("The value of attribute %1 must of type %2, which %3 isn't.")
+            parseInfo->staticContext->error(QtXmlPatterns::tr("The value of attribute %1 must be of type %2, which %3 isn't.")
                                                              .arg(formatKeyword(QLatin1String("priority")),
                                                                   formatType(parseInfo->staticContext->namePool(), BuiltinTypes::xsDecimal),
@@ -4073 +4046 @@
   case 26:
 /* Line 1269 of yacc.c.  */
-#line 1660 "querytransformparser.ypp"
+#line 1694 "querytransformparser.ypp"
     {
         (yyval.qName) = QXmlName();
@@ -4081 +4054 @@
   case 28:
 /* Line 1269 of yacc.c.  */
-#line 1666 "querytransformparser.ypp"
+#line 1700 "querytransformparser.ypp"
     {
         (yyval.qName) = (yyvsp[(2) - (2)].qName);
@@ -4089 +4062 @@
   case 30:
 /* Line 1269 of yacc.c.  */
-#line 1672 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1706 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -4097 +4070 @@
   case 32:
 /* Line 1269 of yacc.c.  */
-#line 1677 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1711 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -4105 +4078 @@
   case 33:
 /* Line 1269 of yacc.c.  */
-#line 1681 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1715 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -4113 +4086 @@
   case 34:
 /* Line 1269 of yacc.c.  */
-#line 1685 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1719 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -4121 +4094 @@
   case 39:
 /* Line 1269 of yacc.c.  */
-#line 1696 "querytransformparser.ypp"
+#line 1730 "querytransformparser.ypp"
     {
         if(!(yyvsp[(6) - (7)].enums.Bool))
-            disallowedConstruct(parseInfo, (yyloc));
+            allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
 
         if((yyvsp[(3) - (7)].sval) == QLatin1String("xmlns"))
@@ -4135 +4108 @@
         {
              parseInfo->staticContext->error(QtXmlPatterns::tr(
-                                            "The prefix %1 can not be bound. By default, it is already bound "
+                                            "The prefix %1 cannot be bound. By default, it is already bound "
                                             "to the namespace %2.")
                                              .arg(formatKeyword("xml"))
@@ -4170 +4143 @@
   case 40:
 /* Line 1269 of yacc.c.  */
-#line 1742 "querytransformparser.ypp"
+#line 1776 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::BoundarySpaceDecl))
@@ -4187 +4160 @@
   case 41:
 /* Line 1269 of yacc.c.  */
-#line 1756 "querytransformparser.ypp"
+#line 1790 "querytransformparser.ypp"
     {
         (yyval.enums.boundarySpacePolicy) = StaticContext::BSPStrip;
@@ -4195 +4168 @@
   case 42:
 /* Line 1269 of yacc.c.  */
-#line 1761 "querytransformparser.ypp"
+#line 1795 "querytransformparser.ypp"
     {
         (yyval.enums.boundarySpacePolicy) = StaticContext::BSPPreserve;
@@ -4203 +4176 @@
   case 45:
 /* Line 1269 of yacc.c.  */
-#line 1770 "querytransformparser.ypp"
+#line 1804 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::DeclareDefaultElementNamespace))
@@ -4220 +4193 @@
   case 46:
 /* Line 1269 of yacc.c.  */
-#line 1785 "querytransformparser.ypp"
+#line 1819 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::DeclareDefaultFunctionNamespace))
@@ -4237 +4210 @@
   case 47:
 /* Line 1269 of yacc.c.  */
-#line 1799 "querytransformparser.ypp"
+#line 1833 "querytransformparser.ypp"
     {
         if((yyvsp[(3) - (5)].qName).prefix() == StandardPrefixes::empty)
@@ -4250 +4223 @@
   case 48:
 /* Line 1269 of yacc.c.  */
-#line 1809 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 1843 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         if(parseInfo->hasDeclaration(ParserContext::OrderingModeDecl))
         {
@@ -4268 +4241 @@
   case 49:
 /* Line 1269 of yacc.c.  */
-#line 1824 "querytransformparser.ypp"
+#line 1858 "querytransformparser.ypp"
     {
         (yyval.enums.orderingMode) = StaticContext::Ordered;
@@ -4276 +4249 @@
   case 50:
 /* Line 1269 of yacc.c.  */
-#line 1828 "querytransformparser.ypp"
+#line 1862 "querytransformparser.ypp"
     {
         (yyval.enums.orderingMode) = StaticContext::Unordered;
@@ -4284 +4257 @@
   case 51:
 /* Line 1269 of yacc.c.  */
-#line 1833 "querytransformparser.ypp"
+#line 1867 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::EmptyOrderDecl))
@@ -4301 +4274 @@
   case 52:
 /* Line 1269 of yacc.c.  */
-#line 1847 "querytransformparser.ypp"
+#line 1881 "querytransformparser.ypp"
     {
         (yyval.enums.orderingEmptySequence) = StaticContext::Least;
@@ -4309 +4282 @@
   case 53:
 /* Line 1269 of yacc.c.  */
-#line 1851 "querytransformparser.ypp"
+#line 1885 "querytransformparser.ypp"
     {
         (yyval.enums.orderingEmptySequence) = StaticContext::Greatest;
@@ -4317 +4290 @@
   case 54:
 /* Line 1269 of yacc.c.  */
-#line 1857 "querytransformparser.ypp"
+#line 1891 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::CopyNamespacesDecl))
@@ -4333 +4306 @@
   case 55:
 /* Line 1269 of yacc.c.  */
-#line 1870 "querytransformparser.ypp"
+#line 1904 "querytransformparser.ypp"
     {
         parseInfo->preserveNamespacesMode = true;
@@ -4341 +4314 @@
   case 56:
 /* Line 1269 of yacc.c.  */
-#line 1875 "querytransformparser.ypp"
+#line 1909 "querytransformparser.ypp"
     {
         parseInfo->preserveNamespacesMode = false;
@@ -4349 +4322 @@
   case 57:
 /* Line 1269 of yacc.c.  */
-#line 1880 "querytransformparser.ypp"
+#line 1914 "querytransformparser.ypp"
     {
         parseInfo->inheritNamespacesMode = true;
@@ -4357 +4330 @@
   case 58:
 /* Line 1269 of yacc.c.  */
-#line 1885 "querytransformparser.ypp"
+#line 1919 "querytransformparser.ypp"
     {
         parseInfo->inheritNamespacesMode = false;
@@ -4365 +4338 @@
   case 59:
 /* Line 1269 of yacc.c.  */
-#line 1890 "querytransformparser.ypp"
+#line 1924 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::DefaultCollationDecl))
@@ -4384 +4357 @@
   case 60:
 /* Line 1269 of yacc.c.  */
-#line 1906 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(3) - (5)].enums.Bool));
+#line 1940 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20), parseInfo, (yyloc), (yyvsp[(3) - (5)].enums.Bool));
         if(parseInfo->hasDeclaration(ParserContext::BaseURIDecl))
         {
@@ -4410 +4383 @@
   case 61:
 /* Line 1269 of yacc.c.  */
-#line 1929 "querytransformparser.ypp"
+#line 1963 "querytransformparser.ypp"
     {
         parseInfo->staticContext->error(QtXmlPatterns::tr("The Schema Import feature is not supported, "
@@ -4421 +4394 @@
   case 65:
 /* Line 1269 of yacc.c.  */
-#line 1941 "querytransformparser.ypp"
+#line 1975 "querytransformparser.ypp"
     {
         if((yyvsp[(4) - (6)].sval).isEmpty())
@@ -4441 +4414 @@
   case 72:
 /* Line 1269 of yacc.c.  */
-#line 1968 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(3) - (9)].enums.Bool));
+#line 2002 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(3) - (9)].enums.Bool));
         if(variableByName((yyvsp[(5) - (9)].qName), 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((yyvsp[(5) - (9)].qName)))),
@@ -4486 +4459 @@
                 {
                     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(), (yyvsp[(5) - (9)].qName))),
                                                     parseInfo->isXSLT() ? ReportContext::XTDE0050 : ReportContext::XPDY0002,
@@ -4498 +4471 @@
   case 73:
 /* Line 1269 of yacc.c.  */
-#line 2022 "querytransformparser.ypp"
+#line 2056 "querytransformparser.ypp"
     {
         (yyval.expr).reset();
@@ -4506 +4479 @@
   case 74:
 /* Line 1269 of yacc.c.  */
-#line 2026 "querytransformparser.ypp"
+#line 2060 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (2)].expr);
@@ -4514 +4487 @@
   case 75:
 /* Line 1269 of yacc.c.  */
-#line 2031 "querytransformparser.ypp"
+#line 2065 "querytransformparser.ypp"
     {
         (yyval.expr).reset();
@@ -4522 +4495 @@
   case 76:
 /* Line 1269 of yacc.c.  */
-#line 2035 "querytransformparser.ypp"
+#line 2069 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (2)].expr);
@@ -4530 +4503 @@
   case 77:
 /* Line 1269 of yacc.c.  */
-#line 2040 "querytransformparser.ypp"
+#line 2074 "querytransformparser.ypp"
     {
         if(parseInfo->hasDeclaration(ParserContext::ConstructionDecl))
@@ -4547 +4520 @@
   case 78:
 /* Line 1269 of yacc.c.  */
-#line 2054 "querytransformparser.ypp"
+#line 2088 "querytransformparser.ypp"
     {
         (yyval.enums.constructionMode) = StaticContext::CMStrip;
@@ -4555 +4528 @@
   case 79:
 /* Line 1269 of yacc.c.  */
-#line 2058 "querytransformparser.ypp"
+#line 2092 "querytransformparser.ypp"
     {
         (yyval.enums.constructionMode) = StaticContext::CMPreserve;
@@ -4563 +4536 @@
   case 80:
 /* Line 1269 of yacc.c.  */
-#line 2063 "querytransformparser.ypp"
+#line 2097 "querytransformparser.ypp"
     {
                 (yyval.enums.slot) = parseInfo->currentExpressionSlot() - (yyvsp[(6) - (7)].functionArguments).count();
@@ -4571 +4544 @@
   case 81:
 /* Line 1269 of yacc.c.  */
-#line 2067 "querytransformparser.ypp"
+#line 2101 "querytransformparser.ypp"
     {
         if(!(yyvsp[(3) - (11)].enums.Bool))
-            disallowedConstruct(parseInfo, (yyloc), (yyvsp[(3) - (11)].enums.Bool));
+            allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(3) - (11)].enums.Bool));
 
         /* If FunctionBody is null, it is 'external', otherwise the value is the body. */
@@ -4678 +4651 @@
   case 82:
 /* Line 1269 of yacc.c.  */
-#line 2171 "querytransformparser.ypp"
+#line 2205 "querytransformparser.ypp"
     {
         (yyval.functionArguments) = FunctionArgument::List();
@@ -4686 +4659 @@
   case 83:
 /* Line 1269 of yacc.c.  */
-#line 2175 "querytransformparser.ypp"
+#line 2209 "querytransformparser.ypp"
     {
         FunctionArgument::List l;
@@ -4696 +4669 @@
   case 84:
 /* Line 1269 of yacc.c.  */
-#line 2181 "querytransformparser.ypp"
+#line 2215 "querytransformparser.ypp"
     {
         FunctionArgument::List::const_iterator it((yyvsp[(1) - (3)].functionArguments).constBegin());
@@ -4705 +4678 @@
             if((*it)->name() == (yyvsp[(3) - (3)].functionArgument)->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.")
@@ -4720 +4693 @@
   case 85:
 /* Line 1269 of yacc.c.  */
-#line 2202 "querytransformparser.ypp"
+#line 2236 "querytransformparser.ypp"
     {
         pushVariable((yyvsp[(2) - (3)].qName), (yyvsp[(3) - (3)].sequenceType), Expression::Ptr(), VariableDeclaration::FunctionArgument, (yyloc), parseInfo);
@@ -4729 +4702 @@
   case 86:
 /* Line 1269 of yacc.c.  */
-#line 2208 "querytransformparser.ypp"
+#line 2242 "querytransformparser.ypp"
     {
         (yyval.expr).reset();
@@ -4737 +4710 @@
   case 88:
 /* Line 1269 of yacc.c.  */
-#line 2214 "querytransformparser.ypp"
+#line 2248 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (3)].expr);
@@ -4745 +4718 @@
   case 91:
 /* Line 1269 of yacc.c.  */
-#line 2230 "querytransformparser.ypp"
+#line 2264 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new CombineNodes((yyvsp[(1) - (3)].expr), CombineNodes::Union, (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
@@ -4753 +4726 @@
   case 93:
 /* Line 1269 of yacc.c.  */
-#line 2236 "querytransformparser.ypp"
+#line 2270 "querytransformparser.ypp"
     {
         /* We write this into a node test. The spec says, 5.5.3 The Meaning of a Pattern:
@@ -4766 +4739 @@
   case 94:
 /* Line 1269 of yacc.c.  */
-#line 2245 "querytransformparser.ypp"
+#line 2279 "querytransformparser.ypp"
     {
         /* /axis::node-test
@@ -4840 +4813 @@
   case 95:
 /* Line 1269 of yacc.c.  */
-#line 2315 "querytransformparser.ypp"
+#line 2349 "querytransformparser.ypp"
     {
         /* //axis::node-test
@@ -4855 +4828 @@
   case 97:
 /* Line 1269 of yacc.c.  */
-#line 2327 "querytransformparser.ypp"
+#line 2361 "querytransformparser.ypp"
     {
         createIdPatternPath((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), QXmlNodeModelIndex::AxisParent, (yylsp[(2) - (3)]), parseInfo);
@@ -4863 +4836 @@
   case 98:
 /* Line 1269 of yacc.c.  */
-#line 2331 "querytransformparser.ypp"
+#line 2365 "querytransformparser.ypp"
     {
         createIdPatternPath((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), QXmlNodeModelIndex::AxisAncestor, (yylsp[(2) - (3)]), parseInfo);
@@ -4871 +4844 @@
   case 99:
 /* Line 1269 of yacc.c.  */
-#line 2336 "querytransformparser.ypp"
+#line 2370 "querytransformparser.ypp"
     {
         const Expression::List ands((yyvsp[(1) - (1)].expr)->operands());
@@ -4943 +4916 @@
   case 101:
 /* Line 1269 of yacc.c.  */
-#line 2406 "querytransformparser.ypp"
+#line 2440 "querytransformparser.ypp"
     {
         (yyval.expr) = createPatternPath((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), QXmlNodeModelIndex::AxisParent, (yylsp[(2) - (3)]), parseInfo);
@@ -4951 +4924 @@
   case 102:
 /* Line 1269 of yacc.c.  */
-#line 2410 "querytransformparser.ypp"
+#line 2444 "querytransformparser.ypp"
     {
         (yyval.expr) = createPatternPath((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), QXmlNodeModelIndex::AxisAncestor, (yylsp[(2) - (3)]), parseInfo);
@@ -4959 +4932 @@
   case 103:
 /* Line 1269 of yacc.c.  */
-#line 2415 "querytransformparser.ypp"
+#line 2449 "querytransformparser.ypp"
     {
         const Expression::Ptr expr(findAxisStep((yyvsp[(1) - (1)].expr)));
@@ -5006 +4979 @@
   case 105:
 /* Line 1269 of yacc.c.  */
-#line 2460 "querytransformparser.ypp"
+#line 2494 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new ExpressionSequence((yyvsp[(1) - (1)].expressionList)), (yyloc), parseInfo);
@@ -5014 +4987 @@
   case 106:
 /* Line 1269 of yacc.c.  */
-#line 2465 "querytransformparser.ypp"
+#line 2499 "querytransformparser.ypp"
     {
         Expression::List l;
@@ -5025 +4998 @@
   case 107:
 /* Line 1269 of yacc.c.  */
-#line 2472 "querytransformparser.ypp"
+#line 2506 "querytransformparser.ypp"
     {
         (yyvsp[(1) - (3)].expressionList).append((yyvsp[(3) - (3)].expr));
@@ -5034 +5007 @@
   case 113:
 /* Line 1269 of yacc.c.  */
-#line 2483 "querytransformparser.ypp"
+#line 2517 "querytransformparser.ypp"
     {
         (yyval.expr) = createDirAttributeValue((yyvsp[(3) - (4)].expressionList), parseInfo, (yyloc));
@@ -5042 +5015 @@
   case 114:
 /* Line 1269 of yacc.c.  */
-#line 2488 "querytransformparser.ypp"
+#line 2522 "querytransformparser.ypp"
     {
         QVector<QXmlName> result;
@@ -5052 +5025 @@
   case 115:
 /* Line 1269 of yacc.c.  */
-#line 2494 "querytransformparser.ypp"
+#line 2528 "querytransformparser.ypp"
     {
         (yyval.qNameVector) = (yyvsp[(2) - (2)].qNameVector);
@@ -5060 +5033 @@
   case 116:
 /* Line 1269 of yacc.c.  */
-#line 2499 "querytransformparser.ypp"
+#line 2533 "querytransformparser.ypp"
     {
             (yyval.qName) = QXmlName(StandardNamespaces::InternalXSLT, StandardLocalNames::Default);
@@ -5068 +5041 @@
   case 117:
 /* Line 1269 of yacc.c.  */
-#line 2503 "querytransformparser.ypp"
+#line 2537 "querytransformparser.ypp"
     {
         (yyval.qName) = (yyvsp[(2) - (2)].qName);
@@ -5076 +5049 @@
   case 118:
 /* Line 1269 of yacc.c.  */
-#line 2508 "querytransformparser.ypp"
+#line 2542 "querytransformparser.ypp"
     {
         QVector<QXmlName> result;
@@ -5086 +5059 @@
   case 119:
 /* Line 1269 of yacc.c.  */
-#line 2514 "querytransformparser.ypp"
+#line 2548 "querytransformparser.ypp"
     {
         (yyvsp[(1) - (3)].qNameVector).append((yyvsp[(3) - (3)].qName));
@@ -5095 +5068 @@
   case 120:
 /* Line 1269 of yacc.c.  */
-#line 2520 "querytransformparser.ypp"
+#line 2554 "querytransformparser.ypp"
     {
         (yyval.qName) = (yyvsp[(1) - (1)].qName);
@@ -5103 +5076 @@
   case 121:
 /* Line 1269 of yacc.c.  */
-#line 2524 "querytransformparser.ypp"
+#line 2558 "querytransformparser.ypp"
     {
         if((yyvsp[(1) - (1)].sval) == QLatin1String("#current"))
@@ -5130 +5103 @@
   case 124:
 /* Line 1269 of yacc.c.  */
-#line 2553 "querytransformparser.ypp"
+#line 2587 "querytransformparser.ypp"
     {
                /* We're pushing the range variable here, not the positional. */
@@ -5139 +5112 @@
   case 125:
 /* Line 1269 of yacc.c.  */
-#line 2557 "querytransformparser.ypp"
+#line 2591 "querytransformparser.ypp"
     {
                /* It is ok this appears after PositionalVar, because currentRangeSlot()
@@ -5150 +5123 @@
   case 126:
 /* Line 1269 of yacc.c.  */
-#line 2564 "querytransformparser.ypp"
+#line 2598 "querytransformparser.ypp"
     {
         Q_ASSERT((yyvsp[(7) - (10)].expr));
@@ -5186 +5159 @@
   case 127:
 /* Line 1269 of yacc.c.  */
-#line 2598 "querytransformparser.ypp"
+#line 2632 "querytransformparser.ypp"
     {
              pushVariable((yyvsp[(3) - (7)].qName), quantificationType((yyvsp[(4) - (7)].sequenceType)), (yyvsp[(7) - (7)].expr), VariableDeclaration::RangeVariable, (yyloc), parseInfo);
@@ -5194 +5167 @@
   case 128:
 /* Line 1269 of yacc.c.  */
-#line 2601 "querytransformparser.ypp"
+#line 2635 "querytransformparser.ypp"
     {
              /* It is ok this appears after PositionalVar, because currentRangeSlot()
@@ -5205 +5178 @@
   case 129:
 /* Line 1269 of yacc.c.  */
-#line 2608 "querytransformparser.ypp"
+#line 2642 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new ForClause((yyvsp[(9) - (10)].enums.slot), (yyvsp[(7) - (10)].expr), (yyvsp[(10) - (10)].expr), (yyvsp[(5) - (10)].enums.slot)), (yyloc), parseInfo);
@@ -5218 +5191 @@
   case 133:
 /* Line 1269 of yacc.c.  */
-#line 2622 "querytransformparser.ypp"
+#line 2656 "querytransformparser.ypp"
     {
         (yyval.enums.slot) = -1;
@@ -5226 +5199 @@
   case 134:
 /* Line 1269 of yacc.c.  */
-#line 2627 "querytransformparser.ypp"
+#line 2661 "querytransformparser.ypp"
     {
         pushVariable((yyvsp[(3) - (3)].qName), CommonSequenceTypes::ExactlyOneInteger, Expression::Ptr(),
@@ -5236 +5209 @@
   case 135:
 /* Line 1269 of yacc.c.  */
-#line 2634 "querytransformparser.ypp"
+#line 2668 "querytransformparser.ypp"
     {
                 (yyval.expr) = pushVariable((yyvsp[(4) - (7)].qName), quantificationType((yyvsp[(5) - (7)].sequenceType)), (yyvsp[(7) - (7)].expr), VariableDeclaration::ExpressionVariable, (yyloc), parseInfo);
@@ -5244 +5217 @@
   case 136:
 /* Line 1269 of yacc.c.  */
-#line 2638 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (9)].enums.Bool));
+#line 2672 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (9)].enums.Bool));
 
         Q_ASSERT(parseInfo->variables.top()->name == (yyvsp[(4) - (9)].qName));
@@ -5256 +5229 @@
   case 137:
 /* Line 1269 of yacc.c.  */
-#line 2647 "querytransformparser.ypp"
+#line 2681 "querytransformparser.ypp"
     { (yyval.expr) = pushVariable((yyvsp[(3) - (6)].qName), quantificationType((yyvsp[(4) - (6)].sequenceType)), (yyvsp[(6) - (6)].expr), VariableDeclaration::ExpressionVariable, (yyloc), parseInfo);}
     break;
@@ -5262 +5235 @@
   case 138:
 /* Line 1269 of yacc.c.  */
-#line 2649 "querytransformparser.ypp"
+#line 2683 "querytransformparser.ypp"
     {
         Q_ASSERT(parseInfo->variables.top()->name == (yyvsp[(3) - (8)].qName));
@@ -5272 +5245 @@
   case 142:
 /* Line 1269 of yacc.c.  */
-#line 2660 "querytransformparser.ypp"
+#line 2694 "querytransformparser.ypp"
     {
         if((yyvsp[(1) - (3)].orderSpecs).isEmpty())
@@ -5283 +5256 @@
   case 143:
 /* Line 1269 of yacc.c.  */
-#line 2668 "querytransformparser.ypp"
+#line 2702 "querytransformparser.ypp"
     {
         if((yyvsp[(3) - (5)].orderSpecs).isEmpty())
@@ -5296 +5269 @@
   case 144:
 /* Line 1269 of yacc.c.  */
-#line 2678 "querytransformparser.ypp"
+#line 2712 "querytransformparser.ypp"
     {
         (yyval.orderSpecs) = OrderSpecTransfer::List();
@@ -5304 +5277 @@
   case 146:
 /* Line 1269 of yacc.c.  */
-#line 2684 "querytransformparser.ypp"
+#line 2718 "querytransformparser.ypp"
     {
         (yyval.orderSpecs) = (yyvsp[(2) - (2)].orderSpecs);
@@ -5312 +5285 @@
   case 147:
 /* Line 1269 of yacc.c.  */
-#line 2689 "querytransformparser.ypp"
+#line 2723 "querytransformparser.ypp"
     {
         OrderSpecTransfer::List list;
@@ -5323 +5296 @@
   case 148:
 /* Line 1269 of yacc.c.  */
-#line 2696 "querytransformparser.ypp"
+#line 2730 "querytransformparser.ypp"
     {
         OrderSpecTransfer::List list;
@@ -5333 +5306 @@
   case 149:
 /* Line 1269 of yacc.c.  */
-#line 2703 "querytransformparser.ypp"
+#line 2737 "querytransformparser.ypp"
     {
         (yyval.orderSpec) = OrderSpecTransfer((yyvsp[(1) - (4)].expr), OrderBy::OrderSpec((yyvsp[(2) - (4)].enums.sortDirection), (yyvsp[(3) - (4)].enums.orderingEmptySequence)));
@@ -5341 +5314 @@
   case 150:
 /* Line 1269 of yacc.c.  */
-#line 2708 "querytransformparser.ypp"
+#line 2742 "querytransformparser.ypp"
     {
         /* Where does the specification state the default value is ascending?
@@ -5365 +5338 @@
   case 151:
 /* Line 1269 of yacc.c.  */
-#line 2729 "querytransformparser.ypp"
+#line 2763 "querytransformparser.ypp"
     {
         (yyval.enums.sortDirection) = OrderBy::OrderSpec::Ascending;
@@ -5373 +5346 @@
   case 152:
 /* Line 1269 of yacc.c.  */
-#line 2734 "querytransformparser.ypp"
+#line 2768 "querytransformparser.ypp"
     {
         (yyval.enums.sortDirection) = OrderBy::OrderSpec::Descending;
@@ -5381 +5354 @@
   case 153:
 /* Line 1269 of yacc.c.  */
-#line 2739 "querytransformparser.ypp"
+#line 2773 "querytransformparser.ypp"
     {
         (yyval.enums.orderingEmptySequence) = parseInfo->staticContext->orderingEmptySequence();
@@ -5389 +5362 @@
   case 156:
 /* Line 1269 of yacc.c.  */
-#line 2746 "querytransformparser.ypp"
+#line 2780 "querytransformparser.ypp"
     {
         if(parseInfo->isXSLT())
@@ -5400 +5373 @@
   case 157:
 /* Line 1269 of yacc.c.  */
-#line 2753 "querytransformparser.ypp"
+#line 2787 "querytransformparser.ypp"
     {
         /* We do nothing. We don't use collations, and we have this non-terminal
@@ -5409 +5382 @@
   case 158:
 /* Line 1269 of yacc.c.  */
-#line 2759 "querytransformparser.ypp"
+#line 2793 "querytransformparser.ypp"
     {
         parseInfo->orderStability.push(OrderBy::StableOrder);
@@ -5417 +5390 @@
   case 159:
 /* Line 1269 of yacc.c.  */
-#line 2763 "querytransformparser.ypp"
+#line 2797 "querytransformparser.ypp"
     {
         parseInfo->orderStability.push(OrderBy::UnstableOrder);
@@ -5425 +5398 @@
   case 162:
 /* Line 1269 of yacc.c.  */
-#line 2771 "querytransformparser.ypp"
+#line 2805 "querytransformparser.ypp"
     {
                             pushVariable((yyvsp[(3) - (6)].qName), quantificationType((yyvsp[(4) - (6)].sequenceType)), (yyvsp[(6) - (6)].expr),
@@ -5434 +5407 @@
   case 163:
 /* Line 1269 of yacc.c.  */
-#line 2775 "querytransformparser.ypp"
+#line 2809 "querytransformparser.ypp"
     {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();}
     break;
@@ -5440 +5413 @@
   case 164:
 /* Line 1269 of yacc.c.  */
-#line 2777 "querytransformparser.ypp"
-    {
+#line 2811 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new QuantifiedExpression((yyvsp[(8) - (9)].enums.slot),
                                              QuantifiedExpression::Some, (yyvsp[(6) - (9)].expr), (yyvsp[(9) - (9)].expr)), (yyloc), parseInfo);
@@ -5450 +5424 @@
   case 165:
 /* Line 1269 of yacc.c.  */
-#line 2784 "querytransformparser.ypp"
+#line 2819 "querytransformparser.ypp"
     {
                             (yyval.expr) = pushVariable((yyvsp[(3) - (6)].qName), quantificationType((yyvsp[(4) - (6)].sequenceType)), (yyvsp[(6) - (6)].expr),
@@ -5459 +5433 @@
   case 166:
 /* Line 1269 of yacc.c.  */
-#line 2788 "querytransformparser.ypp"
+#line 2823 "querytransformparser.ypp"
     {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();}
     break;
@@ -5465 +5439 @@
   case 167:
 /* Line 1269 of yacc.c.  */
-#line 2790 "querytransformparser.ypp"
+#line 2825 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new QuantifiedExpression((yyvsp[(8) - (9)].enums.slot),
@@ -5475 +5449 @@
   case 169:
 /* Line 1269 of yacc.c.  */
-#line 2799 "querytransformparser.ypp"
+#line 2834 "querytransformparser.ypp"
     {
                             pushVariable((yyvsp[(3) - (6)].qName), quantificationType((yyvsp[(4) - (6)].sequenceType)), (yyvsp[(6) - (6)].expr),
@@ -5484 +5458 @@
   case 170:
 /* Line 1269 of yacc.c.  */
-#line 2803 "querytransformparser.ypp"
+#line 2838 "querytransformparser.ypp"
     {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();}
     break;
@@ -5490 +5464 @@
   case 171:
 /* Line 1269 of yacc.c.  */
-#line 2805 "querytransformparser.ypp"
-    {
+#line 2840 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new QuantifiedExpression((yyvsp[(8) - (9)].enums.slot),
                                              QuantifiedExpression::Every, (yyvsp[(6) - (9)].expr), (yyvsp[(9) - (9)].expr)), (yyloc), parseInfo);
@@ -5500 +5475 @@
   case 172:
 /* Line 1269 of yacc.c.  */
-#line 2812 "querytransformparser.ypp"
+#line 2848 "querytransformparser.ypp"
     {
                             (yyval.expr) = pushVariable((yyvsp[(3) - (6)].qName), quantificationType((yyvsp[(4) - (6)].sequenceType)), (yyvsp[(6) - (6)].expr),
@@ -5509 +5484 @@
   case 173:
 /* Line 1269 of yacc.c.  */
-#line 2816 "querytransformparser.ypp"
+#line 2852 "querytransformparser.ypp"
     {(yyval.enums.slot) = parseInfo->staticContext->currentRangeSlot();}
     break;
@@ -5515 +5490 @@
   case 174:
 /* Line 1269 of yacc.c.  */
-#line 2818 "querytransformparser.ypp"
+#line 2854 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new QuantifiedExpression((yyvsp[(8) - (9)].enums.slot),
@@ -5525 +5500 @@
   case 176:
 /* Line 1269 of yacc.c.  */
-#line 2827 "querytransformparser.ypp"
+#line 2863 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (2)].expr);
@@ -5533 +5508 @@
   case 177:
 /* Line 1269 of yacc.c.  */
-#line 2854 "querytransformparser.ypp"
+#line 2890 "querytransformparser.ypp"
     {
                     parseInfo->typeswitchSource.push((yyvsp[(3) - (4)].expr));
@@ -5541 +5516 @@
   case 178:
 /* Line 1269 of yacc.c.  */
-#line 2858 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 2894 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         parseInfo->typeswitchSource.pop();
         (yyval.expr) = (yyvsp[(6) - (6)].expr);
@@ -5551 +5526 @@
   case 179:
 /* Line 1269 of yacc.c.  */
-#line 2865 "querytransformparser.ypp"
+#line 2901 "querytransformparser.ypp"
     {
         if(!(yyvsp[(2) - (3)].qName).isNull())
@@ -5563 +5538 @@
   case 180:
 /* Line 1269 of yacc.c.  */
-#line 2873 "querytransformparser.ypp"
+#line 2909 "querytransformparser.ypp"
     {
         /* The variable shouldn't be in-scope for other case branches. */
@@ -5573 +5548 @@
   case 181:
 /* Line 1269 of yacc.c.  */
-#line 2879 "querytransformparser.ypp"
+#line 2915 "querytransformparser.ypp"
     {
         const Expression::Ptr instanceOf(create(new InstanceOf(parseInfo->typeswitchSource.top(), (yyvsp[(3) - (8)].sequenceType)), (yyloc), parseInfo));
@@ -5582 +5557 @@
   case 184:
 /* Line 1269 of yacc.c.  */
-#line 2888 "querytransformparser.ypp"
+#line 2924 "querytransformparser.ypp"
     {
         (yyval.qName) = QXmlName();
@@ -5590 +5565 @@
   case 185:
 /* Line 1269 of yacc.c.  */
-#line 2893 "querytransformparser.ypp"
+#line 2929 "querytransformparser.ypp"
     {
         (yyval.qName) = (yyvsp[(2) - (3)].qName);
@@ -5598 +5573 @@
   case 186:
 /* Line 1269 of yacc.c.  */
-#line 2898 "querytransformparser.ypp"
+#line 2934 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(3) - (3)].expr);
@@ -5606 +5581 @@
   case 187:
 /* Line 1269 of yacc.c.  */
-#line 2902 "querytransformparser.ypp"
+#line 2938 "querytransformparser.ypp"
     {
         if(!(yyvsp[(3) - (3)].qName).isNull())
@@ -5619 +5594 @@
   case 188:
 /* Line 1269 of yacc.c.  */
-#line 2911 "querytransformparser.ypp"
+#line 2947 "querytransformparser.ypp"
     {
         if(!(yyvsp[(3) - (6)].qName).isNull())
@@ -5629 +5604 @@
   case 189:
 /* Line 1269 of yacc.c.  */
-#line 2918 "querytransformparser.ypp"
-    {
+#line 2954 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new IfThenClause((yyvsp[(3) - (8)].expr), (yyvsp[(6) - (8)].expr), (yyvsp[(8) - (8)].expr)), (yyloc), parseInfo);
     }
@@ -5637 +5613 @@
   case 191:
 /* Line 1269 of yacc.c.  */
-#line 2924 "querytransformparser.ypp"
-    {
+#line 2961 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new OrExpression((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5645 +5622 @@
   case 193:
 /* Line 1269 of yacc.c.  */
-#line 2930 "querytransformparser.ypp"
-    {
+#line 2968 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new AndExpression((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5653 +5631 @@
   case 199:
 /* Line 1269 of yacc.c.  */
-#line 2941 "querytransformparser.ypp"
-    {
+#line 2980 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new RangeExpression((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5661 +5640 @@
   case 201:
 /* Line 1269 of yacc.c.  */
-#line 2947 "querytransformparser.ypp"
-    {
+#line 2987 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new ArithmeticExpression((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.mathOperator), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5669 +5649 @@
   case 202:
 /* Line 1269 of yacc.c.  */
-#line 2951 "querytransformparser.ypp"
+#line 2992 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::Add;}
     break;
@@ -5675 +5655 @@
   case 203:
 /* Line 1269 of yacc.c.  */
-#line 2952 "querytransformparser.ypp"
+#line 2993 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::Substract;}
     break;
@@ -5681 +5661 @@
   case 205:
 /* Line 1269 of yacc.c.  */
-#line 2956 "querytransformparser.ypp"
-    {
+#line 2997 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new ArithmeticExpression((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.mathOperator), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5689 +5670 @@
   case 206:
 /* Line 1269 of yacc.c.  */
-#line 2960 "querytransformparser.ypp"
+#line 3002 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::Multiply;}
     break;
@@ -5695 +5676 @@
   case 207:
 /* Line 1269 of yacc.c.  */
-#line 2961 "querytransformparser.ypp"
+#line 3003 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::Div;}
     break;
@@ -5701 +5682 @@
   case 208:
 /* Line 1269 of yacc.c.  */
-#line 2962 "querytransformparser.ypp"
+#line 3004 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::IDiv;}
     break;
@@ -5707 +5688 @@
   case 209:
 /* Line 1269 of yacc.c.  */
-#line 2963 "querytransformparser.ypp"
+#line 3005 "querytransformparser.ypp"
     {(yyval.enums.mathOperator) = AtomicMathematician::Mod;}
     break;
@@ -5713 +5694 @@
   case 211:
 /* Line 1269 of yacc.c.  */
-#line 2967 "querytransformparser.ypp"
-    {
+#line 3009 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10
+                                 | QXmlQuery::XPath20
+                                 | QXmlQuery::XmlSchema11IdentityConstraintField
+                                 | QXmlQuery::XmlSchema11IdentityConstraintSelector),
+                  parseInfo, (yyloc));
         (yyval.expr) = create(new CombineNodes((yyvsp[(1) - (3)].expr), CombineNodes::Union, (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5721 +5707 @@
   case 213:
 /* Line 1269 of yacc.c.  */
-#line 2973 "querytransformparser.ypp"
-    {
+#line 3020 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new CombineNodes((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.combinedNodeOp), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
     }
@@ -5729 +5716 @@
   case 216:
 /* Line 1269 of yacc.c.  */
-#line 2981 "querytransformparser.ypp"
+#line 3029 "querytransformparser.ypp"
     {
         (yyval.enums.combinedNodeOp) = CombineNodes::Intersect;
@@ -5737 +5724 @@
   case 217:
 /* Line 1269 of yacc.c.  */
-#line 2985 "querytransformparser.ypp"
+#line 3033 "querytransformparser.ypp"
     {
         (yyval.enums.combinedNodeOp) = CombineNodes::Except;
@@ -5745 +5732 @@
   case 219:
 /* Line 1269 of yacc.c.  */
-#line 2991 "querytransformparser.ypp"
-    {
+#line 3039 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new InstanceOf((yyvsp[(1) - (4)].expr),
-        SequenceType::Ptr((yyvsp[(4) - (4)].sequenceType))), (yyloc), parseInfo);
+                    SequenceType::Ptr((yyvsp[(4) - (4)].sequenceType))), (yyloc), parseInfo);
     }
     break;
@@ -5754 +5742 @@
   case 221:
 /* Line 1269 of yacc.c.  */
-#line 2998 "querytransformparser.ypp"
-    {
+#line 3047 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new TreatAs((yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].sequenceType)), (yyloc), parseInfo);
     }
@@ -5762 +5751 @@
   case 223:
 /* Line 1269 of yacc.c.  */
-#line 3004 "querytransformparser.ypp"
-    {
+#line 3054 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new CastableAs((yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].sequenceType)), (yyloc), parseInfo);
     }
@@ -5770 +5760 @@
   case 225:
 /* Line 1269 of yacc.c.  */
-#line 3010 "querytransformparser.ypp"
-    {
+#line 3061 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new CastAs((yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].sequenceType)), (yyloc), parseInfo);
     }
@@ -5778 +5769 @@
   case 227:
 /* Line 1269 of yacc.c.  */
-#line 3016 "querytransformparser.ypp"
-    {
+#line 3068 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new UnaryExpression((yyvsp[(1) - (2)].enums.mathOperator), (yyvsp[(2) - (2)].expr), parseInfo->staticContext), (yyloc), parseInfo);
     }
@@ -5786 +5778 @@
   case 228:
 /* Line 1269 of yacc.c.  */
-#line 3021 "querytransformparser.ypp"
+#line 3074 "querytransformparser.ypp"
     {
         (yyval.enums.mathOperator) = AtomicMathematician::Add;
@@ -5794 +5786 @@
   case 229:
 /* Line 1269 of yacc.c.  */
-#line 3025 "querytransformparser.ypp"
+#line 3078 "querytransformparser.ypp"
     {
         (yyval.enums.mathOperator) = AtomicMathematician::Substract;
@@ -5802 +5794 @@
   case 233:
 /* Line 1269 of yacc.c.  */
-#line 3034 "querytransformparser.ypp"
-    {
+#line 3087 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new GeneralComparison((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.valueOperator), (yyvsp[(3) - (3)].expr), parseInfo->isBackwardsCompat.top()), (yyloc), parseInfo);
     }
@@ -5810 +5803 @@
   case 234:
 /* Line 1269 of yacc.c.  */
-#line 3038 "querytransformparser.ypp"
+#line 3092 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorEqual;}
     break;
@@ -5816 +5809 @@
   case 235:
 /* Line 1269 of yacc.c.  */
-#line 3039 "querytransformparser.ypp"
+#line 3093 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorNotEqual;}
     break;
@@ -5822 +5815 @@
   case 236:
 /* Line 1269 of yacc.c.  */
-#line 3040 "querytransformparser.ypp"
+#line 3094 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterOrEqual;}
     break;
@@ -5828 +5821 @@
   case 237:
 /* Line 1269 of yacc.c.  */
-#line 3041 "querytransformparser.ypp"
+#line 3095 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterThan;}
     break;
@@ -5834 +5827 @@
   case 238:
 /* Line 1269 of yacc.c.  */
-#line 3042 "querytransformparser.ypp"
+#line 3096 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessOrEqual;}
     break;
@@ -5840 +5833 @@
   case 239:
 /* Line 1269 of yacc.c.  */
-#line 3043 "querytransformparser.ypp"
+#line 3097 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessThan;}
     break;
@@ -5846 +5839 @@
   case 240:
 /* Line 1269 of yacc.c.  */
-#line 3046 "querytransformparser.ypp"
+#line 3100 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new ValueComparison((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.valueOperator), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
@@ -5854 +5847 @@
   case 241:
 /* Line 1269 of yacc.c.  */
-#line 3050 "querytransformparser.ypp"
+#line 3104 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorEqual;}
     break;
@@ -5860 +5853 @@
   case 242:
 /* Line 1269 of yacc.c.  */
-#line 3051 "querytransformparser.ypp"
+#line 3105 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorNotEqual;}
     break;
@@ -5866 +5859 @@
   case 243:
 /* Line 1269 of yacc.c.  */
-#line 3052 "querytransformparser.ypp"
+#line 3106 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterOrEqual;}
     break;
@@ -5872 +5865 @@
   case 244:
 /* Line 1269 of yacc.c.  */
-#line 3053 "querytransformparser.ypp"
+#line 3107 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorGreaterThan;}
     break;
@@ -5878 +5871 @@
   case 245:
 /* Line 1269 of yacc.c.  */
-#line 3054 "querytransformparser.ypp"
+#line 3108 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessOrEqual;}
     break;
@@ -5884 +5877 @@
   case 246:
 /* Line 1269 of yacc.c.  */
-#line 3055 "querytransformparser.ypp"
+#line 3109 "querytransformparser.ypp"
     {(yyval.enums.valueOperator) = AtomicComparator::OperatorLessThan;}
     break;
@@ -5890 +5883 @@
   case 247:
 /* Line 1269 of yacc.c.  */
-#line 3058 "querytransformparser.ypp"
+#line 3112 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new NodeComparison((yyvsp[(1) - (3)].expr), (yyvsp[(2) - (3)].enums.nodeOperator), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
@@ -5898 +5891 @@
   case 248:
 /* Line 1269 of yacc.c.  */
-#line 3062 "querytransformparser.ypp"
+#line 3116 "querytransformparser.ypp"
     {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Is;}
     break;
@@ -5904 +5897 @@
   case 249:
 /* Line 1269 of yacc.c.  */
-#line 3063 "querytransformparser.ypp"
+#line 3117 "querytransformparser.ypp"
     {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Precedes;}
     break;
@@ -5910 +5903 @@
   case 250:
 /* Line 1269 of yacc.c.  */
-#line 3064 "querytransformparser.ypp"
+#line 3118 "querytransformparser.ypp"
     {(yyval.enums.nodeOperator) = QXmlNodeModelIndex::Follows;}
     break;
@@ -5916 +5909 @@
   case 251:
 /* Line 1269 of yacc.c.  */
-#line 3067 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 3121 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         parseInfo->staticContext->error(QtXmlPatterns::tr("The Schema Validation Feature is not supported. "
                                                           "Hence, %1-expressions may not be used.")
@@ -5931 +5924 @@
   case 252:
 /* Line 1269 of yacc.c.  */
-#line 3080 "querytransformparser.ypp"
+#line 3134 "querytransformparser.ypp"
     {(yyval.enums.validationMode) = Validate::Strict;}
     break;
@@ -5937 +5930 @@
   case 253:
 /* Line 1269 of yacc.c.  */
-#line 3081 "querytransformparser.ypp"
+#line 3135 "querytransformparser.ypp"
     {(yyval.enums.validationMode) = Validate::Strict;}
     break;
@@ -5943 +5936 @@
   case 254:
 /* Line 1269 of yacc.c.  */
-#line 3082 "querytransformparser.ypp"
+#line 3136 "querytransformparser.ypp"
     {(yyval.enums.validationMode) = Validate::Lax;}
     break;
@@ -5949 +5942 @@
   case 255:
 /* Line 1269 of yacc.c.  */
-#line 3085 "querytransformparser.ypp"
-    {
+#line 3139 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
         /* We don't support any pragmas, so we only do the
          * necessary validation and use the fallback expression. */
@@ -5968 +5962 @@
   case 256:
 /* Line 1269 of yacc.c.  */
-#line 3101 "querytransformparser.ypp"
+#line 3156 "querytransformparser.ypp"
     {
         (yyval.expr).reset();
@@ -5976 +5970 @@
   case 257:
 /* Line 1269 of yacc.c.  */
-#line 3105 "querytransformparser.ypp"
+#line 3160 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (3)].expr);
@@ -5984 +5978 @@
   case 260:
 /* Line 1269 of yacc.c.  */
-#line 3113 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 3168 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -5992 +5986 @@
   case 263:
 /* Line 1269 of yacc.c.  */
-#line 3121 "querytransformparser.ypp"
+#line 3176 "querytransformparser.ypp"
     {
         /* This is "/step". That is, fn:root(self::node()) treat as document-node()/RelativePathExpr. */
@@ -6001 +5995 @@
   case 264:
 /* Line 1269 of yacc.c.  */
-#line 3127 "querytransformparser.ypp"
+#line 3182 "querytransformparser.ypp"
     {
         (yyval.expr) = createSlashSlashPath(createRootExpression(parseInfo, (yyloc)), (yyvsp[(2) - (2)].expr), (yyloc), parseInfo);
@@ -6009 +6003 @@
   case 265:
 /* Line 1269 of yacc.c.  */
-#line 3131 "querytransformparser.ypp"
+#line 3186 "querytransformparser.ypp"
     {
         /* This is "/". That is, fn:root(self::node()) treat as document-node(). */
@@ -6018 +6012 @@
   case 268:
 /* Line 1269 of yacc.c.  */
-#line 3141 "querytransformparser.ypp"
+#line 3196 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new Path((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), (yyvsp[(2) - (3)].enums.pathKind)), (yyloc), parseInfo);
@@ -6026 +6020 @@
   case 269:
 /* Line 1269 of yacc.c.  */
-#line 3145 "querytransformparser.ypp"
+#line 3200 "querytransformparser.ypp"
     {
         const Expression::Ptr orderBy(createReturnOrderBy((yyvsp[(4) - (7)].orderSpecs), (yyvsp[(6) - (7)].expr), parseInfo->orderStability.pop(), (yyloc), parseInfo));
@@ -6039 +6033 @@
   case 270:
 /* Line 1269 of yacc.c.  */
-#line 3154 "querytransformparser.ypp"
+#line 3209 "querytransformparser.ypp"
     {
         (yyval.expr) = createSlashSlashPath((yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr), (yyloc), parseInfo);
@@ -6047 +6041 @@
   case 271:
 /* Line 1269 of yacc.c.  */
-#line 3159 "querytransformparser.ypp"
+#line 3214 "querytransformparser.ypp"
     {
         (yyval.expr) = NodeSortExpression::wrapAround((yyvsp[(1) - (1)].expr), parseInfo->staticContext);
@@ -6055 +6049 @@
   case 273:
 /* Line 1269 of yacc.c.  */
-#line 3164 "querytransformparser.ypp"
+#line 3219 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new CurrentItemStore((yyvsp[(2) - (2)].expr)), (yyloc), parseInfo);
@@ -6063 +6057 @@
   case 274:
 /* Line 1269 of yacc.c.  */
-#line 3168 "querytransformparser.ypp"
+#line 3223 "querytransformparser.ypp"
     {
         const xsDouble version = (yyvsp[(1) - (1)].sval).toDouble();
@@ -6075 +6069 @@
   case 275:
 /* Line 1269 of yacc.c.  */
-#line 3176 "querytransformparser.ypp"
+#line 3231 "querytransformparser.ypp"
     {
         if((yyvsp[(2) - (3)].enums.Double) < 2)
@@ -6086 +6080 @@
   case 276:
 /* Line 1269 of yacc.c.  */
-#line 3183 "querytransformparser.ypp"
-    {
+#line 3238 "querytransformparser.ypp"
+    {
+    allowedIn(QXmlQuery::XSLT20, parseInfo, (yyloc));
     Q_ASSERT(!(yyvsp[(2) - (5)].sval).isEmpty());
     (yyval.expr) = create(new StaticBaseURIStore((yyvsp[(2) - (5)].sval), (yyvsp[(4) - (5)].expr)), (yyloc), parseInfo);
@@ -6095 +6090 @@
   case 277:
 /* Line 1269 of yacc.c.  */
-#line 3189 "querytransformparser.ypp"
-    {
+#line 3245 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20), parseInfo, (yyloc));
         parseInfo->resolvers.push(parseInfo->staticContext->namespaceBindings());
         const NamespaceResolver::Ptr resolver(new DelegatingNamespaceResolver(parseInfo->staticContext->namespaceBindings()));
@@ -6108 +6104 @@
   case 278:
 /* Line 1269 of yacc.c.  */
-#line 3199 "querytransformparser.ypp"
+#line 3256 "querytransformparser.ypp"
     {
         parseInfo->staticContext->setNamespaceBindings(parseInfo->resolvers.pop());
@@ -6117 +6113 @@
   case 279:
 /* Line 1269 of yacc.c.  */
-#line 3204 "querytransformparser.ypp"
+#line 3261 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new CallTemplate((yyvsp[(2) - (5)].qName), parseInfo->templateWithParams), (yyloc), parseInfo);
@@ -6127 +6123 @@
   case 280:
 /* Line 1269 of yacc.c.  */
-#line 3211 "querytransformparser.ypp"
+#line 3268 "querytransformparser.ypp"
     {
         parseInfo->startParsingWithParam();
@@ -6135 +6131 @@
   case 281:
 /* Line 1269 of yacc.c.  */
-#line 3215 "querytransformparser.ypp"
+#line 3272 "querytransformparser.ypp"
     {
         parseInfo->endParsingWithParam();
@@ -6143 +6139 @@
   case 282:
 /* Line 1269 of yacc.c.  */
-#line 3220 "querytransformparser.ypp"
+#line 3277 "querytransformparser.ypp"
     {
     }
@@ -6150 +6146 @@
   case 283:
 /* Line 1269 of yacc.c.  */
-#line 3223 "querytransformparser.ypp"
+#line 3280 "querytransformparser.ypp"
     {
     }
@@ -6157 +6153 @@
   case 284:
 /* Line 1269 of yacc.c.  */
-#line 3226 "querytransformparser.ypp"
+#line 3283 "querytransformparser.ypp"
     {
     }
@@ -6164 +6160 @@
   case 285:
 /* Line 1269 of yacc.c.  */
-#line 3230 "querytransformparser.ypp"
+#line 3287 "querytransformparser.ypp"
     {
     }
@@ -6171 +6167 @@
   case 286:
 /* Line 1269 of yacc.c.  */
-#line 3233 "querytransformparser.ypp"
+#line 3290 "querytransformparser.ypp"
     {
     }
@@ -6178 +6174 @@
   case 287:
 /* Line 1269 of yacc.c.  */
-#line 3237 "querytransformparser.ypp"
+#line 3294 "querytransformparser.ypp"
     {
         /* Note, this grammar rule is invoked for @c xsl:param @em and @c
@@ -6246 +6242 @@
   case 288:
 /* Line 1269 of yacc.c.  */
-#line 3302 "querytransformparser.ypp"
+#line 3359 "querytransformparser.ypp"
     {
         (yyval.enums.Bool) = false;
@@ -6254 +6250 @@
   case 289:
 /* Line 1269 of yacc.c.  */
-#line 3306 "querytransformparser.ypp"
+#line 3363 "querytransformparser.ypp"
     {
         (yyval.enums.Bool) = true;
@@ -6262 +6258 @@
   case 290:
 /* Line 1269 of yacc.c.  */
-#line 3311 "querytransformparser.ypp"
+#line 3368 "querytransformparser.ypp"
     {
         (yyval.expr) = Expression::Ptr();
@@ -6270 +6266 @@
   case 291:
 /* Line 1269 of yacc.c.  */
-#line 3315 "querytransformparser.ypp"
+#line 3372 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (2)].expr);
@@ -6278 +6274 @@
   case 292:
 /* Line 1269 of yacc.c.  */
-#line 3324 "querytransformparser.ypp"
+#line 3381 "querytransformparser.ypp"
     {
         (yyval.enums.pathKind) = Path::RegularPath;
@@ -6286 +6282 @@
   case 293:
 /* Line 1269 of yacc.c.  */
-#line 3328 "querytransformparser.ypp"
+#line 3385 "querytransformparser.ypp"
     {
         (yyval.enums.pathKind) = Path::XSLTForEach;
@@ -6294 +6290 @@
   case 294:
 /* Line 1269 of yacc.c.  */
-#line 3332 "querytransformparser.ypp"
+#line 3389 "querytransformparser.ypp"
     {
         (yyval.enums.pathKind) = Path::ForApplyTemplate;
@@ -6302 +6298 @@
   case 296:
 /* Line 1269 of yacc.c.  */
-#line 3338 "querytransformparser.ypp"
+#line 3395 "querytransformparser.ypp"
     {
         (yyval.expr) = create(GenericPredicate::create((yyvsp[(1) - (4)].expr), (yyvsp[(3) - (4)].expr), parseInfo->staticContext, fromYYLTYPE((yyloc), parseInfo)), (yyloc), parseInfo);
@@ -6310 +6306 @@
   case 299:
 /* Line 1269 of yacc.c.  */
-#line 3346 "querytransformparser.ypp"
+#line 3403 "querytransformparser.ypp"
     {
                 if((yyvsp[(1) - (1)].enums.axis) == QXmlNodeModelIndex::AxisAttribute)
@@ -6319 +6315 @@
   case 300:
 /* Line 1269 of yacc.c.  */
-#line 3351 "querytransformparser.ypp"
+#line 3408 "querytransformparser.ypp"
     {
         if((yyvsp[(3) - (3)].itemType))
@@ -6348 +6344 @@
   case 304:
 /* Line 1269 of yacc.c.  */
-#line 3381 "querytransformparser.ypp"
+#line 3438 "querytransformparser.ypp"
     {
         if((yyvsp[(1) - (2)].enums.axis) == QXmlNodeModelIndex::AxisNamespace)
@@ -6360 +6356 @@
         else
             (yyval.enums.axis) = (yyvsp[(1) - (2)].enums.axis);
+
+        switch((yyvsp[(1) - (2)].enums.axis))
+        {
+            case QXmlNodeModelIndex::AxisAttribute:
+            {
+                allowedIn(QueryLanguages(  QXmlQuery::XPath20
+                                         | QXmlQuery::XQuery10
+                                         | QXmlQuery::XmlSchema11IdentityConstraintField
+                                         | QXmlQuery::XSLT20),
+                          parseInfo, (yyloc));
+                break;
+            }
+            case QXmlNodeModelIndex::AxisChild:
+            {
+                allowedIn(QueryLanguages(  QXmlQuery::XPath20
+                                         | QXmlQuery::XQuery10
+                                         | QXmlQuery::XmlSchema11IdentityConstraintField
+                                         | QXmlQuery::XmlSchema11IdentityConstraintSelector
+                                         | QXmlQuery::XSLT20),
+                          parseInfo, (yyloc));
+                break;
+            }
+            default:
+            {
+                allowedIn(QueryLanguages(  QXmlQuery::XPath20
+                                         | QXmlQuery::XQuery10
+                                         | QXmlQuery::XSLT20),
+                          parseInfo, (yyloc));
+            }
+        }
     }
     break;
@@ -6365 +6391 @@
   case 305:
 /* Line 1269 of yacc.c.  */
-#line 3394 "querytransformparser.ypp"
+#line 3481 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAncestorOrSelf  ;}
     break;
@@ -6371 +6397 @@
   case 306:
 /* Line 1269 of yacc.c.  */
-#line 3395 "querytransformparser.ypp"
+#line 3482 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAncestor        ;}
     break;
@@ -6377 +6403 @@
   case 307:
 /* Line 1269 of yacc.c.  */
-#line 3396 "querytransformparser.ypp"
+#line 3483 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisAttribute       ;}
     break;
@@ -6383 +6409 @@
   case 308:
 /* Line 1269 of yacc.c.  */
-#line 3397 "querytransformparser.ypp"
+#line 3484 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisChild           ;}
     break;
@@ -6389 +6415 @@
   case 309:
 /* Line 1269 of yacc.c.  */
-#line 3398 "querytransformparser.ypp"
+#line 3485 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisDescendantOrSelf;}
     break;
@@ -6395 +6421 @@
   case 310:
 /* Line 1269 of yacc.c.  */
-#line 3399 "querytransformparser.ypp"
+#line 3486 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisDescendant      ;}
     break;
@@ -6401 +6427 @@
   case 311:
 /* Line 1269 of yacc.c.  */
-#line 3400 "querytransformparser.ypp"
+#line 3487 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisFollowing       ;}
     break;
@@ -6407 +6433 @@
   case 312:
 /* Line 1269 of yacc.c.  */
-#line 3401 "querytransformparser.ypp"
+#line 3488 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisPreceding       ;}
     break;
@@ -6413 +6439 @@
   case 313:
 /* Line 1269 of yacc.c.  */
-#line 3402 "querytransformparser.ypp"
+#line 3489 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisFollowingSibling;}
     break;
@@ -6419 +6445 @@
   case 314:
 /* Line 1269 of yacc.c.  */
-#line 3403 "querytransformparser.ypp"
+#line 3490 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisPrecedingSibling;}
     break;
@@ -6425 +6451 @@
   case 315:
 /* Line 1269 of yacc.c.  */
-#line 3404 "querytransformparser.ypp"
+#line 3491 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisParent          ;}
     break;
@@ -6431 +6457 @@
   case 316:
 /* Line 1269 of yacc.c.  */
-#line 3405 "querytransformparser.ypp"
+#line 3492 "querytransformparser.ypp"
     {(yyval.enums.axis) = QXmlNodeModelIndex::AxisSelf            ;}
     break;
@@ -6437 +6463 @@
   case 317:
 /* Line 1269 of yacc.c.  */
-#line 3408 "querytransformparser.ypp"
+#line 3495 "querytransformparser.ypp"
     {
                         parseInfo->nodeTestSource = BuiltinTypes::attribute;
@@ -6445 +6471 @@
   case 318:
 /* Line 1269 of yacc.c.  */
-#line 3412 "querytransformparser.ypp"
-    {
+#line 3499 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XSLT20 | QXmlQuery::XmlSchema11IdentityConstraintField), parseInfo, (yyloc));
         (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisAttribute, (yyvsp[(3) - (3)].itemType)), (yyloc), parseInfo);
 
@@ -6455 +6482 @@
   case 319:
 /* Line 1269 of yacc.c.  */
-#line 3418 "querytransformparser.ypp"
+#line 3506 "querytransformparser.ypp"
     {
         ItemType::Ptr nodeTest;
@@ -6470 +6497 @@
   case 320:
 /* Line 1269 of yacc.c.  */
-#line 3429 "querytransformparser.ypp"
+#line 3517 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisAttribute, (yyvsp[(1) - (1)].itemType)), (yyloc), parseInfo);
@@ -6478 +6505 @@
   case 322:
 /* Line 1269 of yacc.c.  */
-#line 3436 "querytransformparser.ypp"
+#line 3524 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new AxisStep(QXmlNodeModelIndex::AxisParent, BuiltinTypes::node), (yyloc), parseInfo);
@@ -6484 +6511 @@
     break;
 
+  case 324:
+/* Line 1269 of yacc.c.  */
+#line 3530 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
+    }
+    break;
+
   case 325:
 /* Line 1269 of yacc.c.  */
-#line 3444 "querytransformparser.ypp"
+#line 3535 "querytransformparser.ypp"
     {
         (yyval.itemType) = QNameTest::create(parseInfo->nodeTestSource, (yyvsp[(1) - (1)].qName));
@@ -6494 +6529 @@
   case 327:
 /* Line 1269 of yacc.c.  */
-#line 3450 "querytransformparser.ypp"
+#line 3541 "querytransformparser.ypp"
     {
         (yyval.itemType) = parseInfo->nodeTestSource;
@@ -6502 +6537 @@
   case 328:
 /* Line 1269 of yacc.c.  */
-#line 3454 "querytransformparser.ypp"
+#line 3545 "querytransformparser.ypp"
     {
         const NamePool::Ptr np(parseInfo->staticContext->namePool());
@@ -6515 +6550 @@
   case 329:
 /* Line 1269 of yacc.c.  */
-#line 3463 "querytransformparser.ypp"
-    {
+#line 3554 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         const QXmlName::LocalNameCode c = parseInfo->staticContext->namePool()->allocateLocalName((yyvsp[(1) - (1)].sval));
         (yyval.itemType) = LocalNameTest::create(parseInfo->nodeTestSource, c);
@@ -6524 +6560 @@
   case 331:
 /* Line 1269 of yacc.c.  */
-#line 3470 "querytransformparser.ypp"
-    {
+#line 3562 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(GenericPredicate::create((yyvsp[(1) - (4)].expr), (yyvsp[(3) - (4)].expr), parseInfo->staticContext, fromYYLTYPE((yylsp[(4) - (4)]), parseInfo)), (yyloc), parseInfo);
     }
@@ -6532 +6569 @@
   case 339:
 /* Line 1269 of yacc.c.  */
-#line 3482 "querytransformparser.ypp"
+#line 3575 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new ApplyTemplate(parseInfo->modeFor((yyvsp[(2) - (5)].qName)),
@@ -6545 +6582 @@
   case 341:
 /* Line 1269 of yacc.c.  */
-#line 3493 "querytransformparser.ypp"
+#line 3586 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new Literal(AtomicString::fromValue((yyvsp[(1) - (1)].sval))), (yyloc), parseInfo);
@@ -6553 +6590 @@
   case 342:
 /* Line 1269 of yacc.c.  */
-#line 3498 "querytransformparser.ypp"
-    {
+#line 3591 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = createNumericLiteral<Double>((yyvsp[(1) - (1)].sval), (yyloc), parseInfo);
     }
@@ -6561 +6599 @@
   case 343:
 /* Line 1269 of yacc.c.  */
-#line 3502 "querytransformparser.ypp"
-    {
+#line 3596 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = createNumericLiteral<Numeric>((yyvsp[(1) - (1)].sval), (yyloc), parseInfo);
     }
@@ -6569 +6608 @@
   case 344:
 /* Line 1269 of yacc.c.  */
-#line 3507 "querytransformparser.ypp"
-    {
+#line 3602 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = resolveVariable((yyvsp[(2) - (2)].qName), (yyloc), parseInfo, false);
     }
@@ -6577 +6617 @@
   case 345:
 /* Line 1269 of yacc.c.  */
-#line 3512 "querytransformparser.ypp"
+#line 3608 "querytransformparser.ypp"
     {
         /* See: http://www.w3.org/TR/xpath20/#id-variables */
@@ -6586 +6626 @@
   case 346:
 /* Line 1269 of yacc.c.  */
-#line 3517 "querytransformparser.ypp"
+#line 3613 "querytransformparser.ypp"
     {
         (yyval.qName) = (yyvsp[(1) - (1)].qName);
@@ -6594 +6634 @@
   case 347:
 /* Line 1269 of yacc.c.  */
-#line 3522 "querytransformparser.ypp"
-    {
+#line 3618 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = (yyvsp[(2) - (3)].expr);
     }
@@ -6602 +6643 @@
   case 348:
 /* Line 1269 of yacc.c.  */
-#line 3526 "querytransformparser.ypp"
-    {
+#line 3623 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         (yyval.expr) = create(new EmptySequence, (yyloc), parseInfo);
     }
@@ -6610 +6652 @@
   case 349:
 /* Line 1269 of yacc.c.  */
-#line 3531 "querytransformparser.ypp"
+#line 3629 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new ContextItem(), (yyloc), parseInfo);
@@ -6618 +6660 @@
   case 350:
 /* Line 1269 of yacc.c.  */
-#line 3536 "querytransformparser.ypp"
+#line 3634 "querytransformparser.ypp"
     {
         (yyval.expr) = (yyvsp[(2) - (2)].expr);
@@ -6626 +6668 @@
   case 351:
 /* Line 1269 of yacc.c.  */
-#line 3541 "querytransformparser.ypp"
-    {
+#line 3639 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
         if(XPathHelper::isReservedNamespace((yyvsp[(1) - (4)].qName).namespaceURI()) || (yyvsp[(1) - (4)].qName).namespaceURI() == StandardNamespaces::InternalXSLT)
         { /* We got a call to a builtin function. */
@@ -6640 +6683 @@
             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(), (yyvsp[(1) - (4)].qName))),
                                                 ReportContext::XPST0017, fromYYLTYPE((yyloc), parseInfo));
@@ -6657 +6700 @@
   case 352:
 /* Line 1269 of yacc.c.  */
-#line 3569 "querytransformparser.ypp"
+#line 3668 "querytransformparser.ypp"
     {
         (yyval.expressionList) = Expression::List();
@@ -6665 +6708 @@
   case 353:
 /* Line 1269 of yacc.c.  */
-#line 3574 "querytransformparser.ypp"
+#line 3673 "querytransformparser.ypp"
     {
         Expression::List list;
@@ -6675 +6718 @@
   case 355:
 /* Line 1269 of yacc.c.  */
-#line 3583 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc));
+#line 3682 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc));
     }
     break;
@@ -6683 +6726 @@
   case 360:
 /* Line 1269 of yacc.c.  */
-#line 3624 "querytransformparser.ypp"
+#line 3726 "querytransformparser.ypp"
     {
                         (yyval.enums.tokenizerPosition) = parseInfo->tokenizer->commenceScanOnly();
@@ -6692 +6735 @@
   case 361:
 /* Line 1269 of yacc.c.  */
-#line 3633 "querytransformparser.ypp"
+#line 3735 "querytransformparser.ypp"
     {
                         ++parseInfo->elementConstructorDepth;
@@ -6840 +6883 @@
   case 362:
 /* Line 1269 of yacc.c.  */
-#line 3779 "querytransformparser.ypp"
+#line 3881 "querytransformparser.ypp"
     {
         /* We add the content constructor after the attribute constructors. This might result
@@ -6890 +6933 @@
                 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((yyloc), parseInfo));
@@ -6939 +6982 @@
   case 363:
 /* Line 1269 of yacc.c.  */
-#line 3875 "querytransformparser.ypp"
+#line 3977 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new EmptySequence(), (yyloc), parseInfo);
@@ -6947 +6990 @@
   case 364:
 /* Line 1269 of yacc.c.  */
-#line 3879 "querytransformparser.ypp"
+#line 3981 "querytransformparser.ypp"
     {
         if(!(yyvsp[(4) - (5)].qName).isLexicallyEqual(parseInfo->tagStack.top()))
@@ -6969 +7012 @@
   case 365:
 /* Line 1269 of yacc.c.  */
-#line 3898 "querytransformparser.ypp"
+#line 4000 "querytransformparser.ypp"
     {
         (yyval.attributeHolders) = AttributeHolderVector();
@@ -6977 +7020 @@
   case 366:
 /* Line 1269 of yacc.c.  */
-#line 3902 "querytransformparser.ypp"
+#line 4004 "querytransformparser.ypp"
     {
         (yyvsp[(1) - (2)].attributeHolders).append((yyvsp[(2) - (2)].attributeHolder));
@@ -6986 +7029 @@
   case 367:
 /* Line 1269 of yacc.c.  */
-#line 3908 "querytransformparser.ypp"
+#line 4010 "querytransformparser.ypp"
     {
         (yyval.attributeHolder) = qMakePair((yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].expr));
@@ -6994 +7037 @@
   case 368:
 /* Line 1269 of yacc.c.  */
-#line 3913 "querytransformparser.ypp"
+#line 4015 "querytransformparser.ypp"
     {
         (yyval.expr) = createDirAttributeValue((yyvsp[(2) - (3)].expressionList), parseInfo, (yyloc));
@@ -7002 +7045 @@
   case 369:
 /* Line 1269 of yacc.c.  */
-#line 3918 "querytransformparser.ypp"
+#line 4020 "querytransformparser.ypp"
     {
         (yyval.expr) = createDirAttributeValue((yyvsp[(2) - (3)].expressionList), parseInfo, (yyloc));
@@ -7010 +7053 @@
   case 370:
 /* Line 1269 of yacc.c.  */
-#line 3923 "querytransformparser.ypp"
+#line 4025 "querytransformparser.ypp"
     {
         (yyval.expressionList) = Expression::List();
@@ -7018 +7061 @@
   case 371:
 /* Line 1269 of yacc.c.  */
-#line 3927 "querytransformparser.ypp"
+#line 4029 "querytransformparser.ypp"
     {
         Expression::Ptr content((yyvsp[(1) - (2)].expr));
@@ -7032 +7075 @@
   case 372:
 /* Line 1269 of yacc.c.  */
-#line 3937 "querytransformparser.ypp"
+#line 4039 "querytransformparser.ypp"
     {
         (yyvsp[(2) - (2)].expressionList).prepend(create(new Literal(AtomicString::fromValue((yyvsp[(1) - (2)].sval))), (yyloc), parseInfo));
@@ -7041 +7084 @@
   case 373:
 /* Line 1269 of yacc.c.  */
-#line 3943 "querytransformparser.ypp"
+#line 4045 "querytransformparser.ypp"
     {
         (yyval.expressionList) = Expression::List();
@@ -7050 +7093 @@
   case 374:
 /* Line 1269 of yacc.c.  */
-#line 3948 "querytransformparser.ypp"
+#line 4050 "querytransformparser.ypp"
     {
         (yyvsp[(1) - (2)].expressionList).append((yyvsp[(2) - (2)].expr));
@@ -7060 +7103 @@
   case 375:
 /* Line 1269 of yacc.c.  */
-#line 3954 "querytransformparser.ypp"
+#line 4056 "querytransformparser.ypp"
     {
         if(parseInfo->staticContext->boundarySpacePolicy() == StaticContext::BSPStrip &&
@@ -7078 +7121 @@
   case 376:
 /* Line 1269 of yacc.c.  */
-#line 3968 "querytransformparser.ypp"
+#line 4070 "querytransformparser.ypp"
     {
         (yyvsp[(1) - (2)].expressionList).append(create(new TextNodeConstructor(create(new Literal(AtomicString::fromValue((yyvsp[(2) - (2)].sval))), (yyloc), parseInfo)), (yyloc), parseInfo));
@@ -7088 +7131 @@
   case 377:
 /* Line 1269 of yacc.c.  */
-#line 3974 "querytransformparser.ypp"
+#line 4076 "querytransformparser.ypp"
     {
         /* We insert a text node constructor that send an empty text node between
@@ -7108 +7151 @@
   case 378:
 /* Line 1269 of yacc.c.  */
-#line 3991 "querytransformparser.ypp"
+#line 4093 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new CommentConstructor(create(new Literal(AtomicString::fromValue((yyvsp[(2) - (2)].sval))), (yyloc), parseInfo)), (yyloc), parseInfo);
@@ -7116 +7159 @@
   case 379:
 /* Line 1269 of yacc.c.  */
-#line 3996 "querytransformparser.ypp"
+#line 4098 "querytransformparser.ypp"
     {
         const ReflectYYLTYPE ryy((yyloc), parseInfo);
@@ -7132 +7175 @@
   case 387:
 /* Line 1269 of yacc.c.  */
-#line 4017 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (3)].enums.Bool));
+#line 4119 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (3)].enums.Bool));
 
         (yyval.expr) = create(new DocumentConstructor((yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
@@ -7142 +7185 @@
   case 388:
 /* Line 1269 of yacc.c.  */
-#line 4024 "querytransformparser.ypp"
+#line 4126 "querytransformparser.ypp"
     {
                         /* This value is incremented before the action below is executed. */
@@ -7151 +7194 @@
   case 389:
 /* Line 1269 of yacc.c.  */
-#line 4029 "querytransformparser.ypp"
+#line 4131 "querytransformparser.ypp"
     {
         Q_ASSERT(5);
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (5)].enums.Bool));
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (5)].enums.Bool));
 
         Expression::Ptr effExpr;
@@ -7188 +7231 @@
   case 390:
 /* Line 1269 of yacc.c.  */
-#line 4063 "querytransformparser.ypp"
+#line 4165 "querytransformparser.ypp"
     {
         (yyval.enums.Bool) = false;
@@ -7196 +7239 @@
   case 391:
 /* Line 1269 of yacc.c.  */
-#line 4067 "querytransformparser.ypp"
+#line 4169 "querytransformparser.ypp"
     {
         (yyval.enums.Bool) = true;
@@ -7204 +7247 @@
   case 392:
 /* Line 1269 of yacc.c.  */
-#line 4075 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (4)].enums.Bool));
+#line 4177 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (4)].enums.Bool));
 
         const Expression::Ptr name(create(new AttributeNameValidator((yyvsp[(3) - (4)].expr)), (yyloc), parseInfo));
@@ -7219 +7262 @@
   case 393:
 /* Line 1269 of yacc.c.  */
-#line 4087 "querytransformparser.ypp"
+#line 4189 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new TextNodeConstructor(createSimpleContent((yyvsp[(3) - (3)].expr), (yyloc), parseInfo)), (yyloc), parseInfo);
@@ -7227 +7270 @@
   case 394:
 /* Line 1269 of yacc.c.  */
-#line 4092 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (3)].enums.Bool));
+#line 4194 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (3)].enums.Bool));
 
         (yyval.expr) = create(new CommentConstructor(createSimpleContent((yyvsp[(3) - (3)].expr), (yyloc), parseInfo)), (yyloc), parseInfo);
@@ -7237 +7280 @@
   case 395:
 /* Line 1269 of yacc.c.  */
-#line 4099 "querytransformparser.ypp"
-    {
-        disallowedConstruct(parseInfo, (yyloc), (yyvsp[(2) - (3)].expr));
+#line 4201 "querytransformparser.ypp"
+    {
+        allowedIn(QXmlQuery::XQuery10, parseInfo, (yyloc), (yyvsp[(2) - (3)].expr));
 
         if((yyvsp[(3) - (3)].expr))
@@ -7252 +7295 @@
   case 396:
 /* Line 1269 of yacc.c.  */
-#line 4110 "querytransformparser.ypp"
+#line 4212 "querytransformparser.ypp"
     {
                         parseInfo->nodeTestSource = BuiltinTypes::attribute;
@@ -7260 +7303 @@
   case 397:
 /* Line 1269 of yacc.c.  */
-#line 4114 "querytransformparser.ypp"
+#line 4216 "querytransformparser.ypp"
     {
                         parseInfo->restoreNodeTestSource();
@@ -7268 +7311 @@
   case 398:
 /* Line 1269 of yacc.c.  */
-#line 4117 "querytransformparser.ypp"
+#line 4219 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new Literal(toItem(QNameValue::fromValue(parseInfo->staticContext->namePool(), (yyvsp[(2) - (3)].qName)))), (yyloc), parseInfo);
@@ -7276 +7319 @@
   case 400:
 /* Line 1269 of yacc.c.  */
-#line 4123 "querytransformparser.ypp"
+#line 4225 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new Literal(toItem(QNameValue::fromValue(parseInfo->staticContext->namePool(), (yyvsp[(1) - (1)].qName)))), (yyloc), parseInfo);
@@ -7284 +7327 @@
   case 402:
 /* Line 1269 of yacc.c.  */
-#line 4129 "querytransformparser.ypp"
+#line 4231 "querytransformparser.ypp"
     {
         if(BuiltinTypes::xsQName->xdtTypeMatches((yyvsp[(1) - (1)].expr)->staticType()->itemType()))
@@ -7299 +7342 @@
   case 403:
 /* Line 1269 of yacc.c.  */
-#line 4144 "querytransformparser.ypp"
+#line 4246 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new NCNameConstructor(create(new Literal(AtomicString::fromValue((yyvsp[(1) - (1)].sval))), (yyloc), parseInfo)), (yyloc), parseInfo);
@@ -7307 +7350 @@
   case 404:
 /* Line 1269 of yacc.c.  */
-#line 4148 "querytransformparser.ypp"
+#line 4250 "querytransformparser.ypp"
     {
         (yyval.expr) = create(new NCNameConstructor((yyvsp[(1) - (1)].expr)), (yyloc), parseInfo);
@@ -7315 +7358 @@
   case 405:
 /* Line 1269 of yacc.c.  */
-#line 4157 "querytransformparser.ypp"
+#line 4259 "querytransformparser.ypp"
     {
     (yyval.expr) = create(new ComputedNamespaceConstructor((yyvsp[(2) - (3)].expr), (yyvsp[(3) - (3)].expr)), (yyloc), parseInfo);
@@ -7323 +7366 @@
   case 406:
 /* Line 1269 of yacc.c.  */
-#line 4162 "querytransformparser.ypp"
+#line 4264 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = makeGenericSequenceType((yyvsp[(1) - (1)].itemType), Cardinality::exactlyOne());
@@ -7331 +7374 @@
   case 407:
 /* Line 1269 of yacc.c.  */
-#line 4166 "querytransformparser.ypp"
+#line 4268 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = makeGenericSequenceType((yyvsp[(1) - (2)].itemType), Cardinality::zeroOrOne());
@@ -7339 +7382 @@
   case 408:
 /* Line 1269 of yacc.c.  */
-#line 4171 "querytransformparser.ypp"
+#line 4273 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = CommonSequenceTypes::ZeroOrMoreItems;
@@ -7347 +7390 @@
   case 409:
 /* Line 1269 of yacc.c.  */
-#line 4175 "querytransformparser.ypp"
+#line 4277 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = (yyvsp[(2) - (2)].sequenceType);
@@ -7355 +7398 @@
   case 410:
 /* Line 1269 of yacc.c.  */
-#line 4180 "querytransformparser.ypp"
+#line 4282 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = makeGenericSequenceType((yyvsp[(1) - (2)].itemType), (yyvsp[(2) - (2)].cardinality));
@@ -7363 +7406 @@
   case 411:
 /* Line 1269 of yacc.c.  */
-#line 4185 "querytransformparser.ypp"
+#line 4287 "querytransformparser.ypp"
     {
         (yyval.sequenceType) = CommonSequenceTypes::Empty;
@@ -7371 +7414 @@
   case 412:
 /* Line 1269 of yacc.c.  */
-#line 4189 "querytransformparser.ypp"
+#line 4291 "querytransformparser.ypp"
     {(yyval.cardinality) = Cardinality::exactlyOne();}
     break;
@@ -7377 +7420 @@
   case 413:
 /* Line 1269 of yacc.c.  */
-#line 4190 "querytransformparser.ypp"
+#line 4292 "querytransformparser.ypp"
     {(yyval.cardinality) = Cardinality::oneOrMore();}
     break;
@@ -7383 +7426 @@
   case 414:
 /* Line 1269 of yacc.c.  */
-#line 4191 "querytransformparser.ypp"
+#line 4293 "querytransformparser.ypp"
     {(yyval.cardinality) = Cardinality::zeroOrMore();}
     break;
@@ -7389 +7432 @@
   case 415:
 /* Line 1269 of yacc.c.  */
-#line 4192 "querytransformparser.ypp"
+#line 4294 "querytransformparser.ypp"
     {(yyval.cardinality) = Cardinality::zeroOrOne();}
     break;
@@ -7395 +7438 @@
   case 419:
 /* Line 1269 of yacc.c.  */
-#line 4198 "querytransformparser.ypp"
+#line 4300 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::item;
@@ -7403 +7446 @@
   case 420:
 /* Line 1269 of yacc.c.  */
-#line 4203 "querytransformparser.ypp"
+#line 4305 "querytransformparser.ypp"
     {
         const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[(1) - (1)].qName)));
@@ -7439 +7482 @@
   case 428:
 /* Line 1269 of yacc.c.  */
-#line 4247 "querytransformparser.ypp"
+#line 4349 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::node;
@@ -7447 +7490 @@
   case 429:
 /* Line 1269 of yacc.c.  */
-#line 4252 "querytransformparser.ypp"
+#line 4354 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::document;
@@ -7455 +7498 @@
   case 430:
 /* Line 1269 of yacc.c.  */
-#line 4257 "querytransformparser.ypp"
+#line 4359 "querytransformparser.ypp"
     {
         // TODO support for document element testing
@@ -7464 +7507 @@
   case 433:
 /* Line 1269 of yacc.c.  */
-#line 4266 "querytransformparser.ypp"
+#line 4368 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::text;
@@ -7472 +7515 @@
   case 434:
 /* Line 1269 of yacc.c.  */
-#line 4271 "querytransformparser.ypp"
+#line 4373 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::comment;
@@ -7480 +7523 @@
   case 435:
 /* Line 1269 of yacc.c.  */
-#line 4276 "querytransformparser.ypp"
+#line 4378 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::pi;
@@ -7488 +7531 @@
   case 436:
 /* Line 1269 of yacc.c.  */
-#line 4281 "querytransformparser.ypp"
+#line 4383 "querytransformparser.ypp"
     {
         (yyval.itemType) = LocalNameTest::create(BuiltinTypes::pi, parseInfo->staticContext->namePool()->allocateLocalName((yyvsp[(3) - (4)].sval)));
@@ -7496 +7539 @@
   case 437:
 /* Line 1269 of yacc.c.  */
-#line 4286 "querytransformparser.ypp"
+#line 4388 "querytransformparser.ypp"
     {
         if(QXmlUtils::isNCName((yyvsp[(3) - (4)].sval)))
@@ -7515 +7558 @@
   case 440:
 /* Line 1269 of yacc.c.  */
-#line 4305 "querytransformparser.ypp"
+#line 4407 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::attribute;
@@ -7523 +7566 @@
   case 441:
 /* Line 1269 of yacc.c.  */
-#line 4310 "querytransformparser.ypp"
+#line 4412 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::attribute;
@@ -7531 +7574 @@
   case 442:
 /* Line 1269 of yacc.c.  */
-#line 4315 "querytransformparser.ypp"
+#line 4417 "querytransformparser.ypp"
     {
         (yyval.itemType) = QNameTest::create(BuiltinTypes::attribute, (yyvsp[(3) - (4)].qName));
@@ -7539 +7582 @@
   case 443:
 /* Line 1269 of yacc.c.  */
-#line 4319 "querytransformparser.ypp"
+#line 4421 "querytransformparser.ypp"
     {
         const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[(5) - (6)].qName)));
@@ -7555 +7598 @@
   case 444:
 /* Line 1269 of yacc.c.  */
-#line 4331 "querytransformparser.ypp"
+#line 4433 "querytransformparser.ypp"
     {
         const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[(5) - (6)].qName)));
@@ -7571 +7614 @@
   case 445:
 /* Line 1269 of yacc.c.  */
-#line 4344 "querytransformparser.ypp"
+#line 4446 "querytransformparser.ypp"
     {
         parseInfo->staticContext->error(QtXmlPatterns::tr("%1 is not in the in-scope attribute "
@@ -7584 +7627 @@
   case 446:
 /* Line 1269 of yacc.c.  */
-#line 4354 "querytransformparser.ypp"
+#line 4456 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::element;
@@ -7592 +7635 @@
   case 447:
 /* Line 1269 of yacc.c.  */
-#line 4359 "querytransformparser.ypp"
+#line 4461 "querytransformparser.ypp"
     {
         (yyval.itemType) = BuiltinTypes::element;
@@ -7600 +7643 @@
   case 448:
 /* Line 1269 of yacc.c.  */
-#line 4364 "querytransformparser.ypp"
+#line 4466 "querytransformparser.ypp"
     {
         (yyval.itemType) = QNameTest::create(BuiltinTypes::element, (yyvsp[(3) - (4)].qName));
@@ -7608 +7651 @@
   case 449:
 /* Line 1269 of yacc.c.  */
-#line 4369 "querytransformparser.ypp"
+#line 4471 "querytransformparser.ypp"
     {
         const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[(5) - (7)].qName)));
@@ -7625 +7668 @@
   case 450:
 /* Line 1269 of yacc.c.  */
-#line 4383 "querytransformparser.ypp"
+#line 4485 "querytransformparser.ypp"
     {
         const SchemaType::Ptr t(parseInfo->staticContext->schemaDefinitions()->createSchemaType((yyvsp[(5) - (7)].qName)));
@@ -7642 +7685 @@
   case 453:
 /* Line 1269 of yacc.c.  */
-#line 4400 "querytransformparser.ypp"
+#line 4502 "querytransformparser.ypp"
     {
         parseInfo->staticContext->error(QtXmlPatterns::tr("%1 is not in the in-scope attribute "
@@ -7655 +7698 @@
   case 455:
 /* Line 1269 of yacc.c.  */
-#line 4412 "querytransformparser.ypp"
+#line 4514 "querytransformparser.ypp"
     {
         (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::empty, (yyvsp[(1) - (1)].sval));
@@ -7663 +7706 @@
   case 457:
 /* Line 1269 of yacc.c.  */
-#line 4424 "querytransformparser.ypp"
+#line 4526 "querytransformparser.ypp"
     {
         if(parseInfo->nodeTestSource == BuiltinTypes::element)
@@ -7674 +7717 @@
   case 462:
 /* Line 1269 of yacc.c.  */
-#line 4438 "querytransformparser.ypp"
+#line 4540 "querytransformparser.ypp"
     {
         (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(parseInfo->staticContext->defaultFunctionNamespace(), (yyvsp[(1) - (1)].sval));
@@ -7682 +7725 @@
   case 463:
 /* Line 1269 of yacc.c.  */
-#line 4442 "querytransformparser.ypp"
+#line 4544 "querytransformparser.ypp"
     {
         (yyval.qName) = parseInfo->staticContext->namePool()->allocateQName(StandardNamespaces::InternalXSLT, (yyvsp[(2) - (2)].sval));
@@ -7690 +7733 @@
   case 466:
 /* Line 1269 of yacc.c.  */
-#line 4450 "querytransformparser.ypp"
+#line 4552 "querytransformparser.ypp"
     {
         parseInfo->staticContext->error(QtXmlPatterns::tr("The name of an extension expression must be in "
@@ -7698 +7741 @@
     break;
 
+  case 469:
+/* Line 1269 of yacc.c.  */
+#line 4562 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
+    }
+    break;
+
+  case 470:
+/* Line 1269 of yacc.c.  */
+#line 4566 "querytransformparser.ypp"
+    {
+        allowedIn(QueryLanguages(QXmlQuery::XQuery10 | QXmlQuery::XPath20), parseInfo, (yyloc));
+    }
+    break;
+
   case 471:
 /* Line 1269 of yacc.c.  */
-#line 4463 "querytransformparser.ypp"
+#line 4571 "querytransformparser.ypp"
     {
 
@@ -7716 +7775 @@
   case 472:
 /* Line 1269 of yacc.c.  */
-#line 4475 "querytransformparser.ypp"
+#line 4583 "querytransformparser.ypp"
     {
         (yyval.qName) = parseInfo->staticContext->namePool()->fromClarkName((yyvsp[(1) - (1)].sval));
@@ -7724 +7783 @@
 
 /* Line 1269 of yacc.c.  */
-#line 7643 "qquerytransformparser.cpp"
+#line 7763 "qquerytransformparser.cpp"
       default: break;
     }
@@ -7942 +8001 @@
 
 /* Line 1486 of yacc.c.  */
-#line 4479 "querytransformparser.ypp"
+#line 4587 "querytransformparser.ypp"