TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

respect __nonzero__

Browse Source
This commit is contained in:
David Rose 2009-08-05 21:51:28 +00:00
parent 9f9316ff81
commit 0e773c8684
1 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -56,49 +56,50 @@ struct FlagSet {
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
RenameSet methodRenameDictionary[] = { RenameSet methodRenameDictionary[] = {
{ "operator ==" , "eq", 0 }, { "operator ==" , "eq", 0 },
{ "operator !=" , "ne", 0 }, { "operator !=" , "ne", 0 },
{ "operator <<" , "__lshift__", 0 }, { "operator <<" , "__lshift__", 0 },
{ "operator >>" , "__rshift__", 0 }, { "operator >>" , "__rshift__", 0 },
{ "operator <" , "lessThan", 0 }, { "operator <" , "lessThan", 0 },
{ "operator >" , "greaterThan", 0 }, { "operator >" , "greaterThan", 0 },
{ "operator <=" , "lessThanOrEqual", 0 }, { "operator <=" , "lessThanOrEqual", 0 },
{ "operator >=" , "greaterThanOrEqual", 0 }, { "operator >=" , "greaterThanOrEqual", 0 },
{ "operator =" , "assign", 0 }, { "operator =" , "assign", 0 },
{ "operator ()" , "__call__", 0 }, { "operator ()" , "__call__", 0 },
{ "operator []" , "__getitem__", 0 }, { "operator []" , "__getitem__", 0 },
{ "operator ++unary" , "increment", 0 }, { "operator ++unary", "increment", 0 },
{ "operator ++" , "increment", 0 }, { "operator ++" , "increment", 0 },
{ "operator --unary" , "decrement", 0 }, { "operator --unary", "decrement", 0 },
{ "operator --" , "decrement", 0 }, { "operator --" , "decrement", 0 },
{ "operator ^" , "__xor__", 0 }, { "operator ^" , "__xor__", 0 },
{ "operator %" , "__mod__", 0 }, { "operator %" , "__mod__", 0 },
{ "operator !" , "logicalNot", 0 }, { "operator !" , "logicalNot", 0 },
{ "operator ~unary" , "__invert__", 0 }, { "operator ~unary", "__invert__", 0 },
{ "operator &" , "__and__", 0 }, { "operator &" , "__and__", 0 },
{ "operator &&" , "logicalAnd", 0 }, { "operator &&" , "logicalAnd", 0 },
{ "operator |" , "__or__", 0 }, { "operator |" , "__or__", 0 },
{ "operator ||" , "logicalOr", 0 }, { "operator ||" , "logicalOr", 0 },
{ "operator +" , "__add__", 0 }, { "operator +" , "__add__", 0 },
{ "operator -" , "__sub__", 0 }, { "operator -" , "__sub__", 0 },
{ "operator -unary", "__neg__", 0 }, { "operator -unary", "__neg__", 0 },
{ "operator *" , "__mul__", 0 }, { "operator *" , "__mul__", 0 },
{ "operator /" , "__div__", 0 }, { "operator /" , "__div__", 0 },
{ "operator +=" , "__iadd__", 1 }, { "operator +=" , "__iadd__", 1 },
{ "operator -=" , "__isub__", 1 }, { "operator -=" , "__isub__", 1 },
{ "operator *=" , "__imul__", 1 }, { "operator *=" , "__imul__", 1 },
{ "operator /=" , "__idiv__", 1 }, { "operator /=" , "__idiv__", 1 },
{ "operator ," , "concatenate", 0 }, { "operator ," , "concatenate", 0 },
{ "operator |=" , "__ior__", 1 }, { "operator |=" , "__ior__", 1 },
{ "operator &=" , "__iand__", 1 }, { "operator &=" , "__iand__", 1 },
{ "operator ^=" , "__ixor__", 1 }, { "operator ^=" , "__ixor__", 1 },
{ "operator ~=" , "bitwiseNotEqual", 0 }, { "operator ~=" , "bitwiseNotEqual", 0 },
{ "operator ->" , "dereference", 0 }, { "operator ->" , "dereference", 0 },
{ "operator <<=" , "__ilshift__", 1 }, { "operator <<=" , "__ilshift__", 1 },
{ "operator >>=" , "__irshift__", 1 }, { "operator >>=" , "__irshift__", 1 },
{ "operator typecast bool" , "__nonzero__", 0 }, { "operator typecast bool", "__nonzero__", 0 },
{ "print" , "Cprint", 0 }, { "__nonzero__" , "__nonzero__", 0 },
{ "CInterval.set_t" , "_priv__cSetT", 0 }, { "print" , "Cprint", 0 },
{ "CInterval.set_t", "_priv__cSetT", 0 },
{ NULL, NULL, -1 } { NULL, NULL, -1 }
}; };
@ -558,6 +559,12 @@ get_slotted_function_def(Object *obj, Function *func, SlottedFunctionDef &def) {
return true; return true;
} }
if (method_name == "__nonzero__") {
def._answer_location = "tp_as_number->nb_nonzero";
def._wrapper_type = WT_inquiry;
return true;
}
if (func->_ifunc.is_operator_typecast()) { if (func->_ifunc.is_operator_typecast()) {
// A typecast operator. Check for a supported low-level typecast type. // A typecast operator. Check for a supported low-level typecast type.
if (!func->_remaps.empty()) { if (!func->_remaps.empty()) {