Merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba

[Ghislain Fourny]

Fixing bug 1123165 (prohibit/require feature tests).

Fixing bug 1123165 (prohibit/require feature tests).

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1123165-2013-04-19T14-11-47.953Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1123165-2013-04-19T14-11-47.953Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Matthias Brantner (matthias-brantner)]

- The fix for dynamic_function_invocation seems to be orthogonal. Why is this fixed in this merge proposal? I couldn't find a test to cover this behavior.

- The function check_xquery_feature_options is too long. Could this be simplified and/or split into multiple functions? It feels like most of the implementation should go into the translator and not into the static context.

- The style of the error messages is not consistent with the other error messages. They should be changed as follows:
  XQST0120 "$1": feature not supported
  XQST0128 "$1": unable to disable a supported feature
  XQST0126 impossible to activate all extension features

review: Needs Fixing

[Nicolae Brinza (nbrinza)]

Ghislain, could you also please remove the fix that you submitted for scanner.l problem? Your proposal works, but on linux the GCC gives off a warning for that code. I have a proposal that fixes the issue in another branch, which Matthias will approve and merge soon.

[Nicolae Brinza (nbrinza)]

I too agree that it should be moved to the translator. That's where all the similar code currently is. Other than this and the scanner issue, it looks good for me.

[Nicolae Brinza (nbrinza)]

review: Approve

[Ghislain Fourny (gislenius)]

- The fix for dynamic_function_invocation seems to be orthogonal. Why is this fixed in this merge proposal? I couldn't find a test to cover this behavior.

It does fix some of the W3C tests:

      for $f in () return $f(1, ?)

Raised an error in zorba because it was considered an object lookup. But it looks like valid XQuery to me?

[Ghislain Fourny (gislenius)]

- The function check_xquery_feature_options is too long. Could this be simplified and/or split into multiple functions?

DONE

[Ghislain Fourny (gislenius)]

- It feels like most of the implementation should go into the translator and not into the static context.

DONE

[Ghislain Fourny (gislenius)]

- The style of the error messages is not consistent with the other error messages. They should be changed as follows:
  XQST0120 "$1": feature not supported
  XQST0128 "$1": unable to disable a supported feature
  XQST0126 impossible to activate all extension features

DONE

[Ghislain Fourny (gislenius)]

I think I addressed all comments.

There are three expected failures left:

EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-5-s 0)
EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-10-s 0)

-> This is the for $f in () return $f(1, ?) issue, which needs to be solved separately.

EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-s 0)

-> This is because the new package with the W3C-FOTS fix is not there yet.

[Ghislain Fourny (gislenius)]

I opened the bug for the first two expected failures here: bug 1171860.

[Ghislain Fourny (gislenius)]

EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-5-s 0)

-> I removed it because the test suite got updated in the trunk.

[Ghislain Fourny (gislenius)]

Disapproving to allow running tests without merging.

review: Disapprove

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1123165-2013-04-23T13-54-43.634Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1123165-2013-04-23T13-54-43.634Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 2 Approve, 1 Disapprove, 1 Needs Fixing.

[Nicolae Brinza (nbrinza)]

review: Approve

[Matthias Brantner (matthias-brantner)]

> - The fix for dynamic_function_invocation seems to be orthogonal. Why is this
> fixed in this merge proposal? I couldn't find a test to cover this behavior.
>
> It does fix some of the W3C tests:
>
> for $f in () return $f(1, ?)
>
> Raised an error in zorba because it was considered an object lookup. But it
> looks like valid XQuery to me?
This is one of the cases that we will have to live with. It's a conflict between
JSONiq and HOF. We were trying to push the W3C to make the dynamic function invocation
a map (i.e. $f could be () or a sequence of function items). However, the w3c didn't
want to go this way.

[Matthias Brantner (matthias-brantner)]

awesome

review: Approve

[Ghislain Fourny (gislenius)]

review: Approve

[Ghislain Fourny (gislenius)]

