[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Stage "TestZorbaUbuntu" failed. 1 tests failed (8550 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/329/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/type-api into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/type-api into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 -- https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 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/type-api into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 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/type-api into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/type-api into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/type-api into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 -- https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 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/type-api into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/type-api into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 -- https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278 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-1192246 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1192246 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 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-1192246 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 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-1192246 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 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-1192246 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1192246/+merge/186942 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into
lp:zorba.
Commit message:
Adding Xereces mutex for multi-thread safety
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178
Adding Xereces mutex for multi-thread safety
--
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/system/globalenv.cpp'
--- src/system/globalenv.cpp 2013-09-19 16:47:08 +
+++ src/system/globalenv.cpp 2013-09-24 09:51:29 +
@@ -96,7 +96,7 @@
ZORBA_FATAL(store != NULL, "Must provide store during zorba initialization");
- m_globalEnv->m_store = store;
+ m_globalEnv->theStore = store;
m_globalEnv->theRootTypeManager = new RootTypeManager;
RCHelper::addReference(m_globalEnv->theRootTypeManager);
@@ -169,7 +169,7 @@
AnnotationInternal::destroyBuiltIn();
- m_globalEnv->m_store = NULL;
+ m_globalEnv->theStore = NULL;
// we shutdown icu
// again it is important to mention this in the documentation
@@ -206,7 +206,7 @@
/
GlobalEnvironment::GlobalEnvironment()
:
- m_store(0),
+ theStore(0),
theRootTypeManager(NULL),
theRootStaticContext(0),
m_compilerSubSys(0)
@@ -310,19 +310,19 @@
store::Store& GlobalEnvironment::getStore()
{
- return *m_store;
+ return *theStore;
}
store::ItemFactory* GlobalEnvironment::getItemFactory()
{
- return m_store->getItemFactory();
+ return theStore->getItemFactory();
}
store::IteratorFactory* GlobalEnvironment::getIteratorFactory()
{
- return m_store->getIteratorFactory();
+ return theStore->getIteratorFactory();
}
=== modified file 'src/system/globalenv.h'
--- src/system/globalenv.h 2013-09-17 21:12:49 +
+++ src/system/globalenv.h 2013-09-24 09:51:29 +
@@ -61,7 +61,7 @@
static GlobalEnvironment* m_globalEnv;
private:
- store::Store* m_store;
+ store::Store* theStore;
RootTypeManager * theRootTypeManager;
=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp 2013-09-17 21:12:49 +
+++ src/types/casting.cpp 2013-09-24 09:51:29 +
@@ -2657,7 +2657,8 @@
if (!targetType->isAtomicOne())
{
-if ( throw_on_error ) {
+if ( throw_on_error )
+{
RAISE_ERROR(err::XPST0051, loc,
ERROR_PARAMS(ZED(XPST0051_Atomic_2), targetType));
}
@@ -2700,9 +2701,11 @@
{
CastFunc castFunc = theCastMatrix[theMapping[sourceTypeCode]]
[theMapping[targetTypeCode]];
-if (castFunc == 0) {
+if (castFunc == 0)
+{
if ( throw_on_error )
throwXPTY0004Exception(errInfo);
+
return false;
}
@@ -3202,7 +3205,7 @@
TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
- if (targetType->type_kind() == XQType::USER_DEFINED_KIND )
+ if (targetType->type_kind() == XQType::USER_DEFINED_KIND)
{
const UserDefinedXQType* udt = static_cast(targetType);
if (!udt->isComplex())
@@ -3254,20 +3257,19 @@
/
bool GenericCast::isCastable(
const zstring& str,
-const XQType* aTargetType,
+const XQType* targetType,
TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
- if (aTargetType->type_kind() == XQType::USER_DEFINED_KIND )
+ if (targetType->type_kind() == XQType::USER_DEFINED_KIND )
{
-const UserDefinedXQType* udt = static_cast(aTargetType);
+const UserDefinedXQType* udt = static_cast(targetType);
if (!udt->isComplex())
{
tm->initializeSchema();
return tm->getSchema()->
- isCastableUserSimpleTypes(str,
- udt->getBaseType().getp());
+ isCastableUserSimpleTypes(str, udt->getBaseType().getp());
}
}
#endif // ZORBA_NO_XMLSCHEMA
@@ -3276,8 +3278,9 @@
xqtref_t lSourceType = rtm.STRING_TYPE_ONE;
- TypeConstants::castable_t lIsCastable = TypeOps::castability(*lSourceType,
- *aTargetType);
+ TypeConstants::castable_t lIsCastable =
+ TypeOps::castability(*lSourceType, *targetType);
+
switch(lIsCastable)
{
case TypeConstants::NOT_CASTABLE:
@@ -3292,7 +3295,7 @@
{
store::Item_t dummy;
zstring copyStr = str;
- return castStringToAtomic(dummy, copyStr, aTargetType, tm, NULL, QueryLoc::null, false);
+ return castStringToAtomic(dummy, copyStr, targetType, tm, NULL, QueryLoc::null, false);
}
catch (ZorbaException const&)
{
=== modified file 'src/types/root_typemanager.h'
--- src/types/root_typemanager.h 2013-06-15 02:57:08 +
+++ src/types/root_typemanager.h 2013-09-24 09:51:29 +
@@ -18,9 +18,11 @@
#define ZORBA_ROOT_TYPEMANAGER_H
