zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
Fixed bug #1076402 (bug in CastIterator when target is QName)

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/157737

Fixed bug #1076402 (bug in CastIterator when target is QName)
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/157737
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2013-03-22 00:38:18 +0000
+++ src/context/root_static_context.cpp	2013-04-08 19:50:32 +0000
@@ -56,19 +56,17 @@
   aPath.push_back(full_path);
 }
 
+
 static void append_env_var(
   wchar_t const * env_var_name,
   std::vector<zstring>& pathsVector,
   zstring& core_path,
-  zstring& noncore_path
-  )
+  zstring& noncore_path)
 {
   wchar_t env_var[MAX_VAR_SIZE];
   DWORD path_size;
   // get a relative path from the environment for LIB
-  path_size = GetEnvironmentVariableW (env_var_name,
-                                       env_var,
-                                       MAX_VAR_SIZE );
+  path_size = GetEnvironmentVariableW(env_var_name, env_var, MAX_VAR_SIZE);
   if (path_size)
   {
     char  dll_path[MAX_VAR_SIZE];
@@ -80,8 +78,10 @@
                         MAX_VAR_SIZE,
                         NULL,
                         NULL);
+
     char * str_env = std::strtok(dll_path, ";");
-    while (str_env !=NULL) {
+    while (str_env !=NULL)
+    {
       zstring zorba_env_dir(str_env);
       if (str_env[strlen(str_env)-1] != '\\')
       {
@@ -94,15 +94,14 @@
   }
 }
 #else
-  static void append_env_var
-    (
-  const char * env_var_name,
-  std::vector<zstring>& pathsVector
-  )
+static void append_env_var(
+    const char* env_var_name,
+    std::vector<zstring>& pathsVector)
 {
   char* dll_path = getenv(env_var_name);
   char* str_env = std::strtok(dll_path, ";");
-  while (str_env !=NULL) {
+  while (str_env !=NULL)
+  {
     zstring zorba_env_dir(str_env);
     if (str_env[strlen(str_env)-1] != '/')
     {

=== modified file 'src/runtime/core/sequencetypes.cpp'
--- src/runtime/core/sequencetypes.cpp	2013-03-04 21:00:58 +0000
+++ src/runtime/core/sequencetypes.cpp	2013-04-08 19:50:32 +0000
@@ -249,7 +249,7 @@
     {
       targetType = static_cast<const AtomicXQType*>(theCastType.getp())->get_type_code();
 
-      GenericCast::castToBuiltinAtomic(result, item, targetType, NULL, loc);
+      GenericCast::castToBuiltinAtomic(result, item, targetType, &theNsCtx, loc);
 
       STACK_PUSH(true, state);
     }

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-08 15:07:13 +0000
+++ test/fots/CMakeLists.txt	2013-04-08 19:50:32 +0000
@@ -527,7 +527,6 @@
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof17 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof18 0)
 EXPECTED_FOTS_FAILURE (misc-HigherOrderFunctions xqhof19 0)
-EXPECTED_FOTS_FAILURE (prod-ContextItemDecl contextDecl-055 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-007 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-008 0)
 EXPECTED_FOTS_FAILURE (prod-FunctionCall FunctionCall-010 0)

=== added file 'test/rbkt/ExpQueryResults/zorba/casting/qname_01.xml.res'
--- test/rbkt/ExpQueryResults/zorba/casting/qname_01.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/casting/qname_01.xml.res	2013-04-08 19:50:32 +0000
@@ -0,0 +1,1 @@
+true

=== added file 'test/rbkt/Queries/zorba/casting/qname_01.xq'
--- test/rbkt/Queries/zorba/casting/qname_01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/casting/qname_01.xq	2013-04-08 19:50:32 +0000
@@ -0,0 +1,4 @@
+
+let $a := xs:QName("local:a")
+let $d := "local:a"
+return ($a eq xs:QName($d))