zorba-coders team mailing list archive

[Federico Cavalieri <fcavalieri83@xxxxxxxxx>]

Federico Cavalieri has proposed merging lp:~fcavalieri/zorba/bugs into lp:zorba.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070

Fixed bug #872697 
Updated Changelog for bugs #872697, #871623 and #871629
-- 
https://code.launchpad.net/~fcavalieri/zorba/bugs/+merge/79070
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2011-10-10 19:29:05 +0000
+++ ChangeLog	2011-10-12 07:21:30 +0000
@@ -41,11 +41,13 @@
   * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012)
   * Implemented the probe-index-range-value for general indexes
   * Fixed bug #867662 ("nullptr" warning)
+  * Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections)
   * Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence)
   * Fixed bug #869024 (segmentation fault with node-reference)
   * Fixed bug #869025 (segmentation fault with node-reference)
   * New node-reference module. References can be obtained for any node, and
 	different nodes cannot have the same identifier.
+  * Fixed bug #872697  (segmentation fault with validation of NMTOKENS)
 
 version 2.0.1
 

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2011-07-22 07:23:17 +0000
+++ src/store/naive/simple_item_factory.cpp	2011-10-12 07:21:30 +0000
@@ -162,7 +162,7 @@
   for ( unsigned int i = 0; i < atomicTextValues.size() ; i++)
   {
     store::Item_t resultItem;
-    if ( createNMTOKENS(resultItem, atomicTextValues[i]) )
+    if ( createNMTOKEN(resultItem, atomicTextValues[i]) )
     {
       typedValues.push_back(resultItem.getp());
     }

=== added file 'test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res'
--- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res	2011-10-12 07:21:30 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<note nmt="aaa"/>
\ No newline at end of file

=== added file 'test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq'
--- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-18.xq	2011-10-12 07:21:30 +0000
@@ -0,0 +1,10 @@
+import module namespace x = "http://www.zorba-xquery.com/modules/xml";;
+
+x:parse-xml-fragment("<?xml version='1.0'?>
+<!DOCTYPE note [
+<!ELEMENT note (#PCDATA)>
+<!ATTLIST note nmt NMTOKENS #REQUIRED>
+]>
+<note nmt='aaa'/>
+", 
+"d")