Octave patches for 3.4.0 compatibility, etc. (sf 3387394, thanks for Karl Wette)

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12774 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Xavier Delacour 2011-08-08 21:41:34 +00:00
commit dae9457962
20 changed files with 49 additions and 16 deletions

View file

@ -19,3 +19,4 @@ clean::
rm -f $(TARGET).m
check: all
$(MAKE) -f $(TOP)/Makefile octave_run

View file

@ -10,13 +10,13 @@
/* An output method that turns a complex into a short string */
%extend ComplexVal {
char *__str() {
char *__str__() {
static char temp[512];
sprintf(temp,"(%g,%g)", $self->re(), $self->im());
return temp;
}
ComplexVal __paren(int j) {
ComplexVal __paren__(int j) {
return ComplexVal($self->re()*j,$self->im()*j);
}
};

View file

@ -4,21 +4,21 @@ example
a = example.ComplexVal(2,3);
b = example.ComplexVal(-5,10);
printf("a = %s\n",a);
printf("b = %s\n",b);
printf("a = %s\n",disp(a));
printf("b = %s\n",disp(b));
c = a + b;
printf("c = %s\n",c);
printf("a*b = %s\n",a*b);
printf("a-c = %s\n",a-c);
printf("c = %s\n",disp(c));
printf("a*b = %s\n",disp(a*b));
printf("a-c = %s\n",disp(a-c));
e = example.ComplexVal(a-c);
printf("e = %s\n",e);
printf("e = %s\n",disp(e));
# Big expression
f = ((a+b)*(c+b*e)) + (-a);
printf("f = %s\n",f);
printf("f = %s\n",disp(f));
# paren overloading
printf("a(3)= %s\n",a(3));
printf("a(3)= %s\n",disp(a(3)));