pezy/159201
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: ../as2/main.cpp

Browse Source
This commit is contained in:
mooophy
2014-12-05 12:53:43 +13:00
parent 7f213ae75e
commit 4beb27a75a
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
assignment2/as2/main.cpp
View File

@@ -155,18 +155,9 @@ struct RpnParser
return do_parse_and_evaluate(fn);
}
private:
struct Eval
{
bool is_evaluable(char op) const
{
return dic_.find(op) != dic_.cend();
}
int operator ()(char op, int lhs, int rhs) const
{
return dic_.at(op)(lhs, rhs);
}
struct Eval{
bool is_evaluable(char op) const {return dic_.find(op) != dic_.cend();}
int operator ()(char op, int lhs, int rhs) const {return dic_.at(op)(lhs, rhs);}
std::map<char, std::function<int(int,int)> > const dic_ =
{
{ '+', [](int lhs, int rhs){ return lhs + rhs;} },
@@ -174,10 +165,9 @@ private:
{ '*', [](int lhs, int rhs){ return lhs * rhs;} },
{ '/', [](int lhs, int rhs){ return lhs / rhs;} },
};
};
}
const eval_;
ads::Stack<int> stk_;
const Eval eval_;
//! abstraction II
int get_operand_and_check() throw()