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

octave: recognize Python __float__ numeric conversion operator

Browse source
This commit is contained in:
Karl Wette 2016-02-07 16:27:25 +01:00
commit 000ab753df
4 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/octave/operator/example.i
View file

@ -26,4 +26,9 @@
ComplexVal __paren__(int j) { ComplexVal __paren__(int j) {
return ComplexVal($self->re()*j,$self->im()*j); return ComplexVal($self->re()*j,$self->im()*j);
} }
double __float__() {
return (double) $self->re();
}
}; };

4
Examples/octave/operator/runme.m
View file

@ -24,3 +24,7 @@ printf("a(3)= %s\n",disp(a(3)));
# friend operator # friend operator
printf("2*a = %s\n",disp(2*a)); printf("2*a = %s\n",disp(2*a));
# conversions
printf("single(a) = %g\n", single(a));
printf("double(a) = %g\n", double(a));

21
Lib/octave/octrun.swg
View file

@ -816,6 +816,14 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
return ret.string_value(); return ret.string_value();
} }
virtual double scalar_value(bool frc_str_conv = false) const {
octave_value ret;
if (!dispatch_unary_op("__float__", ret)) {
error("__float__ method not defined");
}
return ret.scalar_value();
}
#if SWIG_OCTAVE_PREREQ(3,3,52) #if SWIG_OCTAVE_PREREQ(3,3,52)
virtual octave_map map_value() const { virtual octave_map map_value() const {
return octave_map(); return octave_map();
@ -1069,6 +1077,9 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
virtual std::string string_value(bool force = false) const virtual std::string string_value(bool force = false) const
{ return ptr->string_value(force); } { return ptr->string_value(force); }
virtual double scalar_value(bool frc_str_conv = false) const
{ return ptr->scalar_value(frc_str_conv); }
#if SWIG_OCTAVE_PREREQ(3,3,52) #if SWIG_OCTAVE_PREREQ(3,3,52)
virtual octave_map map_value() const virtual octave_map map_value() const
{ return ptr->map_value(); } { return ptr->map_value(); }
@ -1126,7 +1137,17 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
#endif #endif
{ return ptr->print(os, pr_as_read_syntax); } { return ptr->print(os, pr_as_read_syntax); }
virtual type_conv_info numeric_conversion_function(void) const {
return octave_base_value::type_conv_info (default_numeric_conversion_function,
octave_scalar::static_type_id ());
}
private: private:
static octave_base_value *default_numeric_conversion_function (const octave_base_value& a) {
const octave_swig_ref& v = dynamic_cast<const octave_swig_ref&>(a);
return new octave_scalar(v.scalar_value());
}
#if !SWIG_OCTAVE_PREREQ(4,0,0) #if !SWIG_OCTAVE_PREREQ(4,0,0)
DECLARE_OCTAVE_ALLOCATOR; DECLARE_OCTAVE_ALLOCATOR;
#endif #endif

1
Lib/octave/octruntime.swg
View file

@ -6,6 +6,7 @@
#include <octave/dynamic-ld.h> #include <octave/dynamic-ld.h>
#include <octave/oct-env.h> #include <octave/oct-env.h>
#include <octave/oct-map.h> #include <octave/oct-map.h>
#include <octave/ov-scalar.h>
#include <octave/ov-fcn-handle.h> #include <octave/ov-fcn-handle.h>
#include <octave/parse.h> #include <octave/parse.h>
#include <octave/toplev.h> #include <octave/toplev.h>