Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

Fixed bug #1188281 (casting to xs:anySimpleType not allowed)

Fixed bug #1188281 (casting to xs:anySimpleType not allowed)

[lp:~zorba-coders/zorba/markos-scratch]

11162. By Markos Zaharioudakis on 2013-06-24

Fixed bug #1188281

[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/markos-scratch-2013-06-24T08-28-50.033Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-06-24T08-28-50.033Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-20 15:23:53 +0000
+++ ChangeLog	2013-06-24 08:18:27 +0000
@@ -44,6 +44,7 @@
   * Fixed bug #1190710 (fn-format-date failures)
   * Fixed bug #1190407 (wrong rewrite of if-then-else return clause in case
     of general flwor)
+  * Fixed bug #1188281 (casting to xs:anySimpleType not allowed)
   * jn:members function takes item()* as aparameter (instead of item())
   * jn:keys function takes item()* as aparameter (instead of item())
   * Fixed bug #1189996 (Relocate some public API headers to util)
 
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-06-21 12:07:22 +0000
+++ src/compiler/translator/translator.cpp	2013-06-24 08:18:27 +0000
@@ -9345,7 +9345,8 @@
   if (TypeOps::is_equal(tm, *type, *theRTM.NOTATION_TYPE_ONE, loc) ||
       TypeOps::is_equal(tm, *type, *theRTM.NOTATION_TYPE_QUESTION, loc) ||
       TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_ONE, loc) ||
-      TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_QUESTION, loc))
+      TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_QUESTION, loc) ||
+      TypeOps::is_equal(tm, *type, *theRTM.ANY_SIMPLE_TYPE, loc))
   {
     RAISE_ERROR(err::XPST0080, loc, ERROR_PARAMS(type->toString()));
   }
 
=== modified file 'src/types/typeops.cpp'
--- src/types/typeops.cpp	2013-06-15 02:57:08 +0000
+++ src/types/typeops.cpp	2013-06-24 08:18:27 +0000
@@ -379,7 +379,7 @@
     return false;
   }
 
-  switch(type1.type_kind()) 
+  switch (type1.type_kind()) 
   {
     case XQType::ATOMIC_TYPE_KIND:
     {
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-06-22 10:59:44 +0000
+++ test/fots/CMakeLists.txt	2013-06-24 08:18:27 +0000
@@ -214,7 +214,6 @@
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 1172270)
 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 1172270)
 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 1133806)
-EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 1188281)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-11 1188279)
 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-12 1188279)
 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 1110217)