Zorba

Merge lp:~zorba-coders/zorba/bug-952829 into lp:zorba

  1. bug-952829
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: William Candillon
Approved revision: 10717
Merged at revision: 10716
Proposed branch: lp:~zorba-coders/zorba/bug-952829
Merge into: lp:zorba
Diff against target: 58 lines (+5/-2)
4 files modified
ChangeLog (+1/-0)
bin/zorbacmd.cpp (+2/-1)
src/functions/pregenerated/func_xqdoc.h (+1/-0)
src/runtime/spec/xqdoc/xqdoc.xml (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-952829
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
William Candillon Approve
Review via email: mp+97065@code.launchpad.net

Commit message

Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked)

Description of the change

Fixed bug #952829 (Nondeterministic annotation doesn't seem to be checked). Internally, the xqdoc:content wasn't annotated as nondeterministic.

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) wrote :

Works great in release mode.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-952829-2012-03-12T17-30-12.508Z/log.html

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-952829-2012-03-12T17-30-12.508Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-03-11 03:23:49 +0000
3+++ ChangeLog 2012-03-12 17:15:25 +0000
4@@ -13,6 +13,7 @@
5 * Added truncate function to the collection modules for efficient deletion of all nodes in a collection.
6 * Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
7 * Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
8+ * Fixed bug 952829 (Nondeterministic annotation doesn't seem to be checked)
9 * Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
10 * New URI module providing percent-decoding functions.
11 * Optimization: change the implementation of the free-vars annotation and got rid
12
13=== modified file 'bin/zorbacmd.cpp'
14--- bin/zorbacmd.cpp 2012-02-28 20:45:43 +0000
15+++ bin/zorbacmd.cpp 2012-03-12 17:15:25 +0000
16@@ -197,8 +197,8 @@
17 zorba::DynamicContext* aDynamicContext,
18 const ZorbaCMDProperties& aProperties)
19 {
20- XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
21 if ( aProperties.contextItem().size() != 0 ) {
22+ XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
23 std::ifstream lInStream(aProperties.contextItem().c_str());
24 Item lDoc = lXmlMgr->parseXML(lInStream);
25 aDynamicContext->setContextItem(lDoc);
26@@ -214,6 +214,7 @@
27 {
28 if ((*lIter).inline_file)
29 {
30+ XmlDataManager* lXmlMgr = zorba->getXmlDataManager();
31 std::ifstream lInStream((*lIter).var_value.c_str());
32 Item lDoc = lXmlMgr->parseXML(lInStream);
33 aDynamicContext->setVariable((*lIter).var_name, lDoc);
34
35=== modified file 'src/functions/pregenerated/func_xqdoc.h'
36--- src/functions/pregenerated/func_xqdoc.h 2012-01-11 17:30:25 +0000
37+++ src/functions/pregenerated/func_xqdoc.h 2012-03-12 17:15:25 +0000
38@@ -46,6 +46,7 @@
39 :
40 function(sig, kind)
41 {
42+setDeterministic(false);
43
44 }
45
46
47=== modified file 'src/runtime/spec/xqdoc/xqdoc.xml'
48--- src/runtime/spec/xqdoc/xqdoc.xml 2010-11-09 22:35:09 +0000
49+++ src/runtime/spec/xqdoc/xqdoc.xml 2012-03-12 17:15:25 +0000
50@@ -18,7 +18,7 @@
51
52 <zorba:description author="Zorba Team">zorba:XQDoc</zorba:description>
53
54- <zorba:function>
55+ <zorba:function isDeterministic="false">
56 <zorba:signature localname="xqdoc" prefix="fn-zorba-xqdoc">
57 <zorba:param>xs:string</zorba:param>
58 <zorba:output>element()</zorba:output>

Subscribers

People subscribed via source and target branches