Zorba

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

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11162
Merged at revision: 11537
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 50 lines (+4/-3)
4 files modified
ChangeLog (+1/-0)
src/compiler/translator/translator.cpp (+2/-1)
src/types/typeops.cpp (+1/-1)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+171029@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
lp:~zorba-coders/zorba/markos-scratch updated
11162. By Markos Zaharioudakis

Fixed bug #1188281

Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-06-24T08-28-50.033Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-06-20 15:23:53 +0000
3+++ ChangeLog 2013-06-24 08:18:27 +0000
4@@ -44,6 +44,7 @@
5 * Fixed bug #1190710 (fn-format-date failures)
6 * Fixed bug #1190407 (wrong rewrite of if-then-else return clause in case
7 of general flwor)
8+ * Fixed bug #1188281 (casting to xs:anySimpleType not allowed)
9 * jn:members function takes item()* as aparameter (instead of item())
10 * jn:keys function takes item()* as aparameter (instead of item())
11 * Fixed bug #1189996 (Relocate some public API headers to util)
12
13=== modified file 'src/compiler/translator/translator.cpp'
14--- src/compiler/translator/translator.cpp 2013-06-21 12:07:22 +0000
15+++ src/compiler/translator/translator.cpp 2013-06-24 08:18:27 +0000
16@@ -9345,7 +9345,8 @@
17 if (TypeOps::is_equal(tm, *type, *theRTM.NOTATION_TYPE_ONE, loc) ||
18 TypeOps::is_equal(tm, *type, *theRTM.NOTATION_TYPE_QUESTION, loc) ||
19 TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_ONE, loc) ||
20- TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_QUESTION, loc))
21+ TypeOps::is_equal(tm, *type, *theRTM.ANY_ATOMIC_TYPE_QUESTION, loc) ||
22+ TypeOps::is_equal(tm, *type, *theRTM.ANY_SIMPLE_TYPE, loc))
23 {
24 RAISE_ERROR(err::XPST0080, loc, ERROR_PARAMS(type->toString()));
25 }
26
27=== modified file 'src/types/typeops.cpp'
28--- src/types/typeops.cpp 2013-06-15 02:57:08 +0000
29+++ src/types/typeops.cpp 2013-06-24 08:18:27 +0000
30@@ -379,7 +379,7 @@
31 return false;
32 }
33
34- switch(type1.type_kind())
35+ switch (type1.type_kind())
36 {
37 case XQType::ATOMIC_TYPE_KIND:
38 {
39
40=== modified file 'test/fots/CMakeLists.txt'
41--- test/fots/CMakeLists.txt 2013-06-22 10:59:44 +0000
42+++ test/fots/CMakeLists.txt 2013-06-24 08:18:27 +0000
43@@ -214,7 +214,6 @@
44 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-9 1172270)
45 EXPECTED_FOTS_FAILURE (prod-Annotation annotation-assertion-10 1172270)
46 EXPECTED_FOTS_FAILURE (prod-BaseURIDecl K2-BaseURIProlog-5 1133806)
47-EXPECTED_FOTS_FAILURE (prod-CastableExpr K-SeqExprCastable-5a 1188281)
48 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-11 1188279)
49 EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-12 1188279)
50 EXPECTED_FOTS_FAILURE (prod-CastExpr.schema CastAs-UnionType-17 1110217)

Subscribers

People subscribed via source and target branches