[Zorba-coders] [Merge] lp:~zorba-coders/zorba/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Validation queue job import-cycles-2013-05-08T09-46-09.344Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/import-cycles-2013-05-08T09-46-09.344Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/import-cycles 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 import-cycles-2013-05-08T08-12-57.851Z is finished. The final status was: 3 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/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/import-cycles-2013-05-08T08-12-57.851Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/import-cycles 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 import-cycles-2013-05-08T03-54-45.905Z is finished. The final status was: 4 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/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/import-cycles-2013-05-08T03-54-45.905Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/import-cycles into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924 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/import-cycles into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/import-cycles
into lp:zorba.
Commit message:
Implemented resolution of module-import cycles according to the W3C XQuery 3.0
spec
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Implemented resolution of module-import cycles according to the W3C XQuery 3.0
spec
--
https://code.launchpad.net/~zorba-coders/zorba/import-cycles/+merge/162924
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-05-07 22:46:58 +
+++ ChangeLog 2013-05-08 03:46:36 +
@@ -24,6 +24,7 @@
* Added xqxq:variable-value function.
* Added canonicalize function to modules/xml.
* Added support for xs:dateTimeStamp type from XMLSchema 1.1, bug #924754.
+ * Implemented resolution of module-import cycles according to the W3C XQuery 3.0 spec.
* Added uri:parse() and uri:serialize() functions to URI module for
parsing URI into components and forming URIs from components.
* Added support for the standardized require-feature and prohibit-feature
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp 2013-04-25 20:41:11 +
+++ src/api/dynamiccontextimpl.cpp 2013-05-08 03:46:36 +
@@ -257,7 +257,7 @@
catch (ZorbaException const& e)
{
// Normally, we should be throwing an exception if the variable has not
- // been declared inside the xquery program, but this cases many failures
+ // been declared inside the xquery program, but this causes many failures
// with the w3c XQTS.
if (e.diagnostic() == err::XPST0008)
{
=== modified file 'src/compiler/parsetree/parsenodes.h'
--- src/compiler/parsetree/parsenodes.h 2013-03-23 13:10:33 +
+++ src/compiler/parsetree/parsenodes.h 2013-05-08 03:46:36 +
@@ -421,9 +421,9 @@
rchandle,
rchandle);
- rchandle get_sind_list() const { return sind_list_h; }
+ SIND_DeclList* get_sind_list() const { return sind_list_h.getp(); }
- rchandle get_vfo_list() const { return vfo_list_h; }
+ VFO_DeclList* get_vfo_list() const { return vfo_list_h.getp(); }
// returns true if the value was NULL before the call
bool set_sind_list(SIND_DeclList* list);
@@ -454,6 +454,16 @@
void push_back(rchandle decl);
void accept(parsenode_visitor&) const;
+
+ const std::vector >& getDecls() const
+ {
+return theDecls;
+ }
+
+ const std::vector >& getModuleImports() const
+ {
+return theModuleImports;
+ }
};
@@ -892,7 +902,7 @@
:
parsenode(loc),
theInitExpr(expr),
-theIsExternal(false)
+theIsExternal(true)
{
}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-05-06 05:34:01 +
+++ src/compiler/translator/translator.cpp 2013-05-08 03:46:36 +
@@ -443,16 +443,16 @@
In non-DEBUGGER mode, this stack remains empty.
- export_sctx :
- -
+ theExportSctx :
+ ---
- In case this is a library module translator, export_sctx is populated with
+ In case this is a library module translator, theExportSctx is populated with
the variable, function, and xqddf declarations that are exported by the
module, i.e., the var, udf, and xqddf declarations that appear in the prolog
- of this module. The export_sctx is created by the importing module, populated
+ of this module. TheExportSctx is created by the importing module, populated
by the imported module, and then merged by the importing module into its own
- sctx. export_sctx is "shared" between importing and imported modules via the
- theModulesInfo->mod_sctx_map. export_sctx is needed because module import is
+ sctx. theExportSctx is "shared" between importing and imported modules via the
+ theModulesInfo->mod_sctx_map. theExportSctx is needed because module import is
not transitive: If M1 imports M2 and M2 imports M3, then M3's declarations
must be seen by M2, but not by M1. This means, that the regular root sctx
S2 of M2 will contain the decls from both M2 and M3. So, M1 should not import
@@ -648,7 +648,7 @@
std::stack theSctxIdStack;
- static_context * export_sctx;
+ static_context * theExportSctx;
rchandletheNSCtx;
@@ -739,7 +739,7 @@
theCurrSctxId(rootSctxId),
theRootSctx(rootSctx),
theSctx(rootSctx),
- export_sctx(NULL),
+ theExportSctx(NULL),
theNSCtx(new namespace_context(theSctx)),
thePrintDepth(0),
theScopeDepth(0),
@@ -788,6 +788,12 @@
}
+bool isRootTranslator() const
+{
+ return theRootTranslator == this;
+}
+
+
const store::Item_t& getDotItemVarName() const
{
return theRootTranslator->theDotItemVarName;
@@ -972,7 +978,7 @@
***/
inline bool in
