zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
Fixed bug in testing if a sequence type is subtype of node(xs:untyped)

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/141715

Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/141715
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-01-02 02:33:53 +0000
+++ ChangeLog	2013-01-03 09:06:22 +0000
@@ -30,6 +30,7 @@
   * Fixed bug #868640 (Node lifetime is shorter than expected due to let
     variable inlining)
   * Fixed bug in castable expr when the target type is xs:QName.
+  * Fixed bug in testing if a sequence type is subtype of node(xs:untyped)
   * Fixed bugs #1081626 (Segmentation fault in a side-effecting FLWOR),
     #1079488 (streaming segfault)
   * Fixed bug #1062093 (bug in var reference iterators with an associated

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2012-12-29 06:48:09 +0000
+++ src/types/typeimpl.cpp	2013-01-03 09:06:22 +0000
@@ -808,7 +808,15 @@
   assert(subitem->isNode());
 
   if (m_node_kind == store::StoreConsts::anyNode)
+  {
+    if (theContentType != NULL &&
+        theContentType->type_kind() == XQType::UNTYPED_KIND)
+    {
+      return (subitem->getType()->equals(GENV_TYPESYSTEM.XS_UNTYPED_QNAME));
+    }
+
     return true;
+  }
 
   if (m_node_kind != subitem->getNodeKind())
     return false;