Zorba

Merge lp:~paul-lucas/zorba/bug-1180224 into lp:zorba

  1. bug-1180224
  2. Merge into trunk
Proposed by Paul J. Lucas
Status: Merged
Approved by: Chris Hillery
Approved revision: 11490
Merged at revision: 11490
Proposed branch: lp:~paul-lucas/zorba/bug-1180224
Merge into: lp:zorba
Diff against target: 654 lines (+0/-441)
11 files modified
include/zorba/diagnostic.h (+0/-49)
include/zorba/error.h (+0/-1)
include/zorba/internal/qname.h (+0/-29)
include/zorba/internal/system_diagnostic.h (+0/-1)
src/capi/error.cpp (+0/-24)
src/diagnostics/diagnostic.cpp (+0/-41)
src/diagnostics/diagnostic_en.xml (+0/-180)
src/diagnostics/pregenerated/dict_en.cpp (+0/-45)
src/diagnostics/qname.cpp (+0/-60)
src/diagnostics/user_error.cpp (+0/-4)
src/diagnostics/zorba_exception.cpp (+0/-7)
To merge this branch: bzr merge lp:~paul-lucas/zorba/bug-1180224
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Paul J. Lucas Approve
Review via email: mp+167184@code.launchpad.net

Commit message

Removed category enum and everything that goes along with it.

Description of the change

Removed category enum and everything that goes along with it.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180224-2013-06-04T00-44-49.419Z/log.html

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

The attempt to merge lp:~paul-lucas/zorba/bug-1180224 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job bug-1180224-2013-06-04T00-44-49.419Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

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

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180224-2013-06-04T04-39-59.57Z/log.html

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

Validation queue job bug-1180224-2013-06-04T04-39-59.57Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1180224-2013-06-04T07-55-57.525Z/log.html

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

