Merge lp:~nbrinza/zorba/bugs into lp:zorba

[Nicolae Brinza]

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing

[Matthias Brantner (matthias-brantner)]

Nicolae, could you please also update the ChangeLog?

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-03T02-45-02.853Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bugs-2011-11-03T02-45-02.853Z 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

[lp:~nbrinza/zorba/bugs]

10536. By Nicolae Brinza on 2011-11-06

Updated Changelog to reflect the fix for the bug #867256

10537. By Nicolae Brinza on 2011-11-07

Fixed a regression for the document-node(schema-element(X)) element test

10538. By Nicolae Brinza on 2011-12-14

Merged changes from Zorba trunk

10539. By Nicolae Brinza on 2011-12-15

Related to the Steps-leading-lone-slash-8a test: removed an unecessary condition from typeimpl.cpp. Removed the expected failure for the said test.

10540. By Nicolae Brinza on 2011-12-16

Merged with Zorba trunk

10541. By Nicolae Brinza on 2011-12-17

Added tests for the document-node(schema-element()) node test, used as variable types and in 'instance of' expressions

10542. By Nicolae Brinza on 2011-12-17

Added test results files for the previous commit (tests for document-node(schema-element()) node test)

10543. By Nicolae Brinza on 2011-12-17

Added spec files for tests with the document-node(schema-element()) node tests

10544. By Nicolae Brinza on 2011-12-20

Merged with Zorba trunk

10545. By Nicolae Brinza on 2012-03-15

Merged with Zorba trunk

10546. By Nicolae Brinza on 2012-03-17

Merged with Zorba trunk

10547. By Nicolae Brinza on 2012-05-10

Merged with Zorba trunk

10548. By Nicolae Brinza on 2012-06-21

Merged with Zorba trunk

10549. By Nicolae Brinza on 2012-06-21

Fixed the 6 failing doc-node-schema-elem-test- tests

10550. By Nicolae Brinza on 2012-12-14

Merged with Zorba trunk

Unmerged revisions

10550. By Nicolae Brinza on 2012-12-14

Merged with Zorba trunk

10549. By Nicolae Brinza on 2012-06-21

Fixed the 6 failing doc-node-schema-elem-test- tests

10548. By Nicolae Brinza on 2012-06-21

Merged with Zorba trunk

10547. By Nicolae Brinza on 2012-05-10

Merged with Zorba trunk

10546. By Nicolae Brinza on 2012-03-17

Merged with Zorba trunk

10545. By Nicolae Brinza on 2012-03-15

Merged with Zorba trunk

10544. By Nicolae Brinza on 2011-12-20

Merged with Zorba trunk

10543. By Nicolae Brinza on 2011-12-17

Added spec files for tests with the document-node(schema-element()) node tests

10542. By Nicolae Brinza on 2011-12-17

Added test results files for the previous commit (tests for document-node(schema-element()) node test)

10541. By Nicolae Brinza on 2011-12-17

Added tests for the document-node(schema-element()) node test, used as variable types and in 'instance of' expressions

=== modified file 'ChangeLog'
--- ChangeLog	2011-11-04 11:40:20 +0000
+++ ChangeLog	2011-11-06 18:45:28 +0000
@@ -1,7 +1,8 @@
 Zorba - The XQuery Processor
 
 version 2.x
-
+  
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
   * Custom Full-text thesaurus.
   * Fixed bug #3401971 (node-by-reference on dynamic collections)
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a
 
=== modified file 'src/types/typeimpl.cpp' (properties changed: -x to +x)
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +0000
+++ src/types/typeimpl.cpp	2011-11-06 18:45:28 +0000
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-    const TypeManager* tm, 
+    const TypeManager* tm,
     const NodeXQType& supertype,
     const QueryLoc& loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-    const TypeManager* tm, 
+    const TypeManager* tm,
     const store::Item* subitem,
     const QueryLoc& loc) const
 {
@@ -488,14 +488,28 @@
     }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode && 
-      m_node_kind != store::StoreConsts::attributeNode)
+  if (m_node_kind != store::StoreConsts::elementNode &&
+      m_node_kind != store::StoreConsts::attributeNode &&
+      (m_content_type == NULL
+      ||
+      m_node_kind != store::StoreConsts::documentNode))
     return true;
 
   if (m_content_type == NULL ||
       m_content_type->type_kind() == XQType::ANY_TYPE_KIND)
     return true;
 
+  // document-node( E ) matches any document node that contains exactly one element 
+  // node, optionally accompanied by one or more comment and processing instruction 
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  if (m_node_kind == store::StoreConsts::documentNode &&
+      m_content_type != NULL &&
+      m_content_type->type_kind() == XQType::NODE_TYPE_KIND)
+  {
+    xqtref_t documentNodeType = tm->create_value_type(subitem, loc);
+    return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm->create_named_type(subitem->getType(),
                                                   TypeConstants::QUANT_ONE,
                                                   loc,