Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-952829 into
lp:zorba.
Requested reviews:
William Candillon (wcandillon)
Related bugs:
Bug #952829 in Zorba: "Nondeterministic annotation doesn't seem to be checked"
https://bugs.launchpad.net/zorba/+bug/952829
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-952829/+merge/97065
Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked).
Internally, the xqdoc:content wasn't annotated as nondeterministic.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-952829/+merge/97065
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-03-11 03:23:49 +0000
+++ ChangeLog 2012-03-12 17:15:25 +0000
@@ -13,6 +13,7 @@
* Added truncate function to the collection modules for efficient deletion of all nodes in a collection.
* Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
* Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
+ * Fixed bug 952829 (Nondeterministic annotation doesn't seem to be checked)
* Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
* New URI module providing percent-decoding functions.
* Optimization: change the implementation of the free-vars annotation and got rid
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2012-02-28 20:45:43 +0000
+++ bin/zorbacmd.cpp 2012-03-12 17:15:25 +0000
@@ -197,8 +197,8 @@
zorba::DynamicContext* aDynamicContext,
const ZorbaCMDProperties& aProperties)
{
- XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
if ( aProperties.contextItem().size() != 0 ) {
+ XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
std::ifstream lInStream(aProperties.contextItem().c_str());
Item lDoc = lXmlMgr->parseXML(lInStream);
aDynamicContext->setContextItem(lDoc);
@@ -214,6 +214,7 @@
{
if ((*lIter).inline_file)
{
+ XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
std::ifstream lInStream((*lIter).var_value.c_str());
Item lDoc = lXmlMgr->parseXML(lInStream);
aDynamicContext->setVariable((*lIter).var_name, lDoc);
=== modified file 'src/functions/pregenerated/func_xqdoc.h'
--- src/functions/pregenerated/func_xqdoc.h 2012-01-11 17:30:25 +0000
+++ src/functions/pregenerated/func_xqdoc.h 2012-03-12 17:15:25 +0000
@@ -46,6 +46,7 @@
:
function(sig, kind)
{
+setDeterministic(false);
}
=== modified file 'src/runtime/spec/xqdoc/xqdoc.xml'
--- src/runtime/spec/xqdoc/xqdoc.xml 2010-11-09 22:35:09 +0000
+++ src/runtime/spec/xqdoc/xqdoc.xml 2012-03-12 17:15:25 +0000
@@ -18,7 +18,7 @@
<zorba:description author="Zorba Team">zorba:XQDoc</zorba:description>
- <zorba:function>
+ <zorba:function isDeterministic="false">
<zorba:signature localname="xqdoc" prefix="fn-zorba-xqdoc">
<zorba:param>xs:string</zorba:param>
<zorba:output>element()</zorba:output>
--
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
