jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

octrun.swg: make dispatch_[unary|binary|index]_op() const-qualified

Browse source
This commit is contained in:
Karl Wette 2016-02-07 15:09:43 +01:00
commit 0dd16f92ab
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/octave/octrun.swg
View file

@ -363,41 +363,44 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
return octave_value_list(); return octave_value_list();
} }
bool dispatch_unary_op(const std::string &symbol, octave_value &ret) { bool dispatch_unary_op(const std::string &symbol, octave_value &ret) const {
member_value_pair *m = find_member(symbol, false); octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
member_value_pair *m = nc_this->find_member(symbol, false);
if (!m || m->first->is_static() || m->first->is_global()) if (!m || m->first->is_static() || m->first->is_global())
return false; return false;
octave_value_list args; octave_value_list args;
args.append(as_value()); args.append(nc_this->as_value());
octave_value_list argout(member_invoke(m, args, 1)); octave_value_list argout(nc_this->member_invoke(m, args, 1));
if (argout.length() < 1) if (argout.length() < 1)
return false; return false;
ret = argout(0); ret = argout(0);
return true; return true;
} }
bool dispatch_binary_op(const std::string &symbol, const octave_base_value &rhs, octave_value &ret) { bool dispatch_binary_op(const std::string &symbol, const octave_base_value &rhs, octave_value &ret) const {
member_value_pair *m = find_member(symbol, false); octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
member_value_pair *m = nc_this->find_member(symbol, false);
if (!m || m->first->is_static() || m->first->is_global()) if (!m || m->first->is_static() || m->first->is_global())
return false; return false;
octave_value_list args; octave_value_list args;
args.append(as_value()); args.append(nc_this->as_value());
args.append(make_value_hack(rhs)); args.append(make_value_hack(rhs));
octave_value_list argout(member_invoke(m, args, 1)); octave_value_list argout(nc_this->member_invoke(m, args, 1));
if (argout.length() < 1) if (argout.length() < 1)
return false; return false;
ret = argout(0); ret = argout(0);
return true; return true;
} }
bool dispatch_index_op(const std::string &symbol, const octave_value_list &rhs, octave_value_list &ret) { bool dispatch_index_op(const std::string &symbol, const octave_value_list &rhs, octave_value_list &ret) const {
member_value_pair *m = find_member(symbol, false); octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
member_value_pair *m = nc_this->find_member(symbol, false);
if (!m || m->first->is_static() || m->first->is_global()) if (!m || m->first->is_static() || m->first->is_global())
return false; return false;
octave_value_list args; octave_value_list args;
args.append(as_value()); args.append(nc_this->as_value());
args.append(rhs); args.append(rhs);
octave_value_list argout(member_invoke(m, args, 1)); octave_value_list argout(nc_this->member_invoke(m, args, 1));
if (argout.length() >= 1) if (argout.length() >= 1)
ret = argout(0); ret = argout(0);
return true; return true;