From 44f1bb5bc3a588ba8ee944198133bce8ae3f802c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <travnja3@fit.cvut.cz>
Date: Thu, 1 Apr 2021 15:23:12 +0200
Subject: [PATCH] clang-tidy: merge namespace specifiers
---
.../convert/ToRTEStateElimination.cpp | 12 +++------
.../generate/RandomAutomatonFactory.cpp | 8 ++----
.../generate/RandomTreeAutomatonFactory.cpp | 8 ++----
.../src/automaton/transform/RHPDAToPDA.cpp | 8 ++----
.../grammar/generate/RandomGrammarFactory.cpp | 8 ++----
.../regexp/convert/ToAutomatonThompson.cpp | 8 ++----
.../regexp/generate/RandomRegExpFactory.cpp | 8 ++----
.../string/generate/RandomStringFactory.cpp | 26 ++++++++-----------
.../src/tree/generate/RandomTreeFactory.cpp | 8 ++----
.../src/automaton/MinimizeGenerator.cpp | 8 ++----
.../src/automaton/RandomAutomatonFactory2.cpp | 8 ++----
.../src/automaton/RandomAutomatonFactory3.cpp | 8 ++----
.../grammar/parsing/AbsorbTerminalSymbol.cpp | 8 ++----
.../parsing/DeterministicLL1Grammar.cpp | 8 ++----
.../parsing/DeterministicLL1ParseTable.cpp | 8 ++----
.../grammar/parsing/ExtractRightContext.cpp | 8 ++----
.../parsing/HandleFirstFirstConflict.cpp | 8 ++----
.../parsing/HandleFirstFollowConflict.cpp | 8 ++----
.../src/grammar/parsing/LR0Parser.cpp | 8 ++----
.../src/grammar/parsing/LRParser.cpp | 8 ++----
.../src/grammar/parsing/LeftFactorize.cpp | 8 ++----
.../src/grammar/parsing/SLR1ParseTable.cpp | 8 ++----
.../src/grammar/parsing/common/Substitute.cpp | 8 ++----
.../indexing/ExperimentalSuffixTrie.cpp | 8 ++----
.../src/maximum_flow/FordFulkerson.cpp | 8 ++----
.../src/minimum_cut/FordFulkerson.cpp | 8 ++----
26 files changed, 63 insertions(+), 167 deletions(-)
diff --git a/alib2algo/src/automaton/convert/ToRTEStateElimination.cpp b/alib2algo/src/automaton/convert/ToRTEStateElimination.cpp
index 99c8ae4ccd..1f301777fd 100644
--- a/alib2algo/src/automaton/convert/ToRTEStateElimination.cpp
+++ b/alib2algo/src/automaton/convert/ToRTEStateElimination.cpp
@@ -1,13 +1,9 @@
#include "ToRTEStateElimination.h"
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
+namespace {
-namespace convert {
+auto ToRTEStateEliminationDFTA = registration::AbstractRegister < automaton::convert::ToRTEStateElimination, rte::FormalRTE < ext::variant < DefaultSymbolType, DefaultStateType > >, const automaton::DFTA < > & > ( automaton::convert::ToRTEStateElimination::convert, "automaton" );
+auto ToRTEStateEliminationNFTA = registration::AbstractRegister < automaton::convert::ToRTEStateElimination, rte::FormalRTE < ext::variant < DefaultSymbolType, DefaultStateType > >, const automaton::NFTA < > & > ( automaton::convert::ToRTEStateElimination::convert, "automaton" );
-auto ToRTEStateEliminationDFTA = registration::AbstractRegister< ToRTEStateElimination, rte::FormalRTE< ext::variant< DefaultSymbolType, DefaultStateType > >, const automaton::DFTA<>& > ( ToRTEStateElimination::convert, "automaton" );
-auto ToRTEStateEliminationNFTA = registration::AbstractRegister< ToRTEStateElimination, rte::FormalRTE< ext::variant< DefaultSymbolType, DefaultStateType > >, const automaton::NFTA<>& > ( ToRTEStateElimination::convert, "automaton" );
-
-} /* namespace convert */
-
-} /* namespace automaton */
+} /* namespace */
diff --git a/alib2algo/src/automaton/generate/RandomAutomatonFactory.cpp b/alib2algo/src/automaton/generate/RandomAutomatonFactory.cpp
index d7f4473b79..0f5c0e565e 100644
--- a/alib2algo/src/automaton/generate/RandomAutomatonFactory.cpp
+++ b/alib2algo/src/automaton/generate/RandomAutomatonFactory.cpp
@@ -1,9 +1,7 @@
#include "RandomAutomatonFactory.h"
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
-
-namespace generate {
+namespace automaton::generate {
automaton::NFA < std::string, unsigned > RandomAutomatonFactory::generateNFA( size_t statesCount, size_t alphabetSize, bool randomizedAlphabet, double density ) {
constexpr size_t ENGLISH_ALPHABET_SIZE = 26;
@@ -46,9 +44,7 @@ unsigned RandomAutomatonFactory::ithInaccessibleState ( const ext::deque < bool
throw std::logic_error ( "Not enough states in deque of visited states" );
}
-} /* namespace generate */
-
-} /* namespace automaton */
+} /* namespace automaton::generate */
namespace {
diff --git a/alib2algo/src/automaton/generate/RandomTreeAutomatonFactory.cpp b/alib2algo/src/automaton/generate/RandomTreeAutomatonFactory.cpp
index c7bfb84545..385ec23750 100644
--- a/alib2algo/src/automaton/generate/RandomTreeAutomatonFactory.cpp
+++ b/alib2algo/src/automaton/generate/RandomTreeAutomatonFactory.cpp
@@ -1,9 +1,7 @@
#include "RandomTreeAutomatonFactory.h"
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
-
-namespace generate {
+namespace automaton::generate {
automaton::NFTA < std::string, unsigned > RandomTreeAutomatonFactory::generateNFTA( size_t statesCount, size_t alphabetSize, size_t maxRank, bool randomizedAlphabet, double density ) {
if(alphabetSize > 26)
@@ -64,9 +62,7 @@ unsigned RandomTreeAutomatonFactory::ithInaccessibleState ( const ext::deque < b
throw std::logic_error ( "Not enough states in deque of visited states" );
}
-} /* namespace generate */
-
-} /* namespace automaton */
+} /* namespace automaton::generate */
namespace {
diff --git a/alib2algo/src/automaton/transform/RHPDAToPDA.cpp b/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
index 80f61795bb..f47e6e0529 100644
--- a/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
+++ b/alib2algo/src/automaton/transform/RHPDAToPDA.cpp
@@ -14,9 +14,7 @@
#include <registration/CastRegistration.hpp>
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
-
-namespace transform {
+namespace automaton::transform {
template < class T >
void constructTransitions ( const ext::tuple < DefaultStateType, DefaultSymbolType, ext::vector < DefaultSymbolType > > & stFirst, const ext::map < DefaultStateType, ext::set < ext::tuple < ext::vector < DefaultSymbolType >, DefaultStateType, ext::vector < DefaultSymbolType > > > > & epsilonTransitions, const DefaultStateType & toState, ext::vector < DefaultSymbolType > pops, ext::vector < DefaultSymbolType > pushes, T & res ) {
@@ -251,9 +249,7 @@ automaton::NPDA < > automaton::transform::RHPDAToPDA::convert ( const automaton:
return res;
}
-} /* namespace transform */
-
-} /* namespace automaton */
+} /* namespace automaton::transform */
namespace {
diff --git a/alib2algo/src/grammar/generate/RandomGrammarFactory.cpp b/alib2algo/src/grammar/generate/RandomGrammarFactory.cpp
index c2d0e2f13e..a8b0bb0a4b 100644
--- a/alib2algo/src/grammar/generate/RandomGrammarFactory.cpp
+++ b/alib2algo/src/grammar/generate/RandomGrammarFactory.cpp
@@ -1,9 +1,7 @@
#include "RandomGrammarFactory.h"
#include <registration/AlgoRegistration.hpp>
-namespace grammar {
-
-namespace generate {
+namespace grammar::generate {
grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactory::generateCFG ( size_t nonterminalsCount, size_t terminalsCount, bool randomizedAlphabet, double density ) {
if(terminalsCount > 26)
@@ -33,9 +31,7 @@ grammar::CFG < std::string, std::string > grammar::generate::RandomGrammarFactor
return grammar::generate::RandomGrammarFactory::randomCFG ( nonterminals, terminals, density );
}
-} /* namespace generate */
-
-} /* namespace grammar */
+} /* namespace grammar::generate */
namespace {
diff --git a/alib2algo/src/regexp/convert/ToAutomatonThompson.cpp b/alib2algo/src/regexp/convert/ToAutomatonThompson.cpp
index a329d4f87a..6dd62098a2 100644
--- a/alib2algo/src/regexp/convert/ToAutomatonThompson.cpp
+++ b/alib2algo/src/regexp/convert/ToAutomatonThompson.cpp
@@ -3,9 +3,7 @@
#include <regexp/formal/FormalRegExpElements.h>
#include <registration/AlgoRegistration.hpp>
-namespace regexp {
-
-namespace convert {
+namespace regexp::convert {
automaton::EpsilonNFA < > regexp::convert::ToAutomatonThompson::convert(const regexp::FormalRegExp < > & regexp) {
//FIXME use actual algorithms that implement product alternation and iteration of re over automata and remove terrible TERRIBLE hack with dummy initial state
@@ -205,9 +203,7 @@ void regexp::convert::ToAutomatonThompson::Unbounded::visit(const regexp::Unboun
tailArg = &(*automaton.getStates().find(tail));
}
-} /* namespace convert */
-
-} /* namespace regexp */
+} /* namespace regexp::convert */
namespace {
diff --git a/alib2algo/src/regexp/generate/RandomRegExpFactory.cpp b/alib2algo/src/regexp/generate/RandomRegExpFactory.cpp
index bdbf7a12b9..eaed41e151 100644
--- a/alib2algo/src/regexp/generate/RandomRegExpFactory.cpp
+++ b/alib2algo/src/regexp/generate/RandomRegExpFactory.cpp
@@ -7,9 +7,7 @@
#include <registration/AlgoRegistration.hpp>
-namespace regexp {
-
-namespace generate {
+namespace regexp::generate {
regexp::UnboundedRegExp < std::string > regexp::generate::RandomRegExpFactory::generateUnboundedRegExp( size_t leafNodes, size_t height, size_t alphabetSize, bool randomizedAlphabet ) {
if ( alphabetSize > 26 )
@@ -140,9 +138,7 @@ ext::ptr_value < regexp::UnboundedRegExpElement < SymbolType > > regexp::generat
}
}
-} /* namespace generate */
-
-} /* namespace regexp */
+} /* namespace regexp::generate */
namespace {
diff --git a/alib2algo/src/string/generate/RandomStringFactory.cpp b/alib2algo/src/string/generate/RandomStringFactory.cpp
index 068fe75441..2b186580e2 100644
--- a/alib2algo/src/string/generate/RandomStringFactory.cpp
+++ b/alib2algo/src/string/generate/RandomStringFactory.cpp
@@ -4,9 +4,7 @@
#include <registration/AlgoRegistration.hpp>
-namespace string {
-
-namespace generate {
+namespace string::generate {
string::LinearString < std::string > string::generate::RandomStringFactory::generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet, bool integerSymbols ) {
if ( !integerSymbols ) return generateLinearString ( size, alphabetSize, randomizedAlphabet );
@@ -22,15 +20,6 @@ string::LinearString < std::string > string::generate::RandomStringFactory::gene
return string::LinearString < std::string > ( elems );
}
-auto GenerateLinearString1 = registration::AbstractRegister < string::generate::RandomStringFactory, string::LinearString < std::string >, size_t, size_t, bool, bool > ( string::generate::RandomStringFactory::generateLinearString, abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT, "size", "alphabetSize", "randomizedAlphabet", "integerSymbols" ).setDocumentation (
-"Generates a random string of given size.\n\
-\n\
-@param size the length of the generated string\n\
-@param alphabetSize size of the alphabet (1-26 for characters and 0-INT_MAX for integers)\n\
-@param randomizedAlphabet selects random symbols from a-z range if true\n\
-@param integerSymbols use integers as symbols in the generated string is true, randomize alphabet is not used if integer alphabet is requested\n\
-@return random string" );
-
string::LinearString < std::string > string::generate::RandomStringFactory::generateLinearString ( size_t size, size_t alphabetSize, bool randomizedAlphabet ) {
if ( alphabetSize > 26 )
throw exception::CommonException ( "Too big alphabet." );
@@ -50,12 +39,19 @@ string::LinearString < std::string > string::generate::RandomStringFactory::gene
return string::generate::RandomStringFactory::generateLinearString ( size, alphabet );
}
-} /* namespace generate */
-
-} /* namespace string */
+} /* namespace string::generate */
namespace {
+auto GenerateLinearString1 = registration::AbstractRegister < string::generate::RandomStringFactory, string::LinearString < std::string >, size_t, size_t, bool, bool > ( string::generate::RandomStringFactory::generateLinearString, abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT, "size", "alphabetSize", "randomizedAlphabet", "integerSymbols" ).setDocumentation (
+"Generates a random string of given size.\n\
+\n\
+@param size the length of the generated string\n\
+@param alphabetSize size of the alphabet (1-26 for characters and 0-INT_MAX for integers)\n\
+@param randomizedAlphabet selects random symbols from a-z range if true\n\
+@param integerSymbols use integers as symbols in the generated string is true, randomize alphabet is not used if integer alphabet is requested\n\
+@return random string" );
+
auto GenerateLinearString2 = registration::AbstractRegister < string::generate::RandomStringFactory, string::LinearString < std::string >, size_t, size_t, bool > ( string::generate::RandomStringFactory::generateLinearString, abstraction::AlgorithmCategories::AlgorithmCategory::DEFAULT, "size", "alphabetSize", "randomizedAlphabet" ).setDocumentation (
"Generates a random string of given size.\n\
\n\
diff --git a/alib2algo/src/tree/generate/RandomTreeFactory.cpp b/alib2algo/src/tree/generate/RandomTreeFactory.cpp
index c687d0a0f2..d66de9d5e9 100644
--- a/alib2algo/src/tree/generate/RandomTreeFactory.cpp
+++ b/alib2algo/src/tree/generate/RandomTreeFactory.cpp
@@ -22,9 +22,7 @@
#include <global/GlobalData.h>
-namespace tree {
-
-namespace generate {
+namespace tree::generate {
struct Node {
char symbol;
@@ -519,9 +517,7 @@ RankedNonlinearPattern < > RandomRankedNonlinearPatternFactory::generateRankedNo
return tree;
}
-} /* namespace generate */
-
-} /* namespace tree */
+} /* namespace tree::generate */
namespace {
diff --git a/alib2algo_experimental/src/automaton/MinimizeGenerator.cpp b/alib2algo_experimental/src/automaton/MinimizeGenerator.cpp
index 40ee4c09e4..be4f514970 100644
--- a/alib2algo_experimental/src/automaton/MinimizeGenerator.cpp
+++ b/alib2algo_experimental/src/automaton/MinimizeGenerator.cpp
@@ -10,9 +10,7 @@
#include <global/GlobalData.h>
-namespace automaton {
-
-namespace generate {
+namespace automaton::generate {
automaton::DFA < std::string, unsigned > MinimizeGenerator::generateMinimizeDFA ( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t alphabetSize, bool randomizedAlphabet, double density, size_t expectedSteps ) {
size_t limit = 10000;
@@ -62,9 +60,7 @@ automaton::DFA < std::string, unsigned > MinimizeGenerator::generateMinimizeDFA
throw exception::CommonException ( "Generating automaton for minimization failed." );
}
-} /* namespace generate */
-
-} /* namespace automaton */
+} /* namespace automaton::generate */
namespace {
diff --git a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.cpp b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.cpp
index b8caa2c5d0..9f87bb2a53 100644
--- a/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.cpp
+++ b/alib2algo_experimental/src/automaton/RandomAutomatonFactory2.cpp
@@ -1,9 +1,7 @@
#include "RandomAutomatonFactory2.h"
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
-
-namespace generate {
+namespace automaton::generate {
size_t RandomAutomatonFactory2::randomSourceState ( size_t statesMinimal, size_t visited, size_t depleted, const ext::deque < bool > & VStates, const ext::deque < bool > & DStates ) {
size_t y = ext::random_devices::semirandom() % ( visited - depleted ) + 1; // select y-th accessible state
@@ -49,9 +47,7 @@ automaton::DFA < std::string, unsigned > RandomAutomatonFactory2::generateDFA( s
return RandomAutomatonFactory2::NonminimalDFA ( statesMinimal, statesDuplicates, statesUnreachable, statesUseless, alphabet, density );
}
-} /* namespace generate */
-
-} /* namespace automaton */
+} /* namespace automaton::generate */
namespace {
diff --git a/alib2algo_experimental/src/automaton/RandomAutomatonFactory3.cpp b/alib2algo_experimental/src/automaton/RandomAutomatonFactory3.cpp
index 034a8b090e..9709adf921 100644
--- a/alib2algo_experimental/src/automaton/RandomAutomatonFactory3.cpp
+++ b/alib2algo_experimental/src/automaton/RandomAutomatonFactory3.cpp
@@ -1,9 +1,7 @@
#include "RandomAutomatonFactory3.h"
#include <registration/AlgoRegistration.hpp>
-namespace automaton {
-
-namespace generate {
+namespace automaton::generate {
automaton::MultiInitialStateNFA < std::string, unsigned > RandomAutomatonFactory3::generate ( size_t statesMinimal, size_t statesDuplicates, size_t statesUnreachable, size_t statesUseless, size_t initialStates, size_t finalStates, size_t alphabetSize, bool randomizedAlphabet, double density, bool deterministic ) {
if ( alphabetSize > 26 )
@@ -44,9 +42,7 @@ ext::vector < unsigned > RandomAutomatonFactory3::makeVector ( size_t begin, siz
return res;
}
-} /* namespace generate */
-
-} /* namespace automaton */
+} /* namespace automaton::generate */
namespace {
diff --git a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
index c951e85b86..2c7d9d7e56 100644
--- a/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/AbsorbTerminalSymbol.cpp
@@ -3,9 +3,7 @@
#include <grammar/ContextFree/CFG.h>
#include <common/createUnique.hpp>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void AbsorbTerminalSymbol::handleAbsobtion ( const grammar::CFG < > & orig, grammar::CFG < > & res, const DefaultSymbolType & terminal, const ext::set < DefaultSymbolType > & nonterminals, const ext::map < DefaultSymbolType, DefaultSymbolType > & nonterminalsPrimed ) {
for ( const DefaultSymbolType & nonterminal : nonterminals )
@@ -71,6 +69,4 @@ void AbsorbTerminalSymbol::absorbTerminalSymbol ( grammar::CFG < > & grammar, co
grammar = res;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
index 428a70daed..8517774957 100644
--- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1Grammar.cpp
@@ -10,9 +10,7 @@
#include <grammar/properties/RecursiveNonterminal.h>
#include <registration/AlgoRegistration.hpp>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
grammar::CFG < > DeterministicLL1Grammar::convert ( const grammar::CFG < > & param ) {
@@ -75,6 +73,4 @@ grammar::CFG < > DeterministicLL1Grammar::convert ( const grammar::CFG < > & par
auto DeterministicLL1GrammarCFG = registration::AbstractRegister < DeterministicLL1Grammar, grammar::CFG < >, const grammar::CFG < > & > ( DeterministicLL1Grammar::convert );
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp
index 203d4583aa..5ec9ef6fec 100644
--- a/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/DeterministicLL1ParseTable.cpp
@@ -2,9 +2,7 @@
#include <exception/CommonException.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
ext::map < ext::pair < ext::vector < DefaultSymbolType >, DefaultSymbolType >, ext::vector < DefaultSymbolType > > DeterministicLL1ParseTable::parseTable ( const ext::map < ext::pair < ext::vector < DefaultSymbolType >, DefaultSymbolType >, ext::set < ext::vector < DefaultSymbolType > > > & parseTable ) {
@@ -24,6 +22,4 @@ ext::map < ext::pair < ext::vector < DefaultSymbolType >, DefaultSymbolType >, e
return res;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp
index 5268471859..d83b52d0ec 100644
--- a/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/ExtractRightContext.cpp
@@ -3,9 +3,7 @@
#include "common/Substitute.h"
#include <grammar/ContextFree/CFG.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void ExtractRightContext::extractRightContext ( grammar::CFG < > & grammar, const DefaultSymbolType & terminal, const ext::set < DefaultSymbolType > & nonterminals ) {
grammar::CFG < > res ( grammar.getInitialSymbol ( ) );
@@ -34,6 +32,4 @@ void ExtractRightContext::extractRightContext ( grammar::CFG < > & grammar, cons
grammar = res;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp
index 9213904e9b..6f32ddf2b5 100644
--- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFirstConflict.cpp
@@ -5,9 +5,7 @@
#include <grammar/ContextFree/CFG.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void HandleFirstFirstConflict::handleFirstFirstConflict ( grammar::CFG < > & grammar, const DefaultSymbolType & terminal, const DefaultSymbolType & nonterminal, const ext::set < ext::vector < ext::variant < DefaultSymbolType, DefaultSymbolType > > > & rhsds ) {
for ( const ext::vector < ext::variant < DefaultSymbolType, DefaultSymbolType > > & rhs : rhsds )
@@ -19,6 +17,4 @@ void HandleFirstFirstConflict::handleFirstFirstConflict ( grammar::CFG < > & gra
LeftFactorize::leftFactorize ( grammar, terminal, nonterminal );
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp
index 089b1e516d..613fbe6783 100644
--- a/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/HandleFirstFollowConflict.cpp
@@ -7,9 +7,7 @@
#include <grammar/ContextFree/CFG.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void HandleFirstFollowConflict::handleFirstFollowConflict ( grammar::CFG < > & grammar, const DefaultSymbolType & terminal, const DefaultSymbolType & nonterminal, const ext::set < ext::vector < ext::variant < DefaultSymbolType, DefaultSymbolType > > > & /* rhsds */ ) {
ext::set < DefaultSymbolType > nullableNonterminals = properties::NullableNonterminals::getNullableNonterminals ( grammar );
@@ -54,6 +52,4 @@ void HandleFirstFollowConflict::handleFirstFollowConflict ( grammar::CFG < > & g
AbsorbTerminalSymbol::absorbTerminalSymbol ( grammar, terminal, symbolsEndingWithNonterminal );
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp b/alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp
index c2450dd268..7afbda0843 100644
--- a/alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/LR0Parser.cpp
@@ -4,9 +4,7 @@
#include <queue>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
LR0Items LR0Parser::getClosure ( LR0Items items, const grammar::CFG < > & originalGrammar ) {
bool changed;
@@ -101,6 +99,4 @@ automaton::DFA < ext::variant < DefaultSymbolType, DefaultSymbolType >, LR0Items
return lr0Automaton;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/LRParser.cpp b/alib2algo_experimental/src/grammar/parsing/LRParser.cpp
index 8e924a17b6..d695e5d5c8 100644
--- a/alib2algo_experimental/src/grammar/parsing/LRParser.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/LRParser.cpp
@@ -4,9 +4,7 @@
#include <stack>
#include <common/createUnique.hpp>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
DefaultSymbolType LRParser::getEndOfInputSymbol ( const grammar::CFG < > & originalGrammar ) {
return common::createUnique ( DefaultSymbolType ( alphabet::EndSymbol ( ) ), originalGrammar.getTerminalAlphabet ( ), originalGrammar.getNonterminalAlphabet ( ) );
@@ -64,6 +62,4 @@ bool LRParser::parse ( const LRActionTable & actionTable, const LRGotoTable & go
return false;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp b/alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp
index 9c94cf2b45..0320ae711d 100644
--- a/alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/LeftFactorize.cpp
@@ -3,9 +3,7 @@
#include <grammar/ContextFree/CFG.h>
#include <common/createUnique.hpp>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void LeftFactorize::leftFactorize ( grammar::CFG < > & grammar, const DefaultSymbolType & terminal, const DefaultSymbolType & nonterminal ) {
grammar::CFG < > res ( grammar.getInitialSymbol ( ) );
@@ -32,6 +30,4 @@ void LeftFactorize::leftFactorize ( grammar::CFG < > & grammar, const DefaultSym
grammar = res;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp b/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp
index 7ba08594e3..9a86ce3981 100644
--- a/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/SLR1ParseTable.cpp
@@ -6,9 +6,7 @@
#include <exception/CommonException.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void SLR1ParseTable::insertToActionTable ( LRActionTable & actionTable, LRActionTable::key_type key, LRActionTable::mapped_type value ) {
std::pair<LRActionTable::iterator, bool> result = actionTable.emplace ( std::move ( key ), std::move ( value ) );
@@ -73,6 +71,4 @@ LRGotoTable SLR1ParseTable::getGotoTable ( const grammar::CFG < > & originalGram
return gotoTable;
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp b/alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp
index a84fff85f5..1b959f2a88 100644
--- a/alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp
+++ b/alib2algo_experimental/src/grammar/parsing/common/Substitute.cpp
@@ -1,9 +1,7 @@
#include "Substitute.h"
#include <grammar/ContextFree/CFG.h>
-namespace grammar {
-
-namespace parsing {
+namespace grammar::parsing {
void Substitute::substitute ( const grammar::CFG < > & orig, grammar::CFG < > & res, const DefaultSymbolType & origLHS, const ext::vector < ext::variant < DefaultSymbolType, DefaultSymbolType > > & origRHS, ext::vector < ext::variant < DefaultSymbolType, DefaultSymbolType > >::const_iterator nonterminal ) {
auto iter = orig.getRules ( ).find ( * nonterminal );
@@ -18,6 +16,4 @@ void Substitute::substitute ( const grammar::CFG < > & orig, grammar::CFG < > &
}
}
-} /* namespace parsing */
-
-} /* namespace grammar */
+} /* namespace grammar::parsing */
diff --git a/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.cpp b/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.cpp
index 784102b0d1..878f55b873 100644
--- a/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.cpp
+++ b/alib2algo_experimental/src/stringology/indexing/ExperimentalSuffixTrie.cpp
@@ -3,9 +3,7 @@
#include <string/LinearStringTerminatingSymbol.h>
#include <registration/AlgoRegistration.hpp>
-namespace stringology {
-
-namespace indexing {
+namespace stringology::indexing {
indexes::SuffixTrieTerminatingSymbol ExperimentalSuffixTrie::construct ( const string::LinearStringTerminatingSymbol & w ) {
indexes::SuffixTrieTerminatingSymbol res ( w.getAlphabet ( ), w.getTerminatingSymbol ( ) );
@@ -25,9 +23,7 @@ indexes::SuffixTrieTerminatingSymbol ExperimentalSuffixTrie::construct ( const s
return res;
}
-} /* namespace indexing */
-
-} /* namespace stringology */
+} /* namespace stringology::indexing */
namespace {
diff --git a/alib2graph_algo/src/maximum_flow/FordFulkerson.cpp b/alib2graph_algo/src/maximum_flow/FordFulkerson.cpp
index ead9a34656..9f0262d8b0 100644
--- a/alib2graph_algo/src/maximum_flow/FordFulkerson.cpp
+++ b/alib2graph_algo/src/maximum_flow/FordFulkerson.cpp
@@ -6,9 +6,7 @@
#include <climits>
#include <registration/AlgoRegistration.hpp>
-namespace graph {
-
-namespace maximum_flow {
+namespace graph::maximum_flow {
enum State { FRESH, OPEN, CLOSED };
struct Context {
@@ -198,9 +196,7 @@ Flow FordFulkerson::findMaximumFlow(const UndirectedGraph &graph,
// ---------------------------------------------------------------------------------------------------------------------
-} // namespace maximum_flow
-
-} // namespace graph
+} // namespace graph::maximum_flow
// ---------------------------------------------------------------------------------------------------------------------
diff --git a/alib2graph_algo/src/minimum_cut/FordFulkerson.cpp b/alib2graph_algo/src/minimum_cut/FordFulkerson.cpp
index 1f07cd4605..2d77c97847 100644
--- a/alib2graph_algo/src/minimum_cut/FordFulkerson.cpp
+++ b/alib2graph_algo/src/minimum_cut/FordFulkerson.cpp
@@ -8,9 +8,7 @@
#include <maximum_flow/FordFulkerson.hpp>
#include <registration/AlgoRegistration.hpp>
-namespace graph {
-
-namespace minimum_cut {
+namespace graph::minimum_cut {
static maximum_flow::Capacity getCapacity(const DirectedGraph &graph) {
maximum_flow::Capacity capacity;
@@ -135,9 +133,7 @@ Cut FordFulkerson::findMinimumCut(const UndirectedGraph &graph,
//auto BasicAlgorithmUndirectedGraph = registration::OverloadRegister < FordFulkerson, UndirectedGraph, UndirectedGraph > ( FordFulkerson::findMinimumCut );
-} // namespace minimumcut
-
-} // namespace graph
+} // namespace graph::minimumcut
// ---------------------------------------------------------------------------------------------------------------------
--
GitLab