Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/diagnostic-namespaces
into lp:zorba.
Commit message:
You can now add more namespaces/prefixes to diagnostics_*.xml files. The
upshot is that core modules can have errors in their own namespaces.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/diagnostic-namespaces/+merge/185610
You can now add more namespaces/prefixes to diagnostics_*.xml files. The
upshot is that core modules can have errors in their own namespaces.
--
https://code.launchpad.net/~zorba-coders/zorba/diagnostic-namespaces/+merge/185610
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt 2013-02-07 17:24:36 +
+++ include/CMakeLists.txt 2013-09-14 00:51:56 +
@@ -27,3 +27,9 @@
${CMAKE_CURRENT_BINARY_DIR}/zorba/config.h
${CMAKE_CURRENT_BINARY_DIR}/zorba/diagnostic_list.h
DESTINATION include/zorba)
+
+INSTALL(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/zorba/qnames.h
+ DESTINATION include/zorba/internal)
+
+# vim:set et sw=2 ts=2:
=== modified file 'include/zorba/diagnostic.h'
--- include/zorba/diagnostic.h 2013-06-04 00:34:52 +
+++ include/zorba/diagnostic.h 2013-09-14 00:51:56 +
@@ -270,8 +270,6 @@
} // namespace diagnostic
} // namespace zorba
-#include zorba/internal/qname.h
-
namespace zorba {
///
@@ -344,7 +342,8 @@
} // namespace zorba
-#include zorba/internal/diagnostic.h
+#include zorba/internal/system_diagnostic.h
+#include zorba/internal/qname.h
#endif /* ZORBA_DIAGNOSTIC_API_H */
/*
=== modified file 'include/zorba/error.h'
--- include/zorba/error.h 2013-06-15 02:57:08 +
+++ include/zorba/error.h 2013-09-14 00:51:56 +
@@ -17,12 +17,11 @@
#ifndef ZORBA_ERROR_API_H
#define ZORBA_ERROR_API_H
-#include zorba/internal/system_diagnostic.h
+#include zorba/internal/diagnostic.h
#include zorba/internal/qname.h
namespace zorba {
-class Diagnostic;
namespace serialization {
class Archiver;
void operator( serialization::Archiver, const Diagnostic* );
@@ -33,23 +32,6 @@
typedef Diagnostic Error;
/**
- * An %XQueryErrorCode is a diagnostic for all XQuery-specific errors.
- */
-typedef internal::SystemDiagnosticinternal::XQueryErrQName XQueryErrorCode;
-
-/**
- * A %ZorbaErrorCode is a diagnostic for all Zorba-specific errors.
- */
-typedef internal::SystemDiagnosticinternal::ZorbaErrQName ZorbaErrorCode;
-
-/**
- * An %JSONiqErrorCode is a diagnostic for all JSONiq-specific errors.
- */
-typedef internal::SystemDiagnosticinternal::JSONiqErrQName JSONiqErrorCode;
-
-///
-
-/**
* A %UserError is-a Diagnostic for user-defined errors via \c fn:error().
*/
class ZORBA_DLL_PUBLIC UserError : public Diagnostic {
=== modified file 'include/zorba/internal/diagnostic.h'
--- include/zorba/internal/diagnostic.h 2013-07-13 00:40:09 +
+++ include/zorba/internal/diagnostic.h 2013-09-14 00:51:56 +
@@ -239,7 +239,6 @@
column_type column_end_;
friend bool operator==( location const, location const );
- friend bool operator!=( location const, location const );
// for plan serialization
friend void serialization::operator( serialization::Archiver, location );
@@ -263,7 +262,9 @@
* @param j The second location.
* @return Returns \c true only if the two locations are not equal.
*/
-bool operator!=( location const i, location const j );
+inline bool operator!=( location const i, location const j ) {
+ return !(i == j);
+}
///
=== added directory 'include/zorba/internal/pregenerated'
=== added file 'include/zorba/internal/pregenerated/qnames.h'
--- include/zorba/internal/pregenerated/qnames.h 1970-01-01 00:00:00 +
+++ include/zorba/internal/pregenerated/qnames.h 2013-09-14 00:51:56 +
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2006-2013 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /*
+ * THIS FILE IS GENERATED.
+ * PLEASE DO NOT EDIT.
+ */
+
+
+#ifndef ZORBA_INTERNAL_QNAMES_H
+#define ZORBA_INTERNAL_QNAMES_H
+
+namespace zorba {
+namespace internal {
+
+class ZORBA_DLL_PUBLIC XQueryErrorQName :
+ public FixedQNameXQueryErrorQName,char const*
+{
+ typedef FixedQNameXQueryErrorQName,char
