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

[Matthias Brantner]

fixed bug #947627 (setting the static type of the context item is ignored)

fixed bug #947627 (setting the static type of the context item is ignored)
- raise an error if specified twice in the prolog
- if set using the C++ api and later in the prolog

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/947627-2012-03-15T04-24-34.805Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/947627-2012-03-15T05-06-12.174Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job 947627-2012-03-15T05-06-12.174Z 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: 3 Pending.

[Till Westmann (tillw)]

review: Approve

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

10724. By Markos Zaharioudakis on 2012-04-23

inner context item declaration hides an outer one

10725. By Markos Zaharioudakis on 2012-04-23

merge from trunk

[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/947627-2012-04-23T11-08-23.457Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job 947627-2012-04-23T11-08-23.457Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-19 23:46:41 +0000
+++ ChangeLog	2012-04-23 10:53:23 +0000
@@ -30,6 +30,8 @@
   * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
   * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
   * Fixed bug #921458 (file:read-text-lines() blocking)
+  * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item
+	               type in same module)
   * Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
   * Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
   * Fixed Bug #933490: Error ItemFactoryImpl::createBase64Binary with istream

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-04-19 21:40:27 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-04-23 10:53:23 +0000
@@ -172,6 +172,8 @@
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0098;
 
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0099;
+
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0106;
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;

