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

[Sorin Marian Nasoi]

fix for lp:987830.

fix for lp:987830.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Markos Zaharioudakis (markos-za)]

"empty" and "none" are not valid sequence types. We should try that are modules are at least parsable by other engines as well, so we should use valid sequence types.; For "empty" use empty-sequence(). There is not a valid sequence type for "none", but I did not see it used anywhere. Do you plan to use it? where?

This also means that the code in translator.cpp should be removed.

review: Needs Fixing

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> "empty" and "none" are not valid sequence types. We should try that are
> modules are at least parsable by other engines as well, so we should use valid
> sequence types.; For "empty" use empty-sequence().
http://www.w3.org/TR/xquery-semantics/#sec_content_models
From this I understand that:
- The type empty matches the empty sequence.
- The type none matches no values.

>There is not a valid sequence type for "none", but I did not see it used anywhere. Do you plan to
> use it? where?
The type none is the static type for [7.2.9 The fn:error function].

> This also means that the code in translator.cpp should be removed.
So where should
http://www.w3.org/TR/xquery-semantics/#sec_content_models
be implemented then?

Thanks for the help.

[Markos Zaharioudakis (markos-za)]

The module files should contain syntactically valid XQuery code. The formal semantics spec you cite is not concerned with syntax, and not everything described there has a coresponding syntactic construct. The none type is one example from the formal semantics that cannot be expressed syntactically. To see what types can be expressed syntactically, you have to look here:

http://www.w3.org/TR/xquery-30/#id-sequencetype-syntax

[Sorin Marian Nasoi (sorin.marian.nasoi)]

> The module files should contain syntactically valid XQuery code. The formal
> semantics spec you cite is not concerned with syntax, and not everything
> described there has a coresponding syntactic construct. The none type is one
> example from the formal semantics that cannot be expressed syntactically. To
> see what types can be expressed syntactically, you have to look here:
>
> http://www.w3.org/TR/xquery-30/#id-sequencetype-syntax
I see this makes sense.

One more thing though: where is the exception added for the fn:error function:
http://www.w3.org/TR/xpath-functions-30/#func-error ?

Thanks,
Sorin

[Sorin Marian Nasoi (sorin.marian.nasoi)]

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/fix_bug_987830-2012-05-01T11-24-01.368Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/fix_bug_987830 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job fix_bug_987830-2012-05-01T11-24-01.368Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~zorba-coders/zorba/fix_bug_987830]

10798. By Sorin Marian Nasoi <email address hidden> on 2012-05-01

Merged trunk.

10799. By Sorin Marian Nasoi <email address hidden> on 2012-05-01

Updated the version fo the Oauth adn data-cleaning modules.

[Sorin Marian Nasoi (sorin.marian.nasoi)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_987830-2012-05-01T21-57-59.05Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job fix_bug_987830-2012-05-01T21-57-59.05Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-04-26 20:54:34 +0000
+++ modules/ExternalModules.conf	2012-05-01 21:52:19 +0000
@@ -26,7 +26,7 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
-data-cleaning   bzr  lp:zorba/data-cleaning-module     zorba-2.2 
+data-cleaning   bzr  lp:zorba/data-cleaning-module     1.1 
 data-converters bzr  lp:zorba/data-converters-module   zorba-2.2 
 data-formatting bzr  lp:zorba/data-formatting-module   zorba-2.2-jvm
 excel           bzr  lp:zorba/excel-module             zorba-2.2 
@@ -34,7 +34,7 @@
 http-client     bzr  lp:zorba/http-client-module       zorba-2.2 
 image           bzr  lp:zorba/image-module             1.0
 languages       bzr  lp:zorba/languages-module         zorba-2.2 
-oauth           bzr  lp:zorba/oauth-module             zorba-2.2 
+oauth           bzr  lp:zorba/oauth-module             1.0 
 process         bzr  lp:zorba/process-module           zorba-2.2 
 security        bzr  lp:zorba/security-module          zorba-2.2 
 system          bzr  lp:zorba/system-module            zorba-2.2 

=== modified file 'modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq'
--- modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq	2012-04-24 12:39:38 +0000
+++ modules/com/zorba-xquery/www/modules/debugger/dbgp-message-handler.xq	2012-05-01 21:52:19 +0000
@@ -258,7 +258,7 @@
  : @param $message the message.
  : @return ().
  :)
