Merge lp:~zorba-coders/zorba/redirect into lp:zorba

[Matthias Brantner]

Allow external functions to be updating.

Allow external functions to be updating.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/redirect-2011-11-23T22-30-21.892Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job redirect-2011-11-23T22-30-21.892Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 3 Pending.

[Juan Zacarias (juan457)]

It solves the issue for the evaluate-updating function for xqxq module to work as an updating function

review: Approve

[Markos Zaharioudakis (markos-za)]

I prefer a different fix, which brings us closer to the end goal of mixing PULs and XDM. I have committed this fix. Please review and make sure it works with xqxq.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/redirect-2011-11-24T10-23-15.44Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job redirect-2011-11-24T10-23-15.44Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 3 Pending.

[Juan Zacarias (juan457)]

Is working for the xqxq module

[Juan Zacarias (juan457)]

review: Approve

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/redirect-2011-11-25T12-45-17.416Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job redirect-2011-11-25T12-45-17.416Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2011-11-23 16:27:08 +0000
+++ ChangeLog	2011-11-24 10:24:28 +0000
@@ -15,6 +15,7 @@
   * Implemented the probe-index-range-value for general indexes
   * Added ExternalFunctionParameter class to be registered in the DynamicContext
   * New module for compiling and executing XQueries from XQuery (xqxq)
+  * External functions are allowed to be updating (i.e. return a pending update list)
 
 Optimization:
   * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a

=== modified file 'doc/zorba/impl_dep_features.dox'
--- doc/zorba/impl_dep_features.dox	2011-10-07 08:28:43 +0000
+++ doc/zorba/impl_dep_features.dox	2011-11-24 10:24:28 +0000
@@ -216,7 +216,7 @@
   <tr bgcolor="lightcyan">
     <td>W3C XQuery Update Facility 1.0</td>
     <td>The mechanism (if any) by which an external function can return an XDM instance and/or a pending update list to the invoking query.</td>
-    <td>Zorba allows external functions to be implemented in C++. Such functions may return XDM instances. However, it is not possible to implement an updating external function.</td>
+    <td>Zorba allows external functions to be implemented in C++. Such functions may return XDM instances. Moreover, external functions declared as updating may return pending update lists generated by any updating expression. However, it's not possible to create new update primtives and return those.</td>
   </tr>
   <tr bgcolor="lightcyan">
     <td>W3C XQuery Update Facility 1.0</td>
@@ -744,4 +744,4 @@
     <td>static</td>
     <td>no wildcards </td>
   </tr>
-</table>*/
\ No newline at end of file
+</table>*/

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2011-11-22 08:57:25 +0000
+++ src/compiler/translator/translator.cpp	2011-11-24 10:24:28 +0000
@@ -3188,12 +3188,6 @@
       // have an updating expr as input to a treat expr, which is not allowed
       // yet.
       //returnType = theRTM.EMPTY_TYPE;
-
-      // TODO: remove this
-      if (func_decl->is_external())
-      {
-        returnType = theRTM.EMPTY_TYPE;
-      }
     }
 
     // Create the function signature.
@@ -3228,7 +3222,7 @@
         // We make sure that the types of the parameters and the return type
         // are equal to the one that is declared in the module
         const signature& s = f->getSignature();
