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: 11053
Merged at revision: 11354
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 152 lines (+25/-12)
8 files modified
ChangeLog (+3/-0)
src/compiler/translator/translator.cpp (+2/-0)
src/diagnostics/diagnostic_en.xml (+4/-0)
src/diagnostics/pregenerated/dict_en.cpp (+1/-0)
src/diagnostics/pregenerated/dict_zed_keys.h (+1/-0)
src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp (+6/-6)
src/store/naive/loader_fast.cpp (+8/-4)
test/fots/CMakeLists.txt (+0/-2)
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+157767@code.launchpad.net

Commit message

Raise XQST0046, if needed, from namespace declaration attribute inside direct element constructor

Description of the change

Raise XQST0046, if needed, from namespace declaration attribute inside direct element constructor

To post a comment you must log in.
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-04-09T07-26-54.779Z/log.html

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

Validation queue job markos-scratch-2013-04-09T07-26-54.779Z 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-04-08 15:07:13 +0000
3+++ ChangeLog 2013-04-08 23:01:20 +0000
4@@ -55,6 +55,7 @@
5 * Fixed bug #1122396 (Associate origin/destination URI to I/O stream)
6 * Fixed bug #1111786 (xml/json parse error location in catch clause).
7 * Fixed bug #1153800 (construct hexBinary without encoding the data)
8+ * Fixed bug #1076402 (bug in CastIterator when target is QName)
9 * NaN items are considered equal to each other during grouping
10 * Fixed bug #855481 (Too small time types on Windows).
11 * Fixed bug #1132032 (Certain regexes involving ^ should be legal)
12@@ -74,6 +75,8 @@
13 constructor exprs)
14 * Fixed bug #1125444 (input group-by exprs were not treated by index-flwor_vars()
15 function, leading to erroneous loop hoisting).
16+ * Raise XQST0046, if needed, from namespace declaration attribute inside
17+ direct element constructor.
18 * Fixed bug #1023362 (xsi:type attribute ignored during validation)
19
20
21
22=== modified file 'src/compiler/translator/translator.cpp'
23--- src/compiler/translator/translator.cpp 2013-04-08 15:07:13 +0000
24+++ src/compiler/translator/translator.cpp 2013-04-08 23:01:20 +0000
25@@ -12697,6 +12697,8 @@
26 RAISE_ERROR(err::XQST0070, loc, ERROR_PARAMS(uri, ZED(NoBindURI)));
27 }
28
29+ URI parsedUri(uri);
30+
31 theSctx->bind_ns(prefix, uri, loc);
32 theNSCtx->bind_ns(prefix, uri);
33
34
35=== modified file 'src/diagnostics/diagnostic_en.xml'
36--- src/diagnostics/diagnostic_en.xml 2013-04-03 08:39:50 +0000
37+++ src/diagnostics/diagnostic_en.xml 2013-04-08 23:01:20 +0000
38@@ -4748,6 +4748,10 @@
39 <value>XML version expected</value>
40 </entry>
41
42+ <entry key="libxml_ERR_99"> <!-- XML_ERR_NS_URI -->
43+ <value>xmlns$6?{:5}\: URI "$6?6:5": invalid URI</value>
44+ </entry>
45+
46 <entry key="libxml_WAR_97"> <!-- XML_WAR_UNKNOWN_VERSION -->
47 <value>"$5": unsupported XML version</value>
48 </entry>
49
50=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
51--- src/diagnostics/pregenerated/dict_en.cpp 2013-04-03 08:39:50 +0000
52+++ src/diagnostics/pregenerated/dict_en.cpp 2013-04-08 23:01:20 +0000
53@@ -1156,6 +1156,7 @@
54 { "~libxml_ERR_94", "validation failed: no DTD found" },
55 { "~libxml_ERR_95", "\"IGNORE\" or \"INCLUDE\" expected" },
56 { "~libxml_ERR_96", "XML version expected" },
57+ { "~libxml_ERR_99", "xmlns$6?{:5}\\: URI \"$6?6:5\": invalid URI" },
58 { "~libxml_WAR_100", "xmlns$6?{:5}\\: URI \"$6?6:5\": invalid URI" },
59 { "~libxml_WAR_102", "\"$5\": invalid value for \"xml:space\"; either \"default\" or \"preserve\" expected" },
60 { "~libxml_WAR_106", "\"$5\": avoid attribute ending with ':'" },
61
62=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
63--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-04-02 21:46:10 +0000
64+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-04-08 23:01:20 +0000
65@@ -454,6 +454,7 @@
66 #define ZED_libxml_ERR_94 "~libxml_ERR_94"
67 #define ZED_libxml_ERR_95 "~libxml_ERR_95"
68 #define ZED_libxml_ERR_96 "~libxml_ERR_96"
69+#define ZED_libxml_ERR_99 "~libxml_ERR_99"
70 #define ZED_libxml_WAR_97 "~libxml_WAR_97"
71 #define ZED_libxml_WAR_98 "~libxml_WAR_98"
72 #define ZED_libxml_WAR_99 "~libxml_WAR_99"
73
74=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
75--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2013-03-05 12:34:19 +0000
76+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2013-04-08 23:01:20 +0000
77@@ -89,19 +89,19 @@
78 loadProps.setStoreDocument(false);
79 result = lStore.loadDocument(baseUri, docUri, *is, loadProps);
80 }
81- catch ( ZorbaException const &e )
82+ catch (const ZorbaException& e)
83 {
84 XQueryException xe(XQUERY_EXCEPTION(err::FODC0006,
85- ERROR_PARAMS("fn:parse-xml()", e.what()),
86- ERROR_LOC(loc))
87- );
88- set_data( xe, e );
89+ ERROR_PARAMS("fn:parse-xml()", e.what()), ERROR_LOC(loc)));
90+
91+ set_data(xe, e);
92 throw xe;
93 }
94
95 STACK_PUSH(true, state);
96 }
97- STACK_END (state);
98+
99+ STACK_END(state);
100 }
101
102
103
104=== modified file 'src/store/naive/loader_fast.cpp'
105--- src/store/naive/loader_fast.cpp 2013-03-11 15:00:50 +0000
106+++ src/store/naive/loader_fast.cpp 2013-04-08 23:01:20 +0000
107@@ -100,7 +100,7 @@
108 /*******************************************************************************
109
110 ********************************************************************************/
111-void XmlLoader::error(void *ctx, xmlErrorPtr error)
112+void XmlLoader::error(void* ctx, xmlErrorPtr error)
113 {
114 if ( error->level == XML_ERR_NONE )
115 return;
116@@ -117,8 +117,11 @@
117 zstring error_int1_8;
118 char const *const error_message_9 = error->message ? error->message : "";
119
120- if ( error->int1 ) { // assume valid only if > 0
121- switch ( error->code ) {
122+ if ( error->int1 )
123+ {
124+ // assume valid only if > 0
125+ switch ( error->code )
126+ {
127 case XML_ERR_ENTITY_CHAR_ERROR:
128 case XML_ERR_INVALID_CHAR:
129 case XML_ERR_SEPARATOR_REQUIRED:
130@@ -144,7 +147,8 @@
131 } // if
132
133 XmlLoader *const loader = static_cast<XmlLoader*>( ctx );
134- switch ( error->level ) {
135+ switch ( error->level )
136+ {
137 case XML_ERR_ERROR:
138 case XML_ERR_FATAL: {
139 XQueryException *const xe = NEW_XQUERY_EXCEPTION(
140
141=== modified file 'test/fots/CMakeLists.txt'
142--- test/fots/CMakeLists.txt 2013-04-08 19:49:28 +0000
143+++ test/fots/CMakeLists.txt 2013-04-08 23:01:20 +0000
144@@ -259,8 +259,6 @@
145 EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-054 0)
146 EXPECTED_FOTS_FAILURE (math-acos math-acos-003 0)
147 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FOAR0001_9 0)
148-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_13 0)
149-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_14 0)
150 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
151 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
152 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)

Subscribers

People subscribed via source and target branches