-declare function dmh:process($message as element())
+declare function dmh:process($message as element()) as xs:anyAtomicType*
 {
   let $nodeName := fn:local-name($message)
   let $id := fn:data($message/@transaction_id)

=== modified file 'modules/com/zorba-xquery/www/modules/project_xqdoc.xq'
--- modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-04-24 22:08:01 +0000
+++ modules/com/zorba-xquery/www/modules/project_xqdoc.xq	2012-05-01 21:52:19 +0000
@@ -59,7 +59,7 @@
  : @return empty sequence.
  :)
 declare %an:sequential function pxqdoc:delete-XML-dir(
-  $xqdocPath as xs:string)
+  $xqdocPath as xs:string) as empty-sequence()
 {
   variable $xqdocXMLPath  := fn:concat( $xqdocPath,
                                         file:directory-separator(),
@@ -92,7 +92,7 @@
  :)
 declare %an:sequential function pxqdoc:generate-xqdoc-XML(
   $zorbaManifestPath as xs:string,
-  $xqdocPath as xs:string)
+  $xqdocPath as xs:string) as empty-sequence()
 {
   (: Note: only the modules that are configured in the Zorba version you are using will be build :)                                      
   variable $xqdocXMLPath := concat($xqdocPath, file:directory-separator(), "xml");

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-04-24 18:22:23 +0000
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-05-01 21:52:19 +0000
@@ -268,7 +268,7 @@
  :)
 declare %an:sequential function xqdoc2html:copy-xhtml-requisites(
   $xhtmlRequisitesPath  as xs:string,
-  $xqdocBuildPath       as xs:string)
+  $xqdocBuildPath       as xs:string) as empty-sequence()
 {
   let $xhtmlPath      := fn:concat($xqdocBuildPath, file:directory-separator(), "xhtml"),
       $xmlPath        := fn:concat($xqdocBuildPath, file:directory-separator(), "xml"),
@@ -370,7 +370,7 @@
   $xqdocBuildPath as xs:string,
   $indexHtmlPath  as xs:string,
   $zorbaVersion   as xs:string,
-  $xhtmlRequisitesPath as xs:string)
+  $xhtmlRequisitesPath as xs:string) as empty-sequence()
 {
   (: fill out $xqdoc2html:ZorbaManifest :)
   xqdoc2html:collectZorbaManifestEntries($zorbaManifestPath, $xqdocBuildPath);

=== modified file 'modules/org/expath/ns/file.xq'
--- modules/org/expath/ns/file.xq	2012-04-24 12:39:38 +0000
+++ modules/org/expath/ns/file.xq	2012-05-01 21:52:19 +0000
@@ -619,7 +619,7 @@
  :)
 declare function file:glob-to-regex(
   $pattern as xs:string
-) {
+) as xs:string {
   let $pattern := fn:replace($pattern, '(\.|\[|\]|\\|/|\||\-|\^|\$|\?|\*|\+|\{|\}|\(|\))','\\$1')
   let $pattern := fn:replace($pattern, '\\\?', '.')
   let $pattern := fn:replace($pattern, '\\\*', '.*')

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-05-01 15:54:27 +0000
+++ src/compiler/translator/translator.cpp	2012-05-01 21:52:19 +0000
@@ -11783,7 +11783,7 @@
   store::Item_t qnameItem;
   expand_elem_qname(qnameItem, qname, loc);
 
-  xqtref_t t = CTX_TM->create_named_atomic_type(qnameItem, TypeConstants::QUANT_ONE);
+  xqtref_t t = CTX_TM->create_named_atomic_type(qnameItem, TypeConstants::QUANT_ONE);  
 
   // some types that should never be parsed, like xs:untyped, are;
   // we catch them with is_simple()

=== modified file 'test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq'
--- test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2012-04-24 12:39:38 +0000
+++ test/rbkt/Queries/zorba/xqdoc/moduleDocumentation.xq	2012-05-01 21:52:19 +0000
@@ -138,7 +138,9 @@
     let $docParamCount := count($params)
     let $missing := $paramCount - $docParamCount  
     let $hasDescr := exists($function/xqdoc:comment/xqdoc:description)
-    let $hasReturn := exists($function/xqdoc:comment/xqdoc:return)
+    let $hasReturn := exists($function/xqdoc:return)
+    let $isUpdating := contains($signature, "updating")
+    let $isReturnDocumented := exists($function/xqdoc:comment/xqdoc:return)
     return string-join((
         (: Test for function description :)
         if (not($hasDescr)) then
@@ -158,8 +160,17 @@
     Arity: ", $paramCount)
         else
             (),
+        (: Test for existing return value in function signature:)
+        if (not($hasReturn) and not($isUpdating)) then
+            concat("
+    ERROR: Return value for the function not stated explicitly in the function signature;
+    Module: ", $module/xqdoc:uri, "
+    Function: ", $function/xqdoc:name, "
+    Arity: ", $paramCount)
+        else
+            (),
         (: Test for documented return value :)
-        if (not($hasReturn)) then
+        if (not($isReturnDocumented)) then
             concat("
     ERROR: Return value not documented;
     Module: ", $module/xqdoc:uri, "