You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/04/06 18:52:52 UTC

[1/5] git commit: avoid a few exceptions

Repository: incubator-vxquery
Updated Branches:
  refs/heads/prestonc/hash_join e55354408 -> 6512b0095
  refs/heads/westmann/prettyprint [created] a09d1f5dd


avoid a few exceptions


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/bd1160a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/bd1160a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/bd1160a4

Branch: refs/heads/prestonc/hash_join
Commit: bd1160a4493a9a340d1dd880d9b0587b6a0fe726
Parents: c13ad12
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 22:05:49 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 ...ueryLogicalExpressionPrettyPrintVisitor.java | 28 ++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/bd1160a4/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
index c630837..e6d8dd1 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java
@@ -40,6 +40,7 @@ import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionC
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression;
 import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
 import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
 import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable;
 
@@ -90,7 +91,23 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
     @Override
     public String visitAggregateFunctionCallExpression(AggregateFunctionCallExpression expr, Integer indent)
             throws AlgebricksException {
-        return appendFunction(new StringBuilder(), expr, indent).toString();
+        if (expr.isTwoStep()) {
+            IFunctionInfo step1Agg = expr.getStepOneAggregate();
+            String step1 = (step1Agg != null ? step1Agg.getFunctionIdentifier().toString() : "null");
+            IFunctionInfo step2Agg = expr.getStepTwoAggregate();
+            String step2 = (step2Agg != null ? step2Agg.getFunctionIdentifier().toString() : "null");
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [" + step1 + "|" + step2 + "], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else if (expr.getFunctionInfo() == null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("function-call: [null], Args:");
+            appendArguments(sb, expr.getArguments(), indent + 2);
+            return sb.toString();
+        } else {
+            return appendFunction(new StringBuilder(), expr, indent).toString();
+        }
     }
 
     @Override
@@ -138,15 +155,16 @@ public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpre
             throws AlgebricksException {
         assert expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL;
         FunctionIdentifier fi = expr.getFunctionIdentifier();
-        if (identifiesTypeOperator(fi) || identifiesPathStep(fi)) {
-            final ILogicalExpression typeEx = expr.getArguments().get(1).getValue();
+        List<Mutable<ILogicalExpression>> args = expr.getArguments();
+        if ((identifiesTypeOperator(fi) || identifiesPathStep(fi)) && args.size() > 1) {
+            final ILogicalExpression typeEx = args.get(1).getValue();
             assert typeEx.getExpressionTag() == LogicalExpressionTag.CONSTANT;
             SequenceType type = getSequenceType((ConstantExpression) typeEx);
             sb.append(fi + " <" + type + ">, Args:");
-            appendArgument(sb, expr.getArguments().get(0), indent + 2);
+            appendArgument(sb, args.get(0), indent + 2);
         } else {
             sb.append("function-call: " + fi + ", Args:");
-            appendArguments(sb, expr.getArguments(), indent + 2);            
+            appendArguments(sb, args, indent + 2);
         }
         return sb;
     }


[4/5] updated XQTS results

Posted by pr...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/6512b009/vxquery-xtest/results/xqts.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/results/xqts.txt b/vxquery-xtest/results/xqts.txt
index ea1a37c..b8eba23 100644
--- a/vxquery-xtest/results/xqts.txt
+++ b/vxquery-xtest/results/xqts.txt
@@ -15,6 +15,19 @@ Appendices/Appendix-A4//appendix-A4-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Appendices/Appendix-A4//appendix-A4-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Basics/EQNames//eqname-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Basics/EQNames//eqname-903, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Basics/StaticContext//static-context-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Basics/Types/SequenceTypeSyntax//sequence-type-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-10, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -37,6 +50,9 @@ Basics/Types/SequenceTypeSyntax//sequence-type-6, EXPECTED_RESULT_GOT_SAME_RESUL
 Basics/Types/SequenceTypeSyntax//sequence-type-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Basics/Types/SequenceTypeSyntax//sequence-type-9, EXPECTED_RESULT_GOT_SAME_RESULT
+Catalog//Catalog001, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog002, EXPECTED_RESULT_GOT_FAILURE
+Catalog//Catalog003, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-1, EXPECTED_ERROR_GOT_FAILURE
 CondExpr//K2-CondExpr-2, EXPECTED_RESULT_GOT_FAILURE
 CondExpr//K2-CondExpr-3, EXPECTED_RESULT_GOT_ERROR
@@ -121,7 +137,7 @@ Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-1, EXPECTED_ERROR_GOT_SAM
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-10, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-11, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-12, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-13, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-14, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-15, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ComputeConElem//K2-ComputeConElem-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -159,20 +175,20 @@ Construct/ComputeCon/ConDocNode//K2-ConDocNode-15, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-16, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-17, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-18, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-19, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-20, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-21, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-22, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-23, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-24, EXPECTED_RESULT_GOT_FAILURE
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-25, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-26, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-27, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-28, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-29, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_ERROR
+Construct/ComputeCon/ConDocNode//K2-ConDocNode-30, EXPECTED_RESULT_GOT_FAILURE
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-31, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-32, EXPECTED_RESULT_GOT_ERROR
 Construct/ComputeCon/ConDocNode//K2-ConDocNode-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
@@ -217,18 +233,18 @@ Construct/DirectConElem//K2-DirectConElem-24, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-25, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-26, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-27, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-28, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-29, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem//K2-DirectConElem-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-30, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-31, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-32, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-33, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem//K2-DirectConElem-34, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem//K2-DirectConElem-35, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem//K2-DirectConElem-36, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem//K2-DirectConElem-37, EXPECTED_ERROR_GOT_RESULT
-Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-38, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-39, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem//K2-DirectConElem-4, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-40, EXPECTED_ERROR_GOT_RESULT
@@ -238,9 +254,9 @@ Construct/DirectConElem//K2-DirectConElem-43, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem//K2-DirectConElem-44, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem//K2-DirectConElem-45, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-46, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Construct/DirectConElem//K2-DirectConElem-47, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem//K2-DirectConElem-48, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem//K2-DirectConElem-49, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem//K2-DirectConElem-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-50, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem//K2-DirectConElem-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -324,7 +340,7 @@ Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-70, EXPECTED_RES
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-71, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-72, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-73, EXPECTED_RESULT_GOT_ERROR
-Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-74, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-75, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-76, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemAttr//K2-DirectConElemAttr-8, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -371,7 +387,7 @@ Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-44, EXPECT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-45, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-46, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-47, EXPECTED_RESULT_GOT_SAME_RESULT
-Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-48, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemContent//K2-DirectConElemContent-7, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -413,7 +429,7 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-35, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-36, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-37, EXPECTED_ERROR_GOT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-38, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-39, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-39, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-4, EXPECTED_ERROR_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-40, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-41, EXPECTED_RESULT_GOT_ERROR
@@ -424,19 +440,19 @@ Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-45, EX
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-46, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-47, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-48, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-49, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-5, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-50, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-51, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-52, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-53, EXPECTED_RESULT_GOT_ERROR
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-54, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-55, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-57, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-59, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_FAILURE
+Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-6, EXPECTED_RESULT_GOT_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-61, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-62, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConElem/DirectConElemNamespace//K2-DirectConElemNamespace-63, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -470,15 +486,15 @@ Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-17,
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-18, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-19, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-20, EXPECTED_RESULT_GOT_SAME_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-21, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-22, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-23, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-24, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-25, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-26, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-3, EXPECTED_RESULT_GOT_FAILURE
-Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-5, EXPECTED_RESULT_GOT_FAILURE
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConElem/DirectConElemWhitespace//K2-DirectConElemWhitespace-7, EXPECTED_RESULT_GOT_FAILURE
@@ -537,10 +553,10 @@ Construct/DirectConOther//K2-DirectConOther-54, EXPECTED_RESULT_GOT_DIFFERENT_RE
 Construct/DirectConOther//K2-DirectConOther-55, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-56, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-57, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-58, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-58, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-59, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Construct/DirectConOther//K2-DirectConOther-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Construct/DirectConOther//K2-DirectConOther-60, EXPECTED_RESULT_GOT_SAME_RESULT
 Construct/DirectConOther//K2-DirectConOther-61, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-62, EXPECTED_ERROR_GOT_SAME_ERROR
 Construct/DirectConOther//K2-DirectConOther-63, EXPECTED_ERROR_GOT_RESULT
@@ -596,9 +612,9 @@ Expressions/CondExpr//K-CondExpr-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/CondExpr//K-CondExpr-8, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/CondExpr//K-CondExpr-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-10, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-11, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-12, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-13, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-14, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-15, EXPECTED_RESULT_GOT_FAILURE
@@ -613,16 +629,16 @@ Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-5, EXP
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-6, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-8, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-compname-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-doc-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-id-2, EXPECTED_ERROR_GOT_RESULT
-Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConAttr//Constr-compattr-parent-1, EXPECTED_RESULT_GOT_FAILURE
@@ -684,7 +700,7 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-7, EX
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-data-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -692,11 +708,11 @@ Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-1, EXPECTE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-name-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nested-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-nodeid-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-parent-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ComputeConElem//Constr-compelem-string-1, EXPECTED_RESULT_GOT_FAILURE
@@ -749,21 +765,21 @@ Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-2, EXPECTED_ERR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-attr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-3, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-constrmod-4, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-data-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-doc-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-enclexpr-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-3, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nested-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-nodeid-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-parent-1, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/ComputeCon/ConDocNode//Constr-docnode-string-1, EXPECTED_RESULT_GOT_ERROR
@@ -791,10 +807,10 @@ Expressions/Construct/ConInScopeNamespace//Constr-inscope-1, EXPECTED_RESULT_GOT
 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-13, 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_DIFFERENT_RESULT
-Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-15, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/ConInScopeNamespace//Constr-inscope-16, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-17, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-18, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/ConInScopeNamespace//Constr-inscope-19, EXPECTED_RESULT_GOT_FAILURE
@@ -813,15 +829,15 @@ Expressions/Construct/DirectConElem//Constr-elem-curlybr-3, EXPECTED_RESULT_GOT_
 Expressions/Construct/DirectConElem//Constr-elem-curlybr-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-curlybr-5, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem//Constr-elem-curlybr-6, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-2, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-empty-3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem//Constr-elem-empty-4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem//Constr-elem-empty-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem//Constr-elem-matchtag-1, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem//Constr-elem-matchtag-2, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-charref-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-charref-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-content-4, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -834,13 +850,13 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-1, E
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-enclexpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-entref-2, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-id-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsdecl-2, EXPECTED_RESULT_GOT_FAILURE
@@ -848,17 +864,17 @@ Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-1, EXPE
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nspre-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-nsprein-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-parent-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-1, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-6, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-syntax-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemAttr//Constr-attr-ws-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -893,11 +909,11 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-constrmod-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-data-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-doc-1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-3, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-document-5, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -916,15 +932,15 @@ Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-1,
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-3, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-invalid-4, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-2, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-4, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nested-5, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-2, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_ERROR
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-4, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nodeid-5, EXPECTED_RESULT_GOT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemContent//Constr-cont-nsmode-10, EXPECTED_ERROR_GOT_FAILURE
@@ -951,19 +967,19 @@ Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-14,
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-15, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-16, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-19, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+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-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-22, 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-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
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-27, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-29, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-4, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-5, EXPECTED_ERROR_GOT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemNamespace//Constr-namespace-6, EXPECTED_ERROR_GOT_RESULT
@@ -990,9 +1006,9 @@ Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-2, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-20, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-21, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-22, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-23, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-24, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/Construct/DirectConElem/DirectConElemWhitespace//Constr-ws-enclexpr-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
@@ -1241,7 +1257,7 @@ Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-55, EXPECTED_RESU
 Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-56, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-7, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-8, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/FLWORExpr/ForExpr/ForExprWithout//K-ForExprWithout-9, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/FLWORExpr/ForExprType//ForExprType001, EXPECTED_RESULT_GOT_ERROR
 Expressions/FLWORExpr/ForExprType//ForExprType002, EXPECTED_RESULT_GOT_FAILURE
@@ -1576,6 +1592,72 @@ Expressions/FunctionCallExpr//K2-FunctionCallExpr-6, EXPECTED_ERROR_GOT_SAME_ERR
 Expressions/FunctionCallExpr//K2-FunctionCallExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/FunctionCallExpr//K2-FunctionCallExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/FunctionCallExpr//K2-FunctionCallExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-001, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-002, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-003, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-004, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-005, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-006, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-007, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-008, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-009, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-010, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-011, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-012, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-013, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-014, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-015, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-016, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-017, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-018, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-019, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-020, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-021, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-022, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-023, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-024, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-025, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-026, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-027, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-028, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-029, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-030, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-031, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-032, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-033, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-034, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-035, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-036, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-037, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-038, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-039, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-040, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-041, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-042, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-043, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-044, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-045, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-046, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-047, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-048, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-901, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-902, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-903, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-904, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-905, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-906, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-907, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-908, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-909, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-910, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-911, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-912, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-913, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-914, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-915, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-916, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-917, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/HigherOrder//hof-918, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/LogicExpr//K-LogicExpr-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/LogicExpr//K-LogicExpr-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/LogicExpr//K-LogicExpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -5469,12 +5551,12 @@ Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeCheckin
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-7, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-8, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/CompExpr/ValComp/ValCompTypeChecking//K-ValCompTypeChecking-9, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodecomparisonerr-3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression33, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression34, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression35, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression36, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeAfter//nodeexpression37, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression38, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression39, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpression40, EXPECTED_RESULT_GOT_FAILURE
@@ -5491,12 +5573,12 @@ Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc12, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc14, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeAfter//nodeexpressionhc15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodecomparisonerr-2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression17, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression18, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression19, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression20, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeBefore//nodeexpression21, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression22, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression23, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpression24, EXPECTED_RESULT_GOT_FAILURE
@@ -5513,8 +5595,8 @@ Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc6, EXPECTED_RESULT_GOT_
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeBefore//nodeexpressionhc9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodecomparisonerr-1, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression1, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodecomparisonerr-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/Operators/NodeOp/NodeSame//nodeexpression1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeSame//nodeexpression10, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression11, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression12, EXPECTED_RESULT_GOT_FAILURE
@@ -5522,10 +5604,10 @@ Expressions/Operators/NodeOp/NodeSame//nodeexpression13, EXPECTED_ERROR_GOT_FAIL
 Expressions/Operators/NodeOp/NodeSame//nodeexpression14, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression15, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression2, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodeexpression2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeSame//nodeexpression3, EXPECTED_ERROR_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression4, EXPECTED_ERROR_GOT_FAILURE
-Expressions/Operators/NodeOp/NodeSame//nodeexpression5, EXPECTED_ERROR_GOT_FAILURE
+Expressions/Operators/NodeOp/NodeSame//nodeexpression5, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/Operators/NodeOp/NodeSame//nodeexpression6, EXPECTED_RESULT_GOT_ERROR
 Expressions/Operators/NodeOp/NodeSame//nodeexpression7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/NodeOp/NodeSame//nodeexpression8, EXPECTED_RESULT_GOT_FAILURE
@@ -5559,9 +5641,9 @@ Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-001, EXPECTED_RESULT_
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-002, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-003, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-005, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-006, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-007, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-008, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqExcept//fn-except-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5582,9 +5664,9 @@ Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-001, EXPECTED_R
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-002, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-003, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-004, EXPECTED_RESULT_GOT_FAILURE
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_ERROR
-Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_ERROR
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-005, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-006, EXPECTED_RESULT_GOT_FAILURE
+Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-007, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-008, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/Operators/SeqOp/SeqIntersect//fn-intersect-node-args-010, EXPECTED_RESULT_GOT_ERROR
@@ -5671,19 +5753,19 @@ Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/AbbrAxes//abbreviatedSyntax-9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-1, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-10, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-11, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-12, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-13, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-14, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-15, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-16, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/PathExpressions//PathExpr-2, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-3, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-4, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-5, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/PathExpressions//PathExpr-6, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-7, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/PathExpressions//PathExpr-9, EXPECTED_ERROR_GOT_SAME_ERROR
@@ -5771,8 +5853,8 @@ Expressions/PathExpr/Steps/Axes//Axes011, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes012, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/Steps/Axes//Axes013, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes014, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes015, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes015, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes016, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes017, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes018, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes019, EXPECTED_RESULT_GOT_FAILURE
@@ -5913,8 +5995,8 @@ Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes084, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes085, EXPECTED_RESULT_GOT_FAILURE
-Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_ERROR
+Expressions/PathExpr/Steps/Axes//Axes086, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/Axes//Axes087, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/Axes//Axes088, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PathExpr/Steps/Axes//Axes089, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/Axes//Axes090, EXPECTED_ERROR_GOT_FAILURE
@@ -5969,7 +6051,7 @@ Expressions/PathExpr/Steps/NodeTest//NodeTesthc-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//NodeTesthc-8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-1, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-10, EXPECTED_RESULT_GOT_ERROR
-Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PathExpr/Steps/NodeTest//nametest-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/PathExpr/Steps/NodeTest//nametest-12, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-13, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PathExpr/Steps/NodeTest//nametest-14, EXPECTED_RESULT_GOT_FAILURE
@@ -6214,13 +6296,13 @@ Expressions/PrimaryExpr/ParenExpr//Parenexpr-11, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-12, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-13, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-15, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-16, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-17, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-18, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-19, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-2, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrimaryExpr/ParenExpr//Parenexpr-20, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-3, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-4, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrimaryExpr/ParenExpr//Parenexpr-5, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -6232,7 +6314,7 @@ Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-1, EXPECTED_RESULT_GOT_ERR
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-2, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//K-BaseURIProlog-3, EXPECTED_ERROR_GOT_RESULT
 Expressions/PrologExpr/BaseURIProlog//base-URI-1, EXPECTED_ERROR_GOT_RESULT
-Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/BaseURIProlog//base-URI-10, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-11, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-12, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/PrologExpr/BaseURIProlog//base-URI-13, EXPECTED_RESULT_GOT_ERROR
@@ -6337,10 +6419,10 @@ Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-2, EXPECTED_RESULT_GO
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-20, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-21, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-22, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_ERROR
-Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_ERROR
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-3, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-4, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-7, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-8, EXPECTED_RESULT_GOT_ERROR
 Expressions/PrologExpr/CopyNamespacesProlog//copynamespace-9, EXPECTED_RESULT_GOT_ERROR
@@ -6730,7 +6812,7 @@ Expressions/PrologExpr/VersionProlog//prolog-version-12, EXPECTED_ERROR_GOT_SAME
 Expressions/PrologExpr/VersionProlog//prolog-version-2, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/PrologExpr/VersionProlog//prolog-version-3, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-4, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/PrologExpr/VersionProlog//prolog-version-5, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/PrologExpr/VersionProlog//prolog-version-6, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/PrologExpr/VersionProlog//prolog-version-9, EXPECTED_ERROR_GOT_RESULT
@@ -6933,9 +7015,9 @@ Expressions/QuantExpr/QuantExprWithout//quantexpr-58, EXPECTED_RESULT_GOT_SAME_R
 Expressions/QuantExpr/QuantExprWithout//quantexpr-59, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc1, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc2, EXPECTED_RESULT_GOT_ERROR
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc5, EXPECTED_RESULT_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc3, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc4, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc5, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqexcepthc6, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc1, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc10, EXPECTED_RESULT_GOT_FAILURE
@@ -6947,8 +7029,8 @@ Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc6, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc7, EXPECTED_RESULT_GOT_FAILURE
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc8, EXPECTED_RESULT_GOT_FAILURE
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqhc9, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc1, EXPECTED_RESULT_GOT_FAILURE
-Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GOT_FAILURE
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc1, EXPECTED_RESULT_GOT_ERROR
+Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc2, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc3, EXPECTED_RESULT_GOT_FAILURE
 Expressions/SeqExpr/CombNodeSeq//combiningnodeseqintersecthc4, EXPECTED_RESULT_GOT_ERROR
 Expressions/SeqExpr/ConstructSeq/RangeExpr//K-RangeExpr-1, EXPECTED_ERROR_GOT_RESULT
@@ -7164,6 +7246,28 @@ Expressions/SeqExpr/RangeExpr//rangeExpr-6, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-7, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-8, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/SeqExpr/RangeExpr//rangeExpr-9, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/SwitchExpr//switch-001, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-002, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-003, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-004, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-005, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-006, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-007, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-008, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-009, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-010, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-011, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-012, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-013, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-901, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-902, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+Expressions/SwitchExpr//switch-903, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-904, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-905, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-906, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-907, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-908, EXPECTED_ERROR_GOT_SAME_ERROR
+Expressions/SwitchExpr//switch-909, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-1, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-10, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-11, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -7184,14 +7288,14 @@ Expressions/XQueryComment//K-XQueryComment-6, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-7, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//K-XQueryComment-8, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//K-XQueryComment-9, EXPECTED_RESULT_GOT_SAME_RESULT
-Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment002, EXPECTED_RESULT_GOT_FAILURE
-Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment003, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment004, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment005, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment006, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment007, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/XQueryComment//XQueryComment008, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/XQueryComment//XQueryComment009, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment010, EXPECTED_RESULT_GOT_FAILURE
 Expressions/XQueryComment//XQueryComment011, EXPECTED_RESULT_GOT_FAILURE
@@ -7203,7 +7307,7 @@ Expressions/XQueryComment//XQueryComment016, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment017, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment018, EXPECTED_ERROR_GOT_SAME_ERROR
 Expressions/XQueryComment//XQueryComment019, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+Expressions/XQueryComment//XQueryComment020, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs001, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs002, EXPECTED_RESULT_GOT_SAME_RESULT
 Expressions/exprSeqTypes/SeqExprCast//CastAs003, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -9083,7 +9187,7 @@ Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-74, EXPECTED_RESULT_GOT_SAME
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-740, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-741, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-742, EXPECTED_ERROR_GOT_SAME_ERROR
-Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_SAME_RESULT
+Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-743, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-744, EXPECTED_RESULT_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-745, EXPECTED_ERROR_GOT_FAILURE
 Expressions/exprSeqTypes/SeqExprCast//K-SeqExprCast-746, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10421,8 +10525,8 @@ FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-1, EXPECTED_ERROR_GOT_SAME_E
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-10, EXPECTED_ERROR_GOT_FAILURE
 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_DIFFERENT_RESULT
-FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-13, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-14, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-15, EXPECTED_RESULT_GOT_SAME_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-16, EXPECTED_RESULT_GOT_SAME_RESULT
 FLWORExpr/ForExpr/ForExprWithout//K2-ForExprWithout-17, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10475,8 +10579,8 @@ FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-18, EXPECTED_RESULT_GOT_ERRO
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-19, EXPECTED_ERROR_GOT_RESULT
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-2, EXPECTED_RESULT_GOT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-20, EXPECTED_RESULT_GOT_FAILURE
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-21, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
-FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_DIFFERENT_RESULT
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-21, EXPECTED_RESULT_GOT_FAILURE
+FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-22, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-23, EXPECTED_RESULT_GOT_FAILURE
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-24, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
 FLWORExpr/LetExpr/LetExprWithout//K2-LetExprWithout-25, EXPECTED_RESULT_GOT_SAME_RESULT
@@ -10540,7 +10644,7 @@ FLWORExpr/OrderbyExpr/OrderbyExprWithout//K2-OrderbyExprWithout-9, EXPECTED_ERRO
 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
-FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10553,7 +10657,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-18, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-19, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-2, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-20, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_ERROR
+FullAxis/ancestor-or-selfAxis//ancestorself-21, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-3, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-4, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-5, EXPECTED_RESULT_GOT_FAILURE
@@ -10562,7 +10666,7 @@ FullAxis/ancestor-or-selfAxis//ancestorself-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//ancestorself-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestor-or-selfAxis//unabbreviatedSyntax-11, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/ancestorAxis//ancestor-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10584,7 +10688,7 @@ FullAxis/ancestorAxis//ancestor-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//ancestor-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/ancestorAxis//unabbreviatedSyntax-10, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/following-siblingAxis//followingsibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10606,7 +10710,7 @@ FullAxis/following-siblingAxis//followingsibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//followingsibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/following-siblingAxis//unabbreviatedSyntax-24, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/followingAxis//following-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/followingAxis//following-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10627,7 +10731,7 @@ FullAxis/followingAxis//following-6, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/followingAxis//following-9, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/preceding-siblingAxis//preceding-sibling-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-12, EXPECTED_RESULT_GOT_FAILURE
@@ -10649,7 +10753,7 @@ FullAxis/preceding-siblingAxis//preceding-sibling-7, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-8, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//preceding-sibling-9, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/preceding-siblingAxis//unabbreviatedSyntax-25, EXPECTED_RESULT_GOT_FAILURE
-FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_DIFFERENT_ERROR
+FullAxis/precedingAxis//preceding-1, EXPECTED_ERROR_GOT_FAILURE
 FullAxis/precedingAxis//preceding-10, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-11, EXPECTED_RESULT_GOT_FAILURE
 FullAxis/precedingAxis//preceding-12, EXPECTED_RESULT_GOT_FAILURE
@@ -11302,7 +11406,7 @@ FunctX/functx-functx-distinct-element-names//functx-functx-distinct-element-name
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-distinct-element-paths//functx-functx-distinct-element-paths-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-distinct-nodes//functx-functx-distinct-nodes-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-duration-from-timezone//functx-functx-duration-from-timezone-1, EXPECTED_RESULT_GOT_ERROR
@@ -11514,18 +11618,18 @@ FunctX/functx-functx-max-line-length//functx-functx-max-line-length-1, EXPECTED_
 FunctX/functx-functx-max-line-length//functx-functx-max-line-length-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-max-line-length//functx-functx-max-line-length-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-max-node//functx-functx-max-node-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-max-string//functx-functx-max-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-max-string//functx-functx-max-string-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-determine-type//functx-functx-min-determine-type-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-node//functx-functx-min-node-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-min-non-empty-string//functx-functx-min-non-empty-string-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-min-string//functx-functx-min-string-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-min-string//functx-functx-min-string-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-mmddyyyy-to-date//functx-functx-mmddyyyy-to-date-3, EXPECTED_RESULT_GOT_ERROR
@@ -11550,11 +11654,11 @@ FunctX/functx-functx-next-day//functx-functx-next-day-2, EXPECTED_RESULT_GOT_ERR
 FunctX/functx-functx-next-day//functx-functx-next-day-all, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-3, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-node-kind//functx-functx-node-kind-4, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-node-kind//functx-functx-node-kind-5, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-node-kind//functx-functx-node-kind-6, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-node-kind//functx-functx-node-kind-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-non-distinct-values//functx-functx-non-distinct-values-3, EXPECTED_RESULT_GOT_ERROR
@@ -11641,29 +11745,29 @@ FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-3, EXPECTED_
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-4, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-5, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-scheme-from-uri//functx-functx-scheme-from-uri-all, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-deep-equal//functx-functx-sequence-deep-equal-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-3, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal-any-order//functx-functx-sequence-node-equal-any-order-all, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-3, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-node-equal//functx-functx-sequence-node-equal-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-10, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-11, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-3, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-4, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-5, EXPECTED_RESULT_GOT_FAILURE
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-6, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-7, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-8, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sequence-type//functx-functx-sequence-type-9, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sequence-type//functx-functx-sequence-type-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-1, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings-same-name//functx-functx-siblings-same-name-2, EXPECTED_RESULT_GOT_FAILURE
@@ -11672,15 +11776,15 @@ FunctX/functx-functx-siblings//functx-functx-siblings-1, EXPECTED_RESULT_GOT_FAI
 FunctX/functx-functx-siblings//functx-functx-siblings-2, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-siblings//functx-functx-siblings-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-2, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-as-numeric//functx-functx-sort-as-numeric-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-2, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort-case-insensitive//functx-functx-sort-case-insensitive-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-sort-document-order//functx-functx-sort-document-order-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-sort//functx-functx-sort-1, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_ERROR
-FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_ERROR
+FunctX/functx-functx-sort//functx-functx-sort-2, EXPECTED_RESULT_GOT_FAILURE
+FunctX/functx-functx-sort//functx-functx-sort-all, EXPECTED_RESULT_GOT_FAILURE
 FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-1, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-functx-substring-after-if-contains//functx-functx-substring-after-if-contains-2, EXPECTED_RESULT_GOT_ERROR
 FunctX/functx-funct

<TRUNCATED>

[2/5] git commit: add NullableTypeComputer to avoid NPE

Posted by pr...@apache.org.
add NullableTypeComputer to avoid NPE


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/c13ad120
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/c13ad120
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/c13ad120

Branch: refs/heads/prestonc/hash_join
Commit: c13ad1202af4da31406b0ac2e83d833e87a4c64d
Parents: 3f4797b
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:47:21 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 .../org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java   | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/c13ad120/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
index 91c7764..2fdfbea 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java
@@ -41,6 +41,7 @@ import org.apache.vxquery.xmlquery.ast.ModuleNode;
 import org.apache.vxquery.xmlquery.translator.XMLQueryTranslator;
 
 import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
+import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
 import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
 import edu.uci.ics.hyracks.algebricks.compiler.api.HeuristicCompilerFactoryBuilder;
 import edu.uci.ics.hyracks.algebricks.compiler.api.ICompiler;
@@ -149,6 +150,12 @@ public class XMLQueryCompiler {
                 return null;
             }
         });
