Merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba
- bug-1044260
- Merge into trunk
Status: | Superseded | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~zorba-coders/zorba/bug-1044260 | ||||||||||||||||
Merge into: | lp:zorba | ||||||||||||||||
Diff against target: |
1579 lines (+688/-142) 27 files modified
include/zorba/internal/diagnostic.h (+6/-5) include/zorba/pregenerated/diagnostic_list.h (+2/-0) modules/org/jsoniq/www/pregenerated/errors.xq (+8/-0) src/compiler/translator/translator.cpp (+5/-5) src/context/static_context.cpp (+1/-1) src/diagnostics/CMakeLists.txt (+16/-5) src/diagnostics/diagnostic.h (+31/-5) src/diagnostics/diagnostic_en.xml (+102/-33) src/diagnostics/dict.h (+3/-1) src/diagnostics/dict_zed_keys_h.xq (+55/-0) src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0) src/diagnostics/pregenerated/dict_en.cpp (+45/-37) src/diagnostics/pregenerated/dict_zed_keys.h (+338/-0) src/runtime/core/apply_updates.cpp (+15/-20) src/runtime/core/fncall_iterator.cpp (+1/-1) src/runtime/core/sequencetypes.cpp (+7/-8) src/runtime/function_item/dynamic_fncall_iterator.cpp (+3/-3) src/runtime/json/jsoniq_functions_impl.cpp (+2/-2) src/runtime/numerics/numerics_impl.cpp (+1/-1) src/store/naive/node_items.cpp (+2/-1) src/store/naive/pul_primitives.cpp (+35/-7) src/util/error_util.cpp (+2/-2) test/rbkt/ExpQueryResults/zorba/index/auctions2u.xml.res (+1/-1) test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_06.xml.res (+1/-1) test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_10.xml.res (+1/-1) test/rbkt/ExpQueryResults/zorba/jsoniq/serializer-JNSE0022.xml.res (+1/-1) test/rbkt/Queries/zorba/index/auctions2u.xq (+1/-1) |
||||||||||||||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-1044260 | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | Needs Fixing | ||
Matthias Brantner | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+125297@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-11-17.
Commit message
ZED keys are now compile-time checked for existence.
Description of the change
ZED keys are now compile-time checked for existence.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Paul J. Lucas (paul-lucas) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1044260-2012-09-
final status was:
37 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1044260 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1044260-2012-09-
final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Matthias Brantner (matthias-brantner) wrote : | # |
Looks good.
I added Markos as a reviewer because he was reviewer for the proposal regarding bug 'Bug #1052283: XUDY0021_AppliedAt used without definition' which has been merged into the proposed branch.
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1044260-2012-09-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.
Markos Zaharioudakis (markos-za) wrote : | # |
I think more error codes must be listed in the catch clause in apply_updates.cpp. For example, XUDY0024, and a bunch of ZDDY codes related to collections and indexes (search for XUDY and ZDDY in src/store and see which of these errors are thrown during PUL apply).
Paul J. Lucas (paul-lucas) wrote : | # |
It looks like: XUDY0014, XUDY0015, XUDY0016, XUDY0017, XUDY0023, XUDY0031, ZDDY0016, ZDDY0027.
Markos Zaharioudakis (markos-za) wrote : | # |
No, the erros you list here are not thrown during PUL apply. My comment was actually meant for Matthias. I think it will be easier for him to find the correct list of errors.
- 11061. By Paul J. Lucas
-
Merge from trunk.
- 11062. By Paul J. Lucas
-
Merge from trunk.
- 11063. By Paul J. Lucas
-
Merge from trunk.
- 11064. By Paul J. Lucas
-
Merge from trunk.
- 11065. By Paul J. Lucas
-
Merge from trunk.
- 11066. By Paul J. Lucas
-
Merge from trunk.
- 11067. By Paul J. Lucas
-
Merge from trunk.
- 11068. By Matthias Brantner
-
fix the build
- 11069. By Paul J. Lucas
-
Merge from trunk.
- 11070. By Paul J. Lucas
-
Merge from trunk.
- 11071. By Paul J. Lucas
-
1. Added line_end and column_end to a variant of make_location.
2. Added make_location(XQueryException const&). - 11072. By Paul J. Lucas
-
Fixed comment.
- 11073. By Paul J. Lucas
-
Added error codes to "catch" clause.
- 11074. By Paul J. Lucas
-
Merge from trunk.
- 11075. By Markos Zaharioudakis
-
1. added some error codes to be reprocessed inside the catch statement in apply_updates.cpp. 2. Added location to errors thrown from pul_primitives.cpp
- 11076. By Paul J. Lucas
-
Merge from trunk.
- 11077. By Paul J. Lucas
-
Now keeping the original error code.
- 11078. By Paul J. Lucas
-
Added base_name().
- 11079. By Markos Zaharioudakis
-
fixed failing test
- 11080. By Paul J. Lucas
-
Now only putting file name in error.
Unmerged revisions
Preview Diff
1 | === modified file 'include/zorba/internal/diagnostic.h' | |||
2 | --- include/zorba/internal/diagnostic.h 2012-09-19 21:16:15 +0000 | |||
3 | +++ include/zorba/internal/diagnostic.h 2012-11-17 18:50:26 +0000 | |||
4 | @@ -70,15 +70,16 @@ | |||
5 | 70 | /** | 70 | /** |
6 | 71 | * Constructs a %location. | 71 | * Constructs a %location. |
7 | 72 | * | 72 | * |
11 | 73 | * @param file The name of the file where the error occurred. | 73 | * @param file The name of the file where the expression causing the error |
12 | 74 | * @param line The line number of the file where the expression that raises | 74 | * occurred. |
13 | 75 | * the error begins. | 75 | * @param line The line number of the file where the expression causing the |
14 | 76 | * error begins. | ||
15 | 76 | * @param column The column number, if any, of the file where the expression | 77 | * @param column The column number, if any, of the file where the expression |
17 | 77 | * that raises the error begins. | 78 | * causing the error begins. |
18 | 78 | * @param line_end The end line number, if any, of the file where the | 79 | * @param line_end The end line number, if any, of the file where the |
19 | 79 | * expression causing the error ends. | 80 | * expression causing the error ends. |
20 | 80 | * @param column_end The end column number, if any, of the file where the | 81 | * @param column_end The end column number, if any, of the file where the |
22 | 81 | * xpression causing the error ends. | 82 | * expression causing the error ends. |
23 | 82 | */ | 83 | */ |
24 | 83 | location( char const *file, line_type line, column_type column = 0, | 84 | location( char const *file, line_type line, column_type column = 0, |
25 | 84 | line_type line_end = 0, column_type column_end = 0 ) : | 85 | line_type line_end = 0, column_type column_end = 0 ) : |
26 | 85 | 86 | ||
27 | === modified file 'include/zorba/pregenerated/diagnostic_list.h' | |||
28 | --- include/zorba/pregenerated/diagnostic_list.h 2012-11-08 05:38:30 +0000 | |||
29 | +++ include/zorba/pregenerated/diagnostic_list.h 2012-11-17 18:50:26 +0000 | |||
30 | @@ -847,6 +847,8 @@ | |||
31 | 847 | 847 | ||
32 | 848 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0012; | 848 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0012; |
33 | 849 | 849 | ||
34 | 850 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0013; | ||
35 | 851 | |||
36 | 850 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0014; | 852 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0014; |
37 | 851 | 853 | ||
38 | 852 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0022; | 854 | extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNSE0022; |
39 | 853 | 855 | ||
40 | === modified file 'modules/org/jsoniq/www/pregenerated/errors.xq' | |||
41 | --- modules/org/jsoniq/www/pregenerated/errors.xq 2012-10-08 12:09:36 +0000 | |||
42 | +++ modules/org/jsoniq/www/pregenerated/errors.xq 2012-11-17 18:50:26 +0000 | |||
43 | @@ -100,6 +100,14 @@ | |||
44 | 100 | declare variable $jerr:JNSE0012 as xs:QName := fn:QName($jerr:NS, "jerr:JNSE0012"); | 100 | declare variable $jerr:JNSE0012 as xs:QName := fn:QName($jerr:NS, "jerr:JNSE0012"); |
45 | 101 | 101 | ||
46 | 102 | (:~ | 102 | (:~ |
47 | 103 | :It is a dynamic error to serialize an atomic value not | ||
48 | 104 | : supported by JSON or a node with the JSON output method and with | ||
49 | 105 | : the jsoniq-serialization-extensions serialization parameter | ||
50 | 106 | : set to false. | ||
51 | 107 | :) | ||
52 | 108 | declare variable $jerr:JNSE0013 as xs:QName := fn:QName($jerr:NS, "jerr:JNSE0013"); | ||
53 | 109 | |||
54 | 110 | (:~ | ||
55 | 103 | :It is a dynamic error to serialize a function or a node with the | 111 | :It is a dynamic error to serialize a function or a node with the |
56 | 104 | : JSON output method. | 112 | : JSON output method. |
57 | 105 | :) | 113 | :) |
58 | 106 | 114 | ||
59 | === modified file 'src/compiler/translator/translator.cpp' | |||
60 | --- src/compiler/translator/translator.cpp 2012-11-08 05:38:30 +0000 | |||
61 | +++ src/compiler/translator/translator.cpp 2012-11-17 18:50:26 +0000 | |||
62 | @@ -6328,7 +6328,7 @@ | |||
63 | 6328 | if (v.has_allowing_empty()) | 6328 | if (v.has_allowing_empty()) |
64 | 6329 | { | 6329 | { |
65 | 6330 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) | 6330 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) |
67 | 6331 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_OuterForClause11))); | 6331 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_OuterForClause30))); |
68 | 6332 | 6332 | ||
69 | 6333 | theFlworClausesStack.push_back(NULL); | 6333 | theFlworClausesStack.push_back(NULL); |
70 | 6334 | } | 6334 | } |
71 | @@ -6547,7 +6547,7 @@ | |||
72 | 6547 | TRACE_VISIT(); | 6547 | TRACE_VISIT(); |
73 | 6548 | 6548 | ||
74 | 6549 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) | 6549 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) |
76 | 6550 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_WindowClause11))); | 6550 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_WindowClause30))); |
77 | 6551 | 6551 | ||
78 | 6552 | return no_state; | 6552 | return no_state; |
79 | 6553 | } | 6553 | } |
80 | @@ -7257,7 +7257,7 @@ | |||
81 | 7257 | TRACE_VISIT (); | 7257 | TRACE_VISIT (); |
82 | 7258 | 7258 | ||
83 | 7259 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) | 7259 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) |
85 | 7260 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_CountClause11))); | 7260 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_CountClause30))); |
86 | 7261 | 7261 | ||
87 | 7262 | return no_state; | 7262 | return no_state; |
88 | 7263 | } | 7263 | } |
89 | @@ -7321,7 +7321,7 @@ | |||
90 | 7321 | 7321 | ||
91 | 7322 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) | 7322 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) |
92 | 7323 | { | 7323 | { |
94 | 7324 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_SwitchExpr11))); | 7324 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_SwitchExpr30))); |
95 | 7325 | } | 7325 | } |
96 | 7326 | 7326 | ||
97 | 7327 | v.get_switch_expr()->accept(*this); | 7327 | v.get_switch_expr()->accept(*this); |
98 | @@ -7731,7 +7731,7 @@ | |||
99 | 7731 | 7731 | ||
100 | 7732 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) | 7732 | if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0) |
101 | 7733 | { | 7733 | { |
103 | 7734 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_TryCatchExpr11))); | 7734 | RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_TryCatchExpr30))); |
104 | 7735 | } | 7735 | } |
105 | 7736 | 7736 | ||
106 | 7737 | theTryStack.push_back(&v); | 7737 | theTryStack.push_back(&v); |
107 | 7738 | 7738 | ||
108 | === modified file 'src/context/static_context.cpp' | |||
109 | --- src/context/static_context.cpp 2012-11-12 17:12:41 +0000 | |||
110 | +++ src/context/static_context.cpp 2012-11-17 18:50:26 +0000 | |||
111 | @@ -284,7 +284,7 @@ | |||
112 | 284 | if (!module) | 284 | if (!module) |
113 | 285 | { | 285 | { |
114 | 286 | throw ZORBA_EXCEPTION(zerr::ZCSE0013_UNABLE_TO_LOAD_QUERY, | 286 | throw ZORBA_EXCEPTION(zerr::ZCSE0013_UNABLE_TO_LOAD_QUERY, |
116 | 287 | ERROR_PARAMS(ZED(NoExternalModuleFromDLL), lURI)); | 287 | ERROR_PARAMS(ZED(NoExternalModuleFromDLL_2), lURI)); |
117 | 288 | } | 288 | } |
118 | 289 | } | 289 | } |
119 | 290 | else | 290 | else |
120 | 291 | 291 | ||
121 | === modified file 'src/diagnostics/CMakeLists.txt' | |||
122 | --- src/diagnostics/CMakeLists.txt 2012-09-19 21:16:15 +0000 | |||
123 | +++ src/diagnostics/CMakeLists.txt 2012-11-17 18:50:26 +0000 | |||
124 | @@ -25,6 +25,7 @@ | |||
125 | 25 | xquery_stack_trace.cpp | 25 | xquery_stack_trace.cpp |
126 | 26 | user_error.cpp | 26 | user_error.cpp |
127 | 27 | user_exception.cpp | 27 | user_exception.cpp |
128 | 28 | dict_zed_keys.h | ||
129 | 28 | ) | 29 | ) |
130 | 29 | 30 | ||
131 | 30 | ZORBA_DIAGNOSTIC_GENERATOR( | 31 | ZORBA_DIAGNOSTIC_GENERATOR( |
132 | @@ -32,21 +33,24 @@ | |||
133 | 32 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" | 33 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" |
134 | 33 | "diagnostic_en.xml" | 34 | "diagnostic_en.xml" |
135 | 34 | "" | 35 | "" |
137 | 35 | "${CMAKE_BINARY_DIR}/include/zorba/diagnostic_list.h") | 36 | "${CMAKE_BINARY_DIR}/include/zorba/diagnostic_list.h" |
138 | 37 | ) | ||
139 | 36 | 38 | ||
140 | 37 | ZORBA_DIAGNOSTIC_GENERATOR( | 39 | ZORBA_DIAGNOSTIC_GENERATOR( |
141 | 38 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_cpp.xq" | 40 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_cpp.xq" |
142 | 39 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" | 41 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" |
143 | 40 | "diagnostic_en.xml" | 42 | "diagnostic_en.xml" |
144 | 41 | "${CMAKE_BINARY_DIR}/include/zorba/diagnostic_list.h" | 43 | "${CMAKE_BINARY_DIR}/include/zorba/diagnostic_list.h" |
146 | 42 | "${CMAKE_BINARY_DIR}/src/diagnostics/diagnostic_list.cpp") | 44 | "${CMAKE_BINARY_DIR}/src/diagnostics/diagnostic_list.cpp" |
147 | 45 | ) | ||
148 | 43 | 46 | ||
149 | 44 | ZORBA_DIAGNOSTIC_GENERATOR( | 47 | ZORBA_DIAGNOSTIC_GENERATOR( |
150 | 45 | "${CMAKE_SOURCE_DIR}/src/diagnostics/dict_XX_cpp.xq" | 48 | "${CMAKE_SOURCE_DIR}/src/diagnostics/dict_XX_cpp.xq" |
151 | 46 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" | 49 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" |
152 | 47 | "diagnostic_en.xml" | 50 | "diagnostic_en.xml" |
153 | 48 | "" | 51 | "" |
155 | 49 | "${CMAKE_BINARY_DIR}/src/diagnostics/dict_en.cpp") | 52 | "${CMAKE_BINARY_DIR}/src/diagnostics/dict_en.cpp" |
156 | 53 | ) | ||
157 | 50 | 54 | ||
158 | 51 | ZORBA_DIAGNOSTIC_GENERATOR( | 55 | ZORBA_DIAGNOSTIC_GENERATOR( |
159 | 52 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_xq.xq" | 56 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_xq.xq" |
160 | @@ -56,6 +60,14 @@ | |||
161 | 56 | "${CMAKE_BINARY_DIR}/modules/w3c/xqt-errors.xq" | 60 | "${CMAKE_BINARY_DIR}/modules/w3c/xqt-errors.xq" |
162 | 57 | ) | 61 | ) |
163 | 58 | 62 | ||
164 | 63 | ZORBA_DIAGNOSTIC_GENERATOR( | ||
165 | 64 | "${CMAKE_SOURCE_DIR}/src/diagnostics/dict_zed_keys_h.xq" | ||
166 | 65 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml" | ||
167 | 66 | "diagnostic_en.xml" | ||
168 | 67 | "" | ||
169 | 68 | "${CMAKE_BINARY_DIR}/src/diagnostics/dict_zed_keys.h" | ||
170 | 69 | ) | ||
171 | 70 | |||
172 | 59 | IF(ZORBA_WITH_JSON) | 71 | IF(ZORBA_WITH_JSON) |
173 | 60 | ZORBA_DIAGNOSTIC_GENERATOR( | 72 | ZORBA_DIAGNOSTIC_GENERATOR( |
174 | 61 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_xq.xq" | 73 | "${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_list_xq.xq" |
175 | @@ -79,8 +91,7 @@ | |||
176 | 79 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml;ns:=zwarn" | 91 | "input=${CMAKE_SOURCE_DIR}/src/diagnostics/diagnostic_en.xml;ns:=zwarn" |
177 | 80 | "diagnostic_en.xml" | 92 | "diagnostic_en.xml" |
178 | 81 | "" | 93 | "" |
181 | 82 | "${CMAKE_BINARY_DIR}/modules/com/zorba-xquery/www/modules/warnings.xq" | 94 | "${CMAKE_BINARY_DIR}/modules/com/zorba-xquery/www/modules/warnings.xq") |
180 | 83 | ) | ||
182 | 84 | 95 | ||
183 | 85 | SET(DIAG_MODULES | 96 | SET(DIAG_MODULES |
184 | 86 | ${CMAKE_BINARY_DIR}/modules/com/zorba-xquery/www/modules/warnings.xq | 97 | ${CMAKE_BINARY_DIR}/modules/com/zorba-xquery/www/modules/warnings.xq |
185 | 87 | 98 | ||
186 | === modified file 'src/diagnostics/diagnostic.h' | |||
187 | --- src/diagnostics/diagnostic.h 2012-09-19 21:16:15 +0000 | |||
188 | +++ src/diagnostics/diagnostic.h 2012-11-17 18:50:26 +0000 | |||
189 | @@ -19,6 +19,7 @@ | |||
190 | 19 | #define ZORBA_DIAGNOSTIC_H | 19 | #define ZORBA_DIAGNOSTIC_H |
191 | 20 | 20 | ||
192 | 21 | #include <zorba/diagnostic.h> | 21 | #include <zorba/diagnostic.h> |
193 | 22 | #include <zorba/xquery_exception.h> | ||
194 | 22 | 23 | ||
195 | 23 | #include "compiler/parser/query_loc.h" | 24 | #include "compiler/parser/query_loc.h" |
196 | 24 | #include "store/api/item.h" | 25 | #include "store/api/item.h" |
197 | @@ -71,16 +72,41 @@ | |||
198 | 71 | /** | 72 | /** |
199 | 72 | * Makes a location. | 73 | * Makes a location. |
200 | 73 | * | 74 | * |
204 | 74 | * @param file The name of the file where the error occurred. | 75 | * @param file The name of the file where the expression causing the error |
202 | 75 | * @param line The line number of the file where the error occurred. | ||
203 | 76 | * @param column The column number, if any, of the file where the error | ||
205 | 77 | * occurred. | 76 | * occurred. |
206 | 77 | * @param line The line number of the file where the expression causing the | ||
207 | 78 | * error begins. | ||
208 | 79 | * @param column The column number, if any, of the file where the expression | ||
209 | 80 | * causing the error begins. | ||
210 | 81 | * @param line_end The end line number, if any, of the file where the | ||
211 | 82 | * expression causing the error ends. | ||
212 | 83 | * @param column_end The end column number, if any, of the file where the | ||
213 | 84 | * expression causing the error ends. | ||
214 | 78 | * @return Returns a new location. | 85 | * @return Returns a new location. |
215 | 79 | */ | 86 | */ |
216 | 80 | inline internal::diagnostic::location | 87 | inline internal::diagnostic::location |
217 | 81 | make_location( char const *file, internal::diagnostic::location::line_type line, | 88 | make_location( char const *file, internal::diagnostic::location::line_type line, |
220 | 82 | internal::diagnostic::location::column_type column = 0 ) { | 89 | internal::diagnostic::location::column_type column = 0, |
221 | 83 | return internal::diagnostic::location( file, line, column ); | 90 | internal::diagnostic::location::line_type line_end = 0, |
222 | 91 | internal::diagnostic::location::column_type column_end = 0 ) { | ||
223 | 92 | return internal::diagnostic::location( | ||
224 | 93 | file, line, column, line_end, column_end | ||
225 | 94 | ); | ||
226 | 95 | } | ||
227 | 96 | |||
228 | 97 | /** | ||
229 | 98 | * Makes a location. | ||
230 | 99 | * | ||
231 | 100 | * @param e The XQueryException to copy the location from. | ||
232 | 101 | * @return Returns a new location. | ||
233 | 102 | */ | ||
234 | 103 | inline internal::diagnostic::location | ||
235 | 104 | make_location( XQueryException const &e ) { | ||
236 | 105 | return internal::diagnostic::location( | ||
237 | 106 | e.source_uri(), | ||
238 | 107 | e.source_line(), e.source_column(), | ||
239 | 108 | e.source_line_end(), e.source_column_end() | ||
240 | 109 | ); | ||
241 | 84 | } | 110 | } |
242 | 85 | 111 | ||
243 | 86 | /** | 112 | /** |
244 | 87 | 113 | ||
245 | === modified file 'src/diagnostics/diagnostic_en.xml' | |||
246 | --- src/diagnostics/diagnostic_en.xml 2012-11-08 05:38:30 +0000 | |||
247 | +++ src/diagnostics/diagnostic_en.xml 2012-11-17 18:50:26 +0000 | |||
248 | @@ -14,6 +14,45 @@ | |||
249 | 14 | ! limitations under the License. | 14 | ! limitations under the License. |
250 | 15 | --> | 15 | --> |
251 | 16 | 16 | ||
252 | 17 | <!-- | ||
253 | 18 | ! Please use the following convention for sub-message keys. | ||
254 | 19 | ! | ||
255 | 20 | ! If a sub-message key has at least one $n number in it (where 'n' is [1-9]), | ||
256 | 21 | ! append an underscore ('_') followed by all the number(s) used in the value. | ||
257 | 22 | ! If the last $n is optional, append a lowercase 'o'. | ||
258 | 23 | ! | ||
259 | 24 | ! For example, given this "throw" in C++ code: | ||
260 | 25 | ! | ||
261 | 26 | ! throw XQUERY_EXCEPTION( | ||
262 | 27 | ! err::XPTY0004, | ||
263 | 28 | ! ERROR_PARAMS( | ||
264 | 29 | ! ZED( BadType_23o ), *domainType, | ||
265 | 30 | ! ZED( NoTreatAs_4 ), *declaredType | ||
266 | 31 | ! ), | ||
267 | 32 | ! ERROR_LOC( get_loc() ) | ||
268 | 33 | ! ); | ||
269 | 34 | ! | ||
270 | 35 | ! The "bad type" and "no treat as" keys are defined as: | ||
271 | 36 | ! | ||
272 | 37 | ! <entry key="BadType_23o"> | ||
273 | 38 | ! <value>"$2": invalid type${: 3}</value> | ||
274 | 39 | ! </entry> | ||
275 | 40 | ! | ||
276 | 41 | ! <entry key="NoTreatAs_4"> | ||
277 | 42 | ! <value>can not treat as "$4"</value> | ||
278 | 43 | ! </entry> | ||
279 | 44 | ! | ||
280 | 45 | ! In the "throw" above, you can tell just by looking at it that all the | ||
281 | 46 | ! required parameters are given and that each has the correct number/position. | ||
282 | 47 | ! | ||
283 | 48 | ! ERROR_PARAMS( | ||
284 | 49 | ! ZED( BadType_23o ), // #1 | ||
285 | 50 | ! *domainType, // #2 | ||
286 | 51 | ! ZED( NoTreatAs_4 ), // #3 | ||
287 | 52 | ! *declaredType // #4 | ||
288 | 53 | ! ), | ||
289 | 54 | --> | ||
290 | 55 | |||
291 | 17 | <diagnostic-list lang="en"> | 56 | <diagnostic-list lang="en"> |
292 | 18 | 57 | ||
293 | 19 | <namespace prefix="err"> | 58 | <namespace prefix="err"> |
294 | @@ -47,27 +86,27 @@ | |||
295 | 47 | <value>"$2": XQuery version must be at least 3.0</value> | 86 | <value>"$2": XQuery version must be at least 3.0</value> |
296 | 48 | </entry> | 87 | </entry> |
297 | 49 | 88 | ||
299 | 50 | <entry key="OuterForClause11"> | 89 | <entry key="OuterForClause30"> |
300 | 51 | <value>"outer-for" clause only available in XQuery 3.0 or later</value> | 90 | <value>"outer-for" clause only available in XQuery 3.0 or later</value> |
301 | 52 | </entry> | 91 | </entry> |
302 | 53 | 92 | ||
304 | 54 | <entry key="WindowClause11"> | 93 | <entry key="WindowClause30"> |
305 | 55 | <value>"window" clause only available in XQuery 3.0 or later</value> | 94 | <value>"window" clause only available in XQuery 3.0 or later</value> |
306 | 56 | </entry> | 95 | </entry> |
307 | 57 | 96 | ||
309 | 58 | <entry key="CountClause11"> | 97 | <entry key="CountClause30"> |
310 | 59 | <value>"count" clause only available in XQuery 3.0 or later</value> | 98 | <value>"count" clause only available in XQuery 3.0 or later</value> |
311 | 60 | </entry> | 99 | </entry> |
312 | 61 | 100 | ||
314 | 62 | <entry key="SwitchExpr11"> | 101 | <entry key="SwitchExpr30"> |
315 | 63 | <value>"switch" expressions only available in XQuery 3.0 or later</value> | 102 | <value>"switch" expressions only available in XQuery 3.0 or later</value> |
316 | 64 | </entry> | 103 | </entry> |
317 | 65 | 104 | ||
319 | 66 | <entry key="TryCatchExpr11"> | 105 | <entry key="TryCatchExpr30"> |
320 | 67 | <value>"try/catch" expressions only available in XQuery 3.0 or later</value> | 106 | <value>"try/catch" expressions only available in XQuery 3.0 or later</value> |
321 | 68 | </entry> | 107 | </entry> |
322 | 69 | 108 | ||
324 | 70 | <entry key="Anotations"> | 109 | <entry key="Annotations"> |
325 | 71 | <value>function and variable annotations only available in XQuery 3.0 or later</value> | 110 | <value>function and variable annotations only available in XQuery 3.0 or later</value> |
326 | 72 | </entry> | 111 | </entry> |
327 | 73 | 112 | ||
328 | @@ -156,32 +195,32 @@ | |||
329 | 156 | 195 | ||
330 | 157 | <value>$1</value> | 196 | <value>$1</value> |
331 | 158 | 197 | ||
333 | 159 | <entry key="FuncReturn"> | 198 | <entry key="NoReturnTypePromote_234"> |
334 | 160 | <value>$2 can not be promoted to return type $3 of function $4()</value> | 199 | <value>$2 can not be promoted to return type $3 of function $4()</value> |
335 | 161 | </entry> | 200 | </entry> |
336 | 162 | 201 | ||
338 | 163 | <entry key="FuncParam"> | 202 | <entry key="NoParamTypePromote_234"> |
339 | 164 | <value>$2 can not be promoted to parameter type $3 of function $4()</value> | 203 | <value>$2 can not be promoted to parameter type $3 of function $4()</value> |
340 | 165 | </entry> | 204 | </entry> |
341 | 166 | 205 | ||
343 | 167 | <entry key="TypePromotion"> | 206 | <entry key="NoTypePromote_23"> |
344 | 168 | <value>$2 can not be promoted to type $3</value> | 207 | <value>$2 can not be promoted to type $3</value> |
345 | 169 | </entry> | 208 | </entry> |
346 | 170 | 209 | ||
348 | 171 | <entry key="NoMultiSeqTypePromotion"> | 210 | <entry key="NoMultiSeqTypePromotion_2"> |
349 | 172 | <value>sequence of more than one item can not be promoted to type $2</value> | 211 | <value>sequence of more than one item can not be promoted to type $2</value> |
350 | 173 | </entry> | 212 | </entry> |
351 | 174 | 213 | ||
353 | 175 | <entry key="TypeMatch"> | 214 | <entry key="NoTreatAs_23"> |
354 | 176 | <value>$2 can not be treated as type $3</value> | 215 | <value>$2 can not be treated as type $3</value> |
355 | 177 | </entry> | 216 | </entry> |
356 | 178 | 217 | ||
357 | 179 | <entry key="FormatNumber_2"> | 218 | <entry key="FormatNumber_2"> |
359 | 180 | <value>the first parameter to the format-number() function is of type $2, which is not allowed</value> | 219 | <value>first parameter to format-number() function is type $2 that is not allowed</value> |
360 | 181 | </entry> | 220 | </entry> |
361 | 182 | 221 | ||
362 | 183 | <entry key="JSONIQ_SELECTOR"> | 222 | <entry key="JSONIQ_SELECTOR"> |
364 | 184 | <value>Cannot atomize and/or cast value of type $2 to a string.</value> | 223 | <value>can not atomize and/or cast value of type $2 to string</value> |
365 | 185 | </entry> | 224 | </entry> |
366 | 186 | 225 | ||
367 | 187 | <entry key="MultiValuedGroupingKey"> | 226 | <entry key="MultiValuedGroupingKey"> |
368 | @@ -1436,7 +1475,15 @@ | |||
369 | 1436 | [XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates | 1475 | [XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates |
370 | 1437 | in the query are made effective. | 1476 | in the query are made effective. |
371 | 1438 | </comment> | 1477 | </comment> |
373 | 1439 | <value>updates violate constraint</value> | 1478 | <value>$1${ 2}</value> |
374 | 1479 | |||
375 | 1480 | <entry key="AttributeName"> | ||
376 | 1481 | <value>"$3": attribute with the same name already exists</value> | ||
377 | 1482 | </entry> | ||
378 | 1483 | |||
379 | 1484 | <entry key="AppliedAt"> | ||
380 | 1485 | <value>(applied at $3)</value> | ||
381 | 1486 | </entry> | ||
382 | 1440 | </diagnostic> | 1487 | </diagnostic> |
383 | 1441 | 1488 | ||
384 | 1442 | <diagnostic code="XUTY0022"> | 1489 | <diagnostic code="XUTY0022"> |
385 | @@ -1988,11 +2035,11 @@ | |||
386 | 1988 | </diagnostic> | 2035 | </diagnostic> |
387 | 1989 | 2036 | ||
388 | 1990 | <diagnostic code="ZAPI0080" name="CANNOT_RETRIEVE_NODE_REFERENCE"> | 2037 | <diagnostic code="ZAPI0080" name="CANNOT_RETRIEVE_NODE_REFERENCE"> |
390 | 1991 | <value>can not retrieve node-reference for a node that is not in a collection.</value> | 2038 | <value>can not retrieve node-reference for a node that is not in a collection</value> |
391 | 1992 | </diagnostic> | 2039 | </diagnostic> |
392 | 1993 | 2040 | ||
393 | 1994 | <diagnostic code="ZAPI0090" name="CANNOT_VALIDATE_NON_ROOT"> | 2041 | <diagnostic code="ZAPI0090" name="CANNOT_VALIDATE_NON_ROOT"> |
395 | 1995 | <value>a non root element cannot be validated in place.</value> | 2042 | <value>non root element cannot be validated in place</value> |
396 | 1996 | </diagnostic> | 2043 | </diagnostic> |
397 | 1997 | 2044 | ||
398 | 1998 | <!--////////// Zorba Class Serialization Errors ////////////////////////--> | 2045 | <!--////////// Zorba Class Serialization Errors ////////////////////////--> |
399 | @@ -2488,7 +2535,7 @@ | |||
400 | 2488 | </diagnostic> | 2535 | </diagnostic> |
401 | 2489 | 2536 | ||
402 | 2490 | <diagnostic code="ZSTR0066" name="REFERENCED_NODE_NOT_IN_COLLECTION"> | 2537 | <diagnostic code="ZSTR0066" name="REFERENCED_NODE_NOT_IN_COLLECTION"> |
404 | 2491 | <value>$1: does not reference a node in collection $2.</value> | 2538 | <value>$1: does not reference a node in collection $2</value> |
405 | 2492 | </diagnostic> | 2539 | </diagnostic> |
406 | 2493 | 2540 | ||
407 | 2494 | <!--////////// XQuery Scripting ////////////////////////////////////////--> | 2541 | <!--////////// XQuery Scripting ////////////////////////////////////////--> |
408 | @@ -2561,6 +2608,7 @@ | |||
409 | 2561 | <diagnostic code="ZJPE0009" name="ILLEGAL_EMPTY_STRING"> | 2608 | <diagnostic code="ZJPE0009" name="ILLEGAL_EMPTY_STRING"> |
410 | 2562 | <value>illegal empty string</value> | 2609 | <value>illegal empty string</value> |
411 | 2563 | </diagnostic> | 2610 | </diagnostic> |
412 | 2611 | |||
413 | 2564 | <diagnostic code="ZJPE0010" name="JSONML_ARRAY_REQUIRES_BRACKET"> | 2612 | <diagnostic code="ZJPE0010" name="JSONML_ARRAY_REQUIRES_BRACKET"> |
414 | 2565 | <value>JsonML (array form) must start with '['</value> | 2613 | <value>JsonML (array form) must start with '['</value> |
415 | 2566 | </diagnostic> | 2614 | </diagnostic> |
416 | @@ -2607,17 +2655,17 @@ | |||
417 | 2607 | 2655 | ||
418 | 2608 | <diagnostic code="JNTY0002" if="defined(ZORBA_WITH_JSON)"> | 2656 | <diagnostic code="JNTY0002" if="defined(ZORBA_WITH_JSON)"> |
419 | 2609 | <comment>It is a type error if the right-hand-side expression of a pair constructor does not return exactly one item.</comment> | 2657 | <comment>It is a type error if the right-hand-side expression of a pair constructor does not return exactly one item.</comment> |
421 | 2610 | <value>Pair value returns no, or more than one, item.</value> | 2658 | <value>pair value returns no, or more than one, item</value> |
422 | 2611 | </diagnostic> | 2659 | </diagnostic> |
423 | 2612 | 2660 | ||
424 | 2613 | <diagnostic code="JNDY0003" if="defined(ZORBA_WITH_JSON)"> | 2661 | <diagnostic code="JNDY0003" if="defined(ZORBA_WITH_JSON)"> |
425 | 2614 | <comment>It is a dynamic error if two pairs in an object constructor or in a simple object union have the same name.</comment> | 2662 | <comment>It is a dynamic error if two pairs in an object constructor or in a simple object union have the same name.</comment> |
427 | 2615 | <value>"$1": pair with the same name already exists in object.</value> | 2663 | <value>"$1": pair with the same name already exists in object</value> |
428 | 2616 | </diagnostic> | 2664 | </diagnostic> |
429 | 2617 | 2665 | ||
430 | 2618 | <diagnostic code="JNTY0004" if="defined(ZORBA_WITH_JSON)"> | 2666 | <diagnostic code="JNTY0004" if="defined(ZORBA_WITH_JSON)"> |
431 | 2619 | <comment>It is a type error to call fn:data on a sequence containing an array or an object.</comment> | 2667 | <comment>It is a type error to call fn:data on a sequence containing an array or an object.</comment> |
433 | 2620 | <value>Cannot atomize an $1 item. An $1 has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item).</value> | 2668 | <value>can not atomize an $1 item: an $1 has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item)</value> |
434 | 2621 | </diagnostic> | 2669 | </diagnostic> |
435 | 2622 | 2670 | ||
436 | 2623 | <diagnostic code="JNUP0005" if="defined(ZORBA_WITH_JSON)"> | 2671 | <diagnostic code="JNUP0005" if="defined(ZORBA_WITH_JSON)"> |
437 | @@ -2630,14 +2678,14 @@ | |||
438 | 2630 | <diagnostic code="JNUP0006" if="defined(ZORBA_WITH_JSON)"> | 2678 | <diagnostic code="JNUP0006" if="defined(ZORBA_WITH_JSON)"> |
439 | 2631 | <comment>It is a dynamic error if upd:applyUpdates causes an object to contain two pairs with the same name.</comment> | 2679 | <comment>It is a dynamic error if upd:applyUpdates causes an object to contain two pairs with the same name.</comment> |
440 | 2632 | 2680 | ||
442 | 2633 | <value>"$1": pair to insert already exists in object.</value> | 2681 | <value>"$1": pair to insert already exists in object</value> |
443 | 2634 | 2682 | ||
444 | 2635 | </diagnostic> | 2683 | </diagnostic> |
445 | 2636 | 2684 | ||
446 | 2637 | <diagnostic code="JNUP0007" if="defined(ZORBA_WITH_JSON)"> | 2685 | <diagnostic code="JNUP0007" if="defined(ZORBA_WITH_JSON)"> |
447 | 2638 | <comment>It is a type error if, in an updating expression, an array selector cannot be cast to xs:integer or if an object selector cannot be cast to xs:string.</comment> | 2686 | <comment>It is a type error if, in an updating expression, an array selector cannot be cast to xs:integer or if an object selector cannot be cast to xs:string.</comment> |
448 | 2639 | 2687 | ||
450 | 2640 | <value>$1 - wrong type for object/array selector in update expression.</value> | 2688 | <value>"$1": wrong type for object/array selector in update expression</value> |
451 | 2641 | 2689 | ||
452 | 2642 | <entry key="Object"> | 2690 | <entry key="Object"> |
453 | 2643 | <value>"$2": can not be promoted to type xs:string</value> | 2691 | <value>"$2": can not be promoted to type xs:string</value> |
454 | @@ -2663,7 +2711,7 @@ | |||
455 | 2663 | <value>$1</value> | 2711 | <value>$1</value> |
456 | 2664 | 2712 | ||
457 | 2665 | <entry key="Object"> | 2713 | <entry key="Object"> |
459 | 2666 | <value>"$2": target of a renaming expression or of a non-position-inserting expression is not an object.</value> | 2714 | <value>"$2": target of a renaming expression or of a non-position-inserting expression is not an object</value> |
460 | 2667 | </entry> | 2715 | </entry> |
461 | 2668 | 2716 | ||
462 | 2669 | <entry key="Array"> | 2717 | <entry key="Array"> |
463 | @@ -2671,7 +2719,7 @@ | |||
464 | 2671 | </entry> | 2719 | </entry> |
465 | 2672 | 2720 | ||
466 | 2673 | <entry key="ObjectArray"> | 2721 | <entry key="ObjectArray"> |
468 | 2674 | <value>"$2": target of a deleting or replacing expression is not a JSON item.</value> | 2722 | <value>"$2": target of a deleting or replacing expression is not a JSON item</value> |
469 | 2675 | </entry> | 2723 | </entry> |
470 | 2676 | 2724 | ||
471 | 2677 | </diagnostic> | 2725 | </diagnostic> |
472 | @@ -2700,6 +2748,15 @@ | |||
473 | 2700 | <value>can not serialize multiple top-level items as JSON</value> | 2748 | <value>can not serialize multiple top-level items as JSON</value> |
474 | 2701 | </diagnostic> | 2749 | </diagnostic> |
475 | 2702 | 2750 | ||
476 | 2751 | <diagnostic code="JNSE0013" if="defined(ZORBA_WITH_JSON)"> | ||
477 | 2752 | <comment>It is a dynamic error to serialize an atomic value not | ||
478 | 2753 | supported by JSON or a node with the JSON output method and with | ||
479 | 2754 | the jsoniq-serialization-extensions serialization parameter | ||
480 | 2755 | set to false.</comment> | ||
481 | 2756 | |||
482 | 2757 | <value>can not serialize value as JSON: $1</value> | ||
483 | 2758 | </diagnostic> | ||
484 | 2759 | |||
485 | 2703 | <diagnostic code="JNSE0014" if="defined(ZORBA_WITH_JSON)"> | 2760 | <diagnostic code="JNSE0014" if="defined(ZORBA_WITH_JSON)"> |
486 | 2704 | <comment>It is a dynamic error to serialize a function or a node with the | 2761 | <comment>It is a dynamic error to serialize a function or a node with the |
487 | 2705 | JSON output method.</comment> | 2762 | JSON output method.</comment> |
488 | @@ -2710,7 +2767,7 @@ | |||
489 | 2710 | <comment>It is a dynamic error to serialize a sequence that does | 2767 | <comment>It is a dynamic error to serialize a sequence that does |
490 | 2711 | not exist of exactly one document node with XML, HTML, XHTML, Text. | 2768 | not exist of exactly one document node with XML, HTML, XHTML, Text. |
491 | 2712 | </comment> | 2769 | </comment> |
493 | 2713 | <value>$1: invalid serialization method for item type ($2)</value> | 2770 | <value>"$1": invalid serialization method for item type ($2)</value> |
494 | 2714 | </diagnostic> | 2771 | </diagnostic> |
495 | 2715 | 2772 | ||
496 | 2716 | <diagnostic code="JNUP0016" if="defined(ZORBA_WITH_JSON)"> | 2773 | <diagnostic code="JNUP0016" if="defined(ZORBA_WITH_JSON)"> |
497 | @@ -2719,29 +2776,29 @@ | |||
498 | 2719 | <value>$1</value> | 2776 | <value>$1</value> |
499 | 2720 | 2777 | ||
500 | 2721 | <entry key="Object"> | 2778 | <entry key="Object"> |
502 | 2722 | <value>"$2": selector cannot be resolved against supplied object.</value> | 2779 | <value>"$2": selector cannot be resolved against supplied object</value> |
503 | 2723 | </entry> | 2780 | </entry> |
504 | 2724 | 2781 | ||
505 | 2725 | <entry key="Array"> | 2782 | <entry key="Array"> |
507 | 2726 | <value>"$2": selector cannot be resolved against supplied array.</value> | 2783 | <value>"$2": selector cannot be resolved against supplied array</value> |
508 | 2727 | </entry> | 2784 | </entry> |
509 | 2728 | </diagnostic> | 2785 | </diagnostic> |
510 | 2729 | 2786 | ||
511 | 2730 | <diagnostic code="JNUP0017" if="defined(ZORBA_WITH_JSON)"> | 2787 | <diagnostic code="JNUP0017" if="defined(ZORBA_WITH_JSON)"> |
512 | 2731 | <comment> It is a dynamic error if the value in a replace expression is not exactly a single item.</comment> | 2788 | <comment> It is a dynamic error if the value in a replace expression is not exactly a single item.</comment> |
514 | 2732 | <value>Cannot replace with less or more than an item.</value> | 2789 | <value>can not replace with less or more than an item</value> |
515 | 2733 | </diagnostic> | 2790 | </diagnostic> |
516 | 2734 | 2791 | ||
517 | 2735 | <diagnostic code="JNTY0018" if="defined(ZORBA_WITH_JSON)"> | 2792 | <diagnostic code="JNTY0018" if="defined(ZORBA_WITH_JSON)"> |
518 | 2736 | <comment>It is a dynamic error if there is not exactly one supplied parameter for an object or array selector.</comment> | 2793 | <comment>It is a dynamic error if there is not exactly one supplied parameter for an object or array selector.</comment> |
519 | 2737 | 2794 | ||
521 | 2738 | <value>Object or array selection needs exactly one parameter.</value> | 2795 | <value>object or array selection needs exactly one parameter</value> |
522 | 2739 | </diagnostic> | 2796 | </diagnostic> |
523 | 2740 | 2797 | ||
524 | 2741 | <diagnostic code="JNUP0019" if="defined(ZORBA_WITH_JSON)"> | 2798 | <diagnostic code="JNUP0019" if="defined(ZORBA_WITH_JSON)"> |
525 | 2742 | <comment>It is a dynamic error if the content expression, in an object insert expression, does not evaluate to a sequence of objects.</comment> | 2799 | <comment>It is a dynamic error if the content expression, in an object insert expression, does not evaluate to a sequence of objects.</comment> |
526 | 2743 | 2800 | ||
528 | 2744 | <value>The content of an insert expression must evaluate to a sequence of objects.</value> | 2801 | <value>"$1": invalid type (content of insert expression must evaluate to a sequence of objects)</value> |
529 | 2745 | </diagnostic> | 2802 | </diagnostic> |
530 | 2746 | 2803 | ||
531 | 2747 | <diagnostic code="JNTY0023" if="defined(ZORBA_WITH_JSON)"> | 2804 | <diagnostic code="JNTY0023" if="defined(ZORBA_WITH_JSON)"> |
532 | @@ -2787,7 +2844,7 @@ | |||
533 | 2787 | </diagnostic> | 2844 | </diagnostic> |
534 | 2788 | 2845 | ||
535 | 2789 | <diagnostic code="ZWST0004" name="AMBIGUOUS_SEQUENTIAL_FLWOR"> | 2846 | <diagnostic code="ZWST0004" name="AMBIGUOUS_SEQUENTIAL_FLWOR"> |
537 | 2790 | <value>Sequential FLWOR expr may not have the semantics you expect</value> | 2847 | <value>sequential FLWOR expr may not have the semantics you expect</value> |
538 | 2791 | </diagnostic> | 2848 | </diagnostic> |
539 | 2792 | 2849 | ||
540 | 2793 | <diagnostic code="ZWST0005" name="CACHING_NOT_POSSIBLE"> | 2850 | <diagnostic code="ZWST0005" name="CACHING_NOT_POSSIBLE"> |
541 | @@ -3003,6 +3060,10 @@ | |||
542 | 3003 | <value>collection iterator not open</value> | 3060 | <value>collection iterator not open</value> |
543 | 3004 | </entry> | 3061 | </entry> |
544 | 3005 | 3062 | ||
545 | 3063 | <entry key="DefaultCollection"> | ||
546 | 3064 | <value>default collection</value> | ||
547 | 3065 | </entry> | ||
548 | 3066 | |||
549 | 3006 | <entry key="DefaultCollation"> | 3067 | <entry key="DefaultCollation"> |
550 | 3007 | <value>default collation</value> | 3068 | <value>default collation</value> |
551 | 3008 | </entry> | 3069 | </entry> |
552 | @@ -3107,11 +3168,11 @@ | |||
553 | 3107 | <value>full-text was not enabled in this build</value> | 3168 | <value>full-text was not enabled in this build</value> |
554 | 3108 | </entry> | 3169 | </entry> |
555 | 3109 | 3170 | ||
557 | 3110 | <entry key="FunctionFailedErrorCodeMessage_123"> | 3171 | <entry key="FunctionFailedErrorCodeMessage_234"> |
558 | 3111 | <value>$2 failed (error $3): $4</value> | 3172 | <value>$2 failed (error $3): $4</value> |
559 | 3112 | </entry> | 3173 | </entry> |
560 | 3113 | 3174 | ||
562 | 3114 | <entry key="FunctionFailed_12o"> | 3175 | <entry key="FunctionFailed_23o"> |
563 | 3115 | <value>$2 failed${: 3}</value> | 3176 | <value>$2 failed${: 3}</value> |
564 | 3116 | </entry> | 3177 | </entry> |
565 | 3117 | 3178 | ||
566 | @@ -3271,6 +3332,14 @@ | |||
567 | 3271 | <value>document, collection, or module resolver required but no SerializationCallback given</value> | 3332 | <value>document, collection, or module resolver required but no SerializationCallback given</value> |
568 | 3272 | </entry> | 3333 | </entry> |
569 | 3273 | 3334 | ||
570 | 3335 | <entry key="NoExternalFunction_2"> | ||
571 | 3336 | <value>"$2": external function not found</value> | ||
572 | 3337 | </entry> | ||
573 | 3338 | |||
574 | 3339 | <entry key="NoExternalModuleFromDLL_2"> | ||
575 | 3340 | <value>required external module "$2" not found</value> | ||
576 | 3341 | </entry> | ||
577 | 3342 | |||
578 | 3274 | <entry key="NoSerializationCallbackForModule"> | 3343 | <entry key="NoSerializationCallbackForModule"> |
579 | 3275 | <value>no SerializationCallback for required external module "$2"</value> | 3344 | <value>no SerializationCallback for required external module "$2"</value> |
580 | 3276 | </entry> | 3345 | </entry> |
581 | 3277 | 3346 | ||
582 | === modified file 'src/diagnostics/dict.h' | |||
583 | --- src/diagnostics/dict.h 2012-09-19 21:16:15 +0000 | |||
584 | +++ src/diagnostics/dict.h 2012-11-17 18:50:26 +0000 | |||
585 | @@ -17,6 +17,8 @@ | |||
586 | 17 | #ifndef ZORBA_DIAGNOSTIC_DICT_H | 17 | #ifndef ZORBA_DIAGNOSTIC_DICT_H |
587 | 18 | #define ZORBA_DIAGNOSTIC_DICT_H | 18 | #define ZORBA_DIAGNOSTIC_DICT_H |
588 | 19 | 19 | ||
589 | 20 | #include "diagnostics/dict_zed_keys.h" | ||
590 | 21 | |||
591 | 20 | namespace zorba { | 22 | namespace zorba { |
592 | 21 | namespace diagnostic { | 23 | namespace diagnostic { |
593 | 22 | namespace dict { | 24 | namespace dict { |
594 | @@ -40,7 +42,7 @@ | |||
595 | 40 | * \endcode | 42 | * \endcode |
596 | 41 | * \hideinitializer | 43 | * \hideinitializer |
597 | 42 | */ | 44 | */ |
599 | 43 | #define ZED(DICT_KEY) ZED_PREFIX #DICT_KEY | 45 | #define ZED(DICT_KEY) ZED_##DICT_KEY |
600 | 44 | 46 | ||
601 | 45 | /** | 47 | /** |
602 | 46 | * Looks up the given key in the language dictionary. | 48 | * Looks up the given key in the language dictionary. |
603 | 47 | 49 | ||
604 | === added file 'src/diagnostics/dict_zed_keys_h.xq' | |||
605 | --- src/diagnostics/dict_zed_keys_h.xq 1970-01-01 00:00:00 +0000 | |||
606 | +++ src/diagnostics/dict_zed_keys_h.xq 2012-11-17 18:50:26 +0000 | |||
607 | @@ -0,0 +1,55 @@ | |||
608 | 1 | (: | ||
609 | 2 | : Copyright 2006-2009 The FLWOR Foundation. | ||
610 | 3 | : | ||
611 | 4 | : Licensed under the Apache License, Version 2.0 (the "License"); | ||
612 | 5 | : you may not use this file except in compliance with the License. | ||
613 | 6 | : You may obtain a copy of the License at | ||
614 | 7 | : | ||
615 | 8 | : http://www.apache.org/licenses/LICENSE-2.0 | ||
616 | 9 | : | ||
617 | 10 | : Unless required by applicable law or agreed to in writing, software | ||
618 | 11 | : distributed under the License is distributed on an "AS IS" BASIS, | ||
619 | 12 | : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
620 | 13 | : See the License for the specific language governing permissions and | ||
621 | 14 | : limitations under the License. | ||
622 | 15 | :) | ||
623 | 16 | |||
624 | 17 | import module namespace util = "http://www.zorba-xquery.com/diagnostic/util" at "diagnostic_util.xq"; | ||
625 | 18 | |||
626 | 19 | declare function local:make-zed-defines( $doc ) as xs:string* | ||
627 | 20 | { | ||
628 | 21 | for $entry in ( $doc//entry ) | ||
629 | 22 | let $key := $entry/@key | ||
630 | 23 | return | ||
631 | 24 | if ( contains( $key, ' ' ) ) | ||
632 | 25 | then () | ||
633 | 26 | else | ||
634 | 27 | let $full_key := | ||
635 | 28 | if ( $entry/parent::diagnostic ) | ||
636 | 29 | then concat( $entry/parent::diagnostic/@code, "_", $key ) | ||
637 | 30 | else $key | ||
638 | 31 | return concat( "#define ZED_", $full_key, ' "~', $full_key, '"' ) | ||
639 | 32 | }; | ||
640 | 33 | |||
641 | 34 | declare variable $input external; | ||
642 | 35 | |||
643 | 36 | string-join( | ||
644 | 37 | ( util:copyright(), | ||
645 | 38 | '#ifndef ZORBA_DIAGNOSTICS_ZED_KEYS', | ||
646 | 39 | '#define ZORBA_DIAGNOSTICS_ZED_KEYS', | ||
647 | 40 | '', | ||
648 | 41 | local:make-zed-defines( $input ), | ||
649 | 42 | '', | ||
650 | 43 | '#endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */', | ||
651 | 44 | '/*', | ||
652 | 45 | ' * Local variables:', | ||
653 | 46 | ' * mode: c++', | ||
654 | 47 | ' * End:', | ||
655 | 48 | ' */', | ||
656 | 49 | '/* vim:set et sw=2 ts=2: */' | ||
657 | 50 | ), | ||
658 | 51 | $util:newline | ||
659 | 52 | ), | ||
660 | 53 | $util:newline | ||
661 | 54 | |||
662 | 55 | (: vim:set syntax=xquery et sw=2 ts=2: :) | ||
663 | 0 | 56 | ||
664 | === modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp' | |||
665 | --- src/diagnostics/pregenerated/diagnostic_list.cpp 2012-11-08 05:38:30 +0000 | |||
666 | +++ src/diagnostics/pregenerated/diagnostic_list.cpp 2012-11-17 18:50:26 +0000 | |||
667 | @@ -1246,6 +1246,9 @@ | |||
668 | 1246 | JSONiqErrorCode JNSE0012( "JNSE0012" ); | 1246 | JSONiqErrorCode JNSE0012( "JNSE0012" ); |
669 | 1247 | 1247 | ||
670 | 1248 | 1248 | ||
671 | 1249 | JSONiqErrorCode JNSE0013( "JNSE0013" ); | ||
672 | 1250 | |||
673 | 1251 | |||
674 | 1249 | JSONiqErrorCode JNSE0014( "JNSE0014" ); | 1252 | JSONiqErrorCode JNSE0014( "JNSE0014" ); |
675 | 1250 | 1253 | ||
676 | 1251 | 1254 | ||
677 | 1252 | 1255 | ||
678 | === modified file 'src/diagnostics/pregenerated/dict_en.cpp' | |||
679 | --- src/diagnostics/pregenerated/dict_en.cpp 2012-11-08 05:38:30 +0000 | |||
680 | +++ src/diagnostics/pregenerated/dict_en.cpp 2012-11-17 18:50:26 +0000 | |||
681 | @@ -98,7 +98,7 @@ | |||
682 | 98 | { "FTST0019", "\"$1\": match option specified more than once" }, | 98 | { "FTST0019", "\"$1\": match option specified more than once" }, |
683 | 99 | #endif | 99 | #endif |
684 | 100 | #if defined(ZORBA_WITH_JSON) | 100 | #if defined(ZORBA_WITH_JSON) |
686 | 101 | { "JNDY0003", "\"$1\": pair with the same name already exists in object." }, | 101 | { "JNDY0003", "\"$1\": pair with the same name already exists in object" }, |
687 | 102 | #endif | 102 | #endif |
688 | 103 | #if defined(ZORBA_WITH_JSON) | 103 | #if defined(ZORBA_WITH_JSON) |
689 | 104 | { "JNDY0021", "$1" }, | 104 | { "JNDY0021", "$1" }, |
690 | @@ -107,22 +107,25 @@ | |||
691 | 107 | { "JNSE0012", "can not serialize multiple top-level items as JSON" }, | 107 | { "JNSE0012", "can not serialize multiple top-level items as JSON" }, |
692 | 108 | #endif | 108 | #endif |
693 | 109 | #if defined(ZORBA_WITH_JSON) | 109 | #if defined(ZORBA_WITH_JSON) |
694 | 110 | { "JNSE0013", "can not serialize value as JSON: $1" }, | ||
695 | 111 | #endif | ||
696 | 112 | #if defined(ZORBA_WITH_JSON) | ||
697 | 110 | { "JNSE0014", "can not serialize a node or function item as JSON" }, | 113 | { "JNSE0014", "can not serialize a node or function item as JSON" }, |
698 | 111 | #endif | 114 | #endif |
699 | 112 | #if defined(ZORBA_WITH_JSON) | 115 | #if defined(ZORBA_WITH_JSON) |
707 | 113 | { "JNSE0022", "$1: invalid serialization method for item type ($2)" }, | 116 | { "JNSE0022", "\"$1\": invalid serialization method for item type ($2)" }, |
708 | 114 | #endif | 117 | #endif |
709 | 115 | #if defined(ZORBA_WITH_JSON) | 118 | #if defined(ZORBA_WITH_JSON) |
710 | 116 | { "JNTY0002", "Pair value returns no, or more than one, item." }, | 119 | { "JNTY0002", "pair value returns no, or more than one, item" }, |
711 | 117 | #endif | 120 | #endif |
712 | 118 | #if defined(ZORBA_WITH_JSON) | 121 | #if defined(ZORBA_WITH_JSON) |
713 | 119 | { "JNTY0004", "Cannot atomize an $1 item. An $1 has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item)." }, | 122 | { "JNTY0004", "can not atomize an $1 item: an $1 has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item)" }, |
714 | 120 | #endif | 123 | #endif |
715 | 121 | #if defined(ZORBA_WITH_JSON) | 124 | #if defined(ZORBA_WITH_JSON) |
716 | 122 | { "JNTY0011", "JSON item cannot appear in content sequence of node constructor or updating expression" }, | 125 | { "JNTY0011", "JSON item cannot appear in content sequence of node constructor or updating expression" }, |
717 | 123 | #endif | 126 | #endif |
718 | 124 | #if defined(ZORBA_WITH_JSON) | 127 | #if defined(ZORBA_WITH_JSON) |
720 | 125 | { "JNTY0018", "Object or array selection needs exactly one parameter." }, | 128 | { "JNTY0018", "object or array selection needs exactly one parameter" }, |
721 | 126 | #endif | 129 | #endif |
722 | 127 | #if defined(ZORBA_WITH_JSON) | 130 | #if defined(ZORBA_WITH_JSON) |
723 | 128 | { "JNTY0020", "$1: invalid option type for option $2 (expected $3)" }, | 131 | { "JNTY0020", "$1: invalid option type for option $2 (expected $3)" }, |
724 | @@ -137,10 +140,10 @@ | |||
725 | 137 | { "JNUP0005", "\"$1\": duplicate pair to insert" }, | 140 | { "JNUP0005", "\"$1\": duplicate pair to insert" }, |
726 | 138 | #endif | 141 | #endif |
727 | 139 | #if defined(ZORBA_WITH_JSON) | 142 | #if defined(ZORBA_WITH_JSON) |
729 | 140 | { "JNUP0006", "\"$1\": pair to insert already exists in object." }, | 143 | { "JNUP0006", "\"$1\": pair to insert already exists in object" }, |
730 | 141 | #endif | 144 | #endif |
731 | 142 | #if defined(ZORBA_WITH_JSON) | 145 | #if defined(ZORBA_WITH_JSON) |
733 | 143 | { "JNUP0007", "$1 - wrong type for object/array selector in update expression." }, | 146 | { "JNUP0007", "\"$1\": wrong type for object/array selector in update expression" }, |
734 | 144 | #endif | 147 | #endif |
735 | 145 | #if defined(ZORBA_WITH_JSON) | 148 | #if defined(ZORBA_WITH_JSON) |
736 | 146 | { "JNUP0008", "$1" }, | 149 | { "JNUP0008", "$1" }, |
737 | @@ -155,10 +158,10 @@ | |||
738 | 155 | { "JNUP0016", "$1" }, | 158 | { "JNUP0016", "$1" }, |
739 | 156 | #endif | 159 | #endif |
740 | 157 | #if defined(ZORBA_WITH_JSON) | 160 | #if defined(ZORBA_WITH_JSON) |
742 | 158 | { "JNUP0017", "Cannot replace with less or more than an item." }, | 161 | { "JNUP0017", "can not replace with less or more than an item" }, |
743 | 159 | #endif | 162 | #endif |
744 | 160 | #if defined(ZORBA_WITH_JSON) | 163 | #if defined(ZORBA_WITH_JSON) |
746 | 161 | { "JNUP0019", "The content of an insert expression must evaluate to a sequence of objects." }, | 164 | { "JNUP0019", "\"$1\": invalid type (content of insert expression must evaluate to a sequence of objects)" }, |
747 | 162 | #endif | 165 | #endif |
748 | 163 | { "SENR0001", "\"$1\": can not serialize $2" }, | 166 | { "SENR0001", "\"$1\": can not serialize $2" }, |
749 | 164 | { "SEPM0004", "doctype-system parameter, or standalone parameter with a value other than \"omit\", specified" }, | 167 | { "SEPM0004", "doctype-system parameter, or standalone parameter with a value other than \"omit\", specified" }, |
750 | @@ -270,7 +273,7 @@ | |||
751 | 270 | { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" }, | 273 | { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" }, |
752 | 271 | { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" }, | 274 | { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" }, |
753 | 272 | { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" }, | 275 | { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" }, |
755 | 273 | { "XUDY0021", "updates violate constraint" }, | 276 | { "XUDY0021", "$1${ 2}" }, |
756 | 274 | { "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" }, | 277 | { "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" }, |
757 | 275 | { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" }, | 278 | { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" }, |
758 | 276 | { "XUDY0027", "target expression is empty sequence" }, | 279 | { "XUDY0027", "target expression is empty sequence" }, |
759 | @@ -320,8 +323,8 @@ | |||
760 | 320 | { "ZAPI0043", "cannot serialize JSON item using current output method" }, | 323 | { "ZAPI0043", "cannot serialize JSON item using current output method" }, |
761 | 321 | { "ZAPI0045", "cannot serialize sequence containing both JSON and XML items" }, | 324 | { "ZAPI0045", "cannot serialize sequence containing both JSON and XML items" }, |
762 | 322 | { "ZAPI0070", "\"$1\": invalid serialization method for SAX" }, | 325 | { "ZAPI0070", "\"$1\": invalid serialization method for SAX" }, |
765 | 323 | { "ZAPI0080", "can not retrieve node-reference for a node that is not in a collection." }, | 326 | { "ZAPI0080", "can not retrieve node-reference for a node that is not in a collection" }, |
766 | 324 | { "ZAPI0090", "a non root element cannot be validated in place." }, | 327 | { "ZAPI0090", "non root element cannot be validated in place" }, |
767 | 325 | { "ZCSE0001", "\"$1\": nonexistent input field" }, | 328 | { "ZCSE0001", "\"$1\": nonexistent input field" }, |
768 | 326 | { "ZCSE0002", "\"$1\": incompatible input field${: type=2}${, class=3}" }, | 329 | { "ZCSE0002", "\"$1\": incompatible input field${: type=2}${, class=3}" }, |
769 | 327 | { "ZCSE0003", "\"$1\": unrecognized class field" }, | 330 | { "ZCSE0003", "\"$1\": unrecognized class field" }, |
770 | @@ -455,10 +458,10 @@ | |||
771 | 455 | { "ZSTR0055", "streamable string has already been consumed" }, | 458 | { "ZSTR0055", "streamable string has already been consumed" }, |
772 | 456 | { "ZSTR0060", "out of range: $1" }, | 459 | { "ZSTR0060", "out of range: $1" }, |
773 | 457 | { "ZSTR0065", "Zorba did not close properly, objects may still in memory.\n$1 referenced URI(s) remain in the string pool.\nFor help avoiding this message please refer to http://www.zorba-xquery.com/html/documentation in section General Architecture -> Memory Leaks." }, | 460 | { "ZSTR0065", "Zorba did not close properly, objects may still in memory.\n$1 referenced URI(s) remain in the string pool.\nFor help avoiding this message please refer to http://www.zorba-xquery.com/html/documentation in section General Architecture -> Memory Leaks." }, |
775 | 458 | { "ZSTR0066", "$1: does not reference a node in collection $2." }, | 461 | { "ZSTR0066", "$1: does not reference a node in collection $2" }, |
776 | 459 | { "ZWST0002", "\"$1\": unknown or unsupported annotation" }, | 462 | { "ZWST0002", "\"$1\": unknown or unsupported annotation" }, |
777 | 460 | { "ZWST0003", "\"$1\": function declared sequential, but has non-sequential body" }, | 463 | { "ZWST0003", "\"$1\": function declared sequential, but has non-sequential body" }, |
779 | 461 | { "ZWST0004", "Sequential FLWOR expr may not have the semantics you expect" }, | 464 | { "ZWST0004", "sequential FLWOR expr may not have the semantics you expect" }, |
780 | 462 | { "ZWST0005", "\"$1\": function caching not possible; $2" }, | 465 | { "ZWST0005", "\"$1\": function caching not possible; $2" }, |
781 | 463 | { "ZWST0006", "\"$1\": function caching might not give the intended result because the function is declared as $2" }, | 466 | { "ZWST0006", "\"$1\": function caching might not give the intended result because the function is declared as $2" }, |
782 | 464 | { "ZXQD0001", "\"$1\": prefix not declared when calling function \"$2\" from $3" }, | 467 | { "ZXQD0001", "\"$1\": prefix not declared when calling function \"$2\" from $3" }, |
783 | @@ -560,6 +563,7 @@ | |||
784 | 560 | { "~ClosingBraceWithoutOpen", "'}' encountered without '{' first" }, | 563 | { "~ClosingBraceWithoutOpen", "'}' encountered without '{' first" }, |
785 | 561 | { "~CollectionIteratorNotOpen", "collection iterator not open" }, | 564 | { "~CollectionIteratorNotOpen", "collection iterator not open" }, |
786 | 562 | { "~DefaultCollation", "default collation" }, | 565 | { "~DefaultCollation", "default collation" }, |
787 | 566 | { "~DefaultCollection", "default collection" }, | ||
788 | 563 | { "~DivisionNoINF", "division can not have +-INF dividend" }, | 567 | { "~DivisionNoINF", "division can not have +-INF dividend" }, |
789 | 564 | { "~DivisionNoNaN", "division can not involve NaN" }, | 568 | { "~DivisionNoNaN", "division can not involve NaN" }, |
790 | 565 | { "~DocNodeMultipleElements", "document node has more than one element" }, | 569 | { "~DocNodeMultipleElements", "document node has more than one element" }, |
791 | @@ -596,8 +600,8 @@ | |||
792 | 596 | { "~FormatNumberIntegerPart", ": the integer part of a sub-picture must not contain a member of the decimal-digit-family that is followed by an optional-digit-sign" }, | 600 | { "~FormatNumberIntegerPart", ": the integer part of a sub-picture must not contain a member of the decimal-digit-family that is followed by an optional-digit-sign" }, |
793 | 597 | { "~FormatNumberPercentPermille", ": a sub-picture must not contain more than one percent-sign or per-mille-sign, and it must not contain one of each" }, | 601 | { "~FormatNumberPercentPermille", ": a sub-picture must not contain more than one percent-sign or per-mille-sign, and it must not contain one of each" }, |
794 | 598 | { "~FullTextNotEnabled", "full-text was not enabled in this build" }, | 602 | { "~FullTextNotEnabled", "full-text was not enabled in this build" }, |
797 | 599 | { "~FunctionFailedErrorCodeMessage_123", "$2 failed (error $3): $4" }, | 603 | { "~FunctionFailedErrorCodeMessage_234", "$2 failed (error $3): $4" }, |
798 | 600 | { "~FunctionFailed_12o", "$2 failed${: 3}" }, | 604 | { "~FunctionFailed_23o", "$2 failed${: 3}" }, |
799 | 601 | { "~FunctionUndeclared_3", "function with arity $3 not declared" }, | 605 | { "~FunctionUndeclared_3", "function with arity $3 not declared" }, |
800 | 602 | { "~GoodValuesAreUTF8", "valid values are: UTF-8, UTF-16" }, | 606 | { "~GoodValuesAreUTF8", "valid values are: UTF-8, UTF-16" }, |
801 | 603 | { "~GoodValuesAreXMLEtc", "valid values are: xml, html, xhtml, text, binary, json, jsoniq" }, | 607 | { "~GoodValuesAreXMLEtc", "valid values are: xml, html, xhtml, text, binary, json, jsoniq" }, |
802 | @@ -610,10 +614,10 @@ | |||
803 | 610 | { "~JNUP0007_Object", "\"$2\": can not be promoted to type xs:string" }, | 614 | { "~JNUP0007_Object", "\"$2\": can not be promoted to type xs:string" }, |
804 | 611 | { "~JNUP0007_ObjectArray", "\"$2\": can not be promoted to type xs:anyAtomicType" }, | 615 | { "~JNUP0007_ObjectArray", "\"$2\": can not be promoted to type xs:anyAtomicType" }, |
805 | 612 | { "~JNUP0008_Array", "\"$2\": target of an appending expression or of a position-inserting expression is not an array" }, | 616 | { "~JNUP0008_Array", "\"$2\": target of an appending expression or of a position-inserting expression is not an array" }, |
810 | 613 | { "~JNUP0008_Object", "\"$2\": target of a renaming expression or of a non-position-inserting expression is not an object." }, | 617 | { "~JNUP0008_Object", "\"$2\": target of a renaming expression or of a non-position-inserting expression is not an object" }, |
811 | 614 | { "~JNUP0008_ObjectArray", "\"$2\": target of a deleting or replacing expression is not a JSON item." }, | 618 | { "~JNUP0008_ObjectArray", "\"$2\": target of a deleting or replacing expression is not a JSON item" }, |
812 | 615 | { "~JNUP0016_Array", "\"$2\": selector cannot be resolved against supplied array." }, | 619 | { "~JNUP0016_Array", "\"$2\": selector cannot be resolved against supplied array" }, |
813 | 616 | { "~JNUP0016_Object", "\"$2\": selector cannot be resolved against supplied object." }, | 620 | { "~JNUP0016_Object", "\"$2\": selector cannot be resolved against supplied object" }, |
814 | 617 | { "~JSON parser error", "JSON parser error" }, | 621 | { "~JSON parser error", "JSON parser error" }, |
815 | 618 | { "~JSON serialization error", "JSON serialization error" }, | 622 | { "~JSON serialization error", "JSON serialization error" }, |
816 | 619 | { "~JSON_ILLEGAL_CHARACTER", "'$2': illegal JSON character${ at 3}" }, | 623 | { "~JSON_ILLEGAL_CHARACTER", "'$2': illegal JSON character${ at 3}" }, |
817 | @@ -649,6 +653,8 @@ | |||
818 | 649 | { "~NoEmptyLocalname", "local-name can not be empty" }, | 653 | { "~NoEmptyLocalname", "local-name can not be empty" }, |
819 | 650 | { "~NoEmptySeqAsBaseURI", "can't treat empty sequence as base URI" }, | 654 | { "~NoEmptySeqAsBaseURI", "can't treat empty sequence as base URI" }, |
820 | 651 | { "~NoEmptySeqAsCollationParam", "empty-sequence not allowed as collation parameter" }, | 655 | { "~NoEmptySeqAsCollationParam", "empty-sequence not allowed as collation parameter" }, |
821 | 656 | { "~NoExternalFunction_2", "\"$2\": external function not found" }, | ||
822 | 657 | { "~NoExternalModuleFromDLL_2", "required external module \"$2\" not found" }, | ||
823 | 652 | { "~NoHashItemOfType_2", "can not hash item of type \"$2\"" }, | 658 | { "~NoHashItemOfType_2", "can not hash item of type \"$2\"" }, |
824 | 653 | { "~NoInputData", "no input data" }, | 659 | { "~NoInputData", "no input data" }, |
825 | 654 | { "~NoModuleURIResolver", "no module URI resolver could be retrieved using SerializationCallback" }, | 660 | { "~NoModuleURIResolver", "no module URI resolver could be retrieved using SerializationCallback" }, |
826 | @@ -862,27 +868,29 @@ | |||
827 | 862 | { "~VariabledHasNoValue", "variable has no value" }, | 868 | { "~VariabledHasNoValue", "variable has no value" }, |
828 | 863 | { "~VariabledUndeclared", "undeclared variable" }, | 869 | { "~VariabledUndeclared", "undeclared variable" }, |
829 | 864 | { "~XMLSchema", "XML schema" }, | 870 | { "~XMLSchema", "XML schema" }, |
832 | 865 | { "~XPST0003_Anotations", "function and variable annotations only available in XQuery 3.0 or later" }, | 871 | { "~XPST0003_Annotations", "function and variable annotations only available in XQuery 3.0 or later" }, |
833 | 866 | { "~XPST0003_CountClause11", "\"count\" clause only available in XQuery 3.0 or later" }, | 872 | { "~XPST0003_CountClause30", "\"count\" clause only available in XQuery 3.0 or later" }, |
834 | 867 | { "~XPST0003_ModuleDeclNotInMain", "module declaration must not be in main module" }, | 873 | { "~XPST0003_ModuleDeclNotInMain", "module declaration must not be in main module" }, |
836 | 868 | { "~XPST0003_OuterForClause11", "\"outer-for\" clause only available in XQuery 3.0 or later" }, | 874 | { "~XPST0003_OuterForClause30", "\"outer-for\" clause only available in XQuery 3.0 or later" }, |
837 | 869 | { "~XPST0003_PiTarget", "\"XML\" not allowed as target of a direct processing-instruction constructor" }, | 875 | { "~XPST0003_PiTarget", "\"XML\" not allowed as target of a direct processing-instruction constructor" }, |
838 | 870 | { "~XPST0003_Scripting", "scripting feature not available" }, | 876 | { "~XPST0003_Scripting", "scripting feature not available" }, |
839 | 871 | { "~XPST0003_StartEndTagMismatch_23", "start tag \"$2\" does not match end tag \"$3\"" }, | 877 | { "~XPST0003_StartEndTagMismatch_23", "start tag \"$2\" does not match end tag \"$3\"" }, |
843 | 872 | { "~XPST0003_SwitchExpr11", "\"switch\" expressions only available in XQuery 3.0 or later" }, | 878 | { "~XPST0003_SwitchExpr30", "\"switch\" expressions only available in XQuery 3.0 or later" }, |
844 | 873 | { "~XPST0003_TryCatchExpr11", "\"try/catch\" expressions only available in XQuery 3.0 or later" }, | 879 | { "~XPST0003_TryCatchExpr30", "\"try/catch\" expressions only available in XQuery 3.0 or later" }, |
845 | 874 | { "~XPST0003_WindowClause11", "\"window\" clause only available in XQuery 3.0 or later" }, | 880 | { "~XPST0003_WindowClause30", "\"window\" clause only available in XQuery 3.0 or later" }, |
846 | 875 | { "~XPST0003_XQueryVersionAtLeast30_2", "\"$2\": XQuery version must be at least 3.0" }, | 881 | { "~XPST0003_XQueryVersionAtLeast30_2", "\"$2\": XQuery version must be at least 3.0" }, |
851 | 876 | { "~XPTY0004_FormatNumber_2", "the first parameter to the format-number() function is of type $2, which is not allowed" }, | 882 | { "~XPTY0004_FormatNumber_2", "first parameter to format-number() function is type $2 that is not allowed" }, |
852 | 877 | { "~XPTY0004_FuncParam", "$2 can not be promoted to parameter type $3 of function $4()" }, | 883 | { "~XPTY0004_JSONIQ_SELECTOR", "can not atomize and/or cast value of type $2 to string" }, |
849 | 878 | { "~XPTY0004_FuncReturn", "$2 can not be promoted to return type $3 of function $4()" }, | ||
850 | 879 | { "~XPTY0004_JSONIQ_SELECTOR", "Cannot atomize and/or cast value of type $2 to a string." }, | ||
853 | 880 | { "~XPTY0004_MultiValuedGroupingKey", "atomization of grouping variable produces more than one item" }, | 884 | { "~XPTY0004_MultiValuedGroupingKey", "atomization of grouping variable produces more than one item" }, |
857 | 881 | { "~XPTY0004_NoMultiSeqTypePromotion", "sequence of more than one item can not be promoted to type $2" }, | 885 | { "~XPTY0004_NoMultiSeqTypePromotion_2", "sequence of more than one item can not be promoted to type $2" }, |
858 | 882 | { "~XPTY0004_TypeMatch", "$2 can not be treated as type $3" }, | 886 | { "~XPTY0004_NoParamTypePromote_234", "$2 can not be promoted to parameter type $3 of function $4()" }, |
859 | 883 | { "~XPTY0004_TypePromotion", "$2 can not be promoted to type $3" }, | 887 | { "~XPTY0004_NoReturnTypePromote_234", "$2 can not be promoted to return type $3 of function $4()" }, |
860 | 888 | { "~XPTY0004_NoTreatAs_23", "$2 can not be treated as type $3" }, | ||
861 | 889 | { "~XPTY0004_NoTypePromote_23", "$2 can not be promoted to type $3" }, | ||
862 | 884 | { "~XQST0106_CONFLICTING", "conflicting" }, | 890 | { "~XQST0106_CONFLICTING", "conflicting" }, |
863 | 885 | { "~XQST0106_THE_SAME", "the same" }, | 891 | { "~XQST0106_THE_SAME", "the same" }, |
864 | 892 | { "~XUDY0021_AppliedAt", "(applied at $3)" }, | ||
865 | 893 | { "~XUDY0021_AttributeName", "\"$3\": attribute with the same name already exists" }, | ||
866 | 886 | { "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" }, | 894 | { "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" }, |
867 | 887 | { "~XUST0001_Generic", "updating expression illegal here" }, | 895 | { "~XUST0001_Generic", "updating expression illegal here" }, |
868 | 888 | { "~XUST0001_IF", "conditional expression with updating and non-updating branch" }, | 896 | { "~XUST0001_IF", "conditional expression with updating and non-updating branch" }, |
869 | 889 | 897 | ||
870 | === added file 'src/diagnostics/pregenerated/dict_zed_keys.h' | |||
871 | --- src/diagnostics/pregenerated/dict_zed_keys.h 1970-01-01 00:00:00 +0000 | |||
872 | +++ src/diagnostics/pregenerated/dict_zed_keys.h 2012-11-17 18:50:26 +0000 | |||
873 | @@ -0,0 +1,338 @@ | |||
874 | 1 | /** | ||
875 | 2 | * Copyright 2006-2011 The FLWOR Foundation. | ||
876 | 3 | * | ||
877 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | ||
878 | 5 | * you may not use this file except in compliance with the License. | ||
879 | 6 | * You may obtain a copy of the License at | ||
880 | 7 | * | ||
881 | 8 | * http://www.apache.org/licenses/LICENSE-2.0 | ||
882 | 9 | * | ||
883 | 10 | * Unless required by applicable law or agreed to in writing, software | ||
884 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, | ||
885 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
886 | 13 | * See the License for the specific language governing permissions and | ||
887 | 14 | * limitations under the License. | ||
888 | 15 | */ | ||
889 | 16 | |||
890 | 17 | /* | ||
891 | 18 | * THIS FILE IS GENERATED. | ||
892 | 19 | * PLEASE DO NOT EDIT. | ||
893 | 20 | */ | ||
894 | 21 | |||
895 | 22 | #ifndef ZORBA_DIAGNOSTICS_ZED_KEYS | ||
896 | 23 | #define ZORBA_DIAGNOSTICS_ZED_KEYS | ||
897 | 24 | |||
898 | 25 | #define ZED_XPST0003_StartEndTagMismatch_23 "~XPST0003_StartEndTagMismatch_23" | ||
899 | 26 | #define ZED_XPST0003_ModuleDeclNotInMain "~XPST0003_ModuleDeclNotInMain" | ||
900 | 27 | #define ZED_XPST0003_XQueryVersionAtLeast30_2 "~XPST0003_XQueryVersionAtLeast30_2" | ||
901 | 28 | #define ZED_XPST0003_OuterForClause30 "~XPST0003_OuterForClause30" | ||
902 | 29 | #define ZED_XPST0003_WindowClause30 "~XPST0003_WindowClause30" | ||
903 | 30 | #define ZED_XPST0003_CountClause30 "~XPST0003_CountClause30" | ||
904 | 31 | #define ZED_XPST0003_SwitchExpr30 "~XPST0003_SwitchExpr30" | ||
905 | 32 | #define ZED_XPST0003_TryCatchExpr30 "~XPST0003_TryCatchExpr30" | ||
906 | 33 | #define ZED_XPST0003_Annotations "~XPST0003_Annotations" | ||
907 | 34 | #define ZED_XPST0003_Scripting "~XPST0003_Scripting" | ||
908 | 35 | #define ZED_XPST0003_PiTarget "~XPST0003_PiTarget" | ||
909 | 36 | #define ZED_XPTY0004_NoReturnTypePromote_234 "~XPTY0004_NoReturnTypePromote_234" | ||
910 | 37 | #define ZED_XPTY0004_NoParamTypePromote_234 "~XPTY0004_NoParamTypePromote_234" | ||
911 | 38 | #define ZED_XPTY0004_NoTypePromote_23 "~XPTY0004_NoTypePromote_23" | ||
912 | 39 | #define ZED_XPTY0004_NoMultiSeqTypePromotion_2 "~XPTY0004_NoMultiSeqTypePromotion_2" | ||
913 | 40 | #define ZED_XPTY0004_NoTreatAs_23 "~XPTY0004_NoTreatAs_23" | ||
914 | 41 | #define ZED_XPTY0004_FormatNumber_2 "~XPTY0004_FormatNumber_2" | ||
915 | 42 | #define ZED_XPTY0004_JSONIQ_SELECTOR "~XPTY0004_JSONIQ_SELECTOR" | ||
916 | 43 | #define ZED_XPTY0004_MultiValuedGroupingKey "~XPTY0004_MultiValuedGroupingKey" | ||
917 | 44 | #define ZED_XQST0106_THE_SAME "~XQST0106_THE_SAME" | ||
918 | 45 | #define ZED_XQST0106_CONFLICTING "~XQST0106_CONFLICTING" | ||
919 | 46 | #define ZED_FTST0009_BadStopWordsLang "~FTST0009_BadStopWordsLang" | ||
920 | 47 | #define ZED_FTST0009_BadStemmerLang "~FTST0009_BadStemmerLang" | ||
921 | 48 | #define ZED_FTST0009_BadThesaurusLang "~FTST0009_BadThesaurusLang" | ||
922 | 49 | #define ZED_FTST0009_BadTokenizerLang "~FTST0009_BadTokenizerLang" | ||
923 | 50 | #define ZED_XUST0001_CONCAT "~XUST0001_CONCAT" | ||
924 | 51 | #define ZED_XUST0001_TRYCATCH "~XUST0001_TRYCATCH" | ||
925 | 52 | #define ZED_XUST0001_Generic "~XUST0001_Generic" | ||
926 | 53 | #define ZED_XUST0001_IF "~XUST0001_IF" | ||
927 | 54 | #define ZED_XUST0001_UDF_2 "~XUST0001_UDF_2" | ||
928 | 55 | #define ZED_XUDY0021_AttributeName "~XUDY0021_AttributeName" | ||
929 | 56 | #define ZED_XUDY0021_AppliedAt "~XUDY0021_AppliedAt" | ||
930 | 57 | #define ZED_ZXQP0004_TypeOps_is_in_scope_ForFunctionItemTypes "~ZXQP0004_TypeOps_is_in_scope_ForFunctionItemTypes" | ||
931 | 58 | #define ZED_ZXQP0025_RESOURCE_NOT_FOUND "~ZXQP0025_RESOURCE_NOT_FOUND" | ||
932 | 59 | #define ZED_ZXQD0004_NON_NEGATIVE "~ZXQD0004_NON_NEGATIVE" | ||
933 | 60 | #define ZED_ZXQD0004_NOT_WITHIN_RANGE "~ZXQD0004_NOT_WITHIN_RANGE" | ||
934 | 61 | #define ZED_ZDST0027_NO_KEY_TYPE_DECL "~ZDST0027_NO_KEY_TYPE_DECL" | ||
935 | 62 | #define ZED_ZDST0027_NON_SPECIFIC_KEY_TYPE_DECL "~ZDST0027_NON_SPECIFIC_KEY_TYPE_DECL" | ||
936 | 63 | #define ZED_ZDST0027_MULTI_VALUED_KEY_TYPE_DECL "~ZDST0027_MULTI_VALUED_KEY_TYPE_DECL" | ||
937 | 64 | #define ZED_ZDST0027_NON_ATOMIC_KEY_TYPE "~ZDST0027_NON_ATOMIC_KEY_TYPE" | ||
938 | 65 | #define ZED_ZDST0027_NON_ORDERED_KEY_TYPE "~ZDST0027_NON_ORDERED_KEY_TYPE" | ||
939 | 66 | #define ZED_ZDST0060_unknown_namespace "~ZDST0060_unknown_namespace" | ||
940 | 67 | #define ZED_ZDST0060_unknown_localname "~ZDST0060_unknown_localname" | ||
941 | 68 | #define ZED_JNUP0007_Object "~JNUP0007_Object" | ||
942 | 69 | #define ZED_JNUP0007_Array "~JNUP0007_Array" | ||
943 | 70 | #define ZED_JNUP0007_ObjectArray "~JNUP0007_ObjectArray" | ||
944 | 71 | #define ZED_JNUP0008_Object "~JNUP0008_Object" | ||
945 | 72 | #define ZED_JNUP0008_Array "~JNUP0008_Array" | ||
946 | 73 | #define ZED_JNUP0008_ObjectArray "~JNUP0008_ObjectArray" | ||
947 | 74 | #define ZED_JNUP0016_Object "~JNUP0016_Object" | ||
948 | 75 | #define ZED_JNUP0016_Array "~JNUP0016_Array" | ||
949 | 76 | #define ZED_ZWST0005_RETURN_TYPE "~ZWST0005_RETURN_TYPE" | ||
950 | 77 | #define ZED_ZWST0005_PARAM_TYPE "~ZWST0005_PARAM_TYPE" | ||
951 | 78 | #define ZED_ZWST0005_UPDATING "~ZWST0005_UPDATING" | ||
952 | 79 | #define ZED_ZWST0005_VARIADIC "~ZWST0005_VARIADIC" | ||
953 | 80 | #define ZED_AllMatchesHasExcludes "~AllMatchesHasExcludes" | ||
954 | 81 | #define ZED_AlreadySpecified "~AlreadySpecified" | ||
955 | 82 | #define ZED_ArithOpNotDefinedBetween_23 "~ArithOpNotDefinedBetween_23" | ||
956 | 83 | #define ZED_AtomizationHasMoreThanOneValue "~AtomizationHasMoreThanOneValue" | ||
957 | 84 | #define ZED_AttributeName "~AttributeName" | ||
958 | 85 | #define ZED_AttributeNode "~AttributeNode" | ||
959 | 86 | #define ZED_BackRef0Illegal "~BackRef0Illegal" | ||
960 | 87 | #define ZED_BackRefIllegalInCharClass "~BackRefIllegalInCharClass" | ||
961 | 88 | #define ZED_BadAnyURI "~BadAnyURI" | ||
962 | 89 | #define ZED_BadArgTypeForFn_2o34o "~BadArgTypeForFn_2o34o" | ||
963 | 90 | #define ZED_BadCharAfter_34 "~BadCharAfter_34" | ||
964 | 91 | #define ZED_BadCharInBraces_3 "~BadCharInBraces_3" | ||
965 | 92 | #define ZED_BadDecDigit_3 "~BadDecDigit_3" | ||
966 | 93 | #define ZED_BadFileURIAuthority_2 "~BadFileURIAuthority_2" | ||
967 | 94 | #define ZED_BadHexDigit_3 "~BadHexDigit_3" | ||
968 | 95 | #define ZED_BadHexSequence "~BadHexSequence" | ||
969 | 96 | #define ZED_BadItem "~BadItem" | ||
970 | 97 | #define ZED_BadIterator "~BadIterator" | ||
971 | 98 | #define ZED_BadLibraryModule "~BadLibraryModule" | ||
972 | 99 | #define ZED_BadRegexEscape_3 "~BadRegexEscape_3" | ||
973 | 100 | #define ZED_BadPath "~BadPath" | ||
974 | 101 | #define ZED_BadStreamState "~BadStreamState" | ||
975 | 102 | #define ZED_BadTokenInBraces_3 "~BadTokenInBraces_3" | ||
976 | 103 | #define ZED_BadTraceStream "~BadTraceStream" | ||
977 | 104 | #define ZED_BadTypeFor_23 "~BadTypeFor_23" | ||
978 | 105 | #define ZED_BadType_23o "~BadType_23o" | ||
979 | 106 | #define ZED_BadURIScheme_3 "~BadURIScheme_3" | ||
980 | 107 | #define ZED_BadURISyntaxForScheme_3 "~BadURISyntaxForScheme_3" | ||
981 | 108 | #define ZED_BadUnicodeChar_3 "~BadUnicodeChar_3" | ||
982 | 109 | #define ZED_BadWordNetPartOfSpeech_2 "~BadWordNetPartOfSpeech_2" | ||
983 | 110 | #define ZED_BadWordNetPtr_2 "~BadWordNetPtr_2" | ||
984 | 111 | #define ZED_BadXMLDocument_2o "~BadXMLDocument_2o" | ||
985 | 112 | #define ZED_BadXMLNoOpeningTag "~BadXMLNoOpeningTag" | ||
986 | 113 | #define ZED_BadXMLForXQDoc_3 "~BadXMLForXQDoc_3" | ||
987 | 114 | #define ZED_BadXQueryVersion "~BadXQueryVersion" | ||
988 | 115 | #define ZED_Base64BadChar "~Base64BadChar" | ||
989 | 116 | #define ZED_Base64Multiple4 "~Base64Multiple4" | ||
990 | 117 | #define ZED_BaseURI "~BaseURI" | ||
991 | 118 | #define ZED_BoxCondTooManyColumns "~BoxCondTooManyColumns" | ||
992 | 119 | #define ZED_CastFromToFailed_34 "~CastFromToFailed_34" | ||
993 | 120 | #define ZED_CharExpected_3 "~CharExpected_3" | ||
994 | 121 | #define ZED_CloneNotImplemented "~CloneNotImplemented" | ||
995 | 122 | #define ZED_ClosingBraceWithoutOpen "~ClosingBraceWithoutOpen" | ||
996 | 123 | #define ZED_CollectionIteratorNotOpen "~CollectionIteratorNotOpen" | ||
997 | 124 | #define ZED_DefaultCollection "~DefaultCollection" | ||
998 | 125 | #define ZED_DefaultCollation "~DefaultCollation" | ||
999 | 126 | #define ZED_DivisionNoINF "~DivisionNoINF" | ||
1000 | 127 | #define ZED_DivisionNoNaN "~DivisionNoNaN" | ||
1001 | 128 | #define ZED_DocNodeMultipleElements "~DocNodeMultipleElements" | ||
1002 | 129 | #define ZED_EBVNotDefSeq_5 "~EBVNotDefSeq_5" | ||
1003 | 130 | #define ZED_EffectiveBooleanValue "~EffectiveBooleanValue" | ||
1004 | 131 | #define ZED_ElementName "~ElementName" | ||
1005 | 132 | #define ZED_ElementNode "~ElementNode" | ||
1006 | 133 | #define ZED_EmptyPath "~EmptyPath" | ||
1007 | 134 | #define ZED_EmptySeqNoCastToQName "~EmptySeqNoCastToQName" | ||
1008 | 135 | #define ZED_EmptySeqNoCastToTypeWithQuantOne "~EmptySeqNoCastToTypeWithQuantOne" | ||
1009 | 136 | #define ZED_EmptySeqNoFnRemoveArg "~EmptySeqNoFnRemoveArg" | ||
1010 | 137 | #define ZED_EmptySeqNoSearchItem "~EmptySeqNoSearchItem" | ||
1011 | 138 | #define ZED_EmptySequence "~EmptySequence" | ||
1012 | 139 | #define ZED_ErrorCodeMessage_12 "~ErrorCodeMessage_12" | ||
1013 | 140 | #define ZED_ExpectedNumericOrDurationType "~ExpectedNumericOrDurationType" | ||
1014 | 141 | #define ZED_ExpectedNumericType "~ExpectedNumericType" | ||
1015 | 142 | #define ZED_ExpectedType_5 "~ExpectedType_5" | ||
1016 | 143 | #define ZED_ExprNoReturnUpdateList "~ExprNoReturnUpdateList" | ||
1017 | 144 | #define ZED_ExprReturnsTooManyUpdateLists "~ExprReturnsTooManyUpdateLists" | ||
1018 | 145 | #define ZED_ExternFnDeterministic "~ExternFnDeterministic" | ||
1019 | 146 | #define ZED_ExternFnNondeterministic "~ExternFnNondeterministic" | ||
1020 | 147 | #define ZED_FileNotFoundOrReadable "~FileNotFoundOrReadable" | ||
1021 | 148 | #define ZED_FnNilledArgNotNode "~FnNilledArgNotNode" | ||
1022 | 149 | #define ZED_FnOnlyInXQueryVersion_3 "~FnOnlyInXQueryVersion_3" | ||
1023 | 150 | #define ZED_FullTextNotEnabled "~FullTextNotEnabled" | ||
1024 | 151 | #define ZED_FunctionFailedErrorCodeMessage_234 "~FunctionFailedErrorCodeMessage_234" | ||
1025 | 152 | #define ZED_FunctionFailed_23o "~FunctionFailed_23o" | ||
1026 | 153 | #define ZED_FunctionUndeclared_3 "~FunctionUndeclared_3" | ||
1027 | 154 | #define ZED_GoodValuesAreUTF8 "~GoodValuesAreUTF8" | ||
1028 | 155 | #define ZED_GoodValuesAreXMLEtc "~GoodValuesAreXMLEtc" | ||
1029 | 156 | #define ZED_GoodValuesAreYesNo "~GoodValuesAreYesNo" | ||
1030 | 157 | #define ZED_GoodValuesAreYesNoOmit "~GoodValuesAreYesNoOmit" | ||
1031 | 158 | #define ZED_HexBinaryMustBeEven "~HexBinaryMustBeEven" | ||
1032 | 159 | #define ZED_IncompleteKeyInIndexBuild "~IncompleteKeyInIndexBuild" | ||
1033 | 160 | #define ZED_IncompleteKeyInIndexRefresh "~IncompleteKeyInIndexRefresh" | ||
1034 | 161 | #define ZED_LibModVersionMismatch_3 "~LibModVersionMismatch_3" | ||
1035 | 162 | #define ZED_ModuleNotFound "~ModuleNotFound" | ||
1036 | 163 | #define ZED_MustBeAbsoluteURI "~MustBeAbsoluteURI" | ||
1037 | 164 | #define ZED_MustBeNCName "~MustBeNCName" | ||
1038 | 165 | #define ZED_NoAttrNodesInDocument "~NoAttrNodesInDocument" | ||
1039 | 166 | #define ZED_NoBindURI "~NoBindURI" | ||
1040 | 167 | #define ZED_NoCastToCInt_2 "~NoCastToCInt_2" | ||
1041 | 168 | #define ZED_NoCastTo_34o "~NoCastTo_34o" | ||
1042 | 169 | #define ZED_NoCastTo_45o "~NoCastTo_45o" | ||
1043 | 170 | #define ZED_NoCompareTypes_23 "~NoCompareTypes_23" | ||
1044 | 171 | #define ZED_NoCompareWithType_4 "~NoCompareWithType_4" | ||
1045 | 172 | #define ZED_NoDriveSpecification "~NoDriveSpecification" | ||
1046 | 173 | #define ZED_NoEmptyLocalname "~NoEmptyLocalname" | ||
1047 | 174 | #define ZED_NoEmptySeqAsBaseURI "~NoEmptySeqAsBaseURI" | ||
1048 | 175 | #define ZED_NoEmptySeqAsCollationParam "~NoEmptySeqAsCollationParam" | ||
1049 | 176 | #define ZED_NoHashItemOfType_2 "~NoHashItemOfType_2" | ||
1050 | 177 | #define ZED_NoInputData "~NoInputData" | ||
1051 | 178 | #define ZED_NoModuleURIResolver "~NoModuleURIResolver" | ||
1052 | 179 | #define ZED_NoMultiKeyNodeValues_2 "~NoMultiKeyNodeValues_2" | ||
1053 | 180 | #define ZED_NoParseFnArity "~NoParseFnArity" | ||
1054 | 181 | #define ZED_NoRebindPrefix "~NoRebindPrefix" | ||
1055 | 182 | #define ZED_NoRegisteredSerializationCallback_2 "~NoRegisteredSerializationCallback_2" | ||
1056 | 183 | #define ZED_NoResolveRelativeURI "~NoResolveRelativeURI" | ||
1057 | 184 | #define ZED_NoSeqAsArithOp "~NoSeqAsArithOp" | ||
1058 | 185 | #define ZED_NoSeqAsCollationParam "~NoSeqAsCollationParam" | ||
1059 | 186 | #define ZED_NoSeqCastToTypeWithQuantOneOrQuestion "~NoSeqCastToTypeWithQuantOneOrQuestion" | ||
1060 | 187 | #define ZED_NoSeqForFnOp_2 "~NoSeqForFnOp_2" | ||
1061 | 188 | #define ZED_NoSeqForConcat "~NoSeqForConcat" | ||
1062 | 189 | #define ZED_NoSeqInValueComp "~NoSeqInValueComp" | ||
1063 | 190 | #define ZED_NoSeqTestedForAtomicEquiv "~NoSeqTestedForAtomicEquiv" | ||
1064 | 191 | #define ZED_NoSerializationCallbackForDocColMod "~NoSerializationCallbackForDocColMod" | ||
1065 | 192 | #define ZED_NoExternalFunction_2 "~NoExternalFunction_2" | ||
1066 | 193 | #define ZED_NoExternalModuleFromDLL_2 "~NoExternalModuleFromDLL_2" | ||
1067 | 194 | #define ZED_NoSerializationCallbackForModule "~NoSerializationCallbackForModule" | ||
1068 | 195 | #define ZED_NoSerializationCallbackForTraceStream "~NoSerializationCallbackForTraceStream" | ||
1069 | 196 | #define ZED_NoSourceURI "~NoSourceURI" | ||
1070 | 197 | #define ZED_NoTreatAs_4 "~NoTreatAs_4" | ||
1071 | 198 | #define ZED_NoTypeInCtx "~NoTypeInCtx" | ||
1072 | 199 | #define ZED_NoTypeInMainModule_4 "~NoTypeInMainModule_4" | ||
1073 | 200 | #define ZED_NoTypeInModule_45 "~NoTypeInModule_45" | ||
1074 | 201 | #define ZED_NoURIAuthority "~NoURIAuthority" | ||
1075 | 202 | #define ZED_NoURIInStore "~NoURIInStore" | ||
1076 | 203 | #define ZED_NoURIScheme "~NoURIScheme" | ||
1077 | 204 | #define ZED_NoUntypedKeyNodeValue_2 "~NoUntypedKeyNodeValue_2" | ||
1078 | 205 | #define ZED_NodeIDNeedsBytes_2 "~NodeIDNeedsBytes_2" | ||
1079 | 206 | #define ZED_NodeIDTooBig "~NodeIDTooBig" | ||
1080 | 207 | #define ZED_NonClosedBackRef_3 "~NonClosedBackRef_3" | ||
1081 | 208 | #define ZED_NonFileThesaurusURI "~NonFileThesaurusURI" | ||
1082 | 209 | #define ZED_NonLocalhostAuthority "~NonLocalhostAuthority" | ||
1083 | 210 | #define ZED_NonexistentBackRef_3 "~NonexistentBackRef_3" | ||
1084 | 211 | #define ZED_NotAllowedForTypeName "~NotAllowedForTypeName" | ||
1085 | 212 | #define ZED_NotAmongInScopeSchemaTypes "~NotAmongInScopeSchemaTypes" | ||
1086 | 213 | #define ZED_NotDefInDynamicCtx "~NotDefInDynamicCtx" | ||
1087 | 214 | #define ZED_NotDocOrElementNode "~NotDocOrElementNode" | ||
1088 | 215 | #define ZED_NotInStaticCtx "~NotInStaticCtx" | ||
1089 | 216 | #define ZED_NotPlainFile "~NotPlainFile" | ||
1090 | 217 | #define ZED_NotSpecified "~NotSpecified" | ||
1091 | 218 | #define ZED_OpIsSameNodeMustHaveNodes "~OpIsSameNodeMustHaveNodes" | ||
1092 | 219 | #define ZED_OpNodeAfterMustHaveNodes "~OpNodeAfterMustHaveNodes" | ||
1093 | 220 | #define ZED_OpNodeBeforeMustHaveNodes "~OpNodeBeforeMustHaveNodes" | ||
1094 | 221 | #define ZED_OperationNotDef_23 "~OperationNotDef_23" | ||
1095 | 222 | #define ZED_OperationNotPossibleWithTypes_234 "~OperationNotPossibleWithTypes_234" | ||
1096 | 223 | #define ZED_ParserInitFailed "~ParserInitFailed" | ||
1097 | 224 | #define ZED_ParserNoCreateTree "~ParserNoCreateTree" | ||
1098 | 225 | #define ZED_PromotionImpossible "~PromotionImpossible" | ||
1099 | 226 | #define ZED_QuotedColon_23 "~QuotedColon_23" | ||
1100 | 227 | #define ZED_SEPM0009_Not10 "~SEPM0009_Not10" | ||
1101 | 228 | #define ZED_SEPM0009_NotOmit "~SEPM0009_NotOmit" | ||
1102 | 229 | #define ZED_SchemaAttributeName "~SchemaAttributeName" | ||
1103 | 230 | #define ZED_SchemaElementName "~SchemaElementName" | ||
1104 | 231 | #define ZED_SchemaOutOfMemory "~SchemaOutOfMemory" | ||
1105 | 232 | #define ZED_SchemaParseError "~SchemaParseError" | ||
1106 | 233 | #define ZED_SchemaUnexpected "~SchemaUnexpected" | ||
1107 | 234 | #define ZED_SearchKeyTypeMismatch_234 "~SearchKeyTypeMismatch_234" | ||
1108 | 235 | #define ZED_SearchKeyTypeNoProbeIndex_23 "~SearchKeyTypeNoProbeIndex_23" | ||
1109 | 236 | #define ZED_SeqFnBody "~SeqFnBody" | ||
1110 | 237 | #define ZED_SeqNoCastToQName "~SeqNoCastToQName" | ||
1111 | 238 | #define ZED_SingletonExpected_2o "~SingletonExpected_2o" | ||
1112 | 239 | #define ZED_StackOverflow "~StackOverflow" | ||
1113 | 240 | #define ZED_StingLiteral "~StingLiteral" | ||
1114 | 241 | #define ZED_StringValue "~StringValue" | ||
1115 | 242 | #define ZED_SumImpossibleWithTypes_23 "~SumImpossibleWithTypes_23" | ||
1116 | 243 | #define ZED_TrailingChar_3 "~TrailingChar_3" | ||
1117 | 244 | #define ZED_TwoDecimalFormatsSameName_2 "~TwoDecimalFormatsSameName_2" | ||
1118 | 245 | #define ZED_TwoDefaultDecimalFormats "~TwoDefaultDecimalFormats" | ||
1119 | 246 | #define ZED_TypeIsNotSubtype "~TypeIsNotSubtype" | ||
1120 | 247 | #define ZED_U_REGEX_BAD_ESCAPE_SEQUENCE "~U_REGEX_BAD_ESCAPE_SEQUENCE" | ||
1121 | 248 | #define ZED_U_REGEX_BAD_INTERVAL "~U_REGEX_BAD_INTERVAL" | ||
1122 | 249 | #define ZED_U_REGEX_INTERNAL_ERROR "~U_REGEX_INTERNAL_ERROR" | ||
1123 | 250 | #define ZED_U_REGEX_INVALID_BACK_REF "~U_REGEX_INVALID_BACK_REF" | ||
1124 | 251 | #define ZED_U_REGEX_INVALID_FLAG "~U_REGEX_INVALID_FLAG" | ||
1125 | 252 | #define ZED_U_REGEX_INVALID_RANGE "~U_REGEX_INVALID_RANGE" | ||
1126 | 253 | #define ZED_U_REGEX_INVALID_STATE "~U_REGEX_INVALID_STATE" | ||
1127 | 254 | #define ZED_U_REGEX_LOOK_BEHIND_LIMIT "~U_REGEX_LOOK_BEHIND_LIMIT" | ||
1128 | 255 | #define ZED_U_REGEX_MAX_LT_MIN "~U_REGEX_MAX_LT_MIN" | ||
1129 | 256 | #define ZED_U_REGEX_MISMATCHED_PAREN "~U_REGEX_MISMATCHED_PAREN" | ||
1130 | 257 | #define ZED_U_REGEX_MISSING_CLOSE_BRACKET "~U_REGEX_MISSING_CLOSE_BRACKET" | ||
1131 | 258 | #define ZED_U_REGEX_NUMBER_TOO_BIG "~U_REGEX_NUMBER_TOO_BIG" | ||
1132 | 259 | #define ZED_U_REGEX_OCTAL_TOO_BIG "~U_REGEX_OCTAL_TOO_BIG" | ||
1133 | 260 | #define ZED_U_REGEX_PROPERTY_SYNTAX "~U_REGEX_PROPERTY_SYNTAX" | ||
1134 | 261 | #define ZED_U_REGEX_RULE_SYNTAX "~U_REGEX_RULE_SYNTAX" | ||
1135 | 262 | #define ZED_U_REGEX_SET_CONTAINS_STRING "~U_REGEX_SET_CONTAINS_STRING" | ||
1136 | 263 | #define ZED_U_REGEX_STACK_OVERFLOW "~U_REGEX_STACK_OVERFLOW" | ||
1137 | 264 | #define ZED_U_REGEX_STOPPED_BY_CALLER "~U_REGEX_STOPPED_BY_CALLER" | ||
1138 | 265 | #define ZED_U_REGEX_TIME_OUT "~U_REGEX_TIME_OUT" | ||
1139 | 266 | #define ZED_U_REGEX_UNIMPLEMENTED "~U_REGEX_UNIMPLEMENTED" | ||
1140 | 267 | #define ZED_REGEX_UNIMPLEMENTED "~REGEX_UNIMPLEMENTED" | ||
1141 | 268 | #define ZED_REGEX_MISMATCHED_PAREN "~REGEX_MISMATCHED_PAREN" | ||
1142 | 269 | #define ZED_REGEX_BROKEN_P_CONSTRUCT "~REGEX_BROKEN_P_CONSTRUCT" | ||
1143 | 270 | #define ZED_REGEX_UNKNOWN_PL_CONSTRUCT "~REGEX_UNKNOWN_PL_CONSTRUCT" | ||
1144 | 271 | #define ZED_REGEX_UNKNOWN_PM_CONSTRUCT "~REGEX_UNKNOWN_PM_CONSTRUCT" | ||
1145 | 272 | #define ZED_REGEX_UNKNOWN_PN_CONSTRUCT "~REGEX_UNKNOWN_PN_CONSTRUCT" | ||
1146 | 273 | #define ZED_REGEX_UNKNOWN_PP_CONSTRUCT "~REGEX_UNKNOWN_PP_CONSTRUCT" | ||
1147 | 274 | #define ZED_REGEX_UNKNOWN_PZ_CONSTRUCT "~REGEX_UNKNOWN_PZ_CONSTRUCT" | ||
1148 | 275 | #define ZED_REGEX_UNKNOWN_PS_CONSTRUCT "~REGEX_UNKNOWN_PS_CONSTRUCT" | ||
1149 | 276 | #define ZED_REGEX_UNKNOWN_PC_CONSTRUCT "~REGEX_UNKNOWN_PC_CONSTRUCT" | ||
1150 | 277 | #define ZED_REGEX_BROKEN_PIs_CONSTRUCT "~REGEX_BROKEN_PIs_CONSTRUCT" | ||
1151 | 278 | #define ZED_REGEX_UNKNOWN_PIs_CONSTRUCT "~REGEX_UNKNOWN_PIs_CONSTRUCT" | ||
1152 | 279 | #define ZED_REGEX_INVALID_UNICODE_CODEPOINT_u "~REGEX_INVALID_UNICODE_CODEPOINT_u" | ||
1153 | 280 | #define ZED_REGEX_UNKNOWN_ESC_CHAR "~REGEX_UNKNOWN_ESC_CHAR" | ||
1154 | 281 | #define ZED_REGEX_INVALID_BACK_REF "~REGEX_INVALID_BACK_REF" | ||
1155 | 282 | #define ZED_REGEX_INVALID_ATOM_CHAR "~REGEX_INVALID_ATOM_CHAR" | ||
1156 | 283 | #define ZED_REGEX_INVALID_SUBCLASS "~REGEX_INVALID_SUBCLASS" | ||
1157 | 284 | #define ZED_REGEX_INVALID_USE_OF_SUBCLASS "~REGEX_INVALID_USE_OF_SUBCLASS" | ||
1158 | 285 | #define ZED_REGEX_MULTICHAR_IN_CHAR_RANGE "~REGEX_MULTICHAR_IN_CHAR_RANGE" | ||
1159 | 286 | #define ZED_REGEX_MISSING_CLOSE_BRACKET "~REGEX_MISSING_CLOSE_BRACKET" | ||
1160 | 287 | #define ZED_REGEX_MAX_LT_MIN "~REGEX_MAX_LT_MIN" | ||
1161 | 288 | #define ZED_UnaryArithOp "~UnaryArithOp" | ||
1162 | 289 | #define ZED_UnbalancedChar_3 "~UnbalancedChar_3" | ||
1163 | 290 | #define ZED_UnescapedChar_3 "~UnescapedChar_3" | ||
1164 | 291 | #define ZED_UnexpectedElement "~UnexpectedElement" | ||
1165 | 292 | #define ZED_VarValMustBeSingleItem_2 "~VarValMustBeSingleItem_2" | ||
1166 | 293 | #define ZED_Variable "~Variable" | ||
1167 | 294 | #define ZED_VariabledHasNoValue "~VariabledHasNoValue" | ||
1168 | 295 | #define ZED_VariabledUndeclared "~VariabledUndeclared" | ||
1169 | 296 | #define ZED_XMLSchema "~XMLSchema" | ||
1170 | 297 | #define ZED_XUST0002_Transform "~XUST0002_Transform" | ||
1171 | 298 | #define ZED_XUST0002_UDF_2 "~XUST0002_UDF_2" | ||
1172 | 299 | #define ZED_ZeroLenURI "~ZeroLenURI" | ||
1173 | 300 | #define ZED_error "~error" | ||
1174 | 301 | #define ZED_format_integer_bad_picture_format "~format_integer_bad_picture_format" | ||
1175 | 302 | #define ZED_format_integer_duplicated_optional_format_modifier "~format_integer_duplicated_optional_format_modifier" | ||
1176 | 303 | #define ZED_format_integer_optional_format_modifier_not_closed "~format_integer_optional_format_modifier_not_closed" | ||
1177 | 304 | #define ZED_format_integer_picture_empty "~format_integer_picture_empty" | ||
1178 | 305 | #define ZED_format_integer_unknown_optional_format_modifier_character "~format_integer_unknown_optional_format_modifier_character" | ||
1179 | 306 | #define ZED_format_integer_value_1_10 "~format_integer_value_1_10" | ||
1180 | 307 | #define ZED_format_integer_value_1_20 "~format_integer_value_1_20" | ||
1181 | 308 | #define ZED_format_integer_value_gt_3000 "~format_integer_value_gt_3000" | ||
1182 | 309 | #define ZED_warning "~warning" | ||
1183 | 310 | #define ZED_xqueryx_empty_content "~xqueryx_empty_content" | ||
1184 | 311 | #define ZED_ParseFragmentOptionCombinationNotAllowed "~ParseFragmentOptionCombinationNotAllowed" | ||
1185 | 312 | #define ZED_ParseFragmentInvalidOptions "~ParseFragmentInvalidOptions" | ||
1186 | 313 | #define ZED_ParseFragmentDoctypeNotAllowed "~ParseFragmentDoctypeNotAllowed" | ||
1187 | 314 | #define ZED_ParseFragmentDoctypeNotAllowedHere "~ParseFragmentDoctypeNotAllowedHere" | ||
1188 | 315 | #define ZED_FormatNumberDuplicates "~FormatNumberDuplicates" | ||
1189 | 316 | #define ZED_FormatNumberGroupingAdjacentToDecimal "~FormatNumberGroupingAdjacentToDecimal" | ||
1190 | 317 | #define ZED_FormatNumberIntegerPart "~FormatNumberIntegerPart" | ||
1191 | 318 | #define ZED_FormatNumberFractionalPart "~FormatNumberFractionalPart" | ||
1192 | 319 | #define ZED_FormatNumberPercentPermille "~FormatNumberPercentPermille" | ||
1193 | 320 | #define ZED_FormatNumberAtLeastOneOptionalOrDecimal "~FormatNumberAtLeastOneOptionalOrDecimal" | ||
1194 | 321 | #define ZED_JSON_ILLEGAL_CHARACTER "~JSON_ILLEGAL_CHARACTER" | ||
1195 | 322 | #define ZED_JSON_ILLEGAL_CODEPOINT "~JSON_ILLEGAL_CODEPOINT" | ||
1196 | 323 | #define ZED_JSON_ILLEGAL_ESCAPE "~JSON_ILLEGAL_ESCAPE" | ||
1197 | 324 | #define ZED_JSON_ILLEGAL_LITERAL "~JSON_ILLEGAL_LITERAL" | ||
1198 | 325 | #define ZED_JSON_ILLEGAL_NUMBER "~JSON_ILLEGAL_NUMBER" | ||
1199 | 326 | #define ZED_JSON_UNEXPECTED_TOKEN "~JSON_UNEXPECTED_TOKEN" | ||
1200 | 327 | #define ZED_JSON_UNTERMINATED_STRING "~JSON_UNTERMINATED_STRING" | ||
1201 | 328 | #define ZED_JSON_UNEXPECTED_EXTRA_CONTENT "~JSON_UNEXPECTED_EXTRA_CONTENT" | ||
1202 | 329 | #define ZED_FUNCTION "~FUNCTION" | ||
1203 | 330 | #define ZED_ANNOTATION "~ANNOTATION" | ||
1204 | 331 | |||
1205 | 332 | #endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */ | ||
1206 | 333 | /* | ||
1207 | 334 | * Local variables: | ||
1208 | 335 | * mode: c++ | ||
1209 | 336 | * End: | ||
1210 | 337 | */ | ||
1211 | 338 | /* vim:set et sw=2 ts=2: */ | ||
1212 | 0 | 339 | ||
1213 | === modified file 'src/runtime/core/apply_updates.cpp' | |||
1214 | --- src/runtime/core/apply_updates.cpp 2012-10-08 12:09:36 +0000 | |||
1215 | +++ src/runtime/core/apply_updates.cpp 2012-11-17 18:50:26 +0000 | |||
1216 | @@ -38,6 +38,7 @@ | |||
1217 | 38 | #include "common/shared_types.h" | 38 | #include "common/shared_types.h" |
1218 | 39 | 39 | ||
1219 | 40 | #include "diagnostics/util_macros.h" | 40 | #include "diagnostics/util_macros.h" |
1220 | 41 | #include "zorba/internal/system_diagnostic.h" | ||
1221 | 41 | 42 | ||
1222 | 42 | 43 | ||
1223 | 43 | namespace zorba | 44 | namespace zorba |
1224 | @@ -232,32 +233,27 @@ | |||
1225 | 232 | } | 233 | } |
1226 | 233 | catch (XQueryException& e) | 234 | catch (XQueryException& e) |
1227 | 234 | { | 235 | { |
1246 | 235 | if (e.has_source() && | 236 | if ( e.has_source() ) { |
1247 | 236 | (e.diagnostic() == err::XUDY0021 || | 237 | if ( e.diagnostic() == err::XUDY0021 |
1248 | 237 | e.diagnostic() == err::XUDY0015 || | 238 | || e.diagnostic() == err::XUDY0024 |
1249 | 238 | e.diagnostic() == err::XUDY0016 || | 239 | || e.diagnostic() == zerr::ZDDY0013_COLLECTION_BAD_DESTROY_INDEXES |
1250 | 239 | e.diagnostic() == err::XUDY0017 || | 240 | || e.diagnostic() == zerr::ZDDY0014_COLLECTION_BAD_DESTROY_ICS |
1251 | 240 | e.diagnostic() == err::XUDY0014)) | 241 | || e.diagnostic() == zerr::ZDDY0028_INDEX_DOMAIN_HAS_DUPLICATE_NODES |
1252 | 241 | { | 242 | || e.diagnostic() == zerr::ZSTR0002_INDEX_DOES_NOT_EXIST |
1253 | 242 | XQueryException lNewE = | 243 | ) |
1254 | 243 | XQUERY_EXCEPTION(err::XUDY0021, ERROR_PARAMS(ZED(XUDY0021_AppliedAt), loc)); | 244 | throw XQUERY_EXCEPTION( |
1255 | 244 | 245 | err::XUDY0021, | |
1256 | 245 | QueryLoc lLoc; | 246 | ERROR_PARAMS( e.what(), ZED(XUDY0021_AppliedAt), loc ), |
1257 | 246 | lLoc.setFilename(e.source_uri()); | 247 | ERROR_LOC( e ) |
1258 | 247 | lLoc.setLineBegin(e.source_line()); | 248 | ); |
1241 | 248 | lLoc.setColumnBegin(e.source_column()); | ||
1242 | 249 | set_source(lNewE, lLoc); | ||
1243 | 250 | lNewE.set_diagnostic(e.diagnostic()); | ||
1244 | 251 | |||
1245 | 252 | throw lNewE; | ||
1259 | 253 | } | 249 | } |
1260 | 254 | else | 250 | else |
1261 | 255 | { | 251 | { |
1262 | 256 | // exception raised by the store doesn't have a store location | 252 | // exception raised by the store doesn't have a store location |
1263 | 257 | // hence, we add the location of the apply expression | 253 | // hence, we add the location of the apply expression |
1264 | 258 | set_source(e, loc); | 254 | set_source(e, loc); |
1265 | 259 | throw; | ||
1266 | 260 | } | 255 | } |
1267 | 256 | throw; | ||
1268 | 261 | } | 257 | } |
1269 | 262 | } | 258 | } |
1270 | 263 | 259 | ||
1271 | @@ -265,6 +261,5 @@ | |||
1272 | 265 | UNARY_ACCEPT(ApplyIterator); | 261 | UNARY_ACCEPT(ApplyIterator); |
1273 | 266 | 262 | ||
1274 | 267 | 263 | ||
1275 | 268 | |||
1276 | 269 | } // namespace zorba | 264 | } // namespace zorba |
1277 | 270 | /* vim:set et sw=2 ts=2: */ | 265 | /* vim:set et sw=2 ts=2: */ |
1278 | 271 | 266 | ||
1279 | === modified file 'src/runtime/core/fncall_iterator.cpp' | |||
1280 | --- src/runtime/core/fncall_iterator.cpp 2012-10-19 20:42:38 +0000 | |||
1281 | +++ src/runtime/core/fncall_iterator.cpp 2012-11-17 18:50:26 +0000 | |||
1282 | @@ -711,7 +711,7 @@ | |||
1283 | 711 | throw ZORBA_EXCEPTION( | 711 | throw ZORBA_EXCEPTION( |
1284 | 712 | zerr::ZCSE0013_UNABLE_TO_LOAD_QUERY, | 712 | zerr::ZCSE0013_UNABLE_TO_LOAD_QUERY, |
1285 | 713 | ERROR_PARAMS( | 713 | ERROR_PARAMS( |
1287 | 714 | ZED( NoExternalFunction ), | 714 | ZED( NoExternalFunction_2 ), |
1288 | 715 | BUILD_STRING( '{', theNamespace, '}', lLocalname ) | 715 | BUILD_STRING( '{', theNamespace, '}', lLocalname ) |
1289 | 716 | ) | 716 | ) |
1290 | 717 | ); | 717 | ); |
1291 | 718 | 718 | ||
1292 | === modified file 'src/runtime/core/sequencetypes.cpp' | |||
1293 | --- src/runtime/core/sequencetypes.cpp 2012-10-24 11:32:56 +0000 | |||
1294 | +++ src/runtime/core/sequencetypes.cpp 2012-11-17 18:50:26 +0000 | |||
1295 | @@ -468,7 +468,7 @@ | |||
1296 | 468 | assert(theQName != NULL); | 468 | assert(theQName != NULL); |
1297 | 469 | 469 | ||
1298 | 470 | RAISE_ERROR(err::XPTY0004, loc, | 470 | RAISE_ERROR(err::XPTY0004, loc, |
1300 | 471 | ERROR_PARAMS(ZED(XPTY0004_FuncReturn), | 471 | ERROR_PARAMS(ZED(XPTY0004_NoReturnTypePromote_234), |
1301 | 472 | valueType, targetType, theQName->getStringValue())); | 472 | valueType, targetType, theQName->getStringValue())); |
1302 | 473 | break; | 473 | break; |
1303 | 474 | } | 474 | } |
1304 | @@ -477,14 +477,14 @@ | |||
1305 | 477 | assert(theQName != NULL); | 477 | assert(theQName != NULL); |
1306 | 478 | 478 | ||
1307 | 479 | RAISE_ERROR(err::XPTY0004, loc, | 479 | RAISE_ERROR(err::XPTY0004, loc, |
1309 | 480 | ERROR_PARAMS(ZED(XPTY0004_FuncParam), | 480 | ERROR_PARAMS(ZED(XPTY0004_NoParamTypePromote_234), |
1310 | 481 | valueType, targetType, theQName->getStringValue())); | 481 | valueType, targetType, theQName->getStringValue())); |
1311 | 482 | break; | 482 | break; |
1312 | 483 | } | 483 | } |
1313 | 484 | case PROMOTE_TYPE_PROMOTION: | 484 | case PROMOTE_TYPE_PROMOTION: |
1314 | 485 | { | 485 | { |
1315 | 486 | RAISE_ERROR(err::XPTY0004, loc, | 486 | RAISE_ERROR(err::XPTY0004, loc, |
1317 | 487 | ERROR_PARAMS(ZED(XPTY0004_TypePromotion), valueType, targetType)); | 487 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromote_23), valueType, targetType)); |
1318 | 488 | break; | 488 | break; |
1319 | 489 | } | 489 | } |
1320 | 490 | #ifdef ZORBA_WITH_JSON | 490 | #ifdef ZORBA_WITH_JSON |
1321 | @@ -670,7 +670,7 @@ | |||
1322 | 670 | assert(theQName != NULL); | 670 | assert(theQName != NULL); |
1323 | 671 | 671 | ||
1324 | 672 | RAISE_ERROR(err::XPTY0004, loc, | 672 | RAISE_ERROR(err::XPTY0004, loc, |
1326 | 673 | ERROR_PARAMS(ZED(XPTY0004_FuncReturn), | 673 | ERROR_PARAMS(ZED(XPTY0004_NoReturnTypePromote_234), |
1327 | 674 | valueType, targetType, theQName->getStringValue())); | 674 | valueType, targetType, theQName->getStringValue())); |
1328 | 675 | break; | 675 | break; |
1329 | 676 | } | 676 | } |
1330 | @@ -679,14 +679,14 @@ | |||
1331 | 679 | assert(theQName != NULL); | 679 | assert(theQName != NULL); |
1332 | 680 | 680 | ||
1333 | 681 | RAISE_ERROR(err::XPTY0004, loc, | 681 | RAISE_ERROR(err::XPTY0004, loc, |
1335 | 682 | ERROR_PARAMS(ZED(XPTY0004_FuncParam), | 682 | ERROR_PARAMS(ZED(XPTY0004_NoParamTypePromote_234), |
1336 | 683 | valueType, targetType, theQName->getStringValue())); | 683 | valueType, targetType, theQName->getStringValue())); |
1337 | 684 | break; | 684 | break; |
1338 | 685 | } | 685 | } |
1339 | 686 | case TREAT_TYPE_MATCH: | 686 | case TREAT_TYPE_MATCH: |
1340 | 687 | { | 687 | { |
1341 | 688 | RAISE_ERROR(err::XPTY0004, loc, | 688 | RAISE_ERROR(err::XPTY0004, loc, |
1343 | 689 | ERROR_PARAMS(ZED(XPTY0004_TypeMatch), valueType, targetType)); | 689 | ERROR_PARAMS(ZED(XPTY0004_NoTreatAs_23), valueType, targetType)); |
1344 | 690 | break; | 690 | break; |
1345 | 691 | } | 691 | } |
1346 | 692 | case TREAT_EXPR: | 692 | case TREAT_EXPR: |
1347 | @@ -742,8 +742,7 @@ | |||
1348 | 742 | } | 742 | } |
1349 | 743 | case TREAT_JSONIQ_OBJECT_UPDATE_CONTENT: | 743 | case TREAT_JSONIQ_OBJECT_UPDATE_CONTENT: |
1350 | 744 | { | 744 | { |
1353 | 745 | RAISE_ERROR(jerr::JNUP0019, loc, | 745 | RAISE_ERROR(jerr::JNUP0019, loc, ERROR_PARAMS(valueType)); |
1352 | 746 | ERROR_PARAMS(ZED(JNUP0019), valueType)); | ||
1354 | 747 | break; | 746 | break; |
1355 | 748 | } | 747 | } |
1356 | 749 | case TREAT_JSONIQ_ARRAY_UPDATE_TARGET: | 748 | case TREAT_JSONIQ_ARRAY_UPDATE_TARGET: |
1357 | 750 | 749 | ||
1358 | === modified file 'src/runtime/function_item/dynamic_fncall_iterator.cpp' | |||
1359 | --- src/runtime/function_item/dynamic_fncall_iterator.cpp 2012-09-19 21:16:15 +0000 | |||
1360 | +++ src/runtime/function_item/dynamic_fncall_iterator.cpp 2012-11-17 18:50:26 +0000 | |||
1361 | @@ -167,7 +167,7 @@ | |||
1362 | 167 | if (!consumeNext(targetItem, theChildren[0], planState)) | 167 | if (!consumeNext(targetItem, theChildren[0], planState)) |
1363 | 168 | { | 168 | { |
1364 | 169 | RAISE_ERROR(err::XPTY0004, loc, | 169 | RAISE_ERROR(err::XPTY0004, loc, |
1366 | 170 | ERROR_PARAMS(ZED(XPTY0004_TypePromotion), | 170 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromote_23), |
1367 | 171 | "empty-sequence()", | 171 | "empty-sequence()", |
1368 | 172 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); | 172 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); |
1369 | 173 | } | 173 | } |
1370 | @@ -177,7 +177,7 @@ | |||
1371 | 177 | if (consumeNext(item, theChildren[0], planState)) | 177 | if (consumeNext(item, theChildren[0], planState)) |
1372 | 178 | { | 178 | { |
1373 | 179 | RAISE_ERROR(err::XPTY0004, loc, | 179 | RAISE_ERROR(err::XPTY0004, loc, |
1375 | 180 | ERROR_PARAMS(ZED(XPTY0004_NoMultiSeqTypePromotion), | 180 | ERROR_PARAMS(ZED(XPTY0004_NoMultiSeqTypePromotion_2), |
1376 | 181 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); | 181 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); |
1377 | 182 | } | 182 | } |
1378 | 183 | 183 | ||
1379 | @@ -308,7 +308,7 @@ | |||
1380 | 308 | xqtref_t type = tm->create_value_type(targetItem); | 308 | xqtref_t type = tm->create_value_type(targetItem); |
1381 | 309 | 309 | ||
1382 | 310 | RAISE_ERROR(err::XPTY0004, loc, | 310 | RAISE_ERROR(err::XPTY0004, loc, |
1384 | 311 | ERROR_PARAMS(ZED(XPTY0004_TypePromotion), | 311 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromote_23), |
1385 | 312 | type->toSchemaString(), | 312 | type->toSchemaString(), |
1386 | 313 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); | 313 | GENV_TYPESYSTEM.ANY_FUNCTION_TYPE_ONE->toSchemaString())); |
1387 | 314 | } | 314 | } |
1388 | 315 | 315 | ||
1389 | === modified file 'src/runtime/json/jsoniq_functions_impl.cpp' | |||
1390 | --- src/runtime/json/jsoniq_functions_impl.cpp 2012-10-24 12:49:43 +0000 | |||
1391 | +++ src/runtime/json/jsoniq_functions_impl.cpp 2012-11-17 18:50:26 +0000 | |||
1392 | @@ -1160,7 +1160,7 @@ | |||
1393 | 1160 | xqtref_t type = tm->create_value_type(selector, loc); | 1160 | xqtref_t type = tm->create_value_type(selector, loc); |
1394 | 1161 | 1161 | ||
1395 | 1162 | RAISE_ERROR(err::XPTY0004, loc, | 1162 | RAISE_ERROR(err::XPTY0004, loc, |
1397 | 1163 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromotion_23), | 1163 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromote_23), |
1398 | 1164 | type->toSchemaString(), | 1164 | type->toSchemaString(), |
1399 | 1165 | GENV_TYPESYSTEM.INTEGER_TYPE_ONE->toSchemaString())); | 1165 | GENV_TYPESYSTEM.INTEGER_TYPE_ONE->toSchemaString())); |
1400 | 1166 | } | 1166 | } |
1401 | @@ -1178,7 +1178,7 @@ | |||
1402 | 1178 | xqtref_t type = tm->create_value_type(selector, loc); | 1178 | xqtref_t type = tm->create_value_type(selector, loc); |
1403 | 1179 | 1179 | ||
1404 | 1180 | RAISE_ERROR(err::XPTY0004, loc, | 1180 | RAISE_ERROR(err::XPTY0004, loc, |
1406 | 1181 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromotion_23), | 1181 | ERROR_PARAMS(ZED(XPTY0004_NoTypePromote_23), |
1407 | 1182 | type->toSchemaString(), | 1182 | type->toSchemaString(), |
1408 | 1183 | GENV_TYPESYSTEM.STRING_TYPE_ONE->toSchemaString())); | 1183 | GENV_TYPESYSTEM.STRING_TYPE_ONE->toSchemaString())); |
1409 | 1184 | } | 1184 | } |
1410 | 1185 | 1185 | ||
1411 | === modified file 'src/runtime/numerics/numerics_impl.cpp' | |||
1412 | --- src/runtime/numerics/numerics_impl.cpp 2012-09-19 21:16:15 +0000 | |||
1413 | +++ src/runtime/numerics/numerics_impl.cpp 2012-11-17 18:50:26 +0000 | |||
1414 | @@ -883,7 +883,7 @@ | |||
1415 | 883 | if (!isAllowedType(result->getType())) | 883 | if (!isAllowedType(result->getType())) |
1416 | 884 | { | 884 | { |
1417 | 885 | RAISE_ERROR(err::XPTY0004, info.loc, | 885 | RAISE_ERROR(err::XPTY0004, info.loc, |
1419 | 886 | ERROR_PARAMS(ZED(FormatNumber_2), result->getType()->getStringValue())); | 886 | ERROR_PARAMS(ZED(XPTY0004_FormatNumber_2), result->getType()->getStringValue())); |
1420 | 887 | } | 887 | } |
1421 | 888 | 888 | ||
1422 | 889 | consumeNext(pictureItem, theChildren[1].getp(), planState); | 889 | consumeNext(pictureItem, theChildren[1].getp(), planState); |
1423 | 890 | 890 | ||
1424 | === modified file 'src/store/naive/node_items.cpp' | |||
1425 | --- src/store/naive/node_items.cpp 2012-10-12 09:05:54 +0000 | |||
1426 | +++ src/store/naive/node_items.cpp 2012-11-17 18:50:26 +0000 | |||
1427 | @@ -3224,7 +3224,8 @@ | |||
1428 | 3224 | 3224 | ||
1429 | 3225 | if (!otherAttr->isHidden() && otherAttr->getNodeName()->equals(attrName)) | 3225 | if (!otherAttr->isHidden() && otherAttr->getNodeName()->equals(attrName)) |
1430 | 3226 | { | 3226 | { |
1432 | 3227 | throw XQUERY_EXCEPTION(err::XUDY0021, ERROR_PARAMS(attrName->getStringValue())); | 3227 | throw XQUERY_EXCEPTION(err::XUDY0021, |
1433 | 3228 | ERROR_PARAMS(ZED(XUDY0021_AttributeName), "", attrName->getStringValue())); | ||
1434 | 3228 | } | 3229 | } |
1435 | 3229 | } | 3230 | } |
1436 | 3230 | } | 3231 | } |
1437 | 3231 | 3232 | ||
1438 | === modified file 'src/store/naive/pul_primitives.cpp' | |||
1439 | --- src/store/naive/pul_primitives.cpp 2012-09-19 21:16:15 +0000 | |||
1440 | +++ src/store/naive/pul_primitives.cpp 2012-11-17 18:50:26 +0000 | |||
1441 | @@ -314,7 +314,14 @@ | |||
1442 | 314 | void UpdInsertAttributes::apply() | 314 | void UpdInsertAttributes::apply() |
1443 | 315 | { | 315 | { |
1444 | 316 | theIsApplied = true; | 316 | theIsApplied = true; |
1446 | 317 | ELEM_NODE(theTarget)->insertAttributes(*this); | 317 | try |
1447 | 318 | { | ||
1448 | 319 | ELEM_NODE(theTarget)->insertAttributes(*this); | ||
1449 | 320 | } catch (ZorbaException& e) | ||
1450 | 321 | { | ||
1451 | 322 | set_source(e, *theLoc); | ||
1452 | 323 | throw; | ||
1453 | 324 | } | ||
1454 | 318 | } | 325 | } |
1455 | 319 | 326 | ||
1456 | 320 | 327 | ||
1457 | @@ -364,8 +371,15 @@ | |||
1458 | 364 | 371 | ||
1459 | 365 | void UpdReplaceAttribute::apply() | 372 | void UpdReplaceAttribute::apply() |
1460 | 366 | { | 373 | { |
1463 | 367 | theIsApplied = true; | 374 | try |
1464 | 368 | ELEM_NODE(theTarget)->replaceAttribute(*this); | 375 | { |
1465 | 376 | ELEM_NODE(theTarget)->replaceAttribute(*this); | ||
1466 | 377 | theIsApplied = true; | ||
1467 | 378 | } catch (ZorbaException& e) | ||
1468 | 379 | { | ||
1469 | 380 | set_source(e, *theLoc); | ||
1470 | 381 | throw; | ||
1471 | 382 | } | ||
1472 | 369 | } | 383 | } |
1473 | 370 | 384 | ||
1474 | 371 | 385 | ||
1475 | @@ -463,8 +477,15 @@ | |||
1476 | 463 | ********************************************************************************/ | 477 | ********************************************************************************/ |
1477 | 464 | void UpdRenameElem::apply() | 478 | void UpdRenameElem::apply() |
1478 | 465 | { | 479 | { |
1481 | 466 | ELEM_NODE(theTarget)->replaceName(*this); | 480 | try |
1482 | 467 | theIsApplied = true; | 481 | { |
1483 | 482 | ELEM_NODE(theTarget)->replaceName(*this); | ||
1484 | 483 | theIsApplied = true; | ||
1485 | 484 | } catch (ZorbaException& e) | ||
1486 | 485 | { | ||
1487 | 486 | set_source(e, *theLoc); | ||
1488 | 487 | throw; | ||
1489 | 488 | } | ||
1490 | 468 | } | 489 | } |
1491 | 469 | 490 | ||
1492 | 470 | 491 | ||
1493 | @@ -612,8 +633,15 @@ | |||
1494 | 612 | ********************************************************************************/ | 633 | ********************************************************************************/ |
1495 | 613 | void UpdRenameAttr::apply() | 634 | void UpdRenameAttr::apply() |
1496 | 614 | { | 635 | { |
1499 | 615 | ATTR_NODE(theTarget)->replaceName(*this); | 636 | try |
1500 | 616 | theIsApplied = true; | 637 | { |
1501 | 638 | ATTR_NODE(theTarget)->replaceName(*this); | ||
1502 | 639 | theIsApplied = true; | ||
1503 | 640 | } catch (ZorbaException& e) | ||
1504 | 641 | { | ||
1505 | 642 | set_source(e, *theLoc); | ||
1506 | 643 | throw; | ||
1507 | 644 | } | ||
1508 | 617 | } | 645 | } |
1509 | 618 | 646 | ||
1510 | 619 | 647 | ||
1511 | 620 | 648 | ||
1512 | === modified file 'src/util/error_util.cpp' | |||
1513 | --- src/util/error_util.cpp 2012-09-19 21:16:15 +0000 | |||
1514 | +++ src/util/error_util.cpp 2012-11-17 18:50:26 +0000 | |||
1515 | @@ -61,7 +61,7 @@ | |||
1516 | 61 | if ( function && *function ) { | 61 | if ( function && *function ) { |
1517 | 62 | using namespace internal::diagnostic; | 62 | using namespace internal::diagnostic; |
1518 | 63 | parameters::value_type result = | 63 | parameters::value_type result = |
1520 | 64 | diagnostic::dict::lookup( ZED( FunctionFailed_12o ) ); | 64 | diagnostic::dict::lookup( ZED( FunctionFailed_23o ) ); |
1521 | 65 | parameters const params( ERROR_PARAMS( function, err_string ) ); | 65 | parameters const params( ERROR_PARAMS( function, err_string ) ); |
1522 | 66 | params.substitute( &result ); | 66 | params.substitute( &result ); |
1523 | 67 | return result; | 67 | return result; |
1524 | @@ -77,7 +77,7 @@ | |||
1525 | 77 | parameters::value_type result; | 77 | parameters::value_type result; |
1526 | 78 | if ( function && *function ) { | 78 | if ( function && *function ) { |
1527 | 79 | result = diagnostic::dict::lookup( | 79 | result = diagnostic::dict::lookup( |
1529 | 80 | ZED( FunctionFailedErrorCodeMessage_123 ) | 80 | ZED( FunctionFailedErrorCodeMessage_234 ) |
1530 | 81 | ); | 81 | ); |
1531 | 82 | params = ERROR_PARAMS( function, code, err_string ); | 82 | params = ERROR_PARAMS( function, code, err_string ); |
1532 | 83 | } else { | 83 | } else { |
1533 | 84 | 84 | ||
1534 | === modified file 'test/rbkt/ExpQueryResults/zorba/index/auctions2u.xml.res' | |||
1535 | --- test/rbkt/ExpQueryResults/zorba/index/auctions2u.xml.res 2012-07-03 03:12:05 +0000 | |||
1536 | +++ test/rbkt/ExpQueryResults/zorba/index/auctions2u.xml.res 2012-11-17 18:50:26 +0000 | |||
1537 | @@ -256,7 +256,7 @@ | |||
1538 | 256 | 256 | ||
1539 | 257 | TEST 6 (undo without do): | 257 | TEST 6 (undo without do): |
1540 | 258 | 258 | ||
1542 | 259 | <exception>err:XUDY0021 : updates violate constraint</exception><person id="person1"><watches> | 259 | <exception>err:XUDY0021 : "id": attribute with the same name already exists</exception><person id="person1"><watches> |
1543 | 260 | <watch open_auction="open_auction2"/> | 260 | <watch open_auction="open_auction2"/> |
1544 | 261 | <watch open_auction="open_auction4"/> | 261 | <watch open_auction="open_auction4"/> |
1545 | 262 | <watch open_auction="open_auction5"/> | 262 | <watch open_auction="open_auction5"/> |
1546 | 263 | 263 | ||
1547 | === modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_06.xml.res' | |||
1548 | --- test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_06.xml.res 2012-09-11 15:38:58 +0000 | |||
1549 | +++ test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_06.xml.res 2012-11-17 18:50:26 +0000 | |||
1550 | @@ -1,1 +1,1 @@ | |||
1552 | 1 | Cannot atomize an object item. An object has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item). | 1 | can not atomize an object item: an object has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item) |
1553 | 2 | 2 | ||
1554 | === modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_10.xml.res' | |||
1555 | --- test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_10.xml.res 2012-09-11 15:38:58 +0000 | |||
1556 | +++ test/rbkt/ExpQueryResults/zorba/jsoniq/obj_constr_10.xml.res 2012-11-17 18:50:26 +0000 | |||
1557 | @@ -1,1 +1,1 @@ | |||
1559 | 1 | Cannot atomize an array item. An array has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item). | 1 | can not atomize an array item: an array has probably been passed where an atomic value is expected (e.g., as a key, or to a function expecting an atomic item) |
1560 | 2 | 2 | ||
1561 | === modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/serializer-JNSE0022.xml.res' | |||
1562 | --- test/rbkt/ExpQueryResults/zorba/jsoniq/serializer-JNSE0022.xml.res 2012-09-13 12:51:41 +0000 | |||
1563 | +++ test/rbkt/ExpQueryResults/zorba/jsoniq/serializer-JNSE0022.xml.res 2012-11-17 18:50:26 +0000 | |||
1564 | @@ -1,1 +1,1 @@ | |||
1566 | 1 | html: invalid serialization method for item type (js:object) text: invalid serialization method for item type (js:object) xml: invalid serialization method for item type (js:object) xhtml: invalid serialization method for item type (js:object) | 1 | "html": invalid serialization method for item type (js:object) "text": invalid serialization method for item type (js:object) "xml": invalid serialization method for item type (js:object) "xhtml": invalid serialization method for item type (js:object) |
1567 | 2 | 2 | ||
1568 | === modified file 'test/rbkt/Queries/zorba/index/auctions2u.xq' | |||
1569 | --- test/rbkt/Queries/zorba/index/auctions2u.xq 2012-07-03 03:12:05 +0000 | |||
1570 | +++ test/rbkt/Queries/zorba/index/auctions2u.xq 2012-11-17 18:50:26 +0000 | |||
1571 | @@ -162,7 +162,7 @@ | |||
1572 | 162 | }} | 162 | }} |
1573 | 163 | catch * | 163 | catch * |
1574 | 164 | { | 164 | { |
1576 | 165 | <exception>{$err:code} : {$err:description}</exception> | 165 | <exception>{$err:code} : {substring-before($err:description, " (applied")}</exception> |
1577 | 166 | } | 166 | } |
1578 | 167 | , | 167 | , |
1579 | 168 | for $x in auctions:probe-point-watch($auctions:PersonWatches, | 168 | for $x in auctions:probe-point-watch($auctions:PersonWatches, |
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ bug-1044260- 2012-09- 19T18-38- 42.91Z/ log.html
Log at: http://