From 996331d0fda2cae8b27dc35302e32dec8bb0f2a8 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 6 Apr 2016 14:51:00 +0200
Subject: [PATCH] format code
---
alib2str/src/tree/TreeFromStringLexer.cpp | 3 +--
alib2str/src/tree/TreeFromStringParser.cpp | 12 ++++++------
alib2str/src/tree/TreeFromStringParser.h | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/alib2str/src/tree/TreeFromStringLexer.cpp b/alib2str/src/tree/TreeFromStringLexer.cpp
index 56e994fdf0..b854e90647 100644
--- a/alib2str/src/tree/TreeFromStringLexer.cpp
+++ b/alib2str/src/tree/TreeFromStringLexer.cpp
@@ -85,7 +85,7 @@ L3: character = in.get ( );
if ( in.eof ( ) ) {
token.type = TokenType::TEOF;
return token;
- } else if ( character >= 'A' && character <= 'Z' ) {
+ } else if ( ( character >= 'A' ) && ( character <= 'Z' ) ) {
token.type = TokenType::NONLINEAR_VARIABLE;
token.value += character;
token.raw += character;
@@ -96,7 +96,6 @@ L3: character = in.get ( );
token.type = TokenType::ERROR;
return token;
}
-
}
void TreeFromStringLexer::putback ( std::istream & in, TreeFromStringLexer::Token token ) const {
diff --git a/alib2str/src/tree/TreeFromStringParser.cpp b/alib2str/src/tree/TreeFromStringParser.cpp
index 76908ef6d5..bdda346beb 100644
--- a/alib2str/src/tree/TreeFromStringParser.cpp
+++ b/alib2str/src/tree/TreeFromStringParser.cpp
@@ -53,7 +53,7 @@ Tree TreeFromStringParser::parseTree ( std::istream & input, const std::set < FE
token = m_TreeLexer.next ( input );
if ( token.type == TreeFromStringLexer::TokenType::RANK ) {
- std::set<alphabet::RankedSymbol> nonlinearVariables;
+ std::set < alphabet::RankedSymbol > nonlinearVariables;
rank = std::stou ( token.value );
@@ -79,7 +79,7 @@ Tree TreeFromStringParser::parseTree ( std::istream & input, const std::set < FE
if ( features.count ( FEATURES::RANKED_TREE ) ) return Tree ( tree );
}
} else {
- std::set<alphabet::Symbol> nonlinearVariables;
+ std::set < alphabet::Symbol > nonlinearVariables;
std::vector < tree::UnrankedNode * > childs;
bool isPattern = false;
@@ -114,7 +114,7 @@ Tree TreeFromStringParser::parseTree ( std::istream & input, const std::set < FE
}
}
-tree::RankedNode * TreeFromStringParser::parseRankedContent ( std::istream & input, bool & isPattern, std::set<alphabet::RankedSymbol> & nonlinearVariables ) const {
+tree::RankedNode * TreeFromStringParser::parseRankedContent ( std::istream & input, bool & isPattern, std::set < alphabet::RankedSymbol > & nonlinearVariables ) const {
TreeFromStringLexer::Token token = m_TreeLexer.next ( input );
if ( token.type == TreeFromStringLexer::TokenType::SUBTREE_WILDCARD ) {
@@ -124,7 +124,7 @@ tree::RankedNode * TreeFromStringParser::parseRankedContent ( std::istream & inp
} else if ( token.type == TreeFromStringLexer::TokenType::NONLINEAR_VARIABLE ) {
isPattern = true;
alphabet::RankedSymbol nonlinearVariable ( alphabet::Symbol ( alphabet::NonlinearVariableSymbol ( alphabet::symbolFrom ( token.value ) ) ), 0 );
- nonlinearVariables.insert(nonlinearVariable);
+ nonlinearVariables.insert ( nonlinearVariable );
return new RankedNode ( std::move ( nonlinearVariable ), { } );
} else {
m_TreeLexer.putback ( input, token );
@@ -147,7 +147,7 @@ tree::RankedNode * TreeFromStringParser::parseRankedContent ( std::istream & inp
}
}
-tree::UnrankedNode * TreeFromStringParser::parseUnrankedContent ( std::istream & input, bool & isPattern, std::set<alphabet::Symbol>& nonlinearVariables ) const {
+tree::UnrankedNode * TreeFromStringParser::parseUnrankedContent ( std::istream & input, bool & isPattern, std::set < alphabet::Symbol > & nonlinearVariables ) const {
TreeFromStringLexer::Token token = m_TreeLexer.next ( input );
if ( token.type == TreeFromStringLexer::TokenType::SUBTREE_WILDCARD ) {
@@ -167,7 +167,7 @@ tree::UnrankedNode * TreeFromStringParser::parseUnrankedContent ( std::istream &
isPattern = true;
alphabet::Symbol nonlinearVariable ( alphabet::NonlinearVariableSymbol ( alphabet::symbolFrom ( token.value ) ) );
- nonlinearVariables.insert(nonlinearVariable);
+ nonlinearVariables.insert ( nonlinearVariable );
return new UnrankedNode ( std::move ( nonlinearVariable ), { } );
} else {
m_TreeLexer.putback ( input, token );
diff --git a/alib2str/src/tree/TreeFromStringParser.h b/alib2str/src/tree/TreeFromStringParser.h
index 76585fea07..b6782a7dd3 100644
--- a/alib2str/src/tree/TreeFromStringParser.h
+++ b/alib2str/src/tree/TreeFromStringParser.h
@@ -29,8 +29,8 @@ public:
TreeFromStringParser ( ) { }
private:
- tree::RankedNode * parseRankedContent ( std::istream &, bool &, std::set<alphabet::RankedSymbol> & ) const;
- tree::UnrankedNode * parseUnrankedContent ( std::istream &, bool &, std::set<alphabet::Symbol>& ) const;
+ tree::RankedNode * parseRankedContent ( std::istream &, bool &, std::set < alphabet::RankedSymbol > & ) const;
+ tree::UnrankedNode * parseUnrankedContent ( std::istream &, bool &, std::set < alphabet::Symbol > & ) const;
TreeFromStringLexer m_TreeLexer;
--
GitLab