Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/plan-serializer into lp:zorba
Review: Approve -- https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/79162 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/itemfactory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/itemfactory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 -- https://code.launchpad.net/~zorba-coders/zorba/itemfactory/+merge/79181 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos1 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos1 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos1/+merge/79723 -- https://code.launchpad.net/~zorba-coders/zorba/markos1/+merge/79723 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos1 into lp:zorba
Validation queue job markos1-2011-10-18T18-43-08.911Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos1/+merge/79723 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/file_regex into lp:zorba
Validation queue job file_regex-2011-10-18T19-07-00.313Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/file_regex/+merge/79543 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~juan457/zorba/xqxq-api-changes into lp:zorba
I added the test in the test/unit/cxx_api_changes.cpp just one question, what you mena by mention my changes in ChangeLog, you mean in zorba/Changelog or did I miss in bazaar something? Juan, could you please also provide some tests? The best places would either be doc/cxx/examples/context.cpp or test/unit/. Examples in the former file are mostly used for documentation purposes because those examples are linked from the web site. The latter directory contains unit tests. Also, please don't forget to mention your changes in the ChangeLog. -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-18T20-35-01.78Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~juan457/zorba/xqxq-api-changes into lp:zorba
Review: Needs Fixing Yes, the zorba/ChangeLog file should mention bug fixes and such extensions. Also, the tests themselves look good but you should compare for the expected result. For example, whether isSequential really returns true (instead of just outputting it). -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-18T21-33-58.893Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-18T21-33-58.893Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-18T21-49-58.001Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-18T21-49-58.001Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79732 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743
Optimization. Lazily create the external function parameter hashmap. This saves
a lot of time every time the dynamic context is copied, i.e. on every function
invocation.
--
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2011-10-03 09:18:49 +
+++ src/compiler/translator/translator.cpp 2011-10-18 22:22:26 +
@@ -101,6 +101,7 @@
#include util/tracer.h
#include util/utf8_util.h
#include util/xml_util.h
+#include util/hashmap.h
#define NODE_SORT_OPT
=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp 2011-10-03 09:18:49 +
+++ src/context/dynamic_context.cpp 2011-10-18 22:22:26 +
@@ -120,6 +120,7 @@
dynamic_context::dynamic_context(dynamic_context* parent)
:
theParent(NULL),
+ keymap(NULL),
theAvailableIndices(NULL),
theDocLoadingUserTime(0.0),
theDocLoadingTime(0)
@@ -144,13 +145,20 @@
/
dynamic_context::~dynamic_context()
{
- for (uint32_t i = 0; i keymap.size(); ++i)
+ if (keymap)
{
-dctx_value_t lValue = keymap.getentryVal(i);
-if (lValue.type == dctx_value_t::ext_func_param_typed lValue.func_param)
+for (ValueMap::iterator lIter = keymap-begin();
+ lIter != keymap-end();
+ ++lIter)
{
- static_castExternalFunctionParameter*(lValue.func_param)-destroy();
+ dctx_value_t lValue = lIter.getValue();
+ if (lValue.type == dctx_value_t::ext_func_param_typed
+ lValue.func_param)
+ {
+static_castExternalFunctionParameter*(lValue.func_param)-destroy();
+ }
}
+delete keymap;
}
if (theAvailableIndices)
@@ -572,7 +580,20 @@
val.type = dynamic_context::dctx_value_t::ext_func_param;
val.func_param = aValue;
- return keymap.put ( aName, val);
+ if (!keymap)
+ {
+keymap = new ValueMap(8, false);
+ }
+
+ if (!keymap-insert(aName, val))
+ {
+keymap-update(aName, val);
+return false;
+ }
+ else
+ {
+return true;
+ }
}
@@ -583,11 +604,24 @@
const std::string aName,
void* aValue) const
{
+ if (!keymap)
+ {
+if (theParent)
+{
+ return theParent-getExternalFunctionParam(aName, aValue);
+}
+else
+{
+ return false;
+}
+ }
+
dctx_value_t val;
val.type = dynamic_context::dctx_value_t::no_val;
val.func_param = 0;
- if ( !keymap.get(aName, val) )
+ ValueMap::iterator lIter = keymap-find(aName);
+ if ( lIter == keymap-end() )
{
if (theParent)
return theParent-getExternalFunctionParam(aName, aValue);
@@ -595,6 +629,8 @@
return false;
}
+ val = lIter.getValue();
+
if (val.type == dynamic_context::dctx_value_t::ext_func_param)
{
aValue = val.func_param;
@@ -615,6 +651,11 @@
const std::string aName,
ExternalFunctionParameter* aValue)
{
+ if (!keymap)
+ {
+keymap = new ValueMap(8, false);
+ }
+
dctx_value_t val;
val.type = dynamic_context::dctx_value_t::ext_func_param_typed;
val.func_param = aValue;
@@ -624,8 +665,15 @@
{
// destroy the object if it's already contained in the map
lValue-destroy();
- }
- return keymap.put ( aName, val);
+keymap-erase(aName);
+keymap-insert(aName, val);
+return false;
+ }
+ else
+ {
+keymap-insert(aName, val);
+return true;
+ }
}
@@ -635,11 +683,24 @@
ExternalFunctionParameter*
dynamic_context::getExternalFunctionParameter(const std::string aName) const
{
+ if (!keymap)
+ {
+if (theParent)
+{
+ return theParent-getExternalFunctionParameter(aName);
+}
+else
+{
+ return 0;
+}
+ }
+
dctx_value_t val;
val.type = dynamic_context::dctx_value_t::no_val;
val.func_param = 0;
- if ( !keymap.get(aName, val) )
+ ValueMap::iterator lIter = keymap-find(aName);
+ if (lIter == keymap-end())
{
if (theParent)
return theParent-getExternalFunctionParameter(aName);
@@ -647,28 +708,14 @@
return 0;
}
+ val = lIter.getValue();
+
ExternalFunctionParameter* lRes =
static_castExternalFunctionParameter*(val.func_param);
return lRes;
}
-/*
-std::vectorzstring* dynamic_context::get_all_keymap_keys() const
-{
- std::auto_ptrstd::vectorzstring keys;
- if (theParent != NULL)
-keys.reset(theParent-get_all_keymap_keys());
- else
-keys.reset(new std::vectorzstring);
-
- for (unsigned int i=0; ikeymap.size(); i++)
-keys-push_back(keymap.getentryKey(i));
-
- return keys.release();
-}
-*/
-
} // namespace zorba
/* vim:set et sw=2 ts=2: */
Re: [Zorba-coders] [Merge] lp:~juan457/zorba/xqxq-api-changes into lp:zorba
changes done Yes, the zorba/ChangeLog file should mention bug fixes and such extensions. Also, the tests themselves look good but you should compare for the expected result. For example, whether isSequential really returns true (instead of just outputting it). -- https://code.launchpad.net/~juan457/zorba/xqxq-api-changes/+merge/79589 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos1 into lp:zorba
Matthias, this is not really ready for checkin yet. We need to find a way to address the xray regression caused by this memory optimization. -- https://code.launchpad.net/~zorba-coders/zorba/markos1/+merge/79746 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-18T23-00-00.712Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-18T23-00-00.712Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/f-testPerfScript into lp:zorba
Looks like mostly re-formatting changes other than the addition of the test case; is that correct? Out of curiosity, what was the motivation to add explicit fn:data() calls and proc: prefixes? The proc: prefixes seem like they're changing behaviour in some form, so I'd like to know why. -- https://code.launchpad.net/~zorba-coders/zorba/f-testPerfScript/+merge/79628 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~danielturcanu/zorba/mytrunk into lp:zorba
Sorry, I still don't understand why you added the zorba/config.h include. I was able to fix the included test case locally by doing only the change in strings_impl.cpp; it doesn't seem like the dict_XX_cpp.xq change is related at all. And I still think that adding that #include is a bad idea unless it's vitally necessary, because Zorba already has far too many header dependencies. -- https://code.launchpad.net/~danielturcanu/zorba/mytrunk/+merge/79165 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/data-cleaning into lp:zorba/data-cleaning-module
Validation queue job data-cleaning-2011-10-19T02-21-35.63Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/data-cleaning/+merge/79759 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/data-cleaning into lp:zorba/data-cleaning-module
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~matthias-brantner/zorba/data-cleaning/+merge/79759 Your team Zorba Coders is subscribed to branch lp:zorba/data-cleaning-module. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-counting into lp:zorba
Review: Needs Information Why do all the generate files show up as changed? -- https://code.launchpad.net/~zorba-coders/zorba/collection-counting/+merge/79765 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/collection-counting into lp:zorba
Why do all the generate files show up as changed? That's showing up as a problem on one of Rodolfo's branches also. I assume it's line-ending problems but I can't imagine how it's happening. -- https://code.launchpad.net/~zorba-coders/zorba/collection-counting/+merge/79765 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855715 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-855715 into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-855715/+merge/79768
Now checking for invalid regex escape sequences.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-855715/+merge/79768
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-10-12 21:30:46 +
+++ ChangeLog 2011-10-19 05:12:24 +
@@ -52,6 +52,7 @@
* Added undo for node revalidation
* Fixed bug #872796 (validate-in-place can interfere with other update primitives)
* Fixed bug #872799 (validate-in-place can set incorrect types)
+ * Fixed bug #855715 (Invalid escaped characters in regex not caught)
version 2.0.1
=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-10-07 08:28:43 +
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-10-19 05:12:24 +
@@ -1364,7 +1364,7 @@
fn:concat(fn:substring-before($description,.),.) else
order by $name, $param-number
return
-let $type := replace(normalize-space(substring-after(substring-before($signature, function), declare)),\%,),
+let $type := replace(normalize-space(substring-after(substring-before($signature, function), declare)),%,),
$isExternal := ends-with($signature, external),
$paramsAndReturn := substring-after($signature,concat(':',$name)),
$external := if(ends-with($signature,external)) then external else
=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq 2011-10-17 11:49:38 +
+++ modules/org/expath/ns/file.xq 2011-10-19 05:12:24 +
@@ -624,7 +624,7 @@
declare function file:glob-to-regex(
$pattern as xs:string
) {
- let $pattern := fn:replace($pattern, '(\.|\[|\]|\\|\/|\||\-|\^|\$|\?|\*|\+|\{|\}|\(|\))','\\$1')
+ let $pattern := fn:replace($pattern, '(\.|\[|\]|\\|/|\||\-|\^|\$|\?|\*|\+|\{|\}|\(|\))','\\$1')
let $pattern := fn:replace($pattern, '\\\?', '.')
let $pattern := fn:replace($pattern, '\\\*', '.*')
return
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2011-10-05 18:52:55 +
+++ src/diagnostics/diagnostic_en.xml 2011-10-19 05:12:24 +
@@ -2393,6 +2393,10 @@
valueinvalid library module/value
/entry
+entry key=BadRegexEscape_3
+ value$3: illegal escape character/value
+/entry
+
entry key=BadPath
valueinvalid path/value
/entry
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2011-10-05 17:49:48 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-19 05:12:24 +
@@ -424,6 +424,7 @@
{ ~BadIterator, invalid iterator },
{ ~BadLibraryModule, invalid library module },
{ ~BadPath, invalid path },
+ { ~BadRegexEscape_3, \$3\: illegal escape character },
{ ~BadStreamState, bad I/O stream state },
{ ~BadTokenInBraces_3, \$3\: illegal token within { } },
{ ~BadTraceStream, trace stream not retrievable using SerializationCallback },
=== modified file 'src/util/regex.cpp'
--- src/util/regex.cpp 2011-07-18 14:25:21 +
+++ src/util/regex.cpp 2011-10-19 05:12:24 +
@@ -128,33 +128,69 @@
case 'c': // NameChar
*icu_re += [ bs_c ];
continue;
-case 'C': // ^\c
+case 'C': // [^\c]
*icu_re += [^ bs_c ];
continue;
case 'i': // initial NameChar
*icu_re += [ bs_i ];
continue;
-case 'I': // ^\i
+case 'I': // [^\i]
*icu_re += [^ bs_i ];
continue;
-default:
- if ( ascii::is_digit( *xq_c ) ) {
-backref_no = *xq_c - '0';
-if ( !backref_no ) // \0 is illegal
- throw INVALID_RE_EXCEPTION( xq_re, ZED( BackRef0Illegal ) );
-if ( in_char_class ) {
- //
- // XQuery 3.0 FO 5.6.1: Within a character class expression,
- // \ followed by a digit is invalid.
- //
- throw INVALID_RE_EXCEPTION(
-xq_re, ZED( BackRefIllegalInCharClass )
- );
-}
-in_backref = true;
+case '0':
+case '1':
+case '2':
+case '3':
+case '4':
+case '5':
+case '6':
+case '7':
+case '8':
+case '9':
+ backref_no = *xq_c - '0';
+ if ( !backref_no ) // \0 is illegal
+throw INVALID_RE_EXCEPTION( xq_re, ZED( BackRef0Illegal ) );
+ if ( in_char_class ) {
+//
+// XQuery 3.0 FO 5.6.1: Within a character class expression,
+// \ followed by a digit is invalid.
+
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855715 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-855715/+merge/79768 Your team Zorba Coders is subscribed to branch lp:zorba. -- 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
