[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Validation queue job new-jsoniq-2013-04-19T23-43-52.062Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-19T23-43-52.062Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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-1064289 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1064289 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
Validation queue job bug-1064289-2013-04-19T23-18-43.694Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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-1064289 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1064289-2013-04-19T23-18-43.694Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1064289 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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:~paul-lucas/zorba/bug-1064289 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1064289 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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:~paul-lucas/zorba/bug-1064289 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
Validation queue job bug-1064289-2013-04-19T22-31-50.875Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1064289-2013-04-19T22-31-50.875Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1064289 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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:~paul-lucas/zorba/bug-1064289 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904 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-1064289 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1064289 into
lp:zorba.
Commit message:
Fixed bug 1064289.
Added "bool follow_symlinks = true" to most File member functions (they should
have had it all along).
Added ExternalFunction::getItem() convenience function.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1064289 in Zorba: "file module cannot delete broken symbolic links"
https://bugs.launchpad.net/zorba/+bug/1064289
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904
Fixed bug 1064289.
Added "bool follow_symlinks = true" to most File member functions (they should
have had it all along).
Added ExternalFunction::getItem() convenience function.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-1064289/+merge/159904
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-19 04:07:25 +
+++ ChangeLog 2013-04-19 22:28:26 +
@@ -72,6 +72,7 @@
* Fixed bug #1023168 (Non-single-char-escapes in regex character ranges not
caught)
* Throw XQST0048 for groupby clause, as specified by XQuery 3.0.
+ * Fixed bug #1064289 (file module cannot delete broken symbolic links)
* Fixed bug in raising XQTY0086 (copying of namespace-sensitive values during
node construction).
* Fixed bug #866874 (regex "range subtraction" not supported for ICU)
=== modified file 'include/zorba/file.h'
--- include/zorba/file.h 2013-02-07 17:24:36 +
+++ include/zorba/file.h 2013-04-19 22:28:26 +
@@ -70,12 +70,12 @@
virtual const std::string getFilePath() const = 0;
virtual const std::string getFileUri() const = 0;
- virtual bool isDirectory() const = 0;
- virtual bool isFile() const = 0;
+ virtual bool isDirectory( bool follow_symlinks = true ) const = 0;
+ virtual bool isFile( bool follow_symlinks = true ) const = 0;
virtual bool isLink() const = 0;
- virtual bool isVolume() const = 0;
- virtual bool isInvalid() const = 0;
- virtual bool exists() const = 0;
+ virtual bool isVolume( bool follow_symlinks = true ) const = 0;
+ virtual bool isInvalid() const = 0; // deprecated
+ virtual bool exists( bool follow_symlinks = true ) const = 0;
virtual void remove() = 0;
virtual bool create() = 0;
=== modified file 'include/zorba/function.h'
--- include/zorba/function.h 2013-02-07 17:24:36 +
+++ include/zorba/function.h 2013-04-19 22:28:26 +
@@ -170,6 +170,10 @@
*/
virtual bool
isContextual() const = 0;
+
+protected:
+ Item
+ getItem( Arguments_t const &args, unsigned pos ) const;
};
=== modified file 'include/zorba/util/file.h'
--- include/zorba/util/file.h 2013-03-06 02:54:03 +
+++ include/zorba/util/file.h 2013-04-19 22:28:26 +
@@ -1,12 +1,12 @@
/*
* Copyright 2006-2008 The FLWOR Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,15 +57,34 @@
public: // common methods
void set_path(std::string const& _path ) { *((filesystem_path *) this) = _path; }
void set_filetype(filetype) { /* do nothing */ } // deprecated
- filetype get_filetype() const { return do_stat(); }
-
- bool is_directory() const { return do_stat() == type_directory; }
- bool is_file() const { return do_stat() == type_file; }
- bool is_link() const { return do_stat( false ) == type_link; }
- bool is_volume() const{ return do_stat() == type_volume; }
-
- bool is_invalid() const { return false; } // deprecated
- bool exists() const { return do_stat() != type_non_existent; }
+
+ filetype get_filetype( bool follow_symlinks = true ) const {
+return do_stat( follow_symlinks );
+ }
+
+ bool is_directory( bool follow_symlinks = true ) const {
+return do_stat( follow_symlinks ) == type_directory;
+ }
+
+ bool is_file( bool follow_symlinks = true ) const {
+return do_stat( follow_symlinks ) == type_file;
+ }
+
+ bool is_link() const {
+return do_stat( false ) == type_link;
+ }
+
+ bool is_volume( bool follow_symlinks = true ) const {
+return do_stat( follow_symlinks ) == type_volume;
+ }
+
+ bool is_invalid() const { // deprecated
+return false;
+ }
+
+ bool exists( bool follow_symlinks = true ) const {
+return do_stat( follow_symlinks ) != type_non_existent;
+ }
time_t lastModified() const;
=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq 2013-03-06 04:04:43 +
+++ modules/org/expath/ns/file
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 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/bug1064978_xqxq_bind_cast_variable into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1064978_xqxq_bind_cast_variable-2013-04-19T21-42-08.357Z is finished. The final status was: 179 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 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/bug1064978_xqxq_bind_cast_variable into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1064978_xqxq_bind_cast_variable-2013-04-19T21-42-08.357Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job new-jsoniq-2013-04-19T21-18-54.417Z is finished. The final status was: 5 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/bug-1123165 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
I too agree that it should be moved to the translator. That's where all the similar code currently is. Other than this and the scanner issue, it looks good for me. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug1064978_xqxq_bind_cast_variable into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 -- https://code.launchpad.net/~zorba-coders/zorba/bug1064978_xqxq_bind_cast_variable/+merge/158480 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-19T21-18-54.417Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job new-jsoniq-2013-04-19T20-39-52.046Z is finished. The final status was: 5 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-19T20-39-52.046Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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-1131984 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1131984 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 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-1131984 into lp:zorba
Validation queue job bug-1131984-2013-04-19T20-05-42.554Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 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-1131984 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1131984-2013-04-19T20-05-42.554Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 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-1131984 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1131984 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 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:~paul-lucas/zorba/bug-1131984 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1131984/+merge/159750 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/feature-compare_null into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-compare_null into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
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. -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
Validation queue job feature-compare_null-2013-04-19T19-08-42.164Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-compare_null-2013-04-19T19-08-42.164Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-compare_null into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 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/feature-compare_null into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/feature-compare_null into lp:zorba. Commit message: added additional test comparing null eq () Requested reviews: Ghislain Fourny (gislenius) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 -- https://code.launchpad.net/~zorba-coders/zorba/feature-compare_null/+merge/159871 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/rbkt/Queries/zorba/jsoniq/null08.jq' --- test/rbkt/Queries/zorba/jsoniq/null08.jq 2013-03-24 19:06:30 + +++ test/rbkt/Queries/zorba/jsoniq/null08.jq 2013-04-19 19:05:33 + @@ -1,1 +1,1 @@ -null eq null, null ne null +null eq null, null ne null, null eq () -- 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/new-jsoniq into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159739 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/bug-1123165 into lp:zorba
Ghislain, could you also please remove the fix that you submitted for scanner.l problem? Your proposal works, but on linux the GCC gives off a warning for that code. I have a proposal that fixes the issue in another branch, which Matthias will approve and merge soon. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
Review: Needs Fixing - The fix for dynamic_function_invocation seems to be orthogonal. Why is this fixed in this merge proposal? I couldn't find a test to cover this behavior. - The function check_xquery_feature_options is too long. Could this be simplified and/or split into multiple functions? It feels like most of the implementation should go into the translator and not into the static context. - The style of the error messages is not consistent with the other error messages. They should be changed as follows: XQST0120 "$1": feature not supported XQST0128 "$1": unable to disable a supported feature XQST0126 impossible to activate all extension features -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug-1123165-2013-04-19T14-11-47.953Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1123165-2013-04-19T14-11-47.953Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba has been updated. Commit Message changed to: Fixing bug 1123165 (prohibit/require feature tests). For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1123165 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822 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/bug-1123165 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-1123165 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #1123165 in Zorba: "failures in require-feature and prohibit-feature (at
least 27)"
https://bugs.launchpad.net/zorba/+bug/1123165
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822
Fixing bug 1123165 (prohibit/require feature tests).
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1123165/+merge/159822
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-04-04 04:14:46 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-19 13:05:34 +
@@ -162,8 +162,14 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0114;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0120;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0126;
+
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0128;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-04-04 04:14:46 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-19 13:05:34 +
@@ -692,6 +692,15 @@
(:~
:
+ : It is a static error if a feature required by require-feature is not
+ : supported by the implementation.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0120 as xs:QName := fn:QName($err:NS, "err:XQST0120");
+
+(:~
+ :
: It is a static error if the name of a feature in require-feature is not
: recognized by the implementation.
:
@@ -701,6 +710,24 @@
(:~
:
+ : It is a static error if all-extensions appears in a require-feature option declaration.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0126 as xs:QName := fn:QName($err:NS, "err:XQST0126");
+
+(:~
+ :
+ : It is a static error if a feature name that an implementation supports appears
+ : in a prohibit-feature option declaration, and the implementation is unable to
+ : disable the feature.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0128 as xs:QName := fn:QName($err:NS, "err:XQST0128");
+
+(:~
+ :
: It is a dynamic error if evaluation of an expression relies on some part
: of the dynamic context that has not been assigned a value.
:
=== modified file 'src/compiler/parser/scanner.l'
--- src/compiler/parser/scanner.l 2013-04-17 22:41:05 +
+++ src/compiler/parser/scanner.l 2013-04-19 13:05:34 +
@@ -147,8 +147,8 @@
|
| String literal definitions
|__*/
-NonQuotAnd [^""&]
-NonAposAnd [^''&]
+NonQuotAnd [^\"&]
+NonAposAnd [^\'&]
#ifdef XQUERY_SCANNER
StringLiteral ({Quote}({EscapeQuot}|{Ref}|{NonQuotAnd})*{Quote})|({Apos}({EscapeApos}|{Ref}|{NonAposAnd})*{Apos})
#else
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-04-18 08:47:43 +
+++ src/compiler/translator/translator.cpp 2013-04-19 13:05:34 +
@@ -3856,6 +3856,8 @@
bind_fn(f, numParams, loc);
}
+ theSctx->check_xquery_feature_options(loc);
+
return no_state;
}
@@ -11718,7 +11720,21 @@
TypeManager* tm = sourceExpr->get_type_manager();
xqtref_t srcType = sourceExpr->get_return_type();
- if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ITEM_TYPE_STAR))
+ if (TypeOps::is_subtype(tm, *srcType, *theRTM.EMPTY_TYPE) &&
+ numArgs > 1)
+ {
+// If the source expression is the empty sequence and there is more than
+// one parameter, we should still consider it a dynamic invocation.
+fc->set_allowing_empty(true);
+
+expr* dynFuncInvocation =
+CREATE(dynamic_function_invocation)(theRootSctx, theUDF, loc,
+flworVarExpr,
+arguments);
+
+flworExpr->set_return_expr(dynFuncInvocation);
+ }
+ else if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ITEM_TYPE_STAR))
{
if (numArgs > 1)
{
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-04-16 07:43:15 +
+++ src/context/static_context.cpp 2013-04-19 13:05:34 +
@@ -3505,6 +3505,217 @@
// //
/
+/***//**
+
+/
+void static_context::check_xquery_feature_options(const QueryLoc& loc)
+{
+ if (theOptionMap ==
