Merge lp:~zorba-coders/zorba/hof-next into lp:zorba
- hof-next
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Markos Zaharioudakis |
Approved revision: | 11328 |
Merged at revision: | 11325 |
Proposed branch: | lp:~zorba-coders/zorba/hof-next |
Merge into: | lp:zorba |
Diff against target: |
341 lines (+88/-121) 4 files modified
src/compiler/translator/translator.cpp (+86/-70) test/fots/CMakeLists.txt (+0/-1) test/rbkt/Queries/w3c_known_failures.txt (+1/-50) test/rbkt/Queries/w3c_known_failures_XQueryX.txt (+1/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/hof-next |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | Approve | ||
Review via email: mp+155722@code.launchpad.net |
Commit message
fixed function coersion
Description of the change
fixed function coersion
Markos Zaharioudakis (markos-za) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/hof-next into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job hof-next-
final status was:
2 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
- 11327. By Markos Zaharioudakis
-
added expected w3c failure
- 11328. By Markos Zaharioudakis
-
added expected w3c failure
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job hof-next-
All tests succeeded!
Preview Diff
1 | === modified file 'src/compiler/translator/translator.cpp' | |||
2 | --- src/compiler/translator/translator.cpp 2013-03-27 09:32:22 +0000 | |||
3 | +++ src/compiler/translator/translator.cpp 2013-03-27 15:43:22 +0000 | |||
4 | @@ -1517,14 +1517,21 @@ | |||
5 | 1517 | PROMOTE_FUNC_PARAM, | 1517 | PROMOTE_FUNC_PARAM, |
6 | 1518 | func->getName()); | 1518 | func->getName()); |
7 | 1519 | } | 1519 | } |
8 | 1520 | else if (paramType->type_kind() == XQType::FUNCTION_TYPE_KIND) | ||
9 | 1521 | { | ||
10 | 1522 | // function coercion | ||
11 | 1523 | argExpr = wrap_in_coercion(paramType, argExpr, loc); | ||
12 | 1524 | |||
13 | 1525 | xqtref_t cardType = tm->create_any_item_type(paramType->get_quantifier()); | ||
14 | 1526 | |||
15 | 1527 | argExpr = wrap_in_type_match(argExpr, | ||
16 | 1528 | cardType, | ||
17 | 1529 | loc, | ||
18 | 1530 | TREAT_FUNC_PARAM, | ||
19 | 1531 | func->getName()); | ||
20 | 1532 | } | ||
21 | 1520 | else | 1533 | else |
22 | 1521 | { | 1534 | { |
23 | 1522 | if (paramType->type_kind() == XQType::FUNCTION_TYPE_KIND) | ||
24 | 1523 | { | ||
25 | 1524 | // function coercion | ||
26 | 1525 | argExpr = wrap_in_coercion(paramType, argExpr, loc, theCCB); | ||
27 | 1526 | } | ||
28 | 1527 | |||
29 | 1528 | argExpr = wrap_in_type_match(argExpr, | 1535 | argExpr = wrap_in_type_match(argExpr, |
30 | 1529 | paramType, | 1536 | paramType, |
31 | 1530 | loc, | 1537 | loc, |
32 | @@ -1538,83 +1545,94 @@ | |||
33 | 1538 | 1545 | ||
34 | 1539 | 1546 | ||
35 | 1540 | /******************************************************************************* | 1547 | /******************************************************************************* |
36 | 1548 | The coersion expr is a flwor that looks like this: | ||
37 | 1549 | |||
38 | 1550 | for $fi in argExpr | ||
39 | 1551 | return function($p1 as t1, ... $pn as tn) { $fi(p1, ..., pn) } | ||
40 | 1541 | 1552 | ||
41 | 1542 | ********************************************************************************/ | 1553 | ********************************************************************************/ |
42 | 1543 | expr* wrap_in_coercion( | 1554 | expr* wrap_in_coercion( |
43 | 1544 | xqtref_t targetType, | 1555 | xqtref_t targetType, |
48 | 1545 | expr* theExpr, | 1556 | expr* argExpr, |
49 | 1546 | const QueryLoc& loc, | 1557 | const QueryLoc& loc) |
46 | 1547 | CompilerCB* theCCB, | ||
47 | 1548 | bool is_func_return = false) | ||
50 | 1549 | { | 1558 | { |
56 | 1550 | const FunctionXQType* func_type = static_cast<const FunctionXQType*>(targetType.getp()); | 1559 | const FunctionXQType* funcType = |
57 | 1551 | 1560 | static_cast<const FunctionXQType*>(targetType.getp()); | |
58 | 1552 | // Create the dynamic call body | 1561 | |
59 | 1553 | 1562 | xqtref_t returnType = funcType->get_return_type(); | |
60 | 1554 | function_item_expr* fiExpr = | 1563 | |
61 | 1564 | push_scope(); | ||
62 | 1565 | |||
63 | 1566 | flwor_expr* coersionFlwor = CREATE(flwor)(theRootSctx, theUDF, loc, false); | ||
64 | 1567 | for_clause* fiClause = wrap_in_forclause(argExpr, NULL); | ||
65 | 1568 | var_expr* fiVar = fiClause->get_var(); | ||
66 | 1569 | coersionFlwor->add_clause(fiClause); | ||
67 | 1570 | |||
68 | 1571 | function_item_expr* inlineFuncExpr = | ||
69 | 1555 | CREATE(function_item)(theRootSctx, theUDF, loc, true, false, true); | 1572 | CREATE(function_item)(theRootSctx, theUDF, loc, true, false, true); |
70 | 1556 | 1573 | ||
87 | 1557 | push_nodestack(fiExpr); | 1574 | coersionFlwor->set_return_expr(inlineFuncExpr); |
88 | 1558 | 1575 | ||
89 | 1559 | push_scope(); | 1576 | var_expr* fiSubstVar = bind_var(loc, fiVar->get_name(), var_expr::hof_var); |
90 | 1560 | 1577 | ||
91 | 1561 | // handle the function item expression | 1578 | inlineFuncExpr->add_variable(fiVar, fiSubstVar, fiVar->get_name(), 0); |
92 | 1562 | flwor_expr* fnItem_flwor = CREATE(flwor)(theRootSctx, theUDF, loc, false); | 1579 | |
93 | 1563 | for_clause* fnItem_fc = wrap_in_forclause(theExpr, NULL); | 1580 | // Create the inline udf obj. |
94 | 1564 | var_expr* fnItem_var = fnItem_fc->get_var(); | 1581 | user_function_t inlineUDF = |
95 | 1565 | fnItem_flwor->add_clause(fnItem_fc); | 1582 | new user_function(loc, |
96 | 1566 | var_expr* inner_subst_var = bind_var(loc, fnItem_var->get_name(), var_expr::hof_var); | 1583 | signature(function_item_expr::create_inline_fname(loc), |
97 | 1567 | fiExpr->add_variable(fnItem_var, inner_subst_var, fnItem_var->get_name(), 0 /*var is not global*/); | 1584 | funcType->get_param_types(), |
98 | 1568 | 1585 | returnType), | |
99 | 1569 | // bind the function item variable in the inner flwor | 1586 | NULL, |
100 | 1570 | flwor_expr* inner_flwor = CREATE(flwor)(theRootSctx, theUDF, loc, false); | 1587 | SIMPLE_EXPR, |
101 | 1571 | 1588 | theCCB); | |
102 | 1572 | // Handle parameters. For each parameter, a let binding is added to the inner flwor. | 1589 | |
103 | 1590 | inlineFuncExpr->set_function(inlineUDF); | ||
104 | 1591 | |||
105 | 1592 | std::vector<var_expr*> argVars; | ||
106 | 1573 | std::vector<expr*> arguments; // Arguments to the dynamic function call | 1593 | std::vector<expr*> arguments; // Arguments to the dynamic function call |
126 | 1574 | for(csize i = 0; i < func_type->get_number_params(); i++) | 1594 | csize numParams = funcType->get_number_params(); |
127 | 1575 | { | 1595 | for(csize i = 0; i < numParams; ++i) |
128 | 1576 | xqtref_t paramType = func_type->operator[](i); | 1596 | { |
129 | 1577 | 1597 | xqtref_t paramType = funcType->operator[](i); | |
130 | 1578 | var_expr* arg_var = create_temp_var(loc, var_expr::arg_var); | 1598 | |
131 | 1579 | var_expr* subst_var = bind_var(loc, arg_var->get_name(), var_expr::let_var); | 1599 | var_expr* argVar = create_temp_var(loc, var_expr::arg_var); |
132 | 1580 | let_clause* lc = wrap_in_letclause(&*arg_var, subst_var); | 1600 | argVar->set_param_pos(i); |
133 | 1581 | 1601 | argVar->set_type(paramType); | |
134 | 1582 | arg_var->set_param_pos(inner_flwor->num_clauses()); | 1602 | argVars.push_back(argVar); |
135 | 1583 | arg_var->set_type(paramType); | 1603 | |
136 | 1584 | 1604 | expr* arg = CREATE(wrapper)(theRootSctx, theUDF, loc, argVar); | |
137 | 1585 | inner_flwor->add_clause(lc); | 1605 | arg = normalize_fo_arg(i, arg, inlineUDF, loc); |
138 | 1586 | 1606 | arguments.push_back(arg); | |
120 | 1587 | arguments.push_back(CREATE(wrapper)(theRootSctx, theUDF, loc, subst_var)); | ||
121 | 1588 | } | ||
122 | 1589 | |||
123 | 1590 | if (inner_flwor->num_clauses() == 0) | ||
124 | 1591 | { | ||
125 | 1592 | inner_flwor = NULL; | ||
139 | 1593 | } | 1607 | } |
140 | 1594 | 1608 | ||
141 | 1595 | expr* body = | 1609 | expr* body = |
142 | 1596 | CREATE(dynamic_function_invocation)(theRootSctx, | 1610 | CREATE(dynamic_function_invocation)(theRootSctx, |
143 | 1597 | theUDF, | 1611 | theUDF, |
144 | 1598 | loc, | 1612 | loc, |
146 | 1599 | CREATE(wrapper)(theRootSctx, theUDF, loc, inner_subst_var), | 1613 | CREATE(wrapper)(theRootSctx, theUDF, loc, |
147 | 1614 | fiSubstVar), | ||
148 | 1600 | arguments, | 1615 | arguments, |
149 | 1601 | NULL); | 1616 | NULL); |
150 | 1602 | 1617 | ||
157 | 1603 | create_inline_function(body, | 1618 | if (returnType->isBuiltinAtomicAny()) |
158 | 1604 | inner_flwor, | 1619 | { |
159 | 1605 | func_type->get_param_types(), | 1620 | body = wrap_in_type_promotion(body, returnType, PROMOTE_TYPE_PROMOTION); |
160 | 1606 | func_type->get_return_type(), | 1621 | } |
161 | 1607 | loc, | 1622 | else |
162 | 1608 | true); | 1623 | { |
163 | 1624 | body = wrap_in_type_match(body, returnType, loc, TREAT_TYPE_MATCH); | ||
164 | 1625 | } | ||
165 | 1609 | 1626 | ||
169 | 1610 | theExpr = pop_nodestack(); | 1627 | inlineUDF->setBody(body); |
170 | 1611 | fnItem_flwor->set_return_expr(theExpr); | 1628 | inlineUDF->setScriptingKind(body->get_scripting_detail()); |
171 | 1612 | theExpr = fnItem_flwor; | 1629 | inlineUDF->setArgVars(argVars); |
172 | 1630 | inlineUDF->setOptimized(true); | ||
173 | 1613 | 1631 | ||
174 | 1614 | // pop the scope. | 1632 | // pop the scope. |
175 | 1615 | pop_scope(); | 1633 | pop_scope(); |
176 | 1616 | 1634 | ||
178 | 1617 | return theExpr; | 1635 | return coersionFlwor; |
179 | 1618 | } | 1636 | } |
180 | 1619 | 1637 | ||
181 | 1620 | 1638 | ||
182 | @@ -3984,7 +4002,7 @@ | |||
183 | 3984 | // Wrap in coercion if the return type is a function item | 4002 | // Wrap in coercion if the return type is a function item |
184 | 3985 | if (returnType->type_kind() == XQType::FUNCTION_TYPE_KIND) | 4003 | if (returnType->type_kind() == XQType::FUNCTION_TYPE_KIND) |
185 | 3986 | { | 4004 | { |
187 | 3987 | body = wrap_in_coercion(returnType, body, loc, theCCB, true); | 4005 | body = wrap_in_coercion(returnType, body, loc); |
188 | 3988 | } | 4006 | } |
189 | 3989 | 4007 | ||
190 | 3990 | // If function has any params, they have been wraped in a flwor expr. Set the | 4008 | // If function has any params, they have been wraped in a flwor expr. Set the |
191 | @@ -12069,7 +12087,7 @@ | |||
192 | 12069 | } | 12087 | } |
193 | 12070 | } | 12088 | } |
194 | 12071 | 12089 | ||
196 | 12072 | create_inline_function(body, flwor, paramTypes, returnType, loc, false); | 12090 | create_inline_function(body, flwor, paramTypes, returnType, loc); |
197 | 12073 | 12091 | ||
198 | 12074 | // pop the scope. | 12092 | // pop the scope. |
199 | 12075 | pop_scope(); | 12093 | pop_scope(); |
200 | @@ -12084,8 +12102,7 @@ | |||
201 | 12084 | flwor_expr* flwor, | 12102 | flwor_expr* flwor, |
202 | 12085 | const std::vector<xqtref_t>& paramTypes, | 12103 | const std::vector<xqtref_t>& paramTypes, |
203 | 12086 | xqtref_t returnType, | 12104 | xqtref_t returnType, |
206 | 12087 | const QueryLoc& loc, | 12105 | const QueryLoc& loc) |
205 | 12088 | bool is_coercion) | ||
207 | 12089 | { | 12106 | { |
208 | 12090 | std::vector<var_expr*> argVars; | 12107 | std::vector<var_expr*> argVars; |
209 | 12091 | 12108 | ||
210 | @@ -12131,11 +12148,10 @@ | |||
211 | 12131 | // invoked in many other places, it is not possible to perform function | 12148 | // invoked in many other places, it is not possible to perform function |
212 | 12132 | // call normalization. Instead the domain expressions of arg vars is | 12149 | // call normalization. Instead the domain expressions of arg vars is |
213 | 12133 | // wrapped in type matches. | 12150 | // wrapped in type matches. |
219 | 12134 | if (!is_coercion) | 12151 | letClause->set_expr(normalize_fo_arg(i, |
220 | 12135 | letClause->set_expr(normalize_fo_arg(i, | 12152 | letClause->get_expr(), |
221 | 12136 | letClause->get_expr(), | 12153 | udf.getp(), |
222 | 12137 | udf.getp(), | 12154 | loc)); |
218 | 12138 | loc)); | ||
223 | 12139 | } | 12155 | } |
224 | 12140 | } | 12156 | } |
225 | 12141 | 12157 | ||
226 | 12142 | 12158 | ||
227 | === modified file 'test/fots/CMakeLists.txt' | |||
228 | --- test/fots/CMakeLists.txt 2013-03-27 09:26:16 +0000 | |||
229 | +++ test/fots/CMakeLists.txt 2013-03-27 15:43:22 +0000 | |||
230 | @@ -643,7 +643,6 @@ | |||
231 | 643 | EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-528 0) | 643 | EXPECTED_FOTS_FAILURE (fn-function-lookup fn-function-lookup-528 0) |
232 | 644 | EXPECTED_FOTS_FAILURE (fn-map-pairs fn-map-pairs-026 0) | 644 | EXPECTED_FOTS_FAILURE (fn-map-pairs fn-map-pairs-026 0) |
233 | 645 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions hof-036 0) | 645 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions hof-036 0) |
234 | 646 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions hof-919 0) | ||
235 | 647 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 0) | 646 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 0) |
236 | 648 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof14 0) | 647 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof14 0) |
237 | 649 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof15 0) | 648 | EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof15 0) |
238 | 650 | 649 | ||
239 | === modified file 'test/rbkt/Queries/w3c_known_failures.txt' | |||
240 | --- test/rbkt/Queries/w3c_known_failures.txt 2013-03-15 08:22:41 +0000 | |||
241 | +++ test/rbkt/Queries/w3c_known_failures.txt 2013-03-27 15:43:22 +0000 | |||
242 | @@ -4,34 +4,17 @@ | |||
243 | 4 | test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-01 | 4 | test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-01 |
244 | 5 | test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001 | 5 | test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001 |
245 | 6 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-013 | 6 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-013 |
258 | 7 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-006 | 7 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-044 |
247 | 8 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-012 | ||
248 | 9 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-009 | ||
249 | 10 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-001 | ||
250 | 11 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-008 | ||
251 | 12 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-011 | ||
252 | 13 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-002 | ||
253 | 14 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-004 | ||
254 | 15 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-005 | ||
255 | 16 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-003 | ||
256 | 17 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-010 | ||
257 | 18 | test/rbkt/w3c_testsuite/XQuery/Basics/EQNames/eqname-007 | ||
259 | 19 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-904 | 8 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-904 |
260 | 20 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-031 | 9 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-031 |
261 | 21 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-037 | 10 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-037 |
262 | 22 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-047 | 11 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-047 |
263 | 23 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-007 | ||
264 | 24 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-028 | ||
265 | 25 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-018 | ||
266 | 26 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-036 | 12 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-036 |
267 | 27 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-008 | 13 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-008 |
268 | 28 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-024 | 14 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-024 |
269 | 29 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-046 | 15 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-046 |
270 | 30 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-038 | 16 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-038 |
271 | 31 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-049 | ||
272 | 32 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-017 | ||
273 | 33 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-913 | 17 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-913 |
274 | 34 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-021 | ||
275 | 35 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-015 | 18 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-015 |
276 | 36 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-029 | 19 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-029 |
277 | 37 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-039 | 20 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-039 |
278 | @@ -39,7 +22,6 @@ | |||
279 | 39 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-915 | 22 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-915 |
280 | 40 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-916 | 23 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-916 |
281 | 41 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-030 | 24 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-030 |
282 | 42 | test/rbkt/w3c_testsuite/XQuery/Expressions/HigherOrder/hof-009 | ||
283 | 43 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7 | 25 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7 |
284 | 44 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8 | 26 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8 |
285 | 45 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10 | 27 | test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10 |
286 | @@ -48,43 +30,12 @@ | |||
287 | 48 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-001 | 30 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-001 |
288 | 49 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-002 | 31 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-002 |
289 | 50 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007 | 32 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007 |
290 | 51 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-902 | ||
291 | 52 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-004 | ||
292 | 53 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-901 | ||
293 | 54 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-903 | ||
294 | 55 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-005 | ||
295 | 56 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-006 | ||
296 | 57 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-003 | ||
297 | 58 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-903 | ||
298 | 59 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-902 | ||
299 | 60 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-004 | ||
300 | 61 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-005 | ||
301 | 62 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-003 | ||
302 | 63 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-901 | ||
303 | 64 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Filter/filter-002 | ||
304 | 65 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-004 | ||
305 | 66 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-003 | ||
306 | 67 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-009 | ||
307 | 68 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-002 | ||
308 | 69 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-005 | ||
309 | 70 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-008 | ||
310 | 71 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldLeft/fold-left-001 | ||
311 | 72 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-004 | ||
312 | 73 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-001 | 33 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-001 |
313 | 74 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-002 | 34 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-002 |
314 | 75 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-005 | 35 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-005 |
315 | 76 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-003 | 36 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-003 |
316 | 77 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-006 | 37 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-006 |
317 | 78 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-007 | 38 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/FoldRight/fold-right-007 |
318 | 79 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-007 | ||
319 | 80 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-005 | ||
320 | 81 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-001 | ||
321 | 82 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-902 | ||
322 | 83 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-003 | ||
323 | 84 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-006 | ||
324 | 85 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-901 | ||
325 | 86 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-002 | ||
326 | 87 | test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/MapPairs/map-pairs-008 | ||
327 | 88 | test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-all | 39 | test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-all |
328 | 89 | test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-7 | 40 | test/rbkt/w3c_testsuite/XQuery/FunctX/functx-fn-tokenize/functx-fn-tokenize-7 |
329 | 90 | test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5 | 41 | test/rbkt/w3c_testsuite/XQuery/Functions/AllStringFunc/MatchStringFunc/MatchesFunc/K2-MatchesFunc-5 |
330 | 91 | 42 | ||
331 | === modified file 'test/rbkt/Queries/w3c_known_failures_XQueryX.txt' | |||
332 | --- test/rbkt/Queries/w3c_known_failures_XQueryX.txt 2013-03-15 08:22:41 +0000 | |||
333 | +++ test/rbkt/Queries/w3c_known_failures_XQueryX.txt 2013-03-27 15:43:22 +0000 | |||
334 | @@ -11,6 +11,7 @@ | |||
335 | 11 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7 | 11 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7 |
336 | 12 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8 | 12 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8 |
337 | 13 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10 | 13 | test/rbkt/w3c_testsuite/XQueryX/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10 |
338 | 14 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-044 | ||
339 | 14 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009 | 15 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-009 |
340 | 15 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008 | 16 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-008 |
341 | 16 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-021 | 17 | test/rbkt/w3c_testsuite/XQueryX/Expressions/HigherOrder/hof-021 |
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ hof-next- 2013-03- 27T12-45- 54.501Z/ log.html
Log at: http://