Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/mytrunk into lp:zorba.
Requested reviews: Chris Hillery (ceejatec) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 fn:analyze-string fix Also removed useless test -- https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog' --- ChangeLog 2011-10-12 09:58:12 +0000 +++ ChangeLog 2011-10-12 18:39:36 +0000 @@ -50,6 +50,7 @@ different nodes cannot have the same identifier. * Fixed bug #872697 (segmentation fault with validation of NMTOKENS) * Added undo for node revalidation + * Fixed bug #868325 (fn:analyze-string fails with some recursive subgroups) version 2.0.1 === modified file 'src/diagnostics/dict_XX_cpp.xq' --- src/diagnostics/dict_XX_cpp.xq 2011-08-05 02:21:55 +0000 +++ src/diagnostics/dict_XX_cpp.xq 2011-10-12 18:39:36 +0000 @@ -64,6 +64,7 @@ return string-join( ( util:copyright(), '#include "stdafx.h"', + '#include "zorba/config.h"', '#include "diagnostics/dict_impl.h"', '', 'namespace zorba {', === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2011-10-05 17:49:48 +0000 +++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-12 18:39:36 +0000 @@ -20,6 +20,7 @@ */ #include "stdafx.h" +#include "zorba/config.h" #include "diagnostics/dict_impl.h" namespace zorba { === modified file 'src/runtime/strings/strings_impl.cpp' --- src/runtime/strings/strings_impl.cpp 2011-08-10 18:58:11 +0000 +++ src/runtime/strings/strings_impl.cpp 2011-10-12 18:39:36 +0000 @@ -1688,7 +1688,7 @@ GENV_ITEMFACTORY->createString(strid_item, zstrid); store::Item_t id_attrib_item; GENV_ITEMFACTORY->createAttributeNode(id_attrib_item, group_elem.getp(), nr_attrib_name, untyped_type_name, strid_item); - if(match_startg < 0) + if((match_startg < 0) || (match_startg < match_endgood)) continue; match_endgood = match_endg; if((i+1)<nr_pattern_groups) === modified file 'src/zorbatypes/URI.cpp' --- src/zorbatypes/URI.cpp 2011-06-24 23:00:33 +0000 +++ src/zorbatypes/URI.cpp 2011-10-12 18:39:36 +0000 @@ -1191,8 +1191,6 @@ return is_set(Scheme) && !theScheme.empty(); } - - /******************************************************************************* ********************************************************************************/ @@ -1347,7 +1345,6 @@ path = base_path.substr(0, last_slash+1); // else // path = "/"; - } // 6b - append the relative URI path === added directory 'test/rbkt/ExpQueryResults/zorba/string/Regex' === added file 'test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res' --- test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res 1970-01-01 00:00:00 +0000 +++ test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res 2011-10-12 18:39:36 +0000 @@ -0,0 +1,1 @@ +<fn:analyze-string-result xmlns:fn="http://www.w3.org/2005/xpath-functions"><fn:match>a<fn:group nr="1"><fn:group nr="2"/><fn:group nr="3">c</fn:group></fn:group></fn:match></fn:analyze-string-result> \ No newline at end of file === added directory 'test/rbkt/Queries/zorba/string/Regex' === added file 'test/rbkt/Queries/zorba/string/Regex/regex_a4.xq' --- test/rbkt/Queries/zorba/string/Regex/regex_a4.xq 1970-01-01 00:00:00 +0000 +++ test/rbkt/Queries/zorba/string/Regex/regex_a4.xq 2011-10-12 18:39:36 +0000 @@ -0,0 +1,1 @@ +fn:analyze-string("ac", "((a)|(c))+") \ No newline at end of file
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp