Merge lp:~zorba-coders/zorba/bug-1029836 into lp:zorba

[Ghislain Fourny]

Corrects bug 1029836.

Corrects bug 1029836.

[Ghislain Fourny (gislenius)]

Hi Matthias,
I submitted a new merge proposal following Chris's request.
Regarding your question, I am not certain it is a type error. In the context of dynamic function call, it makes sense that it is a type error (XPTY0004) because it is a mismatch between the type of the function produced by the base expression and the number of provided parameters. However, in the context of object/array selection (with exactly one selector parameter), I am under the impression that this is not a type issue, but a dynamic issue (since we decided object/arrays do not match function types). What do you think?

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1029836-2012-07-30T12-34-05.839Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1029836 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 bug-1029836-2012-07-30T12-34-05.839Z 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

[Matthias Brantner (matthias-brantner)]

> Hi Matthias,
> I submitted a new merge proposal following Chris's request.
> Regarding your question, I am not certain it is a type error. In the context
> of dynamic function call, it makes sense that it is a type error (XPTY0004)
> because it is a mismatch between the type of the function produced by the base
> expression and the number of provided parameters. However, in the context of
> object/array selection (with exactly one selector parameter), I am under the
> impression that this is not a type issue, but a dynamic issue (since we
> decided object/arrays do not match function types). What do you think?

I think it should be a type error for the following reason:

The JSONiq spec says

- An object matches the function type function(xs:string) as item()?.
- An array matches the function type function(xs:integer) as item()?.

The XQuery spec defines "During evaluation of an expression, it is sometimes necessary to determine whether a value with a known dynamic type "matches" an expected sequence type. This process is known as SequenceType matching." Further, the spec says "The rules for SequenceType matching compare the dynamic type of a value with an expected sequence type." All errors raised during sequence type matching are type errors.

This seems to be exactly what is being done for object and array selectors.

What do you think?

[Ghislain Fourny (gislenius)]

Hi Matthias,

I think you finally convinced me that it can be seen as a type error, but for a slightly different reason :-)

The spec used to say so indeed, but it is no longer the case. We decided in our e-mail discussion that objects and arrays do no match function types. Did I miss anything while updating the spec, or is any page not up-to-date?

What happens now is that the PostFixExpr grammar construct is overloaded to do either dynamic function calls (in which case arity is involved in type matching) or JSON item selection (always unary). The choice call/selection occurs dynamically based on the type of the base expression. Meaning that if the construct is not unary, it must be a call, and the type of the base expression must match function(*) - which objects and arrays do not.

I have just updated the branch accordingly. The error code now reads JNTY0018.

Thanks for your thorough feedback!

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1029836-2012-07-31T09-27-02.24Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1029836-2012-07-31T09-27-02.24Z 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, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1029836-2012-07-31T21-13-58.09Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1029836-2012-07-31T21-13-58.09Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-07-24 08:48:48 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-07-31 09:19:22 +0000
@@ -841,6 +841,8 @@
 
 extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNUP0017;
 
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0018;
+
 extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0003;
 
 extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0040;

=== modified file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq	2012-07-11 15:38:39 +0000
+++ modules/org/jsoniq/www/pregenerated/errors.xq	2012-07-31 09:19:22 +0000
@@ -129,6 +129,11 @@
 declare variable $jerr:JNUP0017 as xs:QName := fn:QName($jerr:NS, "jerr:JNUP0017");
 
 (:~
+ :It is a dynamic error if there is not exactly one supplied parameter for an object or array selector.
+:)
+declare variable $jerr:JNTY0018 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0018");
+
+(:~
  :objects or arrays don't have a string value
 :)
 declare variable $jerr:JNTY0003 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0003");

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-07-24 08:48:48 +0000
+++ src/compiler/translator/translator.cpp	2012-07-31 09:19:22 +0000
@@ -10645,9 +10645,12 @@
   xqtref_t srcType = sourceExpr->get_return_type();
 
   if (!theSctx->is_feature_set(feature::hof) ||
-      (numArgs == 1 &&
-       !TypeOps::is_subtype(tm, *srcType, *theRTM.ANY_FUNCTION_TYPE_STAR)))
+      (!TypeOps::is_subtype(tm, *srcType, *theRTM.ANY_FUNCTION_TYPE_STAR)))
   {
+    if (numArgs != 1)
+    {
+      RAISE_ERROR_NO_PARAMS(jerr::JNTY0018, loc);
+    }
     function* func;
 
     rchandle<flwor_expr> flworExpr = wrap_expr_in_flwor(sourceExpr, false);

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-07-24 08:48:48 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-07-31 09:19:22 +0000
@@ -2674,6 +2674,12 @@
       <value>Cannot replace with less or more than an item.</value>
     </diagnostic>
     
+    <diagnostic code="JNTY0018" if="defined(ZORBA_WITH_JSON)">
+      <comment>It is a dynamic error if there is not exactly one supplied parameter for an object or array selector.</comment>
+
+      <value>Object or array selection needs exactly one parameter.</value>
+    </diagnostic>
+    
     <!--////////// JSONIQ ///////////////////////////////////////////-->
 
     <diagnostic code="JNTY0003" if="defined(ZORBA_WITH_JSON)">

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2012-07-24 08:48:48 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2012-07-31 09:19:22 +0000
@@ -1237,6 +1237,9 @@
 JSONiqErrorCode JNUP0017( "JNUP0017" );
 
 
+JSONiqErrorCode JNTY0018( "JNTY0018" );
+
+
 JSONiqErrorCode JNTY0003( "JNTY0003" );
 
 

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-07-24 08:48:48 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-07-31 09:19:22 +0000
@@ -125,6 +125,9 @@
   { "JNTY0011", "JSON item cannot appear in content sequence of node constructor or updating expression" },
 #endif
 #if defined(ZORBA_WITH_JSON)
+  { "JNTY0018", "Object or array selection needs exactly one parameter." },
+#endif
+#if defined(ZORBA_WITH_JSON)
   { "JNUP0005", "\"$1\": duplicate pair to insert" },
 #endif
 #if defined(ZORBA_WITH_JSON)

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-1.spec'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-1.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-1.spec	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+Error: http://www.jsoniq.org/errors:JNTY0018

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-1.xq'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-1.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-1.xq	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+[1, 2]()

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-2.spec'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-2.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-2.spec	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+Error: http://www.jsoniq.org/errors:JNTY0018

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-2.xq'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-2.xq	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+[1, 2](1, 2)

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-3.spec'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-3.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-3.spec	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+Error: http://www.jsoniq.org/errors:JNTY0018

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-3.xq'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-3.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-3.xq	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+{ "foo" : "bar" }()

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-4.spec'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-4.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-4.spec	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+Error: http://www.jsoniq.org/errors:JNTY0018

=== added file 'test/rbkt/Queries/zorba/jsoniq/jndy0018-4.xq'
--- test/rbkt/Queries/zorba/jsoniq/jndy0018-4.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jndy0018-4.xq	2012-07-31 09:19:22 +0000
@@ -0,0 +1,1 @@
+{ "foo" : "bar" }(1, 2)