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

Merge pull request #853 from ivannp/underscores

Browse source 
Renamed all operators beginning with underscore.
This commit is contained in:
Joseph Wang 2016-12-21 21:59:32 +08:00 • committed by GitHub
commit a964098754
4 changed files with 68 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Examples/r/class/example.cxx
View file

@ -19,10 +19,37 @@ double Circle::perimeter() {
return 2*M_PI*radius; return 2*M_PI*radius;
} }
Circle::Circle(double xx, double yy, double rr)
: radius(rr)
{
x = xx;
y = yy;
}
bool Circle::operator==(const Circle & other)
{
return x == other.x && y == other.y && radius == other.radius;
}
bool Circle::operator!=(const Circle & other)
{
return !operator==(other);
}
double Square::area() { double Square::area() {
return width*width; return width*width;
} }
bool Square::operator==(const Square & other)
{
return x == other.x && y == other.y && width == other.width;
}
bool Square::operator!=(const Square & other)
{
return !operator==(other);
}
double Square::perimeter() { double Square::perimeter() {
return 4*width; return 4*width;
} }

7
Examples/r/class/example.h
View file

@ -20,8 +20,12 @@ private:
double radius; double radius;
public: public:
Circle(double r) : radius(r) { } Circle(double r) : radius(r) { }
Circle(double xx, double yy, double rr);
virtual double area(); virtual double area();
virtual double perimeter(); virtual double perimeter();
bool operator==(const Circle & other);
bool operator!=(const Circle & other);
}; };
class Square : public Shape { class Square : public Shape {
@ -31,4 +35,7 @@ public:
Square(double w) : width(w) { } Square(double w) : width(w) { }
virtual double area(); virtual double area();
virtual double perimeter(); virtual double perimeter();
bool operator==(const Square & other);
bool operator!=(const Square & other);
}; };

8
Examples/r/class/runme.R
View file

@ -31,6 +31,14 @@ print("Here is their current position:")
sprintf(" Circle = (%f, %f)", circle$x,circle$y) sprintf(" Circle = (%f, %f)", circle$x,circle$y)
sprintf(" Square = (%f, %f)", square$x,square$y) sprintf(" Square = (%f, %f)", square$x,square$y)
c2 <- Circle(1, 5, 15)
c1 <- circle
c1$move(1, 5)
print(Circle_MemberEq(c1, c2))
print(Circle_MemberNotEq(c1, c2))
print(c1$MemberEq(c2))
# ----- Call some methods ----- # ----- Call some methods -----
print ("Here are some properties of the shapes:") print ("Here are some properties of the shapes:")

64
Lib/r/ropers.swg
View file

@ -1,42 +1,31 @@
#ifdef __cplusplus #ifdef __cplusplus
// These are auto-supported by the Perl-module %rename(MemberPlusPlus) *::operator++;
%rename(__plusplus__) *::operator++; %rename(MemberMinMin) *::operator--;
%rename(__minmin__) *::operator--; %rename(MemberAdd) *::operator+;
%rename(__add__) *::operator+; %rename(MemberSub) *::operator-;
%rename(__sub__) *::operator-; %rename(MemberNeg) *::operator-();
%rename(__neg__) *::operator-(); %rename(MemberNegConst) *::operator-() const;
%rename(__neg__) *::operator-() const; %rename(MemberMul) *::operator*;
%rename(__mul__) *::operator*; %rename(MemberDiv) *::operator/;
%rename(__div__) *::operator/; %rename(MemberEq) *::operator==;
%rename(__eq__) *::operator==; %rename(MemberNotEq) *::operator!=;
%rename(__ne__) *::operator!=; %rename(MemberMod) *::operator%;
%rename(__mod__) *::operator%; %rename(MemberGreater) *::operator>;
%rename(__gt__) *::operator>; %rename(MemberLess) *::operator<;
%rename(__lt__) *::operator<; %rename(MemberNot) *::operator!;
%rename(__not__) *::operator!; %rename(MemberLShift) *::operator<<;
%rename(MemberRShift) *::operator>>;
// These are renamed, but no 'use overload...' is added %rename(MemberAnd) *::operator&;
%rename(__lshift__) *::operator<<; %rename(MemberOr) *::operator|;
%rename(__rshift__) *::operator>>; %rename(MemberXor) *::operator^;
%rename(__and__) *::operator&; %rename(MemberInvert) *::operator~;
%rename(__or__) *::operator|; %rename(MemberLessOrEq) *::operator<=;
%rename(__xor__) *::operator^; %rename(MemberGreaterOrEq) *::operator>=;
%rename(__invert__) *::operator~; %rename(MemberCall) *::operator();
%rename(__le__) *::operator<=; %rename(MemberGetItem) *::operator[];
%rename(__ge__) *::operator>=; %rename(MemberAssign) *::operator=;
%rename(__call__) *::operator(); %rename(MemberArrowStar) *::operator->*;
%rename(__getitem__) *::operator[];
%rename(__seteq__) *::operator=;
%rename(__land__) operator&&;
%rename(__lor__) operator||;
%rename(__plusplus__) *::operator++;
%rename(__minusminus__) *::operator--;
%rename(__arrowstar__) *::operator->*;
%rename(__index__) *::operator[];
%rename(Equal) operator =; %rename(Equal) operator =;
%rename(PlusEqual) operator +=; %rename(PlusEqual) operator +=;
@ -66,5 +55,4 @@
%rename(MinusMinusPrefix) operator--(); %rename(MinusMinusPrefix) operator--();
%rename(MinusMinusPostfix) operator--(int); %rename(MinusMinusPostfix) operator--(int);
#endif #endif