mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-24 02:35:20 +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.
57 lines
1.2 KiB
C++
57 lines
1.2 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file regexp.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Peter Kümmel
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef LYX_REGEXP_H
|
|
#define LYX_REGEXP_H
|
|
|
|
#ifdef LYX_USE_STD_REGEX
|
|
# include <regex>
|
|
// <regex> in gcc is unusable in versions less than 4.9.0
|
|
// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
|
|
# define LR_NS std
|
|
#else
|
|
# include <boost/regex.hpp>
|
|
# define LR_NS boost
|
|
#endif
|
|
|
|
namespace lyx {
|
|
using LR_NS::regex;
|
|
using LR_NS::regex_match;
|
|
using LR_NS::regex_replace;
|
|
using LR_NS::regex_search;
|
|
using LR_NS::sregex_iterator;
|
|
using LR_NS::smatch;
|
|
using LR_NS::basic_regex;
|
|
using LR_NS::regex_error;
|
|
using LR_NS::match_results;
|
|
|
|
namespace regex_constants
|
|
{
|
|
using namespace LR_NS::regex_constants;
|
|
using LR_NS::regex_constants::match_flag_type;
|
|
} // namespace regex_constants
|
|
|
|
} // namespace lyx
|
|
|
|
#undef LR_NS
|
|
|
|
#ifdef LYX_USE_STD_REGEX
|
|
// Match Begin and End of String when using ECMAScript (default std::regex)
|
|
#define REGEX_BOS "^"
|
|
#define REGEX_EOS "$"
|
|
#else
|
|
// Match Begin and End of String when using Perl RE (default boost::regex)
|
|
#define REGEX_BOS "\\`"
|
|
#define REGEX_EOS "\\'"
|
|
#endif
|
|
|
|
#endif
|