Merge lp:~zorba-coders/zorba/bug-1117952 into lp:zorba

[Paul J. Lucas]

Removed #if 0's to enable new XML output code.

Removed #if 0's to enable new XML output code.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1117952-2013-05-23T20-41-43.465Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1117952-2013-05-23T20-41-43.465Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1117952-2013-05-24T00-37-43.703Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1117952-2013-05-24T00-37-43.703Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

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

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1117952-2013-05-24T14-51-44.301Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1117952-2013-05-24T14-51-44.301Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-05-23 20:33:33 +0000
+++ ChangeLog	2013-05-24 00:36:28 +0000
@@ -13,6 +13,7 @@
     if the FOR clause is followed by an orderby or groupby clause.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1117952 (Improve XML error output format)
   * Fixed bug in hoisting through try-catch expr
   * Fixed bug #1162631 (format-integer 'w' format of negative numbers)
   * Fixed bug #1103115 (Timezone units as hours are wrong)

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2013-05-01 06:57:10 +0000
+++ bin/CMakeLists.txt	2013-05-24 00:36:28 +0000
@@ -91,12 +91,12 @@
 ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk1 PASS_REGULAR_EXPRESSION ".*mymod.xq>:22,8:.*:XPST0008.*")
 
 ZORBA_ADD_TEST(bin/zorba_compilechk2 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod.xq" -f -l -x)
-ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk2 PASS_REGULAR_EXPRESSION ".*XPST0008.*mymod.xq.*lineStart=['\"]22['\"] columnStart=['\"]8['\"] lineEnd=['\"]22['\"] columnEnd=['\"]10['\"].*")
+ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk2 PASS_REGULAR_EXPRESSION ".*XPST0008.*mymod.xq.*line-begin=['\"]22['\"] column-begin=['\"]8['\"] line-end=['\"]22['\"] column-end=['\"]10['\"].*")
 
 # test compile checking to work with library modules that have an invalid target namespace uri
 # test for bug #2934414
 ZORBA_ADD_TEST(bin/zorba_compilechk3 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/mymod2.xq" -f -l -x)
-ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk3 PASS_REGULAR_EXPRESSION ".*XQST0046.*mymod2.xq.*lineStart=['\"]17['\"] columnStart=['\"]1['\"] lineEnd=['\"]17['\"] columnEnd=['\"]26['\"].*")
+ZORBA_SET_TEST_PROPERTY(bin/zorba_compilechk3 PASS_REGULAR_EXPRESSION ".*XQST0046.*mymod2.xq.*line-begin=['\"]17['\"] column-begin=['\"]1['\"] line-end=['\"]17['\"] column-end=['\"]26['\"].*")
 
 # test the --option option to set an option in the static context
 ZORBA_ADD_TEST(bin/zorba_option zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/test/option.xq" -f --option "{http://www.zorba-xquery.com}option=value")

=== modified file 'src/diagnostics/xquery_exception.cpp'
--- src/diagnostics/xquery_exception.cpp	2013-02-26 04:12:43 +0000
+++ src/diagnostics/xquery_exception.cpp	2013-05-24 00:36:28 +0000
@@ -143,23 +143,13 @@
     if ( has_source() ) {
       o << indent << "<location";
       print_uri( o, source_uri() );
-#if 0
       o << " line-begin=\"" << source_line() << '"';
+      if ( source_column() )
+        o << " column-begin=\"" << source_column() << '"';
       if ( source_line_end() )
         o << " line-end=\"" << source_line_end() << '"';
-      if ( source_column() )
-        o << " column-begin=\"" << source_column() << '"';
       if ( source_column_end() )
         o << " column-end=\"" << source_column_end() << '"';
-#else
-      o << " lineStart=\"" << source_line() << '"';
-      if ( source_column() )
-        o << " columnStart=\"" << source_column() << '"';
-      if ( source_line_end() )
-        o << " lineEnd=\"" << source_line_end() << '"';
-      if ( source_column_end() )
-        o << " columnEnd=\"" << source_column_end() << '"';
-#endif
       o << "/>" << if_nl; // <location ...
 
       if ( has_data() ) {
@@ -250,7 +240,6 @@
         if ( fn_prefix && *fn_prefix )
           o << " prefix=\"" << fn_prefix << '"';
 
-#if 0
         o << " namespace=\"" << fn_name.ns() << '"'
           << " local-name=\"" << fn_name.localname()
           << " arity=\"" << fn_arity << '"'
@@ -259,28 +248,12 @@
         o << if_inc_indent << indent << "<location uri=\"" << filename << '"';
 
         o << " line-begin=\"" << it->getLine() << '"';
+        if ( it->getColumn() )
+          o << " column-begin=\"" << it->getColumn() << '"';
         if ( it->getLineEnd() )
           o << " line-end=\"" << it->getLineEnd() << '"';
-
-        o << " column-begin=\"" << it->getColumn() << '"';
         if ( it->getColumnEnd() )
           o << " column-end=\"" << it->getColumnEnd() << '"';
-#else
-        o << " ns=\"" << fn_name.ns() << '"'
-          << " localName=\"" << fn_name.localname()
-          << " arity=\"" << fn_arity << '"'
-          << "\">" << if_nl; // <call ...
-
-        o << if_inc_indent << indent << "<location fileName=\"" << filename << '"';
-
-        o << " lineStart=\"" << it->getLine() << '"';
-        o << " columnStart=\"" << it->getColumn() << '"';
-
-        if ( it->getLineEnd() )
-          o << " lineEnd=\"" << it->getLineEnd() << '"';
-        if ( it->getColumnEnd() )
-          o << " columnEnd=\"" << it->getColumnEnd() << '"';
-#endif
 
         o << "/>" << if_nl // <location ...
           << if_dec_indent << "</call>" << if_nl;

=== modified file 'src/diagnostics/zorba_exception.cpp'
--- src/diagnostics/zorba_exception.cpp	2013-02-07 17:24:36 +0000
+++ src/diagnostics/zorba_exception.cpp	2013-05-24 00:36:28 +0000
@@ -128,15 +128,9 @@
 
   if ( as_xml ) {
     diagnostic::QName const &q = d.qname();
-#if 0
     o << indent << "<kind>" << d.kind() << "</kind>" << if_nl
       << indent << "<code namespace=\"" << q.ns()
       << "\" local-name=\"" << q.localname() << "\"/>"
-#else
-    o << indent << "<kind>" << d.kind() << ' '
-      << (is_warning( d ) ? "warning" : "error") << "</kind>" << if_nl
-      << indent << "<code>" << q << "</code>"
-#endif
       << if_nl;
   } else {
     //