-        if (!sig.equals(tm, s))
+        if (!s.subtype(tm, sig, loc))
         {
           RAISE_ERROR(zerr::ZXQP0007_FUNCTION_SIGNATURE_NOT_EQUAL, loc,
           ERROR_PARAMS(BUILD_STRING('{',

=== modified file 'src/functions/signature.cpp'
--- src/functions/signature.cpp	2011-07-01 05:22:12 +0000
+++ src/functions/signature.cpp	2011-11-24 10:24:28 +0000
@@ -37,68 +37,68 @@
   :
   theQName(name),
   theIsVariadic(variadic)
-{
-  theTypes.push_back(returnType);
-  theTypes.push_back(paramType1);
-}
-
-
-signature::signature(
-    const store::Item_t& name,
-    const xqtref_t& returnType)
-  :
-  theQName(name),
-  theIsVariadic(false)
-{
-  theTypes.push_back(returnType);
-}
-
-
-signature::signature(
-    const store::Item_t& name,
-    const xqtref_t& paramType1,
-    const xqtref_t& returnType)
-  :
-  theQName(name),
-  theIsVariadic(false)
-{
-  theTypes.push_back(returnType);
-  theTypes.push_back(paramType1);
-}
-
-
-signature::signature(
-    const store::Item_t& name,
-    const xqtref_t& paramType1,
-    const xqtref_t& paramType2,
-    const xqtref_t& returnType)
-  :
-  theQName(name),
-  theIsVariadic(false)
-{
-  theTypes.push_back(returnType);
-  theTypes.push_back(paramType1);
-  theTypes.push_back(paramType2);
-}
-
-
-signature::signature(
-    const store::Item_t& name,
-    const xqtref_t& paramType1,
-    const xqtref_t& paramType2,
+{
+  theTypes.push_back(returnType);
+  theTypes.push_back(paramType1);
+}
+
+
+signature::signature(
+    const store::Item_t& name,
+    const xqtref_t& returnType)
+  :
+  theQName(name),
+  theIsVariadic(false)
+{
+  theTypes.push_back(returnType);
+}
+
+
+signature::signature(
+    const store::Item_t& name,
+    const xqtref_t& paramType1,
+    const xqtref_t& returnType)
+  :
+  theQName(name),
+  theIsVariadic(false)
+{
+  theTypes.push_back(returnType);
+  theTypes.push_back(paramType1);
+}
+
+
+signature::signature(
+    const store::Item_t& name,
+    const xqtref_t& paramType1,
+    const xqtref_t& paramType2,
+    const xqtref_t& returnType)
+  :
+  theQName(name),
+  theIsVariadic(false)
+{
+  theTypes.push_back(returnType);
+  theTypes.push_back(paramType1);
+  theTypes.push_back(paramType2);
+}
+
+
+signature::signature(
+    const store::Item_t& name,
+    const xqtref_t& paramType1,
+    const xqtref_t& paramType2,
     const xqtref_t& paramType3,
-    const xqtref_t& returnType)
-  :
-  theQName(name),
-  theIsVariadic(false)
-{
-  theTypes.push_back(returnType);
-  theTypes.push_back(paramType1);
-  theTypes.push_back(paramType2);
+    const xqtref_t& returnType)
+  :
+  theQName(name),
+  theIsVariadic(false)
+{
+  theTypes.push_back(returnType);
+  theTypes.push_back(paramType1);
+  theTypes.push_back(paramType2);
   theTypes.push_back(paramType3);
 }
-
-
+
+
 signature::signature(
     const store::Item_t& name,
     const xqtref_t& paramType1,
@@ -237,7 +237,10 @@
 }
 
 
-bool signature::equals(const TypeManager* tm, const signature& s) const
+bool signature::equals(
+    const TypeManager* tm,
+    const signature& s,
+    const QueryLoc& loc) const
 {
   if (paramCount() != s.paramCount())
     return false;
@@ -251,7 +254,34 @@
     if (!TypeOps::is_equal(tm,
                            *theTypes[i].getp(),
                            *s.theTypes[i].getp(), 
-                           QueryLoc::null))
+                           loc))
+    {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+
+bool signature::subtype(
+    const TypeManager* tm,
+    const signature& s,
+    const QueryLoc& loc) const
+{
+  if (paramCount() != s.paramCount())
+    return false;
+
+  if (!theQName->equals(s.theQName.getp()))
+    return false;
+
+  assert (s.theTypes.size() == theTypes.size() || theIsVariadic );
+  for (csize i = 0; i < theTypes.size(); ++i)
+  {
+    if (!TypeOps::is_subtype(tm,
+                             *theTypes[i].getp(),
+                             *s.theTypes[i].getp(), 
+                             loc))
     {
       return false;
     }

=== modified file 'src/functions/signature.h'
--- src/functions/signature.h	2011-06-21 05:41:24 +0000
+++ src/functions/signature.h	2011-11-24 10:24:28 +0000
@@ -168,7 +168,15 @@
 
   xqtref_t& returnType() { return theTypes[0]; }
 
-  bool equals(const TypeManager* tm, const signature& s) const;
+  bool equals(
+      const TypeManager* tm,
+      const signature& s,
+      const QueryLoc& loc) const;
+
+  bool subtype(
+      const TypeManager* tm,
+      const signature& s,
+      const QueryLoc& loc) const;
 };
 
 } /* namespace zorba */