mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 14:15:32 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the
end of namespaces.
The commit was generated by initially running clang-format, and then
from the diff of the result extracting the hunks corresponding to
fixes of namespace comments. The changes being applied and all the
results have been manually reviewed. The source code successfully
builds on macOS.
Further details on the steps below, in case they're of interest to
someone else in the future.
1. Checkout a fresh and up to date version of src/
git pull && git checkout -- src && git status src
2. Ensure there's a suitable .clang-format in place, i.e. with options
to fix the comment at the end of namespaces, including:
FixNamespaceComments: true
SpacesBeforeTrailingComments: 1
and that clang-format is >= 5.0.0, by doing e.g.:
clang-format -dump-config | grep Comments:
clang-format --version
3. Apply clang-format to the source:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
4. Create and filter out hunks related to fixing the namespace
git diff -U0 src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch
5. Filter out hunks corresponding to simple fixes into to a separate patch:
pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \
-e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \
fix_namespace.patch > fix_namespace_simple.patch
6. Manually review the simple patch and then apply it, after first
restoring the source.
git checkout -- src
patch -p1 < fix_namespace_simple.path
7. Manually review the (simple) changes and then stage the changes
git diff src
git add src
8. Again apply clang-format and filter out hunks related to any
remaining fixes to the namespace, this time filter with more
context. There will be fewer hunks as all the simple cases have
already been handled:
clang-format -i $(find src -name "*.cpp" -or -name "*.h")
git diff src > tmp.patch
grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch
9. Manually review/edit the resulting patch file to remove hunks for files
which need to be dealt with manually, noting the file names and
line numbers. Then restore files to as before applying clang-format
and apply the patch:
git checkout src
patch -p1 < fix_namespace2.patch
10. Manually fix the files noted in the previous step. Stage files,
review changes and commit.
229 lines
3.2 KiB
C++
229 lines
3.2 KiB
C++
/**
|
|
* \file convert.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author André Pönitz
|
|
* \author Lars Gullik Bjønnes
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "support/convert.h"
|
|
#include "support/docstring.h"
|
|
|
|
#include <boost/lexical_cast.hpp>
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
//needed for Mac OSX 10.5.2 Leopard
|
|
#include <cstdlib>
|
|
|
|
using namespace std;
|
|
|
|
namespace {
|
|
|
|
// A version of lexical cast that does not throw. Useful for when we convert to string
|
|
template<typename To, typename From>
|
|
To lexical_cast(From const & value, To const & defaultResult = To())
|
|
{
|
|
try {
|
|
return boost::lexical_cast<To>(value);
|
|
} catch(...) {
|
|
// Ignore all exceptions and use default.
|
|
return defaultResult;
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
namespace lyx {
|
|
|
|
template<>
|
|
string convert<string>(bool b)
|
|
{
|
|
return (b ? "true" : "false");
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(char c)
|
|
{
|
|
return string(1, c);
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(short unsigned int sui)
|
|
{
|
|
return lexical_cast<string>(sui);
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(int i)
|
|
{
|
|
return lexical_cast<string>(i);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(int i)
|
|
{
|
|
return from_ascii(lexical_cast<string>(i));
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(unsigned int ui)
|
|
{
|
|
return lexical_cast<string>(ui);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(unsigned int ui)
|
|
{
|
|
return from_ascii(lexical_cast<string>(ui));
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(unsigned long ul)
|
|
{
|
|
return lexical_cast<string>(ul);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(unsigned long ul)
|
|
{
|
|
return from_ascii(lexical_cast<string>(ul));
|
|
}
|
|
|
|
|
|
#ifdef LYX_USE_LONG_LONG
|
|
template<>
|
|
string convert<string>(unsigned long long ull)
|
|
{
|
|
return lexical_cast<string>(ull);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(unsigned long long ull)
|
|
{
|
|
return from_ascii(lexical_cast<string>(ull));
|
|
}
|
|
#endif
|
|
|
|
|
|
template<>
|
|
string convert<string>(long l)
|
|
{
|
|
return lexical_cast<string>(l);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(long l)
|
|
{
|
|
return from_ascii(lexical_cast<string>(l));
|
|
}
|
|
|
|
|
|
#ifdef LYX_USE_LONG_LONG
|
|
template<>
|
|
string convert<string>(long long ll)
|
|
{
|
|
return lexical_cast<string>(ll);
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(long long ll)
|
|
{
|
|
return from_ascii(lexical_cast<string>(ll));
|
|
}
|
|
#endif
|
|
|
|
|
|
template<>
|
|
string convert<string>(float f)
|
|
{
|
|
std::ostringstream val;
|
|
val << f;
|
|
return val.str();
|
|
}
|
|
|
|
|
|
template<>
|
|
string convert<string>(double d)
|
|
{
|
|
std::ostringstream val;
|
|
val << d;
|
|
return val.str();
|
|
}
|
|
|
|
|
|
template<>
|
|
docstring convert<docstring>(double d)
|
|
{
|
|
return from_ascii(convert<string>(d));
|
|
}
|
|
|
|
|
|
template<>
|
|
int convert<int>(string const s)
|
|
{
|
|
return strtol(s.c_str(), 0, 10);
|
|
}
|
|
|
|
|
|
template<>
|
|
int convert<int>(docstring const s)
|
|
{
|
|
return strtol(to_ascii(s).c_str(), 0, 10);
|
|
}
|
|
|
|
|
|
template<>
|
|
unsigned int convert<unsigned int>(string const s)
|
|
{
|
|
return strtoul(s.c_str(), 0, 10);
|
|
}
|
|
|
|
|
|
template<>
|
|
unsigned long convert<unsigned long>(string const s)
|
|
{
|
|
return strtoul(s.c_str(), 0, 10);
|
|
}
|
|
|
|
|
|
template<>
|
|
double convert<double>(string const s)
|
|
{
|
|
return strtod(s.c_str(), 0);
|
|
}
|
|
|
|
|
|
template<>
|
|
int convert<int>(char const * cptr)
|
|
{
|
|
return strtol(cptr, 0, 10);
|
|
}
|
|
|
|
|
|
template<>
|
|
double convert<double>(char const * cptr)
|
|
{
|
|
return strtod(cptr, 0);
|
|
}
|
|
|
|
|
|
} // namespace lyx
|