zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #03964
[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/89646
fix for bug #866932 (string pool not empty on shutdown)
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/89646
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/xmldatamanagerimpl.cpp'
--- src/api/xmldatamanagerimpl.cpp 2011-09-15 11:46:01 +0000
+++ src/api/xmldatamanagerimpl.cpp 2012-01-23 10:10:30 +0000
@@ -216,8 +216,7 @@
{
ZORBA_DM_TRY
{
- Item lQName = theFactory->createQName(static_context::W3C_FN_NS.c_str(),
- "parse-xml");
+ Item lQName = theFactory->createQName(static_context::W3C_FN_NS, "parse-xml");
// create a streamable string item
std::vector<ItemSequence_t> lArgs;
@@ -247,7 +246,7 @@
{
ZORBA_DM_TRY
{
- Item lQName = theFactory->createQName(static_context::W3C_FN_NS.c_str(),
+ Item lQName = theFactory->createQName(static_context::W3C_FN_NS,
"parse-xml");
// create a streamable string item
@@ -280,7 +279,7 @@
{
ZORBA_DM_TRY
{
- Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS.c_str(),
+ Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS,
"parse-xml-fragment");
// create a streamable string item
@@ -315,7 +314,7 @@
{
ZORBA_DM_TRY
{
- Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS.c_str(),
+ Item lQName = theFactory->createQName(static_context::ZORBA_XML_FN_NS,
"parse-xml-fragment");
// create a streamable string item
@@ -349,7 +348,7 @@
{
ZORBA_DM_TRY
{
- Item lQName = theFactory->createQName(static_context::ZORBA_FETCH_FN_NS.c_str(),
+ Item lQName = theFactory->createQName(static_context::ZORBA_FETCH_FN_NS,
"content");
// create a streamable string item
=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp 2012-01-11 17:30:25 +0000
+++ src/context/root_static_context.cpp 2012-01-23 10:10:30 +0000
@@ -72,7 +72,7 @@
const char* const default_ns_initializers[] =
{
//"err", XQUERY_ERR_NS,
- "fn", static_context::W3C_FN_NS.c_str(),
+ "fn", static_context::W3C_FN_NS,
"local", XQUERY_LOCAL_FN_NS,
//"math", XQUERY_MATH_FN_NS,
"xml", XML_NS,
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-01-11 17:30:25 +0000
+++ src/context/static_context.cpp 2012-01-23 10:10:30 +0000
@@ -249,7 +249,6 @@
/***************************************************************************//**
Target namespaces of zorba builtin modules
********************************************************************************/
-#define NS_PRE static_context::ZORBA_NS_PREFIX
const zstring
static_context::DOT_VAR_NAME = "$$dot";
@@ -260,129 +259,151 @@
const zstring
static_context::DOT_SIZE_VAR_NAME = "$$last-idx";
-const zstring
+const char*
static_context::W3C_NS_PREFIX = "http://www.w3.org/";;
-const zstring
+const char*
static_context::ZORBA_NS_PREFIX = "http://www.zorba-xquery.com/";;
-const zstring
-static_context::W3C_FN_NS = W3C_NS_PREFIX + "2005/xpath-functions";
-
-const zstring
-static_context::W3C_XML_NS = W3C_NS_PREFIX + "XML/1998/namespace";
-
-const zstring
-static_context::ZORBA_MATH_FN_NS = NS_PRE + "modules/math";
-
-const zstring
-static_context::ZORBA_BASE64_FN_NS = NS_PRE + "modules/converters/base64";
-
-const zstring
-static_context::ZORBA_NODEREF_FN_NS = NS_PRE + "modules/node-reference";
-
-const zstring
-static_context::ZORBA_NODEPOS_FN_NS = NS_PRE + "modules/node-position";
-
-const zstring
-static_context::ZORBA_STORE_DYNAMIC_COLLECTIONS_DDL_FN_NS
- = NS_PRE + "modules/store/dynamic/collections/ddl";
-
-const zstring
-static_context::ZORBA_STORE_DYNAMIC_COLLECTIONS_DML_FN_NS
- = NS_PRE + "modules/store/dynamic/collections/dml";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_COLLECTIONS_DDL_FN_NS
- = NS_PRE + "modules/store/static/collections/ddl";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_COLLECTIONS_DML_FN_NS
- = NS_PRE + "modules/store/static/collections/dml";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_INDEXES_DDL_FN_NS
- = NS_PRE + "modules/store/static/indexes/ddl";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_INDEXES_DML_FN_NS
- = NS_PRE + "modules/store/static/indexes/dml";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DDL_FN_NS
- = NS_PRE + "modules/store/static/integrity_constraints/ddl";
-
-const zstring
-static_context::ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DML_FN_NS
- = NS_PRE + "modules/store/static/integrity_constraints/dml";
-
-const zstring
-static_context::ZORBA_STORE_DYNAMIC_DOCUMENTS_FN_NS
- = static_context::ZORBA_NS_PREFIX + "modules/store/dynamic/documents";
-
-const zstring
-static_context::ZORBA_STORE_DYNAMIC_UNORDERED_MAP_FN_NS
- = static_context::ZORBA_NS_PREFIX + "modules/store/data-structures/unordered-map";
-
-const zstring
-static_context::ZORBA_SCHEMA_FN_NS = static_context::ZORBA_NS_PREFIX + "modules/schema";
-
-const zstring
-static_context::ZORBA_XQDOC_FN_NS = ZORBA_NS_PREFIX + "modules/xqdoc";
-
-const zstring
-static_context::ZORBA_RANDOM_FN_NS = ZORBA_NS_PREFIX + "modules/random";
-
-const zstring
-static_context::ZORBA_INTROSP_SCTX_FN_NS = NS_PRE + "modules/introspection/sctx";
-
-const zstring
-static_context::ZORBA_REFLECTION_FN_NS = NS_PRE + "modules/reflection";
-
-const zstring
-static_context::ZORBA_UTIL_FN_NS = NS_PRE + "zorba/util-functions";
-
-const zstring
-static_context::ZORBA_SCRIPTING_FN_NS = NS_PRE + "zorba/scripting";
-
-const zstring
-static_context::ZORBA_STRING_FN_NS = NS_PRE + "modules/string";
-
-const zstring
-static_context::ZORBA_FETCH_FN_NS = NS_PRE + "modules/fetch";
-
-const zstring
-static_context::ZORBA_NODE_FN_NS = NS_PRE + "modules/node";
-
-const zstring
-static_context::ZORBA_XML_FN_NS = NS_PRE + "modules/xml";
+const char*
+static_context::W3C_FN_NS = "http://www.w3.org/2005/xpath-functions";;
+
+const char*
+static_context::W3C_XML_NS = "http://www.w3.org/XML/1998/namespace";;
+
+const char*
+static_context::ZORBA_MATH_FN_NS =
+"http://www.zorba-xquery.com/modules/math";;
+
+const char*
+static_context::ZORBA_BASE64_FN_NS =
+"http://www.zorba-xquery.com/modules/converters/base64";;
+
+const char*
+static_context::ZORBA_NODEREF_FN_NS =
+"http://www.zorba-xquery.com/modules/node-reference";;
+
+const char*
+static_context::ZORBA_NODEPOS_FN_NS =
+"http://www.zorba-xquery.com/modules/node-position";;
+
+const char*
+static_context::ZORBA_STORE_DYNAMIC_COLLECTIONS_DDL_FN_NS =
+"http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
+
+const char*
+static_context::ZORBA_STORE_DYNAMIC_COLLECTIONS_DML_FN_NS =
+"http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_COLLECTIONS_DDL_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/collections/ddl";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_COLLECTIONS_DML_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/collections/dml";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_INDEXES_DDL_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/indexes/ddl";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_INDEXES_DML_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/indexes/dml";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DDL_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/integrity_constraints/ddl";;
+
+const char*
+static_context::ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DML_FN_NS =
+"http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml";;
+
+const char*
+static_context::ZORBA_STORE_DYNAMIC_DOCUMENTS_FN_NS =
+"http://www.zorba-xquery.com/modules/store/dynamic/documents";;
+
+const char*
+static_context::ZORBA_STORE_DYNAMIC_UNORDERED_MAP_FN_NS =
+"http://www.zorba-xquery.com/modules/store/data-structures/unordered-map";;
+
+const char*
+static_context::ZORBA_SCHEMA_FN_NS =
+"http://www.zorba-xquery.com/modules/schema";;
+
+const char*
+static_context::ZORBA_XQDOC_FN_NS =
+"http://www.zorba-xquery.com/modules/xqdoc";;
+
+const char*
+static_context::ZORBA_RANDOM_FN_NS =
+"http://www.zorba-xquery.com/modules/random";;
+
+const char*
+static_context::ZORBA_INTROSP_SCTX_FN_NS =
+"http://www.zorba-xquery.com/modules/introspection/sctx";;
+
+const char*
+static_context::ZORBA_REFLECTION_FN_NS =
+"http://www.zorba-xquery.com/modules/reflection";;
+
+const char*
+static_context::ZORBA_UTIL_FN_NS =
+"http://www.zorba-xquery.com/zorba/util-functions";;
+
+const char*
+static_context::ZORBA_SCRIPTING_FN_NS =
+"http://www.zorba-xquery.com/zorba/scripting";;
+
+const char*
+static_context::ZORBA_STRING_FN_NS =
+"http://www.zorba-xquery.com/modules/string";;
+
+const char*
+static_context::ZORBA_FETCH_FN_NS =
+"http://www.zorba-xquery.com/modules/fetch";;
+
+const char*
+static_context::ZORBA_NODE_FN_NS =
+"http://www.zorba-xquery.com/modules/node";;
+
+const char*
+static_context::ZORBA_XML_FN_NS =
+"http://www.zorba-xquery.com/modules/xml";;
/***************************************************************************//**
Target namespaces of zorba reserved modules
********************************************************************************/
-const zstring
-static_context::XQUERY_OP_NS = ZORBA_NS_PREFIX + "internal/xquery-ops";
+const char*
+static_context::XQUERY_OP_NS =
+"http://www.zorba-xquery.com/internal/xquery-ops";;
-const zstring
-static_context::ZORBA_OP_NS = ZORBA_NS_PREFIX + "internal/zorba-ops";
+const char*
+static_context::ZORBA_OP_NS =
+"http://www.zorba-xquery.com/internal/zorba-ops";;
/***************************************************************************//**
Options-related namespaces
********************************************************************************/
-const zstring
-static_context::ZORBA_OPTIONS_NS = ZORBA_NS_PREFIX + "options";
-
-const zstring
-static_context::ZORBA_OPTION_WARN_NS = static_context::ZORBA_OPTIONS_NS + "/warnings";
-
-const zstring
-static_context::ZORBA_OPTION_FEATURE_NS = static_context::ZORBA_OPTIONS_NS + "/features";
-
-const zstring
-static_context::ZORBA_OPTION_OPTIM_NS = static_context::ZORBA_OPTIONS_NS + "/optimizer";
-
-const zstring
-static_context::ZORBA_VERSIONING_NS = static_context::ZORBA_OPTIONS_NS + "/versioning";
+const char*
+static_context::ZORBA_OPTIONS_NS =
+"http://www.zorba-xquery.com/options";;
+
+const char*
+static_context::ZORBA_OPTION_WARN_NS =
+"http://www.zorba-xquery.com/options/warnings";;
+
+const char*
+static_context::ZORBA_OPTION_FEATURE_NS =
+"http://www.zorba-xquery.com/options/features";;
+
+const char*
+static_context::ZORBA_OPTION_OPTIM_NS =
+"http://www.zorba-xquery.com/options/optimizer";;
+
+const char*
+static_context::ZORBA_VERSIONING_NS =
+"http://www.zorba-xquery.com/options/versioning";;
/***************************************************************************//**
@@ -391,7 +412,7 @@
********************************************************************************/
bool static_context::is_builtin_module(const zstring& ns)
{
- if (ns.compare(0, ZORBA_NS_PREFIX.size(), ZORBA_NS_PREFIX) == 0)
+ if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
{
return (ns == ZORBA_MATH_FN_NS ||
ns == ZORBA_BASE64_FN_NS ||
@@ -435,7 +456,7 @@
********************************************************************************/
bool static_context::is_builtin_virtual_module(const zstring& ns)
{
- if (ns.compare(0, ZORBA_NS_PREFIX.size(), ZORBA_NS_PREFIX) == 0)
+ if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
{
return (ns == ZORBA_SCRIPTING_FN_NS ||
ns == ZORBA_UTIL_FN_NS);
@@ -456,7 +477,7 @@
********************************************************************************/
bool static_context::is_non_pure_builtin_module(const zstring& ns)
{
- if (ns.compare(0, ZORBA_NS_PREFIX.size(), ZORBA_NS_PREFIX) == 0)
+ if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
{
return (ns == ZORBA_MATH_FN_NS ||
ns == ZORBA_INTROSP_SCTX_FN_NS ||
@@ -473,7 +494,7 @@
********************************************************************************/
bool static_context::is_reserved_module(const zstring& ns)
{
- if (ns.compare(0, ZORBA_NS_PREFIX.size(), ZORBA_NS_PREFIX) == 0)
+ if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
{
return (ns == ZORBA_OP_NS || ns == XQUERY_OP_NS);
}
@@ -3235,14 +3256,14 @@
{
// Re-use "ModuleVersion" class since it does 98% of the work for us;
// just use a fake URI
- ModuleVersion lOptVersion(ZORBA_VERSIONING_NS + "/corezorba", value);
+ ModuleVersion lOptVersion(zstring(ZORBA_VERSIONING_NS) + "/corezorba", value);
if (! lOptVersion.is_valid_version())
{
RAISE_ERROR(zerr::ZXQP0039_INVALID_VERSION_SPECIFICATION, loc,
ERROR_PARAMS(value));
}
- ModuleVersion lZorbaVersion(ZORBA_VERSIONING_NS + "/corezorba",
+ ModuleVersion lZorbaVersion(zstring(ZORBA_VERSIONING_NS) + "/corezorba",
ZORBA_VERSION);
if ( ! lZorbaVersion.satisfies(lOptVersion))
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2012-01-11 17:30:25 +0000
+++ src/context/static_context.h 2012-01-23 10:10:30 +0000
@@ -431,58 +431,58 @@
//
// W3C namespaces
//
- static const zstring W3C_NS_PREFIX; // http://www.w3.org/
-
- static const zstring W3C_XML_NS; // http://www.w3.org/XML/1998/namespace
-
- static const zstring W3C_FN_NS; // http://www.w3.org/2005/xpath-functions
+ static const char* W3C_NS_PREFIX; // http://www.w3.org/
+
+ static const char* W3C_XML_NS; // http://www.w3.org/XML/1998/namespace
+
+ static const char* W3C_FN_NS; // http://www.w3.org/2005/xpath-functions
//
// Zorba namespaces
//
- static const zstring ZORBA_NS_PREFIX; // http://www.zorba-xquery.com/
+ static const char* ZORBA_NS_PREFIX; // http://www.zorba-xquery.com/
// Namespaces of external modules declaring zorba builtin functions
- static const zstring ZORBA_MATH_FN_NS;
- static const zstring ZORBA_BASE64_FN_NS;
- static const zstring ZORBA_NODEREF_FN_NS;
- static const zstring ZORBA_NODEPOS_FN_NS;
- static const zstring ZORBA_STORE_DYNAMIC_COLLECTIONS_DDL_FN_NS;
- static const zstring ZORBA_STORE_DYNAMIC_COLLECTIONS_DML_FN_NS;
- static const zstring ZORBA_STORE_STATIC_COLLECTIONS_DDL_FN_NS;
- static const zstring ZORBA_STORE_STATIC_COLLECTIONS_DML_FN_NS;
- static const zstring ZORBA_STORE_STATIC_INDEXES_DDL_FN_NS;
- static const zstring ZORBA_STORE_STATIC_INDEXES_DML_FN_NS;
- static const zstring ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DDL_FN_NS;
- static const zstring ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DML_FN_NS;
- static const zstring ZORBA_STORE_DYNAMIC_DOCUMENTS_FN_NS;
- static const zstring ZORBA_STORE_DYNAMIC_UNORDERED_MAP_FN_NS;
- static const zstring ZORBA_SCHEMA_FN_NS;
- static const zstring ZORBA_XQDOC_FN_NS;
- static const zstring ZORBA_RANDOM_FN_NS;
- static const zstring ZORBA_INTROSP_SCTX_FN_NS;
- static const zstring ZORBA_REFLECTION_FN_NS;
- static const zstring ZORBA_STRING_FN_NS;
- static const zstring ZORBA_FETCH_FN_NS;
- static const zstring ZORBA_NODE_FN_NS;
- static const zstring ZORBA_XML_FN_NS;
+ static const char* ZORBA_MATH_FN_NS;
+ static const char* ZORBA_BASE64_FN_NS;
+ static const char* ZORBA_NODEREF_FN_NS;
+ static const char* ZORBA_NODEPOS_FN_NS;
+ static const char* ZORBA_STORE_DYNAMIC_COLLECTIONS_DDL_FN_NS;
+ static const char* ZORBA_STORE_DYNAMIC_COLLECTIONS_DML_FN_NS;
+ static const char* ZORBA_STORE_STATIC_COLLECTIONS_DDL_FN_NS;
+ static const char* ZORBA_STORE_STATIC_COLLECTIONS_DML_FN_NS;
+ static const char* ZORBA_STORE_STATIC_INDEXES_DDL_FN_NS;
+ static const char* ZORBA_STORE_STATIC_INDEXES_DML_FN_NS;
+ static const char* ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DDL_FN_NS;
+ static const char* ZORBA_STORE_STATIC_INTEGRITY_CONSTRAINTS_DML_FN_NS;
+ static const char* ZORBA_STORE_DYNAMIC_DOCUMENTS_FN_NS;
+ static const char* ZORBA_STORE_DYNAMIC_UNORDERED_MAP_FN_NS;
+ static const char* ZORBA_SCHEMA_FN_NS;
+ static const char* ZORBA_XQDOC_FN_NS;
+ static const char* ZORBA_RANDOM_FN_NS;
+ static const char* ZORBA_INTROSP_SCTX_FN_NS;
+ static const char* ZORBA_REFLECTION_FN_NS;
+ static const char* ZORBA_STRING_FN_NS;
+ static const char* ZORBA_FETCH_FN_NS;
+ static const char* ZORBA_NODE_FN_NS;
+ static const char* ZORBA_XML_FN_NS;
// Namespaces of virtual modules declaring zorba builtin functions
- static const zstring ZORBA_UTIL_FN_NS;
- static const zstring ZORBA_SCRIPTING_FN_NS;
+ static const char* ZORBA_UTIL_FN_NS;
+ static const char* ZORBA_SCRIPTING_FN_NS;
// Namespaces of virtual modules declaring internal builtin functions of
// XQUERY or zorba. Internal functions are not visible to xquery programs.
- static const zstring XQUERY_OP_NS;
- static const zstring ZORBA_OP_NS;
+ static const char* XQUERY_OP_NS;
+ static const char* ZORBA_OP_NS;
// options-related namepsaces
- static const zstring ZORBA_OPTIONS_NS;
- static const zstring ZORBA_OPTION_WARN_NS;
- static const zstring ZORBA_OPTION_FEATURE_NS;
- static const zstring ZORBA_OPTION_OPTIM_NS;
- static const zstring ZORBA_VERSIONING_NS;
+ static const char* ZORBA_OPTIONS_NS;
+ static const char* ZORBA_OPTION_WARN_NS;
+ static const char* ZORBA_OPTION_FEATURE_NS;
+ static const char* ZORBA_OPTION_OPTIM_NS;
+ static const char* ZORBA_VERSIONING_NS;
protected:
static_context * theParent;
@@ -497,9 +497,9 @@
BaseUriInfo * theBaseUriInfo;
- ztd::auto_vector<internal::URIMapper> theURIMappers;
+ ztd::auto_vector<internal::URIMapper> theURIMappers;
- ztd::auto_vector<internal::URLResolver> theURLResolvers;
+ ztd::auto_vector<internal::URLResolver> theURLResolvers;
checked_vector<zstring> theURIPath;
=== modified file 'src/functions/func_accessors_impl.cpp'
--- src/functions/func_accessors_impl.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_accessors_impl.cpp 2012-01-23 10:10:30 +0000
@@ -179,11 +179,11 @@
void populate_context_accessors_impl(static_context* sctx)
{
DECL(sctx, fn_name_func,
- (createQName(static_context::W3C_FN_NS.c_str(), "", "name"),
+ (createQName(static_context::W3C_FN_NS, "", "name"),
GENV_TYPESYSTEM.STRING_TYPE_ONE));
DECL(sctx, fn_name_func,
- (createQName(static_context::W3C_FN_NS.c_str(), "", "name"),
+ (createQName(static_context::W3C_FN_NS, "", "name"),
GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION,
GENV_TYPESYSTEM.STRING_TYPE_ONE));
=== modified file 'src/functions/func_apply.cpp'
--- src/functions/func_apply.cpp 2011-06-14 17:26:33 +0000
+++ src/functions/func_apply.cpp 2012-01-23 10:10:30 +0000
@@ -54,7 +54,7 @@
void populate_context_apply(static_context* sctx)
{
- const char* ns = static_context::ZORBA_SCRIPTING_FN_NS.c_str();
+ const char* ns = static_context::ZORBA_SCRIPTING_FN_NS;
DECL(sctx, xqsx_apply,
(createQName(ns, "", "apply"),
=== modified file 'src/functions/func_arithmetic.cpp'
--- src/functions/func_arithmetic.cpp 2011-12-21 14:40:33 +0000
+++ src/functions/func_arithmetic.cpp 2012-01-23 10:10:30 +0000
@@ -287,7 +287,7 @@
********************************************************************************/
void populateContext_Arithmetics(static_context* sctx)
{
- const char* xquery_op_ns = static_context::XQUERY_OP_NS.c_str();
+ const char* xquery_op_ns = static_context::XQUERY_OP_NS;
DECL(sctx, op_add,
(createQName (xquery_op_ns, "", "add"),
=== modified file 'src/functions/func_booleans_impl.cpp'
--- src/functions/func_booleans_impl.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_booleans_impl.cpp 2012-01-23 10:10:30 +0000
@@ -795,7 +795,7 @@
********************************************************************************/
void populateContext_Comparison(static_context* sctx)
{
- const char* zorba_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_ns = static_context::ZORBA_OP_NS;
// General Comparison;
DECL(sctx, op_equal,
@@ -881,8 +881,8 @@
void populate_context_booleans_impl(static_context* sctx)
{
- const char* xquery_op_ns = static_context::XQUERY_OP_NS.c_str();
- const char* fn_ns = static_context::W3C_FN_NS.c_str();
+ const char* xquery_op_ns = static_context::XQUERY_OP_NS;
+ const char* fn_ns = static_context::W3C_FN_NS;
// Boolean
DECL(sctx, fn_true,
=== modified file 'src/functions/func_durations_dates_times_impl.cpp'
--- src/functions/func_durations_dates_times_impl.cpp 2011-06-14 17:26:33 +0000
+++ src/functions/func_durations_dates_times_impl.cpp 2012-01-23 10:10:30 +0000
@@ -637,8 +637,8 @@
void populate_context_durations_dates_times_impl(static_context *sctx)
{
- const char* xquery_op_ns = static_context::XQUERY_OP_NS.c_str();
- const char* fn_ns = static_context::W3C_FN_NS.c_str();
+ const char* xquery_op_ns = static_context::XQUERY_OP_NS;
+ const char* fn_ns = static_context::W3C_FN_NS;
// begin date time
DECL(sctx, fn_datetime_ctor,
=== modified file 'src/functions/func_enclosed.cpp'
--- src/functions/func_enclosed.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_enclosed.cpp 2012-01-23 10:10:30 +0000
@@ -76,7 +76,7 @@
void populateContext_Constructors(static_context* sctx)
{
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL(sctx, op_enclosed_expr,
(createQName(zorba_op_ns, "", "enclosed-expr"),
=== modified file 'src/functions/func_eval.cpp'
--- src/functions/func_eval.cpp 2011-07-29 06:13:28 +0000
+++ src/functions/func_eval.cpp 2012-01-23 10:10:30 +0000
@@ -141,22 +141,22 @@
void populate_context_eval(static_context* sctx)
{
DECL(sctx, fn_zorba_eval,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "eval"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "eval"),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
DECL(sctx, fn_zorba_eval_n,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "eval-n"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "eval-n"),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
DECL(sctx, fn_zorba_eval_u,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "eval-u"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "eval-u"),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.EMPTY_TYPE));
DECL(sctx, fn_zorba_eval_s,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "eval-s"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "eval-s"),
GENV_TYPESYSTEM.STRING_TYPE_ONE,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
}
=== modified file 'src/functions/func_hoist.cpp'
--- src/functions/func_hoist.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_hoist.cpp 2012-01-23 10:10:30 +0000
@@ -118,7 +118,7 @@
void populateContext_Hoisting(static_context* sctx)
{
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL(sctx, zop_hoist,
(createQName(zorba_op_ns, "", "hoist"),
=== modified file 'src/functions/func_index_ddl.cpp'
--- src/functions/func_index_ddl.cpp 2011-08-12 16:07:57 +0000
+++ src/functions/func_index_ddl.cpp 2012-01-23 10:10:30 +0000
@@ -147,7 +147,7 @@
void populate_context_index_ddl(static_context* sctx)
{
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL(sctx, op_value_index_entry_builder,
(createQName(zorba_op_ns, "", "value-index-entry-builder"),
=== modified file 'src/functions/func_node_sort_distinct.cpp'
--- src/functions/func_node_sort_distinct.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_node_sort_distinct.cpp 2012-01-23 10:10:30 +0000
@@ -666,7 +666,7 @@
********************************************************************************/
void populateContext_DocOrder(static_context* sctx)
{
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL(sctx, op_either_nodes_or_atomics,
(createQName(zorba_op_ns,"","either-nodes-or-atomics"),
=== modified file 'src/functions/func_numerics_impl.cpp'
--- src/functions/func_numerics_impl.cpp 2012-01-10 10:52:15 +0000
+++ src/functions/func_numerics_impl.cpp 2012-01-23 10:10:30 +0000
@@ -788,8 +788,8 @@
void populateContext_Numerics(static_context* sctx)
{
- const char* xquery_op_ns = static_context::XQUERY_OP_NS.c_str();
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* xquery_op_ns = static_context::XQUERY_OP_NS;
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL_ALL_ARITH (sctx, add);
DECL_ALL_ARITH (sctx, subtract);
=== modified file 'src/functions/func_reflection.cpp'
--- src/functions/func_reflection.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_reflection.cpp 2012-01-23 10:10:30 +0000
@@ -141,25 +141,25 @@
void populate_context_reflection(static_context* sctx)
{
DECL(sctx, fn_zorba_invoke,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "invoke"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "invoke"),
GENV_TYPESYSTEM.QNAME_TYPE_ONE,
true,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
DECL(sctx, fn_zorba_invoke_n,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "invoke-n"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "invoke-n"),
GENV_TYPESYSTEM.QNAME_TYPE_ONE,
true,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
DECL(sctx, fn_zorba_invoke_u,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "invoke-u"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "invoke-u"),
GENV_TYPESYSTEM.QNAME_TYPE_ONE,
true,
GENV_TYPESYSTEM.EMPTY_TYPE));
DECL(sctx, fn_zorba_invoke_s,
- (createQName(static_context::ZORBA_REFLECTION_FN_NS.c_str(), "", "invoke-s"),
+ (createQName(static_context::ZORBA_REFLECTION_FN_NS, "", "invoke-s"),
GENV_TYPESYSTEM.QNAME_TYPE_ONE,
true,
GENV_TYPESYSTEM.ITEM_TYPE_STAR));
=== modified file 'src/functions/func_sequences_impl.cpp'
--- src/functions/func_sequences_impl.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_sequences_impl.cpp 2012-01-23 10:10:30 +0000
@@ -978,9 +978,9 @@
********************************************************************************/
void populate_context_sequences_impl(static_context* sctx)
{
- const char* xquery_op_ns = static_context::XQUERY_OP_NS.c_str();
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
- const char* fn_ns = static_context::W3C_FN_NS.c_str();
+ const char* xquery_op_ns = static_context::XQUERY_OP_NS;
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
+ const char* fn_ns = static_context::W3C_FN_NS;
DECL(sctx, fn_unordered,
(createQName(fn_ns, "", "unordered"),
=== modified file 'src/functions/func_var_decl.cpp'
--- src/functions/func_var_decl.cpp 2012-01-11 17:30:25 +0000
+++ src/functions/func_var_decl.cpp 2012-01-23 10:10:30 +0000
@@ -88,7 +88,7 @@
********************************************************************************/
void populateContext_VarDecl(static_context* sctx)
{
- const char* zorba_op_ns = static_context::ZORBA_OP_NS.c_str();
+ const char* zorba_op_ns = static_context::ZORBA_OP_NS;
DECL(sctx, ctx_var_get,
(createQName(zorba_op_ns, "", "ctxvar-get"),
Follow ups