Validation queue job bug-1180224-2013-06-04T07-55-57.525Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/zorba/diagnostic.h'
2--- include/zorba/diagnostic.h 2013-02-07 17:24:36 +0000
3+++ include/zorba/diagnostic.h 2013-06-04 01:34:26 +0000
4@@ -221,48 +221,6 @@
5 ///////////////////////////////////////////////////////////////////////////////
6
7 /**
8- * An diagnostic::category is the category of error.
9- */
10-enum category {
11- UNKNOWN_CATEGORY, // must have integer value of 0
12-
13- XQUERY_CORE,
14- XQUERY_FULL_TEXT,
15- XQUERY_SCRIPTING,
16- XQUERY_SERIALIZATION,
17- XQUERY_UPDATE,
18- XQUERY_USER_DEFINED, // for fn:error()
19-
20- ZORBA_XQP, // Zorba XQuery Processor
21- ZORBA_API, // Zorba API
22- ZORBA_DDF, // Data Definition Facility
23- ZORBA_DEBUGGER, // Zorba Debugger
24- ZORBA_OS, // Operating System
25- ZORBA_SERIALIZATION,
26- ZORBA_STORE,
27-
28- JSON_PARSER,
29- JSON_SERIALIZATION,
30-
31-# ifdef ZORBA_WITH_JSON
32- JSONIQ_CORE,
33- JSONIQ_UPDATE,
34-# endif /* ZORBA_WITH_JSON */
35-
36- ZORBA_CORE_MODULE // Zorba Core Module
37-};
38-
39-/**
40- * Emits the given diagnostic::category to the given ostream.
41- *
42- * @param o The ostream to emit to.
43- * @param c The category to emit.
44- * @return Returns \a o.
45- */
46-ZORBA_DLL_PUBLIC
47-std::ostream& operator<<( std::ostream &o, category c );
48-
49-/**
50 * An diagnostic::kind is the kind of error.
51 * See: http://www.w3.org/TR/xquery-30/#id-kinds-of-errors
52 */
53@@ -332,13 +290,6 @@
54 virtual diagnostic::QName const& qname() const = 0;
55
56 /**
57- * Gets the category of this diagnostic.
58- *
59- * @return Returns said category.
60- */
61- virtual diagnostic::category category() const;
62-
63- /**
64 * Gets the kind of this diagnostic.
65 *
66 * @return Returns said kind.
67
68=== modified file 'include/zorba/error.h'
69--- include/zorba/error.h 2013-02-07 17:24:36 +0000
70+++ include/zorba/error.h 2013-06-04 01:34:26 +0000
71@@ -78,7 +78,6 @@
72
73 // inherited
74 diagnostic::QName const& qname() const;
75- diagnostic::category category() const;
76
77 protected:
78 // inherited
79
80=== modified file 'include/zorba/internal/qname.h'
81--- include/zorba/internal/qname.h 2013-02-07 17:24:36 +0000
82+++ include/zorba/internal/qname.h 2013-06-04 01:34:26 +0000
83@@ -131,13 +131,6 @@
84 ZorbaErrQName( char const *localname ) : base_type( localname ) { }
85
86 /**
87- * Gets the category of error this QName represents.
88- *
89- * @return Returns said kind.
90- */
91- zorba::diagnostic::category category() const;
92-
93- /**
94 * Gets the kind of error this QName represents.
95 *
96 * @return Returns said kind.
97@@ -166,13 +159,6 @@
98 XQueryErrQName( char const *localname ) : base_type( localname ) { }
99
100 /**
101- * Gets the category of error this QName represents.
102- *
103- * @return Returns said kind.
104- */
105- zorba::diagnostic::category category() const;
106-
107- /**
108 * Gets the kind of error this QName represents.
109 *
110 * @return Returns said kind.
111@@ -203,14 +189,6 @@
112 JSONiqErrQName( char const *localname ) : base_type( localname ) { }
113
114 /**
115- * Gets the category of error this QName represents.
116- *
117- * @return Returns UNKNOWN_CATEGORY as there currently
118- * are no categories for JSONiq errors
119- */
120- zorba::diagnostic::category category() const;
121-
122- /**
123 * Gets the kind of error this QName represents.
124 *
125 * @return Returns said kind.
126@@ -241,13 +219,6 @@
127 ZorbaWarningQName( char const *localname ) : base_type( localname ) { }
128
129 /**
130- * Gets the category of warning this QName represents.
131- *
132- * @return Returns said kind.
133- */
134- zorba::diagnostic::category category() const;
135-
136- /**
137 * Gets the kind of warning this QName represents.
138 *
139 * @return Returns said kind.
140
141=== modified file 'include/zorba/internal/system_diagnostic.h'
142--- include/zorba/internal/system_diagnostic.h 2013-02-07 17:24:36 +0000
143+++ include/zorba/internal/system_diagnostic.h 2013-06-04 01:34:26 +0000
144@@ -79,7 +79,6 @@
145 }
146
147 // inherited
148- zorba::diagnostic::category category() const { return qname_.category(); }
149 zorba::diagnostic::kind kind() const { return qname_.kind(); }
150 zorba::diagnostic::QName const& qname() const { return qname_; }
151
152
153=== modified file 'src/capi/error.cpp'
154--- src/capi/error.cpp 2013-02-07 17:24:36 +0000
155+++ src/capi/error.cpp 2013-06-04 01:34:26 +0000
156@@ -71,30 +71,6 @@
157
158 /////////////////////////////////////////////////////////////////////////////
159
160- switch ( error.category() ) {
161-
162- case XQUERY_SERIALIZATION:
163- return XQC_SERIALIZATION_ERROR;
164-
165- case ZORBA_API:
166- if ( error == ZAPI0002_XQUERY_COMPILATION_FAILED )
167- return XQC_STATIC_ERROR;
168- return XQC_INVALID_ARGUMENT;
169-
170- case ZORBA_SERIALIZATION:
171- return XQC_INTERNAL_ERROR;
172-
173- case ZORBA_DDF:
174- case ZORBA_STORE:
175- return XQC_INVALID_ARGUMENT;
176-
177- case ZORBA_OS:
178- return XQC_DYNAMIC_ERROR;
179-
180- default: // suppresses warning
181- break;
182- }
183-
184 switch ( error.kind() ) {
185 case XQUERY_DYNAMIC: return XQC_DYNAMIC_ERROR;
186 case XQUERY_STATIC : return XQC_STATIC_ERROR;
187
188=== modified file 'src/diagnostics/diagnostic.cpp'
189--- src/diagnostics/diagnostic.cpp 2013-03-26 01:56:30 +0000
190+++ src/diagnostics/diagnostic.cpp 2013-06-04 01:34:26 +0000
191@@ -111,43 +111,6 @@
192 return false;
193 }
194
195-ostream& operator<<( ostream &o, category c ) {
196- //
197- // It's OK for these to be only in English: they're looked-up in the
198- // diagnostic dictionary later.
199- //
200- switch ( c ) {
201- case UNKNOWN_CATEGORY : o << "unknown" ; break;
202-
203- // XQUERY_CORE : /* nothing */
204- case XQUERY_FULL_TEXT : o << "full-text" ; break;
205- case XQUERY_SCRIPTING : o << "scripting" ; break;
206- case XQUERY_SERIALIZATION: o << "serialization" ; break;
207- case XQUERY_UPDATE : o << "update" ; break;
208- case XQUERY_USER_DEFINED : o << "user-defined" ; break;
209-
210- case ZORBA_API : o << "Zorba API" ; break;
211- case ZORBA_CORE_MODULE : o << "Zorba core module" ; break;
212- case ZORBA_DDF : o << "Zorba data-definition" ; break;
213- case ZORBA_DEBUGGER : o << "Zorba debugger" ; break;
214- case ZORBA_OS : o << "operating system" ; break;
215- case ZORBA_SERIALIZATION : o << "Zorba serialization" ; break;
216- case ZORBA_STORE : o << "Zorba store" ; break;
217- case ZORBA_XQP : o << "Zorba" ; break;
218-
219- case JSON_PARSER : o << "JSON parser" ; break;
220- case JSON_SERIALIZATION : o << "JSON serialization" ; break;
221-
222-# ifdef ZORBA_WITH_JSON
223- case JSONIQ_CORE : o << "JSONiq" ; break;
224- case JSONIQ_UPDATE : o << "JSONiq update" ; break;
225-# endif
226-
227- default : /* suppresses warning */ break;
228- }
229- return o;
230-}
231-
232 ostream& operator<<( ostream &o, kind k ) {
233 //
234 // It's OK for these to be only in English: they're looked-up in the
235@@ -424,10 +387,6 @@
236 delete this;
237 }
238
239-diagnostic::category Diagnostic::category() const {
240- return diagnostic::UNKNOWN_CATEGORY;
241-}
242-
243 diagnostic::kind Diagnostic::kind() const {
244 return diagnostic::UNKNOWN_KIND;
245 }
246
247=== modified file 'src/diagnostics/diagnostic_en.xml'
248--- src/diagnostics/diagnostic_en.xml 2013-05-24 22:52:47 +0000
249+++ src/diagnostics/diagnostic_en.xml 2013-06-04 01:34:26 +0000
250@@ -4330,110 +4330,6 @@
251 <value>zero-length URI (and no base URI given)</value>
252 </entry>
253
254- <entry key="Zorba API error">
255- <value>Zorba API error</value>
256- </entry>
257-
258- <entry key="Zorba core module error">
259- <value>Zorba core module error</value>
260- </entry>
261-
262- <entry key="Zorba data-definition error">
263- <value>Zorba data-definition error</value>
264- </entry>
265-
266- <entry key="Zorba dynamic error">
267- <value>Zorba dynamic error</value>
268- </entry>
269-
270- <entry key="Zorba dynamic warning">
271- <value>Zorba dynamic warning</value>
272- </entry>
273-
274- <entry key="Zorba error">
275- <value>Zorba error</value>
276- </entry>
277-
278- <entry key="Zorba serialization error">
279- <value>Zorba serialization error</value>
280- </entry>
281-
282- <entry key="Zorba serialization warning">
283- <value>Zorba serialization warning</value>
284- </entry>
285-
286- <entry key="Zorba static error">
287- <value>Zorba static error</value>
288- </entry>
289-
290- <entry key="Zorba static warning">
291- <value>Zorba static warning</value>
292- </entry>
293-
294- <entry key="Zorba store error">
295- <value>Zorba store error</value>
296- </entry>
297-
298- <entry key="Zorba type error">
299- <value>Zorba type error</value>
300- </entry>
301-
302- <entry key="Zorba type warning">
303- <value>Zorba type warning</value>
304- </entry>
305-
306- <entry key="Zorba warning">
307- <value>Zorba warning</value>
308- </entry>
309-
310- <entry key="JSON parser error">
311- <value>JSON parser error</value>
312- </entry>
313-
314- <entry key="JSON serialization error">
315- <value>JSON serialization error</value>
316- </entry>
317-
318- <entry key="JSONiq error">
319- <value>JSONIQ error</value>
320- </entry>
321-
322- <entry key="JSONiq type error">
323- <value>JSONIQ type error</value>
324- </entry>
325-
326- <entry key="JSONiq static error">
327- <value>JSONIQ static error</value>
328- </entry>
329-
330- <entry key="JSONiq dynamic error">
331- <value>JSONIQ dynamic error</value>
332- </entry>
333-
334- <entry key="JSONiq serialization error">
335- <value>JSONIQ serialization error</value>
336- </entry>
337-
338- <entry key="JSONiq warning">
339- <value>JSONIQ warning</value>
340- </entry>
341-
342- <entry key="JSONiq type warning">
343- <value>JSONIQ type warning</value>
344- </entry>
345-
346- <entry key="JSONiq static warning">
347- <value>JSONIQ static warning</value>
348- </entry>
349-
350- <entry key="JSONiq dynamic warning">
351- <value>JSONIQ dynamic warning</value>
352- </entry>
353-
354- <entry key="JSONiq serialization warning">
355- <value>JSONIQ serialization warning</value>
356- </entry>
357-
358 <entry key="dynamic error">
359 <value>dynamic error</value>
360 </entry>
361@@ -4446,50 +4342,6 @@
362 <value>error</value>
363 </entry>
364
365- <entry key="full-text dynamic error">
366- <value>full-text dynamic error</value>
367- </entry>
368-
369- <entry key="full-text dynamic warning">
370- <value>full-text dynamic warning</value>
371- </entry>
372-
373- <entry key="full-text static error">
374- <value>full-text static error</value>
375- </entry>
376-
377- <entry key="full-text static warning">
378- <value>full-text static warning</value>
379- </entry>
380-
381- <entry key="full-text type error">
382- <value>full-text type error</value>
383- </entry>
384-
385- <entry key="full-text type warning">
386- <value>full-text type warning</value>
387- </entry>
388-
389- <entry key="operating system error">
390- <value>operating system error</value>
391- </entry>
392-
393- <entry key="scripting static error">
394- <value>scripting static error</value>
395- </entry>
396-
397- <entry key="scripting static warning">
398- <value>scripting static warning</value>
399- </entry>
400-
401- <entry key="serialization error">
402- <value>serialization error</value>
403- </entry>
404-
405- <entry key="serialization warning">
406- <value>serialization warning</value>
407- </entry>
408-
409 <entry key="static error">
410 <value>static error</value>
411 </entry>
412@@ -4506,38 +4358,6 @@
413 <value>type warning</value>
414 </entry>
415
416- <entry key="update dynamic error">
417- <value>update dynamic error</value>
418- </entry>
419-
420- <entry key="update dynamic warning">
421- <value>update dynamic warning</value>
422- </entry>
423-
424- <entry key="update static error">
425- <value>update static error</value>
426- </entry>
427-
428- <entry key="update static warning">
429- <value>update static warning</value>
430- </entry>
431-
432- <entry key="update type error">
433- <value>update type error</value>
434- </entry>
435-
436- <entry key="update type warning">
437- <value>update type warning</value>
438- </entry>
439-
440- <entry key="user-defined error">
441- <value>user-defined error</value>
442- </entry>
443-
444- <entry key="user-defined warning">
445- <value>user-defined warning</value>
446- </entry>
447-
448 <entry key="warning">
449 <value>warning</value>
450 </entry>
451
452=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
453--- src/diagnostics/pregenerated/dict_en.cpp 2013-05-24 22:52:47 +0000
454+++ src/diagnostics/pregenerated/dict_en.cpp 2013-06-04 01:34:26 +0000
455@@ -707,18 +707,6 @@
456 { "~JNUP0008_ObjectArray", "\"$2\": target of a deleting or replacing expression is not a JSON item" },
457 { "~JNUP0016_Array", "\"$2\": selector cannot be resolved against supplied array" },
458 { "~JNUP0016_Object", "\"$2\": selector cannot be resolved against supplied object" },
459- { "~JSON parser error", "JSON parser error" },
460- { "~JSON serialization error", "JSON serialization error" },
461- { "~JSONiq dynamic error", "JSONIQ dynamic error" },
462- { "~JSONiq dynamic warning", "JSONIQ dynamic warning" },
463- { "~JSONiq error", "JSONIQ error" },
464- { "~JSONiq serialization error", "JSONIQ serialization error" },
465- { "~JSONiq serialization warning", "JSONIQ serialization warning" },
466- { "~JSONiq static error", "JSONIQ static error" },
467- { "~JSONiq static warning", "JSONIQ static warning" },
468- { "~JSONiq type error", "JSONIQ type error" },
469- { "~JSONiq type warning", "JSONIQ type warning" },
470- { "~JSONiq warning", "JSONIQ warning" },
471 { "~LibModVersionMismatch_3", "XQuery library version can not be imported by a $3 version module" },
472 { "~ModuleNotFound", "module not found" },
473 { "~MustBeAbsoluteURI", "must be absolute" },
474@@ -1036,29 +1024,9 @@
475 { "~ZXQP0004_TypeOps_is_in_scope_ForFunctionItemTypes", "TypeOps::is_in_scope() for function-item types" },
476 { "~ZXQP0025_RESOURCE_NOT_FOUND", "resource not found" },
477 { "~ZeroLenURI", "zero-length URI (and no base URI given)" },
478- { "~Zorba API error", "Zorba API error" },
479- { "~Zorba core module error", "Zorba core module error" },
480- { "~Zorba data-definition error", "Zorba data-definition error" },
481- { "~Zorba dynamic error", "Zorba dynamic error" },
482- { "~Zorba dynamic warning", "Zorba dynamic warning" },
483- { "~Zorba error", "Zorba error" },
484- { "~Zorba serialization error", "Zorba serialization error" },
485- { "~Zorba serialization warning", "Zorba serialization warning" },
486- { "~Zorba static error", "Zorba static error" },
487- { "~Zorba static warning", "Zorba static warning" },
488- { "~Zorba store error", "Zorba store error" },
489- { "~Zorba type error", "Zorba type error" },
490- { "~Zorba type warning", "Zorba type warning" },
491- { "~Zorba warning", "Zorba warning" },
492 { "~dynamic error", "dynamic error" },
493 { "~dynamic warning", "dynamic warning" },
494 { "~error", "error" },
495- { "~full-text dynamic error", "full-text dynamic error" },
496- { "~full-text dynamic warning", "full-text dynamic warning" },
497- { "~full-text static error", "full-text static error" },
498- { "~full-text static warning", "full-text static warning" },
499- { "~full-text type error", "full-text type error" },
500- { "~full-text type warning", "full-text type warning" },
501 { "~libxml_ERR_1", "libxml internal error${: 9}" },
502 { "~libxml_ERR_101", "encoding expected in text declaration" },
503 { "~libxml_ERR_103", "\"$5\": entity marked standalone but requires external subset" },
504@@ -1204,23 +1172,10 @@
505 { "~libxml_WAR_97", "\"$5\": unsupported XML version" },
506 { "~libxml_WAR_98", "\"$5\": malformed xml:lang value" },
507 { "~libxml_WAR_99", "xmlns$6?{:5}\\: URI \"$6?6:5\": invalid URI" },
508- { "~operating system error", "operating system error" },
509- { "~scripting static error", "scripting static error" },
510- { "~scripting static warning", "scripting static warning" },
511- { "~serialization error", "serialization error" },
512- { "~serialization warning", "serialization warning" },
513 { "~static error", "static error" },
514 { "~static warning", "static warning" },
515 { "~type error", "type error" },
516 { "~type warning", "type warning" },
517- { "~update dynamic error", "update dynamic error" },
518- { "~update dynamic warning", "update dynamic warning" },
519- { "~update static error", "update static error" },
520- { "~update static warning", "update static warning" },
521- { "~update type error", "update type error" },
522- { "~update type warning", "update type warning" },
523- { "~user-defined error", "user-defined error" },
524- { "~user-defined warning", "user-defined warning" },
525 { "~warning", "warning" },
526 { "~xqueryx_empty_content", "xqueryx content is empty" },
527 };
528
529=== modified file 'src/diagnostics/qname.cpp'
530--- src/diagnostics/qname.cpp 2013-04-24 16:12:40 +0000
531+++ src/diagnostics/qname.cpp 2013-06-04 01:34:26 +0000
532@@ -29,23 +29,6 @@
533 char const XQueryErrQName::NAMESPACE[] = XQUERY_ERR_NS;
534 char const XQueryErrQName::PREFIX[] = "err";
535
536-zorba::diagnostic::category XQueryErrQName::category() const {
537- using namespace zorba::diagnostic;
538-
539- char const *const name = localname();
540-
541- if ( ascii::begins_with( name, "FT", 2 ) )
542- return XQUERY_FULL_TEXT;
543- if ( ascii::begins_with( name, "SE", 2 ) )
544- return XQUERY_SERIALIZATION;
545- if ( ascii::begins_with( name, "XS", 2 ) )
546- return XQUERY_SCRIPTING;
547- if ( ascii::begins_with( name, "XU", 2 ) )
548- return XQUERY_UPDATE;
549-
550- return XQUERY_CORE;
551-}
552-
553 zorba::diagnostic::kind XQueryErrQName::kind() const {
554 using namespace zorba::diagnostic;
555
556@@ -70,17 +53,6 @@
557 char const JSONiqErrQName::NAMESPACE[] = JSONIQ_ERR_NS;
558 char const JSONiqErrQName::PREFIX[] = "jerr";
559
560-zorba::diagnostic::category JSONiqErrQName::category() const {
561- using namespace zorba::diagnostic;
562-
563- char const *const name = localname();
564-
565- if ( ascii::begins_with( name, "JU", 2 ) )
566- return JSONIQ_UPDATE;
567-
568- return JSONIQ_CORE;
569-}
570-
571 zorba::diagnostic::kind JSONiqErrQName::kind() const {
572 using namespace zorba::diagnostic;
573
574@@ -103,34 +75,6 @@
575 char const ZorbaErrQName::NAMESPACE[] = ZORBA_ERR_NS;
576 char const ZorbaErrQName::PREFIX[] = "zerr";
577
578-zorba::diagnostic::category ZorbaErrQName::category() const {
579- using namespace zorba::diagnostic;
580-
581- char const *const name = localname();
582- ZORBA_ASSERT( name );
583-
584- switch ( name[1] ) {
585- case 'A': return ZORBA_API;
586- case 'C': return ZORBA_SERIALIZATION;
587- case 'D': switch ( name[3] ) {
588- case 'P': return ZORBA_CORE_MODULE;
589- default : return ZORBA_DDF;
590- }
591- case 'G': return ZORBA_DEBUGGER;
592- case 'J': switch ( name[2] ) {
593- case 'P': return JSON_PARSER;
594- case 'S': return JSON_SERIALIZATION;
595- default : ZORBA_ASSERT( false );
596- }
597- case 'O': return ZORBA_OS;
598- case 'S': return ZORBA_STORE;
599- case 'X': return ZORBA_XQP;
600- case 'U': return ZORBA_CORE_MODULE;
601-
602- default : ZORBA_ASSERT( false );
603- }
604-}
605-
606 zorba::diagnostic::kind ZorbaErrQName::kind() const {
607 return zorba::diagnostic::UNKNOWN_KIND;
608 }
609@@ -140,10 +84,6 @@
610 char const ZorbaWarningQName::NAMESPACE[] = ZORBA_WARN_NS;
611 char const ZorbaWarningQName::PREFIX[] = "zwarn";
612
613-zorba::diagnostic::category ZorbaWarningQName::category() const {
614- return zorba::diagnostic::ZORBA_XQP;
615-}
616-
617 zorba::diagnostic::kind ZorbaWarningQName::kind() const {
618 using namespace zorba::diagnostic;
619
620
621=== modified file 'src/diagnostics/user_error.cpp'
622--- src/diagnostics/user_error.cpp 2013-02-07 17:24:36 +0000
623+++ src/diagnostics/user_error.cpp 2013-06-04 01:34:26 +0000
624@@ -68,10 +68,6 @@
625 return qname_;
626 }
627
628-diagnostic::category UserError::category() const {
629- return diagnostic::XQUERY_USER_DEFINED;
630-}
631-
632 ///////////////////////////////////////////////////////////////////////////////
633
634 } // namespace zorba
635
636=== modified file 'src/diagnostics/zorba_exception.cpp'
637--- src/diagnostics/zorba_exception.cpp 2013-05-23 00:23:33 +0000
638+++ src/diagnostics/zorba_exception.cpp 2013-06-04 01:34:26 +0000
639@@ -141,15 +141,8 @@
640 //
641 ostringstream oss;
642 oss << ZED_PREFIX;
643-
644- streampos pos = oss.tellp();
645- oss << d.category();
646- if ( oss.tellp() != pos ) // emit ' ' only if non-empty category
647- oss << ' ';
648-
649 if ( diagnostic::kind const k = d.kind() )
650 oss << k << ' ';
651-
652 oss << (is_warning( d ) ? "warning" : "error");
653 o << diagnostic::dict::lookup( oss.str() ) << " [" << d.qname() << ']';
654 }

Subscribers

People subscribed via source and target branches