Updated based on feedback and now include an update to the XQTS results.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/c1442497 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/c1442497 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/c1442497 Branch: refs/heads/prestonc/xmark Commit: c14424972962aebf49d8dced3884910b153feea4 Parents: 6f9c8f3 Author: Eldon Carman <[email protected]> Authored: Tue Jun 2 13:21:29 2015 -0700 Committer: Eldon Carman <[email protected]> Committed: Wed Jun 3 14:23:48 2015 -0700 ---------------------------------------------------------------------- .../compiler/rewriter/RewriteRuleset.java | 2 - .../AbstractUsedVariablesProcessingRule.java | 1 - .../step/DescendantOrSelfPathStepUnnesting.java | 24 +-- .../xmlquery/translator/XMLQueryTranslator.java | 2 +- vxquery-xtest/results/xqts.txt | 158 +++++++++---------- 5 files changed, 92 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/c1442497/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java index 8bda5b6..b67402b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java @@ -271,8 +271,6 @@ public class RewriteRuleset { prepareForJobGenRewrites.add(new IsolateHyracksOperatorsRule( HeuristicOptimizer.hyraxOperatorsBelowWhichJobGenIsDisabled)); prepareForJobGenRewrites.add(new ExtractCommonOperatorsRule()); - // prepareForJobGenRewrites.add(new VXQueryExtractCommonOperatorsRule()); - // prepareForJobGenRewrites.add(new DelayMaterializationForJoinProbeRule()); // Re-infer all types, so that, e.g., the effect of not-is-null is // propagated. prepareForJobGenRewrites.add(new PushProjectIntoDataSourceScanRule()); http://git-wip-us.apache.org/repos/asf/vxquery/blob/c1442497/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java index e80597b..5c95a0e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractUsedVariablesProcessingRule.java @@ -52,7 +52,6 @@ public abstract class AbstractUsedVariablesProcessingRule implements IAlgebraicR @Override public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { - opRef.getValue().getOperatorTag(); if (hasRun && !firstOpRef.equals(opRef)) { return false; } else { http://git-wip-us.apache.org/repos/asf/vxquery/blob/c1442497/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java index 3fd1daf..090655b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/step/DescendantOrSelfPathStepUnnesting.java @@ -33,11 +33,11 @@ import edu.uci.ics.hyracks.data.std.api.IPointable; public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathStep { private boolean testSelf; - private boolean printSelf; + private boolean returnSelf; private int indexSeqArgs; private int seqArgsLength; private List<Integer> indexSequence = new ArrayList<Integer>(); - private List<Integer> printedSequence = new ArrayList<Integer>(); + private List<Integer> returnSequence = new ArrayList<Integer>(); private final SequencePointable seqNtp = (SequencePointable) SequencePointable.FACTORY.createPointable(); private final TaggedValuePointable tvpItem = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); @@ -50,10 +50,10 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt } protected void init(TaggedValuePointable[] args) throws SystemException { - printSelf = true; + returnSelf = true; indexSeqArgs = 0; indexSequence.add(0); - printedSequence.add(0); + returnSequence.add(0); // Check the argument passed in as sequence or node tree. if (args[0].getTag() == ValueTag.SEQUENCE_TAG) { @@ -82,7 +82,7 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt } // Next node tree in sequence. indexSeqArgs++; - printSelf = true; + returnSelf = true; } } else { // Single node tree input. @@ -95,8 +95,8 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt } private boolean processNodeTree(TaggedValuePointable rootTVP, IPointable result) throws AlgebricksException { - if (testSelf && printSelf) { - printSelf = false; + if (testSelf && returnSelf) { + returnSelf = false; tvpItem.set(rootTVP); try { setNodeToResult(tvpItem, result); @@ -122,7 +122,7 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt // Set up next level tracking. if (level + 1 > indexSequence.size()) { indexSequence.add(0); - printedSequence.add(0); + returnSequence.add(0); } SequencePointable seqItem = pp.takeOne(SequencePointable.class); @@ -134,8 +134,8 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt seqItem.getEntry(indexSequence.get(level), tvpItem); // Check current node - if (indexSequence.get(level) == printedSequence.get(level)) { - printedSequence.set(level, printedSequence.get(level) + 1); + if (indexSequence.get(level) == returnSequence.get(level)) { + returnSequence.set(level, returnSequence.get(level) + 1); setNodeToResult(tvpItem, result); return true; } @@ -150,10 +150,10 @@ public class DescendantOrSelfPathStepUnnesting extends AbstractForwardAxisPathSt // Reset for next node tree. if (level == 0) { indexSequence.set(level, 0); - printedSequence.set(level, 0); + returnSequence.set(level, 0); } else { indexSequence.remove(level); - printedSequence.remove(level); + returnSequence.remove(level); } return false; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/vxquery/blob/c1442497/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java index 6b443b6..d684730 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java @@ -1048,7 +1048,7 @@ public class XMLQueryTranslator { for (LetVarDeclNode lvdNode : lcNode.getVariables()) { LogicalVariable seqVar = translateExpression(lvdNode.getSequence(), tCtx); tCtx.pushVariableScope(); - SequenceType letVarType = SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_ONE); + SequenceType letVarType = SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_STAR); if (lvdNode.getType() != null) { letVarType = createSequenceType(lvdNode.getType()); } http://git-wip-us.apache.org/repos/asf/vxquery/blob/c1442497/vxquery-xtest/results/xqts.txt ---------------------------------------------------------------------- diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt index 816b4e5..acb34d6 100644 --- a/vxquery-xtest/results/xqts.txt +++ b/vxquery-xtest/results/xqts.txt @@ -117,7 +117,7 @@ Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-58, EXPECTED_RESULT_GOT_E Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-6, EXPECTED_ERROR_GOT_SAME_ERROR Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-61, EXPECTED_ERROR_GOT_SAME_ERROR Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-7, EXPECTED_ERROR_GOT_SAME_ERROR Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR Construct/ComputeCon/ComputeConAttr//K2-ComputeConAttr-9, EXPECTED_ERROR_GOT_SAME_ERROR @@ -469,7 +469,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-73, EX Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-74, EXPECTED_ERROR_GOT_RESULT Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-75, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-76, EXPECTED_ERROR_GOT_RESULT -Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_FAILURE +Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-77, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-78, EXPECTED_RESULT_GOT_FAILURE Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-79, EXPECTED_ERROR_GOT_FAILURE Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-8, EXPECTED_ERROR_GOT_SAME_ERROR @@ -575,7 +575,7 @@ ErrorsAndOptimization//errors-and-optimization-1, EXPECTED_RESULT_GOT_ERROR ErrorsAndOptimization//errors-and-optimization-2, EXPECTED_ERROR_GOT_SAME_ERROR ErrorsAndOptimization//errors-and-optimization-3, EXPECTED_RESULT_GOT_FAILURE ErrorsAndOptimization//errors-and-optimization-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -ErrorsAndOptimization//errors-and-optimization-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +ErrorsAndOptimization//errors-and-optimization-5, EXPECTED_ERROR_GOT_SAME_ERROR ErrorsAndOptimization//errors-and-optimization-6, EXPECTED_ERROR_GOT_SAME_ERROR ErrorsAndOptimization//errors-and-optimization-7, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/CondExpr//CondExpr002, EXPECTED_RESULT_GOT_DIFFERENT_RESULT @@ -805,8 +805,8 @@ Expressions/Construct/ComputeCon/ConText//Constr-text-parent-1, EXPECTED_RESULT_ Expressions/Construct/ComputeCon/ConText//Constr-text-string-1, EXPECTED_RESULT_GOT_ERROR Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/ConInScopeNamespace//Constr-inscope-10, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/ConInScopeNamespace//Constr-inscope-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/Construct/ConInScopeNamespace//Constr-inscope-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/ConInScopeNamespace//Constr-inscope-13, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/ConInScopeNamespace//Constr-inscope-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_SAME_RESULT @@ -816,12 +816,12 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GO Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/ConInScopeNamespace//Constr-inscope-2, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/ConInScopeNamespace//Constr-inscope-20, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/ConInScopeNamespace//Constr-inscope-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/ConInScopeNamespace//Constr-inscope-4, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/ConInScopeNamespace//Constr-inscope-5, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/ConInScopeNamespace//Constr-inscope-6, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/ConInScopeNamespace//Constr-inscope-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/Construct/ConInScopeNamespace//Constr-inscope-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/ConInScopeNamespace//Constr-inscope-9, EXPECTED_RESULT_GOT_FAILURE Expressions/Construct/DirectConElem//Constr-elem-curlybr-1, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem//Constr-elem-curlybr-2, EXPECTED_RESULT_GOT_SAME_RESULT @@ -883,7 +883,7 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-5, EXPECTE Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-adjtext-1, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-adjtext-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-adjtext-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-adjtext-4, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-adjtext-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-attr-1, EXPECTED_ERROR_GOT_FAILURE Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-attr-2, EXPECTED_ERROR_GOT_FAILURE Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-attr-3, EXPECTED_RESULT_GOT_FAILURE @@ -960,8 +960,8 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-text-2, EX Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-uripres-1, EXPECTED_RESULT_GOT_ERROR Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-1, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-11, EXPECTED_RESULT_GOT_FAILURE -Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-12, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-13, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR @@ -970,10 +970,10 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-20, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, EXPECTED_RESULT_GOT_SAME_RESULT -Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-23, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-23, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-24, EXPECTED_ERROR_GOT_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-25, EXPECTED_ERROR_GOT_RESULT Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-26, EXPECTED_RESULT_GOT_FAILURE @@ -1032,11 +1032,11 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-4 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-5, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-nobound-6, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-5, EXPECTED_RESULT_GOT_FAILURE +Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-6, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-7, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-tag-8, EXPECTED_RESULT_GOT_SAME_RESULT @@ -1324,23 +1324,23 @@ Expressions/FLWORExpr/LetExpr//LetExpr006, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr007, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr008, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr009, EXPECTED_RESULT_GOT_SAME_RESULT -Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +Expressions/FLWORExpr/LetExpr//LetExpr010, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/FLWORExpr/LetExpr//LetExpr011, EXPECTED_RESULT_GOT_FAILURE Expressions/FLWORExpr/LetExpr//LetExpr012, EXPECTED_RESULT_GOT_FAILURE Expressions/FLWORExpr/LetExpr//LetExpr013, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr014, EXPECTED_ERROR_GOT_SAME_ERROR -Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_ERROR -Expressions/FLWORExpr/LetExpr//LetExpr016, EXPECTED_RESULT_GOT_ERROR +Expressions/FLWORExpr/LetExpr//LetExpr015, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/FLWORExpr/LetExpr//LetExpr016, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr017, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/FLWORExpr/LetExpr//LetExpr018, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Expressions/FLWORExpr/LetExpr//LetExpr019, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/FLWORExpr/LetExpr//LetExpr020, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//LetExpr021, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/FLWORExpr/LetExpr//xquery10keywords, EXPECTED_RESULT_GOT_SAME_RESULT -Expressions/FLWORExpr/LetExpr//xquery10keywords2, EXPECTED_RESULT_GOT_FAILURE +Expressions/FLWORExpr/LetExpr//xquery10keywords2, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//xquery10keywords3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/FLWORExpr/LetExpr//xquery11keywords, EXPECTED_RESULT_GOT_SAME_RESULT -Expressions/FLWORExpr/LetExpr//xquery11keywords2, EXPECTED_RESULT_GOT_FAILURE +Expressions/FLWORExpr/LetExpr//xquery11keywords2, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/FLWORExpr/LetExpr//xquery11keywords3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/FLWORExpr/LetExpr/LetExprWithout//K-LetExprWithout-2, EXPECTED_ERROR_GOT_SAME_ERROR @@ -4200,7 +4200,7 @@ Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal- Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-14, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-15, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-16, EXPECTED_RESULT_GOT_SAME_RESULT -Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-17, EXPECTED_ERROR_GOT_SAME_ERROR Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-2, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-3, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/Operators/CompExpr/ValComp/BooleanOp/BooleanEqual//op-boolean-equal-4, EXPECTED_RESULT_GOT_SAME_RESULT @@ -6490,28 +6490,28 @@ Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-1, EXPECTED_RESULT_G Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-2, EXPECTED_RESULT_GOT_SAME_RESULT Expressions/PrologExpr/EmptyOrderProlog//K-EmptyOrderProlog-3, EXPECTED_ERROR_GOT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-1, EXPECTED_ERROR_GOT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-10, EXPECTED_RESULT_GOT_FAILURE -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-11, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-14, EXPECTED_RESULT_GOT_FAILURE -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-15, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-18, EXPECTED_RESULT_GOT_FAILURE -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-19, EXPECTED_RESULT_GOT_FAILURE -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-2, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-22, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-24, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-25, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-26, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-26, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-27, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-28, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-3, EXPECTED_RESULT_GOT_FAILURE +Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT Expressions/PrologExpr/EmptyOrderProlog//emptyorderdecl-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT @@ -10522,7 +10522,7 @@ FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-3, EXPECTED_RESU FLWORExpr/ForExpr/ForExprPositionalVar//K2-ForExprPositionalVar-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/ForExpr/ForExprWith//K2-ForExprWith-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_ERROR -FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_RESULT FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE @@ -10593,8 +10593,8 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-7, EXPECTED_ERROR_GOT_DIFFER FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-8, EXPECTED_ERROR_GOT_SAME_ERROR FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-9, EXPECTED_ERROR_GOT_DIFFERENT_ERROR FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-11, EXPECTED_RESULT_GOT_FAILURE +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-10, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-14, EXPECTED_RESULT_GOT_FAILURE @@ -10602,45 +10602,45 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-15, EXPECTED_ERR FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-17, EXPECTED_RESULT_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-18, EXPECTED_RESULT_GOT_SAME_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-19, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-2, EXPECTED_ERROR_GOT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-21, EXPECTED_RESULT_GOT_FAILURE +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-20, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-22, EXPECTED_ERROR_GOT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-23, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-25, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-23, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-24, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-25, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-26, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-27, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-28, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-29, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-3, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-30, EXPECTED_ERROR_GOT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-31, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-32, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-31, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-32, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-33, EXPECTED_ERROR_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-34, EXPECTED_ERROR_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-35, EXPECTED_ERROR_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-36, EXPECTED_ERROR_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-37, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-39, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-39, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-4, EXPECTED_ERROR_GOT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-40, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-40, EXPECTED_ERROR_GOT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-41, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-42, NO_RESULT_FILE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-43, EXPECTED_RESULT_GOT_FAILURE FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-44, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-45, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-46, EXPECTED_RESULT_GOT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-47, EXPECTED_RESULT_GOT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-48, EXPECTED_RESULT_GOT_ERROR FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-49, EXPECTED_RESULT_GOT_ERROR FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-7, EXPECTED_ERROR_GOT_SAME_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-8, EXPECTED_ERROR_GOT_RESULT +FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERROR_GOT_RESULT FLWORExpr/ReturnExpr//K2-ReturnExpr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR FLWORExpr/WhereExpr//K2-WhereExpr-1, EXPECTED_ERROR_GOT_SAME_ERROR FLWORExpr/WhereExpr//K2-WhereExpr-2, EXPECTED_ERROR_GOT_SAME_ERROR @@ -14659,7 +14659,7 @@ Functions/NodeFunc/NodeRootFunc//fn-root-8, EXPECTED_RESULT_GOT_ERROR Functions/NodeFunc/NodeRootFunc//fn-root-9, EXPECTED_RESULT_GOT_ERROR Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-1, EXPECTED_ERROR_GOT_SAME_ERROR Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-10, EXPECTED_RESULT_GOT_ERROR -Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-10d, EXPECTED_RESULT_GOT_ERROR +Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-10d, EXPECTED_RESULT_GOT_FAILURE Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-2, EXPECTED_ERROR_GOT_FAILURE Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-3, EXPECTED_ERROR_GOT_FAILURE Functions/NodeSeqFunc/SeqCollectionFunc//fn-collection-4, EXPECTED_RESULT_GOT_ERROR @@ -17495,7 +17495,7 @@ Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-13, EXPECTED_RESU Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-14, EXPECTED_RESULT_GOT_SAME_RESULT Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-15, EXPECTED_RESULT_GOT_SAME_RESULT Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-16, EXPECTED_RESULT_GOT_SAME_RESULT -Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-17, EXPECTED_RESULT_GOT_FAILURE +Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-17, EXPECTED_RESULT_GOT_SAME_RESULT Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-2, EXPECTED_ERROR_GOT_SAME_ERROR Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-3, EXPECTED_ERROR_GOT_SAME_ERROR Operators/ArithExpr/NumericOpr/NumericDivide//K2-NumericDivide-4, EXPECTED_ERROR_GOT_SAME_ERROR @@ -17570,7 +17570,7 @@ Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-59, EXPECTED_ERROR_GOT_ Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-6, EXPECTED_RESULT_GOT_ERROR Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-60, EXPECTED_ERROR_GOT_DIFFERENT_ERROR Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-61, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-62, EXPECTED_RESULT_GOT_FAILURE +Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-62, EXPECTED_RESULT_GOT_SAME_RESULT Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-7, EXPECTED_ERROR_GOT_SAME_ERROR Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-8, EXPECTED_ERROR_GOT_SAME_ERROR Operators/ArithExpr/NumericOpr/NumericMod//K2-NumericMod-9, EXPECTED_RESULT_GOT_SAME_RESULT @@ -17905,11 +17905,11 @@ PathExpr/Steps//K2-Steps-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR PathExpr/Steps//K2-Steps-10, EXPECTED_ERROR_GOT_FAILURE PathExpr/Steps//K2-Steps-11, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps//K2-Steps-12, EXPECTED_ERROR_GOT_FAILURE -PathExpr/Steps//K2-Steps-13, EXPECTED_RESULT_GOT_FAILURE +PathExpr/Steps//K2-Steps-13, EXPECTED_RESULT_GOT_SAME_RESULT PathExpr/Steps//K2-Steps-14, EXPECTED_ERROR_GOT_RESULT -PathExpr/Steps//K2-Steps-15, EXPECTED_RESULT_GOT_ERROR -PathExpr/Steps//K2-Steps-16, EXPECTED_RESULT_GOT_ERROR -PathExpr/Steps//K2-Steps-17, EXPECTED_RESULT_GOT_ERROR +PathExpr/Steps//K2-Steps-15, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +PathExpr/Steps//K2-Steps-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +PathExpr/Steps//K2-Steps-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT PathExpr/Steps//K2-Steps-18, EXPECTED_RESULT_GOT_FAILURE PathExpr/Steps//K2-Steps-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT PathExpr/Steps//K2-Steps-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR @@ -17931,7 +17931,7 @@ PathExpr/Steps//K2-Steps-33, EXPECTED_RESULT_GOT_ERROR PathExpr/Steps//K2-Steps-34, EXPECTED_RESULT_GOT_ERROR PathExpr/Steps//K2-Steps-35, EXPECTED_RESULT_GOT_FAILURE PathExpr/Steps//K2-Steps-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -PathExpr/Steps//K2-Steps-5, EXPECTED_RESULT_GOT_FAILURE +PathExpr/Steps//K2-Steps-5, EXPECTED_RESULT_GOT_SAME_RESULT PathExpr/Steps//K2-Steps-6, EXPECTED_RESULT_GOT_SAME_RESULT PathExpr/Steps//K2-Steps-7, EXPECTED_RESULT_GOT_SAME_RESULT PathExpr/Steps//K2-Steps-8, EXPECTED_ERROR_GOT_DIFFERENT_ERROR @@ -18055,7 +18055,7 @@ PathExpr/Steps/Axes//K2-Axes-89, EXPECTED_RESULT_GOT_ERROR PathExpr/Steps/Axes//K2-Axes-9, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/Axes//K2-Axes-90, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/Axes//K2-Axes-91, EXPECTED_ERROR_GOT_SAME_ERROR -PathExpr/Steps/Axes//K2-Axes-92, EXPECTED_ERROR_GOT_FAILURE +PathExpr/Steps/Axes//K2-Axes-92, EXPECTED_ERROR_GOT_RESULT PathExpr/Steps/Axes//K2-Axes-93, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/Axes//K2-Axes-94, EXPECTED_ERROR_GOT_FAILURE PathExpr/Steps/Axes//K2-Axes-95, EXPECTED_ERROR_GOT_SAME_ERROR @@ -18088,7 +18088,7 @@ PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-29, EXPECTED_ERROR_GOT_SAME PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-3, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT -PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-32, EXPECTED_RESULT_GOT_FAILURE +PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-33, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-34, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-35, EXPECTED_ERROR_GOT_FAILURE @@ -18122,12 +18122,12 @@ PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-6, EXPECTED_ERROR_GOT_SAME_ PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-60, EXPECTED_ERROR_GOT_FAILURE PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-61, EXPECTED_ERROR_GOT_FAILURE PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-62, EXPECTED_ERROR_GOT_FAILURE -PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-63, EXPECTED_RESULT_GOT_FAILURE -PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-64, EXPECTED_RESULT_GOT_FAILURE -PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-65, EXPECTED_RESULT_GOT_FAILURE +PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-63, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-64, EXPECTED_RESULT_GOT_DIFFERENT_RESULT +PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-65, EXPECTED_RESULT_GOT_DIFFERENT_RESULT PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-66, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-67, EXPECTED_ERROR_GOT_SAME_ERROR -PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-68, EXPECTED_ERROR_GOT_FAILURE +PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-68, EXPECTED_ERROR_GOT_RESULT PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-69, EXPECTED_ERROR_GOT_DIFFERENT_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-7, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NameTest//K2-NameTest-70, EXPECTED_ERROR_GOT_DIFFERENT_ERROR @@ -18185,7 +18185,7 @@ PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-35, EXPECTED_ERROR_GOT_DIFF PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-36, EXPECTED_ERROR_GOT_DIFFERENT_ERROR PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-37, EXPECTED_ERROR_GOT_DIFFERENT_ERROR PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-38, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-39, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-39, EXPECTED_ERROR_GOT_RESULT PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-4, EXPECTED_ERROR_GOT_SAME_ERROR PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-40, EXPECTED_ERROR_GOT_RESULT PathExpr/Steps/NodeTestSection/NodeTest//K2-NodeTest-41, EXPECTED_RESULT_GOT_FAILURE @@ -18452,24 +18452,24 @@ StaticTyping/STFLWORExpr//statictyping-1, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-10, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-11, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-12, EXPECTED_ERROR_GOT_SAME_ERROR -StaticTyping/STFLWORExpr//statictyping-13, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-14, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-19, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +StaticTyping/STFLWORExpr//statictyping-13, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-14, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-15, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-16, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-17, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-18, EXPECTED_ERROR_GOT_SAME_ERROR +StaticTyping/STFLWORExpr//statictyping-19, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-2, EXPECTED_ERROR_GOT_SAME_ERROR -StaticTyping/STFLWORExpr//statictyping-20, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +StaticTyping/STFLWORExpr//statictyping-20, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-21, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-22, EXPECTED_ERROR_GOT_RESULT StaticTyping/STFLWORExpr//statictyping-23, EXPECTED_ERROR_GOT_SAME_ERROR -StaticTyping/STFLWORExpr//statictyping-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +StaticTyping/STFLWORExpr//statictyping-24, EXPECTED_ERROR_GOT_RESULT StaticTyping/STFLWORExpr//statictyping-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR StaticTyping/STFLWORExpr//statictyping-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR StaticTyping/STFLWORExpr//statictyping-5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR StaticTyping/STFLWORExpr//statictyping-6, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -StaticTyping/STFLWORExpr//statictyping-7, EXPECTED_ERROR_GOT_DIFFERENT_ERROR +StaticTyping/STFLWORExpr//statictyping-7, EXPECTED_ERROR_GOT_RESULT StaticTyping/STFLWORExpr//statictyping-8, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFLWORExpr//statictyping-9, EXPECTED_ERROR_GOT_SAME_ERROR StaticTyping/STFunctions//ST-Data001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR @@ -18686,7 +18686,7 @@ exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-1, EXPECTED_ERROR_GO exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-10, EXPECTED_ERROR_GOT_DIFFERENT_ERROR exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-11, EXPECTED_ERROR_GOT_DIFFERENT_ERROR exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-12, EXPECTED_ERROR_GOT_DIFFERENT_ERROR -exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-13, EXPECTED_RESULT_GOT_FAILURE +exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-14, EXPECTED_ERROR_GOT_SAME_ERROR exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-15, EXPECTED_ERROR_GOT_RESULT exprSeqTypes/PrologExpr/NamespaceProlog//K2-NamespaceProlog-16, EXPECTED_ERROR_GOT_SAME_ERROR
