Merge lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba

Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Nicolae Brinza
Approved revision: 11335
Merged at revision: 11335
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1028879
Merge into: lp:zorba
Diff against target: 24 lines (+2/-2)
2 files modified
src/functions/pregenerated/func_collections.cpp (+1/-1)
src/runtime/spec/collections/collections.xml (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1028879
Reviewer Review Type Date Requested Status
Nicolae Brinza Approve
Sorin Marian Nasoi Approve
Review via email: mp+156718@code.launchpad.net

Commit message

Corrected signature for fn:collection.

Description of the change

Corrected signature for fn:collection.

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix_bug_1028879-2013-04-02T23-08-39.715Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

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

Validation queue job fix_bug_1028879-2013-04-03T03-38-37.387Z 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 'src/functions/pregenerated/func_collections.cpp'
2--- src/functions/pregenerated/func_collections.cpp 2013-03-05 23:11:50 +0000
3+++ src/functions/pregenerated/func_collections.cpp 2013-04-02 22:57:25 +0000
4@@ -320,7 +320,7 @@
5 {
6 DECL_WITH_KIND(sctx, fn_collection,
7 (createQName("http://www.w3.org/2005/xpath-functions","","collection"),
8- GENV_TYPESYSTEM.STRING_TYPE_ONE,
9+ GENV_TYPESYSTEM.STRING_TYPE_QUESTION,
10 GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
11 FunctionConsts::FN_COLLECTION_1);
12
13
14=== modified file 'src/runtime/spec/collections/collections.xml'
15--- src/runtime/spec/collections/collections.xml 2013-03-24 20:40:03 +0000
16+++ src/runtime/spec/collections/collections.xml 2013-04-02 22:57:25 +0000
17@@ -212,7 +212,7 @@
18 </zorba:signature>
19
20 <zorba:signature localname="collection" prefix="fn">
21- <zorba:param>xs:string</zorba:param>
22+ <zorba:param>xs:string?</zorba:param>
23 <zorba:output>node()*</zorba:output>
24 </zorba:signature>
25

Subscribers

People subscribed via source and target branches