=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq	2012-04-19 21:40:27 +0000
+++ modules/w3c/pregenerated/xqt-errors.xq	2012-04-23 10:53:23 +0000
@@ -766,6 +766,14 @@
 
 (:~
  :
+ : If a module contains more than one context item declaration, a static error is raised [err:XQST0099].
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0099 as xs:QName := fn:QName($err:NS, "err:XQST0099");
+
+(:~
+ :
  : It is a static error if a function's annotations contain more than one
  : annotation named \c private or \c public.  It is a static error if a
  : function's annotations contain more than one annotation named \c

=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2012-04-19 21:40:27 +0000
+++ src/api/staticcontextimpl.cpp	2012-04-23 10:53:23 +0000
@@ -920,7 +920,7 @@
 
   try
   {
-    for (unsigned int i = 0; i < ann_list->size(); i++)
+    for (csize i = 0; i < ann_list->size(); ++i)
       aAnnotations.push_back(new AnnotationImpl(ann_list->get(i)));
   }
   catch (ZorbaException const& e)
@@ -938,7 +938,7 @@
   {
     xqType = theCtx->get_typemanager()->create_type(*type);
   }
-  theCtx->set_context_item_type(xqType);
+  theCtx->set_context_item_type(xqType, QueryLoc::null);
 }
 
 

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-04-19 21:40:27 +0000
+++ src/compiler/translator/translator.cpp	2012-04-23 10:53:23 +0000
@@ -3935,7 +3935,7 @@
   if (v.get_type() != NULL)
   {
     type = pop_tstack();
-    theSctx->set_context_item_type(type);
+    theSctx->set_context_item_type(type, loc);
   }
   else
   {

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2012-04-19 21:40:27 +0000
+++ src/context/root_static_context.cpp	2012-04-23 10:53:23 +0000
@@ -93,8 +93,6 @@
 
   set_default_function_ns(W3C_FN_NS, true, loc);
 
-  set_context_item_type(GENV_TYPESYSTEM.ITEM_TYPE_ONE);
-
   add_collation(ZORBA_DEF_COLLATION_NS, QueryLoc::null);
   add_collation(W3C_CODEPT_COLLATION_NS, QueryLoc::null);
   set_default_collation(W3C_CODEPT_COLLATION_NS, QueryLoc::null);
@@ -111,6 +109,7 @@
 
   set_default_w3c_collection_type(GENV_TYPESYSTEM.ITEM_TYPE_STAR);
 
+  set_context_item_type(GENV_TYPESYSTEM.ITEM_TYPE_ONE, QueryLoc::null);
 
   // TODO move into globalenv? memory leaks?
   add_url_resolver(new internal::FileURLResolver());

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2012-04-19 21:40:27 +0000
+++ src/context/static_context.cpp	2012-04-23 10:53:23 +0000
@@ -556,7 +556,7 @@
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
   theHaveDefaultFunctionNamespace(false),
-  theContextItemType(GENV_TYPESYSTEM.ITEM_TYPE_ONE),
+  theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
   theFunctionMap(NULL),
@@ -604,7 +604,7 @@
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
   theHaveDefaultFunctionNamespace(false),
-  theContextItemType(GENV_TYPESYSTEM.ITEM_TYPE_ONE),
+  theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
   theFunctionMap(NULL),
@@ -657,7 +657,7 @@
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
   theHaveDefaultFunctionNamespace(false),
-  theContextItemType(GENV_TYPESYSTEM.ITEM_TYPE_ONE),
+  theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
   theFunctionMap(NULL),
@@ -2229,8 +2229,13 @@
 /***************************************************************************//**
 
 ********************************************************************************/
-void static_context::set_context_item_type(const xqtref_t& t)
+void static_context::set_context_item_type(const xqtref_t& t, const QueryLoc& loc)
 {
+  if (theContextItemType != NULL)
+  {
+    RAISE_ERROR_NO_PARAMS(err::XQST0099, loc);
+  }
+
   theContextItemType = t;
 }
 
@@ -2243,8 +2248,8 @@
   const static_context* sctx = this;
   while (sctx != NULL)
   {
-    if (theContextItemType != NULL)
-      return theContextItemType.getp();
+    if (sctx->theContextItemType != NULL)
+      return sctx->theContextItemType.getp();
 
     sctx = sctx->theParent;
   }

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2012-04-19 21:40:27 +0000
+++ src/context/static_context.h	2012-04-23 10:53:23 +0000
@@ -801,7 +801,7 @@
     bool returnPrivateVars = false,
     bool externalVarsOnly = false) const;
 
-  void set_context_item_type(const xqtref_t& t);
+  void set_context_item_type(const xqtref_t& t, const QueryLoc& loc);
 
   const XQType* get_context_item_type() const;
 

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-04-19 21:40:27 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-04-23 10:53:23 +0000
@@ -716,6 +716,13 @@
       <value>properties "$1" and "$2", representing characters used in picture string, do not have distinct values</value>
     </diagnostic>
 
+    <diagnostic code="XQST0099">
+      <comment>
+        If a module contains more than one context item declaration, a static error is raised [err:XQST0099].
+      </comment>
+      <value>module contains more than one context item declaration</value>
+    </diagnostic>
+
     <diagnostic code="XQST0106">
       <comment>
        It is a static error if a function's annotations contain more than one

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2012-04-19 21:40:27 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2012-04-23 10:53:23 +0000
@@ -241,6 +241,9 @@
 XQueryErrorCode XQST0098( "XQST0098" );
 
 
+XQueryErrorCode XQST0099( "XQST0099" );
+
+
 XQueryErrorCode XQST0106( "XQST0106" );
 
 

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-04-19 21:40:27 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-04-23 10:53:23 +0000
@@ -180,6 +180,7 @@
   { "XQST0090", "\"$1\": invalid character reference in XML $2" },
   { "XQST0093", "\"$1\": module must not depend on itself" },
   { "XQST0098", "properties \"$1\" and \"$2\", representing characters used in picture string, do not have distinct values" },
+  { "XQST0099", "module contains more than one context item declaration" },
   { "XQST0106", "$1: multiple annotations with $2 names" },
   { "XQST0111", "$1" },
   { "XQTY0024", "element constructor content sequence must not have an attribute node following a non-attribute node" },

=== added file 'test/rbkt/Queries/zorba/misc/context-item-decl01.spec'
--- test/rbkt/Queries/zorba/misc/context-item-decl01.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/misc/context-item-decl01.spec	2012-04-23 10:53:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XQST0099

=== added file 'test/rbkt/Queries/zorba/misc/context-item-decl01.xq'
--- test/rbkt/Queries/zorba/misc/context-item-decl01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/misc/context-item-decl01.xq	2012-04-23 10:53:23 +0000
@@ -0,0 +1,5 @@
+declare context item as item() := 2;
+
+declare context item as xs:string := "3";
+
+.

=== modified file 'test/unit/context_item.cpp'
--- test/unit/context_item.cpp	2012-04-19 21:40:27 +0000
+++ test/unit/context_item.cpp	2012-04-23 10:53:23 +0000
@@ -97,16 +97,9 @@
     std::ostringstream resultStream;
 
     {
-      zorba::TypeIdentifier_t type =
-      zorba::TypeIdentifier::createNamedType("http://www.w3.org/2001/XMLSchema",
-                                             "integer");
-
       zorba::Item ctxValue = zorba->getItemFactory()->createString("foo");
 
-      zorba::StaticContext_t sctx = zorba->createStaticContext();
-      sctx->setContextItemStaticType(type);
-
-      zorba::XQuery_t query = zorba->compileQuery(queryStream, sctx);
+      zorba::XQuery_t query = zorba->compileQuery(queryStream);
 
       Zorba_SerializerOptions serOptions;
       serOptions.omit_xml_declaration = ZORBA_OMIT_XML_DECLARATION_YES;
@@ -138,6 +131,46 @@
   return 0;
 }
 
+int test_3(zorba::Zorba* zorba)
+{
+  try
+  {
+    std::ifstream queryStream("context_item2.xq");
+    assert(queryStream.good());
+    std::ostringstream resultStream;
+
+    {
+      zorba::TypeIdentifier_t type =
+      zorba::TypeIdentifier::createNamedType("http://www.w3.org/2001/XMLSchema",
+                                             "integer");
+
+      zorba::Item ctxValue = zorba->getItemFactory()->createInteger(10);
+
+      zorba::StaticContext_t sctx = zorba->createStaticContext();
+      sctx->setContextItemStaticType(type);
+
+      zorba::XQuery_t query = zorba->compileQuery(queryStream, sctx);
+
+      zorba::DynamicContext* dctx = query->getDynamicContext();
+      dctx->setContextItem(ctxValue);
+
+      query->execute(resultStream);
+
+      return 5;
+    }
+  }
+  catch (zorba::XQueryException& qe)
+  {
+    std::cerr << qe << std::endl;
+    if (qe.diagnostic() == zorba::err::XPTY0004)
+    {
+      return 0;
+    }
+    return 1;
+  }
+
+  return 2;
+}
 
 int context_item(int argc, char* argv[]) 
 {
@@ -150,9 +183,11 @@
 
   int result2 = test_2(zorba);
 
+  int result3 = test_3(zorba);
+
   zorba->shutdown();
   zorba::StoreManager::shutdownStore(store);
-  return result1 + result2;
+  return result1 + result2 + result3;
 }
 
 /* vim:set et sw=2 ts=2: */