zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

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

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/171029

Fixed bug #1188281 (casting to xs:anySimpleType not allowed)
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/171029
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-20 15:23:53 +0000
+++ ChangeLog	2013-06-24 07:58:29 +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 07:58:29 +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 07:58:29 +0000
@@ -379,7 +379,7 @@
     return false;
   }
 
-  switch(type1.type_kind()) 
+  switch (type1.type_kind()) 
   {
     case XQType::ATOMIC_TYPE_KIND:
     {