Zorba

Merge lp:~danielturcanu/zorba/mytrunk into lp:zorba

  1. mytrunk
  2. Merge into trunk
Proposed by Daniel Turcanu
Status: Superseded
Proposed branch: lp:~danielturcanu/zorba/mytrunk
Merge into: lp:zorba
Diff against target: 85 lines (+6/-4)
7 files modified
ChangeLog (+1/-0)
src/diagnostics/dict_XX_cpp.xq (+1/-0)
src/diagnostics/pregenerated/dict_en.cpp (+1/-0)
src/runtime/strings/strings_impl.cpp (+1/-1)
src/zorbatypes/URI.cpp (+0/-3)
test/rbkt/ExpQueryResults/zorba/string/Regex/regex_a4.xml.res (+1/-0)
test/rbkt/Queries/zorba/string/Regex/regex_a4.xq (+1/-0)
To merge this branch: bzr merge lp:~danielturcanu/zorba/mytrunk
Reviewer Review Type Date Requested Status
Chris Hillery Needs Information
Matthias Brantner Approve
Review via email: mp+79120@code.launchpad.net

This proposal supersedes a proposal from 2011-10-11.

This proposal has been superseded by a proposal from 2011-10-12.

Description of the change

fn:analyze-string fix
Also removed useless test

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal

What is the file test/rbkt/Queries/zorba/resolving/path_to_uri.xq supposed to test. It imports the file module but doesn't use it.

review: Needs Information
Revision history for this message
Daniel Turcanu (danielturcanu) wrote : Posted in a previous version of this proposal

See bug https://bugs.launchpad.net/zorba/+bug/868329

Revision history for this message
Chris Hillery (ceejatec) wrote : Posted in a previous version of this proposal

IMHO, path_to_uri.xq / .spec / .xml.res shouldn't be checked in with this change, since it's not related to the bug being fixed. path_to_uri.spec isn't relevant and shouldn't be checked in at all, since the variable $input-context it declares isn't used by path_to_uri.xq.

Also, why are there additional #include <zorba/config.h> lines added? That will probably slow builds down (more header dependencies), so if it's not critically important it'd be best to leave it out.

Finally, the good news: I confirmed that the change to strings_impl.cpp does fix the query regex_a4.xq. (Although, if I can continue being picky, I'd prefer to leave regex_a4.xq in the test/rbkt/Queries/zorba/string/AnalyzeString directory, rather than adding the new Regex subdirectory there.)

review: Needs Fixing
Revision history for this message
Matthias Brantner (matthias-brantner) wrote :

I approve the fix but it has merge conflicts in the ChangeLog.

review: Approve
Revision history for this message
Chris Hillery (ceejatec) wrote :

Still wondering what the #include <zorba/config.h> additions are about. They don't seem related or necessary...

review: Needs Information
Revision history for this message
Daniel Turcanu (danielturcanu) wrote :

The #include is necessary to have access to zorba settings.

Revision history for this message
Chris Hillery (ceejatec) wrote :

But it doesn't look like like you're using any such settings here...?

Revision history for this message
Daniel Turcanu (danielturcanu) wrote :

There are a lot of #if defined and #if !defined in that file.

lp:~danielturcanu/zorba/mytrunk updated
10480. By Daniel Turcanu

Update to trunk

10481. By Daniel Turcanu

Update to trunk

10482. By Daniel Turcanu

Update to trunk

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-10-12 09:58:12 +0000
+++ ChangeLog 2011-10-12 18:39:26 +0000
@@ -50,6 +50,7 @@
50 different nodes cannot have the same identifier.50 different nodes cannot have the same identifier.
51 * Fixed bug #872697 (segmentation fault with validation of NMTOKENS)51 * Fixed bug #872697 (segmentation fault with validation of NMTOKENS)
52 * Added undo for node revalidation52 * Added undo for node revalidation
53 * Fixed bug #868325 (fn:analyze-string fails with some recursive subgroups)
5354
54version 2.0.155version 2.0.1
5556
5657
=== 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:26 +0000
@@ -64,6 +64,7 @@
64return string-join(64return string-join(
65 ( util:copyright(), 65 ( util:copyright(),
66 '#include "stdafx.h"',66 '#include "stdafx.h"',
67 '#include "zorba/config.h"',
67 '#include "diagnostics/dict_impl.h"',68 '#include "diagnostics/dict_impl.h"',
68 '',69 '',
69 'namespace zorba {',70 'namespace zorba {',
7071
=== 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:26 +0000
@@ -20,6 +20,7 @@
20 */20 */
21 21
22#include "stdafx.h"22#include "stdafx.h"
23#include "zorba/config.h"
23#include "diagnostics/dict_impl.h"24#include "diagnostics/dict_impl.h"
2425
25namespace zorba {26namespace zorba {
2627
=== 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:26 +0000
@@ -1688,7 +1688,7 @@
1688 GENV_ITEMFACTORY->createString(strid_item, zstrid);1688 GENV_ITEMFACTORY->createString(strid_item, zstrid);
1689 store::Item_t id_attrib_item;1689 store::Item_t id_attrib_item;
1690 GENV_ITEMFACTORY->createAttributeNode(id_attrib_item, group_elem.getp(), nr_attrib_name, untyped_type_name, strid_item);1690 GENV_ITEMFACTORY->createAttributeNode(id_attrib_item, group_elem.getp(), nr_attrib_name, untyped_type_name, strid_item);
1691 if(match_startg < 0)1691 if((match_startg < 0) || (match_startg < match_endgood))
1692 continue;1692 continue;
1693 match_endgood = match_endg;1693 match_endgood = match_endg;
1694 if((i+1)<nr_pattern_groups)1694 if((i+1)<nr_pattern_groups)
16951695
=== 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:26 +0000
@@ -1191,8 +1191,6 @@
1191 return is_set(Scheme) && !theScheme.empty();1191 return is_set(Scheme) && !theScheme.empty();
1192}1192}
11931193
1194
1195
1196/*******************************************************************************1194/*******************************************************************************
11971195
1198********************************************************************************/1196********************************************************************************/
@@ -1347,7 +1345,6 @@
1347 path = base_path.substr(0, last_slash+1);1345 path = base_path.substr(0, last_slash+1);
1348// else1346// else
1349// path = "/";1347// path = "/";
1350
1351 }1348 }
13521349
1353 // 6b - append the relative URI path1350 // 6b - append the relative URI path
13541351
=== 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:26 +0000
@@ -0,0 +1,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>
0\ No newline at end of file2\ No newline at end of file
13
=== 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:26 +0000
@@ -0,0 +1,1 @@
1fn:analyze-string("ac", "((a)|(c))+")
0\ No newline at end of file2\ No newline at end of file

Subscribers

People subscribed via source and target branches