diff options
Diffstat (limited to 'src/op.h')
| -rw-r--r-- | src/op.h | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -61,7 +61,7 @@ private: variant<ptr_op_t, // used by all binary operators value_t, // used by constant VALUE string, // used by constant IDENT - function_t // used by terminal FUNCTION + expr_t::func_t // used by terminal FUNCTION > data; public: @@ -171,14 +171,14 @@ public: bool is_function() const { return kind == FUNCTION; } - function_t& as_function_lval() { + expr_t::func_t& as_function_lval() { assert(kind == FUNCTION); - return boost::get<function_t>(data); + return boost::get<expr_t::func_t>(data); } - const function_t& as_function() const { + const expr_t::func_t& as_function() const { return const_cast<op_t *>(this)->as_function_lval(); } - void set_function(const function_t& val) { + void set_function(const expr_t::func_t& val) { data = val; } @@ -280,7 +280,7 @@ public: void dump(std::ostream& out, const int depth) const; static ptr_op_t wrap_value(const value_t& val); - static ptr_op_t wrap_functor(const function_t& fobj); + static ptr_op_t wrap_functor(const expr_t::func_t& fobj); #if defined(HAVE_BOOST_SERIALIZATION) private: @@ -303,7 +303,7 @@ private: (! has_right() || ! right()->is_function()))) { ar & data; } else { - variant<ptr_op_t, value_t, string, function_t> temp_data; + variant<ptr_op_t, value_t, string, expr_t::func_t> temp_data; ar & temp_data; } } @@ -325,7 +325,8 @@ inline expr_t::ptr_op_t expr_t::op_t::wrap_value(const value_t& val) { return temp; } -inline expr_t::ptr_op_t expr_t::op_t::wrap_functor(const function_t& fobj) { +inline expr_t::ptr_op_t +expr_t::op_t::wrap_functor(const expr_t::func_t& fobj) { ptr_op_t temp(new op_t(op_t::FUNCTION)); temp->set_function(fobj); return temp; |