Eval: C++11
This commit is contained in:
@@ -104,7 +104,6 @@ static bool namedConstants (const std::string& name, Variant& value)
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
Eval::Eval ()
|
||||
: _debug (false)
|
||||
{
|
||||
addSource (namedConstants);
|
||||
}
|
||||
@@ -225,8 +224,7 @@ void Eval::evaluatePostfixStack (
|
||||
|
||||
// This is stack used by the postfix evaluator.
|
||||
std::vector <Variant> values;
|
||||
|
||||
for (auto& token : tokens)
|
||||
for (const auto& token : tokens)
|
||||
{
|
||||
// Unary operators.
|
||||
if (token.second == Lexer::Type::op &&
|
||||
@@ -861,4 +859,3 @@ std::string Eval::dump (
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
13
src/Eval.h
13
src/Eval.h
@@ -36,9 +36,6 @@ class Eval
|
||||
{
|
||||
public:
|
||||
Eval ();
|
||||
Eval (const Eval&); // Not implemented.
|
||||
Eval& operator= (const Eval&); // Not implemented.
|
||||
bool operator== (const Eval&); // Not implemented.
|
||||
|
||||
void addSource (bool (*fn)(const std::string&, Variant&));
|
||||
void evaluateInfixExpression (const std::string&, Variant&) const;
|
||||
@@ -69,13 +66,9 @@ private:
|
||||
std::string dump (std::vector <std::pair <std::string, Lexer::Type>>&) const;
|
||||
|
||||
private:
|
||||
std::vector <bool (*)(const std::string&, Variant&)> _sources;
|
||||
bool _debug;
|
||||
std::vector <std::pair <std::string, Lexer::Type>> _compiled;
|
||||
std::vector <bool (*)(const std::string&, Variant&)> _sources {};
|
||||
bool _debug {false};
|
||||
std::vector <std::pair <std::string, Lexer::Type>> _compiled {};
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user