aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdrian Kummerlaender2014-09-16 19:57:28 +0200
committerAdrian Kummerlaender2014-09-16 19:57:28 +0200
commit0e3cfcde619fb60e6e43bf0ffe715df6d5c22218 (patch)
treede4eba6323b29e30e4d226ba1a905ba9bd12714b /src
parent9db4e054627eb30b4e5a7333405c423df5a8d490 (diff)
downloadSimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar.gz
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar.bz2
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar.lz
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar.xz
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.tar.zst
SimpleParser-0e3cfcde619fb60e6e43bf0ffe715df6d5c22218.zip
Improved lexer readabilty and replaced raw new in tree construction
* "new" in Tree::addNode member method was replaced with C++14 std::make_unique * renamed and constified lexer local variables to increase readabilty ** replaced chunky if-clauses with switch-clauses where appropriate * updated README.md to mention C++14 requirement
Diffstat (limited to 'src')
-rw-r--r--src/nodes.cc5
-rw-r--r--src/tree.cc2
-rw-r--r--src/utils.cc122
3 files changed, 79 insertions, 50 deletions
diff --git a/src/nodes.cc b/src/nodes.cc
index e75c02b..f15a8c9 100644
--- a/src/nodes.cc
+++ b/src/nodes.cc
@@ -49,12 +49,11 @@ double OperatorNode::solve() {
);
}
case TokenType::OPERATOR_DIVIDE: {
- double rightChild = this->rightChild->solve();
+ const double rightChild{ this->rightChild->solve() };
if ( rightChild != 0 ) {
return this->leftChild->solve() / rightChild;
- }
- else {
+ } else {
throw divide_exception();
}
}
diff --git a/src/tree.cc b/src/tree.cc
index e377c95..bc1414b 100644
--- a/src/tree.cc
+++ b/src/tree.cc
@@ -100,7 +100,7 @@ std::string Tree::print() {
template <typename NType, typename... Args>
Node* Tree::addNode(Node** place, Args&&... args) {
this->node_collection_.emplace_back(
- new NType(std::forward<Args>(args)...)
+ std::make_unique<NType>(std::forward<Args>(args)...)
);
if ( place != nullptr ) {
diff --git a/src/utils.cc b/src/utils.cc
index 62c3af9..752b774 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -7,7 +7,7 @@
namespace SimpleParser {
-TokenType determineToken(char tmp) {
+TokenType determineToken(const char tmp) {
if ( std::isalpha(tmp) ) {
return TokenType::VALUE_IDENTIFIER;
} else {
@@ -34,7 +34,7 @@ TokenType determineToken(char tmp) {
}
}
-PrecedenceLevel precedence(TokenType token) {
+PrecedenceLevel precedence(const TokenType token) {
switch ( token ) {
case TokenType::VALUE_NUMBER:
case TokenType::VALUE_IDENTIFIER: {
@@ -62,75 +62,94 @@ PrecedenceLevel precedence(TokenType token) {
}
std::vector<std::string> lexer(std::string term) {
- std::string tmp;
- std::string tmpNumber;
- std::string tmpIdentifier;
- std::vector<std::string> output;
- TokenType token;
- TokenType lastToken;
+ std::vector<std::string> resultBuffer;
- uint32_t level = 0;
+ std::string levelBuffer;
+ std::string numberBuffer;
+ std::string identifierBuffer;
- for ( auto termIter = term.begin();
- termIter != term.end();
- termIter++ ) {
- token = determineToken(*termIter);
+ TokenType previousToken;
+ uint32_t level{0};
+
+ for ( auto&& termIter = term.begin();
+ termIter < term.end();
+ ++termIter ) {
+ const TokenType token{ determineToken(*termIter) };
if ( token == TokenType::VALUE_NUMBER ||
token == TokenType::VALUE_IDENTIFIER ||
( token == TokenType::OPERATOR_MINUS &&
termIter == term.begin() ) ) {
if ( level > 0 ) {
- tmp += *termIter;
+ levelBuffer += *termIter;
} else {
- if ( token == TokenType::VALUE_NUMBER ||
- token == TokenType::OPERATOR_MINUS ) {
- tmpNumber += *termIter;
- } else if ( token == TokenType::VALUE_IDENTIFIER ) {
- tmpIdentifier += *termIter;
+ switch ( token ) {
+ case TokenType::VALUE_NUMBER:
+ case TokenType::OPERATOR_MINUS: {
+ numberBuffer += *termIter;
+
+ break;
+ }
+ case TokenType::VALUE_IDENTIFIER: {
+ identifierBuffer += *termIter;
+
+ break;
+ }
+ default: {
+ break;
+ }
}
}
} else {
if ( level == 0 ) {
- if ( lastToken == TokenType::VALUE_NUMBER ) {
- output.push_back(tmpNumber);
- tmpNumber.clear();
- } else if ( lastToken == TokenType::VALUE_IDENTIFIER ) {
- output.push_back(tmpIdentifier);
- tmpIdentifier.clear();
+ switch ( previousToken ) {
+ case TokenType::VALUE_NUMBER: {
+ resultBuffer.push_back(numberBuffer);
+ numberBuffer.clear();
+
+ break;
+ }
+ case TokenType::VALUE_IDENTIFIER: {
+ resultBuffer.push_back(identifierBuffer);
+ identifierBuffer.clear();
+
+ break;
+ }
+ default: {
+ break;
+ }
}
}
switch ( token ) {
case TokenType::PARENTHESES_OPEN: {
if ( level > 0 ) {
- tmp += *termIter;
+ levelBuffer += *termIter;
}
- level++;
+ ++level;
break;
}
case TokenType::PARENTHESES_CLOSE: {
- level--;
+ --level;
if ( level == 0 ) {
- output.push_back(tmp);
- tmp.clear();
+ resultBuffer.push_back(levelBuffer);
+ levelBuffer.clear();
} else {
- tmp += *termIter;
+ levelBuffer += *termIter;
}
break;
}
default: {
if ( level == 0 ) {
- std::string helper;
- helper = *termIter;
+ const std::string helper{ *termIter };
- output.push_back(helper);
+ resultBuffer.push_back(helper);
} else {
- tmp += *termIter;
+ levelBuffer += *termIter;
}
break;
@@ -138,27 +157,38 @@ std::vector<std::string> lexer(std::string term) {
}
}
- lastToken = token;
+ previousToken = token;
}
- if ( lastToken == TokenType::VALUE_NUMBER ) {
- output.push_back(tmpNumber);
- } else if ( lastToken == TokenType::VALUE_IDENTIFIER ) {
- output.push_back(tmpIdentifier);
- } else if ( lastToken != TokenType::PARENTHESES_CLOSE ) {
- throw operator_exception();
+ switch ( previousToken ) {
+ case TokenType::VALUE_NUMBER: {
+ resultBuffer.push_back(numberBuffer);
+
+ break;
+ }
+ case TokenType::VALUE_IDENTIFIER: {
+ resultBuffer.push_back(identifierBuffer);
+
+ break;
+ }
+ case TokenType::PARENTHESES_CLOSE: {
+ break;
+ }
+ default: {
+ throw operator_exception();
+ }
}
if ( level != 0 ) {
throw parenthese_exception();
}
- if ( lastToken == TokenType::PARENTHESES_CLOSE &&
- output.size() == 1 ) {
- output = lexer(output[0]);
+ if ( previousToken == TokenType::PARENTHESES_CLOSE &&
+ resultBuffer.size() == 1 ) {
+ resultBuffer = lexer(resultBuffer[0]);
}
- return output;
+ return resultBuffer;
}
double doubleToString(const std::string& str) {