From 87d91f4b79136fd2fc9df44fd5142bd6a2b32b16 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 9 Mar 2012 15:05:35 +0200 Subject: Make sure --sloc-limit works even without --show-sloc --- xsde/cxx/hybrid/generator.cxx | 56 +++++++++++---------------------------- xsde/cxx/parser/generator.cxx | 21 +++++---------- xsde/cxx/serializer/generator.cxx | 21 +++++---------- 3 files changed, 28 insertions(+), 70 deletions(-) (limited to 'xsde/cxx') diff --git a/xsde/cxx/hybrid/generator.cxx b/xsde/cxx/hybrid/generator.cxx index 092fc52..e40086c 100644 --- a/xsde/cxx/hybrid/generator.cxx +++ b/xsde/cxx/hybrid/generator.cxx @@ -1618,12 +1618,9 @@ namespace CXX fwd << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << fwd_path << ": " - << fwd_sloc.buffer ().count () << endl; + wcerr << fwd_path << ": " << fwd_sloc.buffer ().count () << endl; - sloc += fwd_sloc.buffer ().count (); - } + sloc += fwd_sloc.buffer ().count (); } // C++ namespace mapping for the XML Schema namespace. @@ -1839,12 +1836,9 @@ namespace CXX hxx << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << hxx_path << ": " - << hxx_sloc.buffer ().count () << endl; + wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl; - sloc += hxx_sloc.buffer ().count (); - } + sloc += hxx_sloc.buffer ().count (); } @@ -1913,12 +1907,9 @@ namespace CXX ixx << "#endif // " << guard.c_str () << endl; if (show_sloc) - { - wcerr << ixx_path << ": " - << ixx_sloc.buffer ().count () << endl; + wcerr << ixx_path << ": " << ixx_sloc.buffer ().count () << endl; - sloc += ixx_sloc.buffer ().count (); - } + sloc += ixx_sloc.buffer ().count (); } @@ -1992,12 +1983,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << cxx_path << ": " - << cxx_sloc.buffer ().count () << endl; + wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl; - sloc += cxx_sloc.buffer ().count (); - } + sloc += cxx_sloc.buffer ().count (); } // Populate the type maps if we are generating parsing or @@ -2380,12 +2368,9 @@ namespace CXX hxx << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << hxx_path << ": " - << hxx_sloc.buffer ().count () << endl; + wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl; - sloc += hxx_sloc.buffer ().count (); - } + sloc += hxx_sloc.buffer ().count (); } // CXX @@ -2444,12 +2429,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << cxx_path << ": " - << cxx_sloc.buffer ().count () << endl; + wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl; - sloc += cxx_sloc.buffer ().count (); - } + sloc += cxx_sloc.buffer ().count (); } return sloc; @@ -2800,12 +2782,9 @@ namespace CXX hxx << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << hxx_path << ": " - << hxx_sloc.buffer ().count () << endl; + wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl; - sloc += hxx_sloc.buffer ().count (); - } + sloc += hxx_sloc.buffer ().count (); } // CXX @@ -2864,12 +2843,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << cxx_path << ": " - << cxx_sloc.buffer ().count () << endl; + wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl; - sloc += cxx_sloc.buffer ().count (); - } + sloc += cxx_sloc.buffer ().count (); } return sloc; diff --git a/xsde/cxx/parser/generator.cxx b/xsde/cxx/parser/generator.cxx index 7ae012f..8f91f6b 100644 --- a/xsde/cxx/parser/generator.cxx +++ b/xsde/cxx/parser/generator.cxx @@ -1467,12 +1467,9 @@ namespace CXX hxx << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << hxx_path << ": " - << hxx_sloc.buffer ().count () << endl; + wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl; - sloc += hxx_sloc.buffer ().count (); - } + sloc += hxx_sloc.buffer ().count (); } @@ -1524,12 +1521,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << ixx_path << ": " - << ixx_sloc.buffer ().count () << endl; + wcerr << ixx_path << ": " << ixx_sloc.buffer ().count () << endl; - sloc += ixx_sloc.buffer ().count (); - } + sloc += ixx_sloc.buffer ().count (); } @@ -1590,12 +1584,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << cxx_path << ": " - << cxx_sloc.buffer ().count () << endl; + wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl; - sloc += cxx_sloc.buffer ().count (); - } + sloc += cxx_sloc.buffer ().count (); } // HXX impl diff --git a/xsde/cxx/serializer/generator.cxx b/xsde/cxx/serializer/generator.cxx index c6eeb05..83c2945 100644 --- a/xsde/cxx/serializer/generator.cxx +++ b/xsde/cxx/serializer/generator.cxx @@ -1454,12 +1454,9 @@ namespace CXX hxx << "#endif // " << guard << endl; if (show_sloc) - { - wcerr << hxx_path << ": " - << hxx_sloc.buffer ().count () << endl; + wcerr << hxx_path << ": " << hxx_sloc.buffer ().count () << endl; - sloc += hxx_sloc.buffer ().count (); - } + sloc += hxx_sloc.buffer ().count (); } @@ -1511,12 +1508,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << ixx_path << ": " - << ixx_sloc.buffer ().count () << endl; + wcerr << ixx_path << ": " << ixx_sloc.buffer ().count () << endl; - sloc += ixx_sloc.buffer ().count (); - } + sloc += ixx_sloc.buffer ().count (); } @@ -1576,12 +1570,9 @@ namespace CXX << endl; if (show_sloc) - { - wcerr << cxx_path << ": " - << cxx_sloc.buffer ().count () << endl; + wcerr << cxx_path << ": " << cxx_sloc.buffer ().count () << endl; - sloc += cxx_sloc.buffer ().count (); - } + sloc += cxx_sloc.buffer ().count (); } // HXX impl -- cgit v1.1