+        builder.setNullableTypeComputer(new INullableTypeComputer() {
+            @Override
+            public Object makeNullableType(Object type) throws AlgebricksException {
+                throw new NotImplementedException("NullableTypeComputer is not implented");
+            }
+        });
         builder.setNullWriterFactory(new VXQueryNullWriterFactory());
         if (availableProcessors < 1) {
             builder.setClusterLocations(VXQueryMetadataProvider.getClusterLocations(nodeList));


[3/5] git commit: fix serialization for empty elements

Posted by pr...@apache.org.
fix serialization for empty elements


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/3f4797bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/3f4797bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/3f4797bb

Branch: refs/heads/prestonc/hash_join
Commit: 3f4797bb7b17916947c6d0a9e821eb5084e23f5f
Parents: e553544
Author: Till Westmann <we...@gmail.com>
Authored: Thu Apr 3 10:25:13 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:42 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/vxquery/serializer/XMLSerializer.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/3f4797bb/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
index 51670e8..189ae24 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java
@@ -369,14 +369,16 @@ public class XMLSerializer implements IPrinter {
                 printSequence(ps, seqp);
             }
 
-            ps.append('>');
             enp.getChildrenSequence(ntp, seqp);
             if (seqp.getByteArray() != null) {
+                ps.append('>');
                 printSequence(ps, seqp);
+                ps.append("</");
+                printPrefixedQName(ps, cqp, utf8sp);
+                ps.append('>');
+            } else {
+                ps.append("/>");
             }
-            ps.append("</");
-            printPrefixedQName(ps, cqp, utf8sp);
-            ps.append('>');
         } finally {
             pp.giveBack(seqp);
             pp.giveBack(utf8sp);


[5/5] git commit: updated XQTS results

Posted by pr...@apache.org.
updated XQTS results


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/6512b009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/6512b009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/6512b009

Branch: refs/heads/prestonc/hash_join
Commit: 6512b00954b794ce63b757ed604cf6b31fff07cc
Parents: bd1160a
Author: Till Westmann <we...@gmail.com>
Authored: Fri Apr 4 14:23:40 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Sun Apr 6 09:50:43 2014 -0700

----------------------------------------------------------------------
 vxquery-xtest/results/xqts.txt | 987 ++++++++++++++++++++++--------------
 1 file changed, 596 insertions(+), 391 deletions(-)
----------------------------------------------------------------------