[Zorba-coders] [Bug 905050] Re: Crash on getKind() from TypeIdentifier()
** Changed in: zorba Status: New => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/905050 Title: Crash on getKind() from TypeIdentifier() Status in Zorba - The XQuery Processor: Fix Committed Bug description: crash generated with this code: StaticContext_t staticContext = zorba->createStaticContext(); TypeIdentifier_t typeIdent = staticContext->getContextItemStaticType() typeIdent->getKind(); To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/905050/+subscriptions -- 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/markos-no-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-no-copy into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 -- https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 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/markos-no-copy into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-no-copy into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job markos-no-copy-2011-12-22T05-06-30.741Z 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/markos-no-copy/+merge/83865 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/markos-no-copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 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/markos-no-copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-no-copy-2011-12-22T05-06-30.741Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 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/markos-no-copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-no-copy into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 -- https://code.launchpad.net/~zorba-coders/zorba/markos-no-copy/+merge/83865 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/tokenize into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647 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/zerr into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/tokenize into lp:zorba
I have replaced the assertion with a graceful error. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647 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/tokenize into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/tokenize into lp:zorba has been updated. Commit Message changed to: implementation of string:tokenize function that doesn't accept regular expressions but allows for streamable processing of the input (resolves bug #898074) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647 -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647 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/tokenize into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/tokenize into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
William Candillon (wcandillon)
Related bugs:
Bug #898074 in Zorba: "fn:tokenize() doesn't stream"
https://bugs.launchpad.net/zorba/+bug/898074
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647
implementation of string:tokenize function that doesn't accept regular
expressions but allows for streamable processing of the input (resolves bug
#898074)
--
https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86647
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-12-21 14:40:33 +
+++ ChangeLog 2011-12-22 04:03:27 +
@@ -9,6 +9,8 @@
set multiple times via the c++ api).
* Fixed bug #905050 (setting and getting the context item type via the c++ api)
* Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+ * Added tokenize function to the string module that allows for streamable tokenization but doesn't have regular expression
+support.
version 2.1
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2011-12-21 14:40:33 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2011-12-22 04:03:27 +
@@ -58,7 +58,7 @@
URI "http://www.zorba-xquery.com/modules/reflection";)
DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/schema";)
-DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1
URI "http://www.zorba-xquery.com/modules/string";)
DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/xml";)
=== modified file 'modules/com/zorba-xquery/www/modules/string.xq'
--- modules/com/zorba-xquery/www/modules/string.xq 2011-08-03 15:12:40 +
+++ modules/com/zorba-xquery/www/modules/string.xq 2011-12-22 04:03:27 +
@@ -25,7 +25,7 @@
:)
module namespace string = "http://www.zorba-xquery.com/modules/string";;
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "2.0";
+declare option ver:module-version "2.1";
(:~
: This function materializes a streamable string.
@@ -63,3 +63,23 @@
:
:)
declare function string:is-streamable($s as xs:string) as xs:boolean external;
+
+(:~
+ : Returns a sequence of strings constructed by splitting the input wherever the given
+ : separator is found.
+ :
+ : The function is different from fn:tokenize. It doesn't allow
+ : the separator to be a regular expression. This restriction allows for more
+ : performant implementation. Specifically, the function processes
+ : streamable strings as input in a streamable way which is particularly useful
+ : to tokenize huge strings (e.g. if returned by the file module's read-text
+ : function).
+ :
+ : @param $s the input string to tokenize
+ : @param $separator the separator used for splitting the input string $s
+ :
+ : @return a sequence of strings constructed by splitting the input
+ :)
+declare function string:tokenize(
+ $s as xs:string,
+ $separator as xs:string) as xs:string* external;
=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/func_strings.cpp 2011-12-22 04:03:27 +
@@ -320,6 +320,16 @@
return new StringIsStreamableIterator(sctx, loc, argv);
}
+PlanIter_t fn_zorba_string_tokenize::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector& argv,
+ AnnotationHolder& ann) const
+{
+ return new StringTokenizeIterator(sctx, loc, argv);
+}
+
void populate_context_strings(static_context* sctx)
{
{
@@ -890,6 +900,19 @@
}
+
+ {
+
+
+DECL_WITH_KIND(sctx, fn_zorba_string_tokenize,
+(createQName("http://www.zorba-xquery.com/modules/string","","tokenize";),
+GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.STRING_TYPE_STAR),
+FunctionConsts::FN_ZORBA_STRING_TOKENIZE_2);
+
+ }
+
}
=== modified file 'src/functions/pregenerated/func_strings.h'
--- src/functions/pregenerated/func_strings.h 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/func_strings.h 2011-12-22 04:03:27 +
@@ -423,6 +423,19 @@
};
+//fn-zorba-string:tokenize
+class fn_zorba_string_tokenize : public function
+{
+public:
+ fn_zorba_string_tokenize(const signature& sig, FunctionConsts::FunctionKind kind)
+: function(sig, kind) {
+
+}
+
+ CODEGEN_DECL();
+};
+
+
} //namespace zorba
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/function_enum.h 2011-12-22
[Zorba-coders] [Bug 907624] [NEW] misleading error message on URIMapper::DENY_ACCESS
Public bug reported: This error message if a URIMapper returns DENY_ACCESS is always: "module import not allowed" even if the entity is not a module (e.g. a schema). ** Affects: zorba Importance: Undecided Assignee: Chris Hillery (ceejatec) Status: New ** Changed in: zorba Milestone: None => 2.2 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/907624 Title: misleading error message on URIMapper::DENY_ACCESS Status in Zorba - The XQuery Processor: New Bug description: This error message if a URIMapper returns DENY_ACCESS is always: "module import not allowed" even if the entity is not a module (e.g. a schema). To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/907624/+subscriptions -- 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/tokenize into lp:zorba
> Once you finished the implementation of the transcoding stream buffer, I don't > even want to do this check anymore. This must not happen with the stream > buffer. I don't understand how it "must not happen." It can always happen. However, I think you're saying that you assume the check will happen in the transcoder. While it will be doing checks, bad input can still happen. In the mean time, using an assert() is still too Draconian. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
Once you finished the implementation of the transcoding stream buffer, I don't even want to do this check anymore. This must not happen with the stream buffer. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
> On line 357, why do you call assert()? An invalid byte should throw an > exception, not assert and dump core. I meant line 367. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
On line 357, why do you call assert()? An invalid byte should throw an exception, not assert and dump core. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/tokenize into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
Validation queue job tokenize-2011-12-21T21-46-05.289Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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] [Bug 898074] Re: fn:tokenize() doesn't stream
** Branch linked: lp:~zorba-coders/zorba/tokenize
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/898074
Title:
fn:tokenize() doesn't stream
Status in Zorba - The XQuery Processor:
New
Bug description:
The following query:
let $content := file:read-text("huge_file.txt")
return tokenize($content, "\s")
doesn't stream the result.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/898074/+subscriptions
--
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/tokenize into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/tokenize-2011-12-21T21-46-05.289Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/tokenize into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 -- https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626 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/tokenize into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/tokenize into
lp:zorba.
Requested reviews:
William Candillon (wcandillon)
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #898074 in Zorba: "fn:tokenize() doesn't stream"
https://bugs.launchpad.net/zorba/+bug/898074
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626
implementation of string:tokenize function that doesn't accept regular
expressions but allows for streamable processing of the input (resolves bug
#898074)
--
https://code.launchpad.net/~zorba-coders/zorba/tokenize/+merge/86626
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-12-21 14:40:33 +
+++ ChangeLog 2011-12-21 21:44:29 +
@@ -9,6 +9,8 @@
set multiple times via the c++ api).
* Fixed bug #905050 (setting and getting the context item type via the c++ api)
* Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+ * Added tokenize function to the string module that allows for streamable tokenization but doesn't have regular expression
+support.
version 2.1
=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt 2011-12-21 14:40:33 +
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt 2011-12-21 21:44:29 +
@@ -58,7 +58,7 @@
URI "http://www.zorba-xquery.com/modules/reflection";)
DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/schema";)
-DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.0
+DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1
URI "http://www.zorba-xquery.com/modules/string";)
DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0
URI "http://www.zorba-xquery.com/modules/xml";)
=== modified file 'modules/com/zorba-xquery/www/modules/string.xq'
--- modules/com/zorba-xquery/www/modules/string.xq 2011-08-03 15:12:40 +
+++ modules/com/zorba-xquery/www/modules/string.xq 2011-12-21 21:44:29 +
@@ -25,7 +25,7 @@
:)
module namespace string = "http://www.zorba-xquery.com/modules/string";;
declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "2.0";
+declare option ver:module-version "2.1";
(:~
: This function materializes a streamable string.
@@ -63,3 +63,23 @@
:
:)
declare function string:is-streamable($s as xs:string) as xs:boolean external;
+
+(:~
+ : Returns a sequence of strings constructed by splitting the input wherever the given
+ : separator is found.
+ :
+ : The function is different from fn:tokenize. It doesn't allow
+ : the separator to be a regular expression. This restriction allows for more
+ : performant implementation. Specifically, the function processes
+ : streamable strings as input in a streamable way which is particularly useful
+ : to tokenize huge strings (e.g. if returned by the file module's read-text
+ : function).
+ :
+ : @param $s the input string to tokenize
+ : @param $separator the separator used for splitting the input string $s
+ :
+ : @return a sequence of strings constructed by splitting the input
+ :)
+declare function string:tokenize(
+ $s as xs:string,
+ $separator as xs:string) as xs:string* external;
=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/func_strings.cpp 2011-12-21 21:44:29 +
@@ -320,6 +320,16 @@
return new StringIsStreamableIterator(sctx, loc, argv);
}
+PlanIter_t fn_zorba_string_tokenize::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector& argv,
+ AnnotationHolder& ann) const
+{
+ return new StringTokenizeIterator(sctx, loc, argv);
+}
+
void populate_context_strings(static_context* sctx)
{
{
@@ -890,6 +900,19 @@
}
+
+ {
+
+
+DECL_WITH_KIND(sctx, fn_zorba_string_tokenize,
+(createQName("http://www.zorba-xquery.com/modules/string","","tokenize";),
+GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.STRING_TYPE_STAR),
+FunctionConsts::FN_ZORBA_STRING_TOKENIZE_2);
+
+ }
+
}
=== modified file 'src/functions/pregenerated/func_strings.h'
--- src/functions/pregenerated/func_strings.h 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/func_strings.h 2011-12-21 21:44:29 +
@@ -423,6 +423,19 @@
};
+//fn-zorba-string:tokenize
+class fn_zorba_string_tokenize : public function
+{
+public:
+ fn_zorba_string_tokenize(const signature& sig, FunctionConsts::FunctionKind kind)
+: function(sig, kind) {
+
+}
+
+ CODEGEN_DECL();
+};
+
+
} //namespace zorba
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2011-12-21 14:40:33 +
+++ src/functions/pregenerated/function_enum.h 2011-12-21
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/zerr into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zerr into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/zerr into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/zerr into lp:zorba
Validation queue job zerr-2011-12-21T19-43-10.97Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/zerr into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/zerr-2011-12-21T19-43-10.97Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/zerr into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/zerr into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 -- https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609 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/zerr into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/zerr into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609
do not predeclare zerr
--
https://code.launchpad.net/~zorba-coders/zorba/zerr/+merge/86609
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-12-21 14:40:33 +
+++ ChangeLog 2011-12-21 19:43:39 +
@@ -9,6 +9,7 @@
set multiple times via the c++ api).
* Fixed bug #905050 (setting and getting the context item type via the c++ api)
* Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+ * zerr is not predeclared anymore to be http://www.zorba-xquery.com/errors
version 2.1
=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp 2011-12-21 14:40:33 +
+++ src/context/root_static_context.cpp 2011-12-21 19:43:39 +
@@ -78,7 +78,7 @@
"xml", XML_NS,
"xs", XML_SCHEMA_NS,
"xsi", XSI_NS,
- "zerr", ZORBA_ERR_NS,
+ //"zerr", ZORBA_ERR_NS,
NULL, NULL
};
=== modified file 'test/rbkt/Queries/zorba/store/documents.xq'
--- test/rbkt/Queries/zorba/store/documents.xq 2011-08-04 02:14:56 +
+++ test/rbkt/Queries/zorba/store/documents.xq 2011-12-21 19:43:39 +
@@ -1,6 +1,7 @@
import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";;
declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
declare base-uri "http://www.zorba-xquery.com/";;
=== modified file 'test/rbkt/Queries/zorba/xqddf/test-node-reference.xq'
--- test/rbkt/Queries/zorba/xqddf/test-node-reference.xq 2011-04-11 20:48:27 +
+++ test/rbkt/Queries/zorba/xqddf/test-node-reference.xq 2011-12-21 19:43:39 +
@@ -1,5 +1,7 @@
import module namespace ref = "http://www.zorba-xquery.com/modules/node-reference";;
+declare namespace zerr = "http://www.zorba-xquery.com/errors";;
+
declare function local:foo($ref as xs:anyURI) {
ref:node-by-reference($ref)
};
--
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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending. -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue job ignore-2011-12-21T17-14-03.011Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T17-14-03.011Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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] [Bug 898581] Re: Debugger: syntax error client block
** Changed in: zorba Milestone: None => 2.2 ** Changed in: zorba Status: New => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/898581 Title: Debugger: syntax error client block Status in Zorba - The XQuery Processor: Fix Committed Bug description: If one submits a query with syntax errors, the debugger command line reports the error but it blocks. (On Windows at least) To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/898581/+subscriptions -- 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T17-06-02.011Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The attempt to merge lp:~ceejatec/zorba/ignore into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job ignore-2011-12-21T17-06-02.011Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The attempt to merge lp:~ceejatec/zorba/ignore into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job ignore-2011-12-21T16-18-05.17Z is finished. The final status was: 845 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T16-18-05.17Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
Validation queue job markos-scratch-2011-12-21T14-46-26.189Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2011-12-21T14-46-26.189Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551 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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551
Fix for bug #905050 (setting and getting the context item type)
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/86551
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-12-20 21:45:23 +
+++ ChangeLog 2011-12-21 12:13:40 +
@@ -7,8 +7,13 @@
* Added index management function to the C++ api's StaticCollectionManager.
* Fixed bug #905041 (allow for the default element and function namespaces to be
set multiple times via the c++ api).
+<<< TREE
* Added createDayTimeDuration, createYearMonthDuration, createDocumentNode, createCommentNode, createPiNode to api's ItemFactory.
+===
+ * Fixed bug #905050 (setting and getting the context item type via the c++ api)
+
+>>> MERGE-SOURCE
version 2.1
New Features:
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2011-12-20 11:50:23 +
+++ src/api/staticcontextimpl.cpp 2011-12-21 12:13:40 +
@@ -848,7 +848,8 @@
StaticContextImpl::setContextItemStaticType(TypeIdentifier_t type)
{
xqtref_t xqType = NULL;
- if (type != NULL) {
+ if (type != NULL)
+ {
xqType = theCtx->get_typemanager()->create_type(*type);
}
theCtx->set_context_item_type(xqType);
=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp 2011-12-20 09:04:58 +
+++ src/api/xqueryimpl.cpp 2011-12-21 12:13:40 +
@@ -806,7 +806,7 @@
if(var == NULL)
throw XQUERY_EXCEPTION(zerr::ZAPI0011_ELEMENT_NOT_DECLARED,
-ERROR_PARAMS(BUILD_STRING('{', qname->getNamespace(), '}', qname->getLocalName()), ZED(Variable)));
+ ERROR_PARAMS(BUILD_STRING('{', qname->getNamespace(), '}', qname->getLocalName()), ZED(Variable)));
if (var->hasInitializer())
return true;
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2011-12-20 18:30:39 +
+++ src/compiler/translator/translator.cpp 2011-12-21 12:13:40 +
@@ -442,6 +442,9 @@
theHaveSequentialExitExprs :
+ theHaveContextItemDecl :
+
+
theAssignedVars :
---
@@ -576,6 +579,8 @@
bool theHaveSequentialExitExprs;
+ bool theHaveContextItemDecl;
+
std::vector > theAssignedVars;
inttheTempVarCounter;
@@ -654,6 +659,7 @@
thePrologGraph(rootSctx),
theHaveUpdatingExitExprs(false),
theHaveSequentialExitExprs(false),
+ theHaveContextItemDecl(false),
theTempVarCounter(1),
theIsInIndexDomain(false),
hadBSpaceDecl(false),
@@ -696,10 +702,12 @@
}
}
-~TranslatorImpl() {
+
+~TranslatorImpl()
+{
#ifndef ZORBA_NO_FULL_TEXT
- while ( !theFTNodeStack.empty() )
-delete ztd::pop_stack( theFTNodeStack );
+ while (!theFTNodeStack.empty())
+delete ztd::pop_stack(theFTNodeStack);
#endif
}
@@ -2223,8 +2231,7 @@
var_expr_t var = bind_var(loc,
DOT_VARNAME,
var_expr::prolog_var,
-GENV_TYPESYSTEM.ITEM_TYPE_ONE);
- //var->set_external(true);
+theSctx->get_context_item_type());
var->set_unique_id(1);
//GlobalBinding b(var, NULL, true);
@@ -2241,6 +2248,17 @@
assert(theCCB->theIsEval || !program->is_updating());
+ // If an appliaction set a type for the context item via the c++ api, then
+ // create a full declaration for it in order to enforce that type.
+ if (!theHaveContextItemDecl &&
+ theSctx->get_context_item_type() != theRTM.ITEM_TYPE_ONE.getp())
+ {
+var_expr* var = lookup_ctx_var(DOT_VARNAME, loc);
+var->set_external(true);
+GlobalBinding b(var, NULL, true);
+declare_var(b, theModulesInfo->theInitExprs);
+ }
+
// the main module debug iterator has no location otherwise
// this would take precedence over a child debug iterator
// starting in the same line
@@ -3856,13 +3874,10 @@
TRACE_VISIT();
if (theSctx->xquery_version() <= StaticContextConsts::xquery_version_1_0)
-throw XQUERY_EXCEPTION(
- err::XPST0003,
- ERROR_PARAMS(
-ZED( XQueryVersionAtLeast10_2 ), theSctx->xquery_version()
- ),
- ERROR_LOC( loc )
-);
+RAISE_ERROR(err::XPST0003, loc,
+ERROR_PARAMS(ZED(XQueryVersionAtLeast10_2), theSctx->xquery_version()));
+
+ theHaveContextItemDecl = true;
return no_state;
}
@@ -3875,9 +3890,18 @@
if (v.get_expr() != NULL)
initExpr = pop_nodestack();
- xqtref_t type = GENV_TYPESYSTEM.ITEM_TYPE_ONE;
+ xqtref_t type;
+
if (v.get_type() != NULL)
+ {
type = pop_tstack();
+theSctx->set_c
[Zorba-coders] [Merge] lp:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending. -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue job ignore-2011-12-21T09-22-16.222Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T09-22-16.222Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The attempt to merge lp:~ceejatec/zorba/ignore into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job ignore-2011-12-21T08-47-20.898Z 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/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T08-47-20.898Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The attempt to merge lp:~ceejatec/zorba/ignore into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job ignore-2011-12-21T08-04-20.286Z is finished. The final status was: 229 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ignore-2011-12-21T08-04-20.286Z/log.html -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
The proposal to merge lp:~ceejatec/zorba/ignore into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 -- https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507 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:~ceejatec/zorba/ignore into lp:zorba
Chris Hillery has proposed merging lp:~ceejatec/zorba/ignore into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507
--
https://code.launchpad.net/~ceejatec/zorba/ignore/+merge/86507
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-12-20 18:30:39 +
+++ CMakeLists.txt 2011-12-21 08:01:52 +
@@ -16,7 +16,6 @@
ENABLE_TESTING()
INCLUDE(CTest)
-
# overwriting the source and binary directories with the current zorba ones
# this is usefull for other projects reusing zorba as a subcomponent
SET(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
--
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
