Renamed all operators beginning with underscore.

1 files changed, 26 insertions, 38 deletions

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