This is one of the cases that we will have to live with. It's a conflict between
JSONiq and HOF. We were trying to push the W3C to make the dynamic function invocation
a map (i.e. $f could be () or a sequence of function items). However, the w3c didn't
want to go this way.

-> In this case, $f is not the empty object - it is just a virtual single item (as is always the case for a for variable, without "allowing empty") that it will never get bound to.

We do not have to consider $f an object lookup in this case, right? I have the more general feeling that there might be something wrong in type inference regarding for loops on empty sequences.

[Nicolae Brinza (nbrinza)]

> We do not have to consider $f an object lookup in this case, right? I have the more general feeling that there might be something wrong in type inference regarding for loops on empty sequences.

Since there is a partial application "?", it definitely cannot be an object lookup.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1123165-2013-04-23T15-14-42.012Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1123165-2013-04-23T15-14-42.012Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2013-04-04 04:14:46 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2013-04-23 14:00:36 +0000
@@ -162,8 +162,16 @@
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0114;
 
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0120;
+
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
 
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0126;
+
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0127;
+
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0128;
+
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;

=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq	2013-04-04 04:14:46 +0000
+++ modules/w3c/pregenerated/xqt-errors.xq	2013-04-23 14:00:36 +0000
@@ -692,6 +692,15 @@
 
 (:~
  :
+ : It is a static error if a feature required by require-feature is not
+ : supported by the implementation.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0120 as xs:QName := fn:QName($err:NS, "err:XQST0120");
+
+(:~
+ :
  : It is a static error if the name of a feature in require-feature is not
  : recognized by the implementation.
  : 
@@ -701,6 +710,32 @@
 
 (:~
  :
+ : It is a static error if all-extensions appears in a require-feature option declaration.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0126 as xs:QName := fn:QName($err:NS, "err:XQST0126");
+
+(:~
+ :
+ : It is a static error if a given feature is both required and prohibited, directly or indirectly, in a module.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0127 as xs:QName := fn:QName($err:NS, "err:XQST0127");
+
+(:~
+ :
+ : It is a static error if a feature name that an implementation supports appears
+ : in a prohibit-feature option declaration, and the implementation is unable to
+ : disable the feature.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0128 as xs:QName := fn:QName($err:NS, "err:XQST0128");
+
+(:~
+ :
  : It is a dynamic error if evaluation of an expression relies on some part
  : of the dynamic context that has not been assigned a value.
  : 

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-04-18 08:47:43 +0000
+++ src/compiler/translator/translator.cpp	2013-04-23 14:00:36 +0000
@@ -15,11 +15,12 @@
  */
 #include "stdafx.h"
 
+#include <bitset>
+#include <iterator>
+#include <map>
 #include <sstream>
-#include <iterator>
 #include <stack>
-#include <map>
-#include <bitset>
+#include <vector>
 
 #include <zorba/config.h>
 #include <zorba/diagnostic_list.h>
@@ -3856,9 +3857,208 @@
     bind_fn(f, numParams, loc);
   }
 
+  check_xquery_feature_options(loc);
+
   return no_state;
 }
 
+store::Item_t parse_and_expand_qname(
+    const zstring& value,
+    const char* default_ns,
+    const QueryLoc& loc) const
+{
+  zstring lPrefix;
+  zstring lLocalName;
+
+  zstring::size_type n = value.rfind(':');
+
+  if ( n == zstring::npos )
+  {
+    lLocalName = value;
+  }
+  else
+  {
+    lPrefix = value.substr( 0, n );
+    lLocalName = value.substr( n+1 );
+  }
+  store::Item_t lQName;
+  theSctx->expand_qname( lQName, default_ns, lPrefix, lLocalName, loc );
+
+  return lQName;
+}
+
+void parse_feature_list(
+    const zstring& anOptionName,
+    std::map<zstring, bool>* aFeatures,
+    bool aRequired,
+    const QueryLoc& loc)
+{
+  // Looking up feature options.
+  zstring lFeatureList;
+  store::Item_t lFeatureQName = parse_and_expand_qname(
+      anOptionName,
+      static_context::XQUERY_NS,
+      loc);
+  theSctx->lookup_option(lFeatureQName, lFeatureList);
+  
+  if (aFeatures == NULL || lFeatureList.empty())
+  {
+    return;
+  }
+  size_t lPositionLeft = 0;
+  size_t lPositionRight = lFeatureList.find(" ", lPositionLeft);
+  bool lLastTime = lPositionRight == zstring::npos;
+  while (lPositionRight != zstring::npos || lLastTime)
+  {
+    zstring lFeature = lFeatureList.substr(
+        lPositionLeft,
+        lPositionRight - lPositionLeft);
+    store::Item_t lFeatureQName = parse_and_expand_qname(
+        lFeature,
+        static_context::XQUERY_NS,
+        loc);
+    // Requiring a non-recognized feature.
+    if (aRequired && lFeatureQName->getNamespace() != static_context::XQUERY_NS)
+    {
+      RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(lFeature));
+    }
+    zstring lFeatureName = lFeatureQName->getLocalName();
+    if (aRequired && !is_recognized_feature(lFeatureName))
+    {
+      RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(lFeature));
+    }
+
+    // Only adding to the feature matrix if recognized.
+    if (is_recognized_feature(lFeatureName))
+    {
+      // Error in case of conflicting flags.
+       std::map<zstring, bool>::iterator lIt = aFeatures->find(lFeatureName);
+      if (lIt != aFeatures->end() && lIt->second != aRequired)
+      {
+        RAISE_ERROR(err::XQST0127, loc, ERROR_PARAMS(lFeature));
+      }
+      (*aFeatures)[lFeatureName] = aRequired;
+    }
+    if (lLastTime)
+    {
+      break;
+    }
+    lPositionLeft = lPositionRight + 1;
+    lPositionRight = lFeatureList.find(" ", lPositionLeft);
+    if (lPositionRight == zstring::npos)
+    {
+      lLastTime = true;
+    }
+  }
+}
+
+bool is_recognized_feature(const zstring& aFeatureName)
+{
+  return aFeatureName == "static-typing" ||
+         aFeatureName == "module" ||
+         aFeatureName == "higher-order-function" ||
+         aFeatureName == "schema-aware" ||
+         aFeatureName == "all-extensions" ||
+         aFeatureName == "all-optional-features";
+}
+
+bool is_required_feature(
+    const std::map<zstring, bool>& aFeatureMatrix,
+    const zstring& aFeatureName
+)
+{
+  std::map<zstring, bool>::const_iterator lIt =
+    aFeatureMatrix.find(aFeatureName);
+  if (lIt == aFeatureMatrix.end())
+  {
+    return false;
+  }
+  return lIt->second;
+}
+
+bool is_prohibited_feature(
+    const std::map<zstring, bool>& aFeatureMatrix,
+    const zstring& aFeatureName
+)
+{
+  std::map<zstring, bool>::const_iterator lIt =
+    aFeatureMatrix.find(aFeatureName);
+  if (lIt == aFeatureMatrix.end())
+  {
+    return false;
+  }
+  return !lIt->second;
+}
+
+void check_xquery_feature_options(const QueryLoc& loc)
+{
+  // Constructing feature vectors.
+  std::map<zstring, bool> lFeatures;
+  parse_feature_list("require-feature", &lFeatures, true, loc);
+  parse_feature_list("prohibit-feature", &lFeatures, false, loc);
+  
+  std::vector<zstring> lSupportedFeatures;
+  lSupportedFeatures.push_back("module");
+  lSupportedFeatures.push_back("higher-order-function");
+  lSupportedFeatures.push_back("schema-aware");
+  std::vector<zstring> lNonSupportedFeatures;
+  lNonSupportedFeatures.push_back("static-typing");
+  
+  // Non supported features cannot be required.
+  for (std::vector<zstring>::iterator lIt = lNonSupportedFeatures.begin();
+       lIt != lNonSupportedFeatures.end();
+       ++lIt)
+  {
+    if (is_required_feature(lFeatures, *lIt))
+    {
+      RAISE_ERROR(err::XQST0120, loc, ERROR_PARAMS(*lIt));
+    }
+  }
+  // It is not possible to require all extensions.
+  if (is_required_feature(lFeatures, "all-extensions"))
+  {
+    RAISE_ERROR(err::XQST0126, loc, ERROR_PARAMS("all-extensions"));
+  }
+  // All optional features can only be required if all unsupported features are
+  // prohibited.
+  if (is_required_feature(lFeatures, "all-optional-features"))
+  {
+    for (std::vector<zstring>::iterator lIt = lNonSupportedFeatures.begin();
+         lIt != lNonSupportedFeatures.end();
+         ++lIt)
+    {
+      if (!is_prohibited_feature(lFeatures, *lIt))
+      {
+        RAISE_ERROR(err::XQST0120, loc, ERROR_PARAMS(*lIt));
+      }
+    }
+  }
+  // Supported features cannot be prohibited.
+  for (std::vector<zstring>::iterator lIt = lSupportedFeatures.begin();
+       lIt != lSupportedFeatures.end();
+       ++lIt)
+  {
+    if (is_prohibited_feature(lFeatures, *lIt))
+    {
+      RAISE_ERROR(err::XQST0128, loc, ERROR_PARAMS(*lIt));
+    }
+  }
+  // All optional features can only be prohibited if all supported features
+  // are required.
+  if (is_prohibited_feature(lFeatures, "all-optional-features"))
+  {
+    for (std::vector<zstring>::iterator lIt = lSupportedFeatures.begin();
+         lIt != lSupportedFeatures.end();
+         ++lIt)
+    {
+      if (!is_required_feature(lFeatures, *lIt))
+      {
+        RAISE_ERROR(err::XQST0128, loc, ERROR_PARAMS(*lIt));
+      }
+    }
+  }
+}
+
 
 void end_visit(const VFO_DeclList& v, void* /*visit_state*/)
 {

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-04-16 07:43:15 +0000
+++ src/context/static_context.cpp	2013-04-23 14:00:36 +0000
@@ -3505,7 +3505,6 @@
 //                                                                             //
 /////////////////////////////////////////////////////////////////////////////////
 
-
 /***************************************************************************//**
 
 ********************************************************************************/
@@ -3524,12 +3523,23 @@
   store::Item* qname2 = option.theName.getp();
 
   zstring lNamespace = qname2->getNamespace();
+  zstring lLocalName = qname2->getLocalName();
 
+  // If option namespace is the XQuery namespace.
+  if ( lNamespace == XQUERY_NS)
+  {
+    OptionMap::iterator lIt = theOptionMap->find(qname2);
+    if (lIt != theOptionMap->end())
+    {
+      std::ostringstream lOss;
+      lOss << lIt.getValue().theValue << " " << option.theValue;
+      option.theValue = lOss.str();
+    }
+  }
+  
   // If option namespace starts with zorba options namespace
   if ( lNamespace.find(ZORBA_OPTIONS_NS) == 0 )
   {
-    zstring lLocalName = qname2->getLocalName();
-
     if (lNamespace == ZORBA_OPTION_FEATURE_NS &&
         (lLocalName == "enable" || lLocalName == "disable"))
     {

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2013-04-10 02:24:08 +0000
+++ src/diagnostics/diagnostic_en.xml	2013-04-23 14:00:36 +0000
@@ -830,15 +830,46 @@
       </comment>
       <value>"$1": duplicate decimal format property</value>
     </diagnostic>
-
+    
+    <diagnostic code="XQST0120">
+      <comment>
+        It is a static error if a feature required by require-feature is not
+        supported by the implementation.
+      </comment>
+      <value>"$1": feature not supported</value>
+    </diagnostic>
+    
     <diagnostic code="XQST0123">
       <comment>
-       It is a static error if the name of a feature in require-feature is not
-       recognized by the implementation.
+        It is a static error if the name of a feature in require-feature is not
+        recognized by the implementation.
       </comment>
       <value>$1</value>
     </diagnostic>
-
+    
+    <diagnostic code="XQST0126">
+      <comment>
+        It is a static error if all-extensions appears in a require-feature option declaration.
+      </comment>
+      <value>impossible to require all extension features</value>
+    </diagnostic>
+    
+    <diagnostic code="XQST0127">
+      <comment>
+        It is a static error if a given feature is both required and prohibited, directly or indirectly, in a module.
+      </comment>
+      <value>$1 : impossible to require and prohibit at the same time</value>
+    </diagnostic>
+    
+    <diagnostic code="XQST0128">
+      <comment>
+        It is a static error if a feature name that an implementation supports appears
+        in a prohibit-feature option declaration, and the implementation is unable to
+        disable the feature.
+      </comment>
+      <value>"$1": unable to disable a supported feature</value>
+    </diagnostic>
+    
     <diagnostic code="XPDY0002">
       <comment>
        It is a dynamic error if evaluation of an expression relies on some part

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2013-04-04 04:14:46 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2013-04-23 14:00:36 +0000
@@ -226,9 +226,21 @@
 XQueryErrorCode XQST0114( "XQST0114" );
 
 
+XQueryErrorCode XQST0120( "XQST0120" );
+
+
 XQueryErrorCode XQST0123( "XQST0123" );
 
 
+XQueryErrorCode XQST0126( "XQST0126" );
+
+
+XQueryErrorCode XQST0127( "XQST0127" );
+
+
+XQueryErrorCode XQST0128( "XQST0128" );
+
+
 XQueryErrorCode XPDY0002( "XPDY0002" );
 
 

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2013-04-10 02:24:08 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2013-04-23 14:00:36 +0000
@@ -262,7 +262,11 @@
   { "XQST0106", "$1: multiple annotations with $2 names" },
   { "XQST0111", "$1" },
   { "XQST0114", "\"$1\": duplicate decimal format property" },
+  { "XQST0120", "\"$1\": feature not supported" },
   { "XQST0123", "$1" },
+  { "XQST0126", "impossible to require all extension features" },
+  { "XQST0127", "$1 : impossible to require and prohibit at the same time" },
+  { "XQST0128", "\"$1\": unable to disable a supported feature" },
   { "XQTY0024", "element constructor content sequence must not have an attribute node following a non-attribute node" },
   { "XQTY0030", "validate argument must be exactly one document or element node" },
   { "XQTY0086", "typed value of copied element or attribute node is namespace-sensitive when construction mode is preserve and copy-namespaces mode is no-preserve" },

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-23 02:39:22 +0000
+++ test/fots/CMakeLists.txt	2013-04-23 14:00:36 +0000
@@ -378,30 +378,8 @@
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy50 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy51 0)
 EXPECTED_FOTS_FAILURE (prod-OrderByClause orderBy59 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-static-typing-1-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-9-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-1-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-schema-aware-2-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-1-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-2-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-3-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-4-ns 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature unknown-feature 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature well-formed-feature-1 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature well-formed-feature-2 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature well-formed-feature-3 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature well-formed-feature-4 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-1 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-2 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-feature-list-2-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-feature-list-3-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-4 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-prohibit-5 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-extensions-1 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-3-ns3 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-2-ns2 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-all-optional-features-1 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-all-optional-features-7-s 0)
+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-5-s 1171860)
+EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-10-s 1171860)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport qischema031 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-001 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-002 0)
@@ -462,15 +440,6 @@
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof12 0)
 EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-062 0)
 EXPECTED_FOTS_FAILURE (prod-NamedFunctionRef function-literal-494 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-5-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature require-higher-order-function-10-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-1-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-2-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-3-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature prohibit-higher-order-function-4-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-5-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-6-s 0)
-EXPECTED_FOTS_FAILURE (prod-RequireProhibitFeature separate-modules-7-s 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-030 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-031 0)
 EXPECTED_FOTS_FAILURE (prod-SchemaImport substitution-032 0)