mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 07:55:41 +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.
101 lines
3.4 KiB
C++
101 lines
3.4 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file ModuleList.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Richard Heck
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef LAYOUTMODULELIST_H
|
|
#define LAYOUTMODULELIST_H
|
|
|
|
#include <list>
|
|
#include <string>
|
|
|
|
namespace lyx {
|
|
|
|
class LayoutFile;
|
|
|
|
/**
|
|
Represents a list of modules, such as might be associated with
|
|
a particular document. Provides methods for adding modules, checking
|
|
if a module can be added, and, importantly, adapting the list to a
|
|
new DocumentClass.
|
|
*/
|
|
class LayoutModuleList {
|
|
public:
|
|
///
|
|
typedef std::list<std::string>::const_iterator const_iterator;
|
|
///
|
|
typedef std::list<std::string>::iterator iterator;
|
|
///
|
|
iterator begin() { return lml_.begin(); }
|
|
///
|
|
iterator end() { return lml_.end(); }
|
|
///
|
|
const_iterator begin() const { return lml_.begin(); }
|
|
///
|
|
const_iterator end() const { return lml_.end(); }
|
|
///
|
|
void clear() { lml_.clear(); }
|
|
///
|
|
bool empty() const { return lml_.empty(); }
|
|
///
|
|
iterator erase(iterator pos) { return lml_.erase(pos); }
|
|
///
|
|
iterator insert(iterator pos, std::string const & str)
|
|
{ return lml_.insert(pos, str); }
|
|
///
|
|
void push_back(std::string const & str) { lml_.push_back(str); }
|
|
///
|
|
size_t size() const { return lml_.size(); }
|
|
/// This is needed in GuiDocument. It seems better than an
|
|
/// implicit conversion.
|
|
std::list<std::string> const & list() const { return lml_; }
|
|
/// Checks to make sure module's requriements are satisfied, that it does
|
|
/// not conflict with already-present modules, isn't already loaded, etc.
|
|
bool moduleCanBeAdded(std::string const & modName,
|
|
LayoutFile const * const lay) const;
|
|
/// Like !moduleCanBeAdded(), but does not check requirements
|
|
bool moduleConflicts(std::string const & modName,
|
|
LayoutFile const * const lay) const;
|
|
/// If the user changes the base class for a given document, then the
|
|
/// associated module list has to be updated. This just calls
|
|
/// (i) removeBadModules()
|
|
/// (ii) addDefaultModules()
|
|
/// (iii) checkModuleConsistency()
|
|
/// in that order, for which see below.
|
|
/// \param lay The new base class.
|
|
/// \param removedModules Modules the user explicitly removed and so
|
|
/// which should not be included.
|
|
/// \return true if no changes had to be made, false if some did have
|
|
/// to be made.
|
|
bool adaptToBaseClass(LayoutFile const * const lay,
|
|
std::list<std::string> const & removedModules);
|
|
private:
|
|
/// Removes modules excluded by, provided by, etc, the base class.
|
|
/// \param lay The document class against which to check.
|
|
/// \return true, if modules were consistent, false if changes had
|
|
/// to be made.
|
|
bool removeBadModules(LayoutFile const * const lay);
|
|
/// Adds default modules, if they're addable.
|
|
/// \param lay The base class from which to get default modules.
|
|
/// \param removedModules Modules the user has explicitly removed.
|
|
void addDefaultModules(LayoutFile const * const lay,
|
|
std::list<std::string> removedModules);
|
|
/// Checks for consistency among modules: makes sure requirements
|
|
/// are met, no modules exclude one another, etc, and resolves any
|
|
/// such conflicts, leaving us with a consistent collection.
|
|
/// \param lay The base class against which to check.
|
|
/// \return true if modules were consistent, false if changes had
|
|
/// to be made.
|
|
bool checkModuleConsistency(LayoutFile const * const lay);
|
|
///
|
|
std::list<std::string> lml_;
|
|
};
|
|
} // namespace lyx
|
|
#endif
|