Commit6196140

committed

Add eq and ineq operators, disallow reverse for comp

1 parent187816e commit6196140Copy full SHA for 6196140

File tree

+30

-3

lines changed

+30

-3

lines changed

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,32 @@ public OperableObject(int num)`
`149`	`149`	`returnnewOperableObject(a.Num^b);`
`150`	`150`	`}`
`151`	`151`
	`152`	`+publicstaticbooloperator==(inta,OperableObjectb)`
	`153`	`+{`
	`154`	`+return(a==b.Num);`
	`155`	`+}`
	`156`	`+publicstaticbooloperator==(OperableObjecta,OperableObjectb)`
	`157`	`+{`
	`158`	`+return(a.Num==b.Num);`
	`159`	`+}`
	`160`	`+publicstaticbooloperator==(OperableObjecta,intb)`
	`161`	`+{`
	`162`	`+return(a.Num==b);`
	`163`	`+}`
	`164`	`+`
	`165`	`+publicstaticbooloperator!=(inta,OperableObjectb)`
	`166`	`+{`
	`167`	`+return(a!=b.Num);`
	`168`	`+}`
	`169`	`+publicstaticbooloperator!=(OperableObjecta,OperableObjectb)`
	`170`	`+{`
	`171`	`+return(a.Num!=b.Num);`
	`172`	`+}`
	`173`	`+publicstaticbooloperator!=(OperableObjecta,intb)`
	`174`	`+{`
	`175`	`+return(a.Num!=b);`
	`176`	`+}`
	`177`	`+`
`152`	`178`	`publicstaticbooloperator<=(inta,OperableObjectb)`
`153`	`179`	`{`
`154`	`180`	`return(a<=b.Num);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,16 +343,17 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth`
`343`	`343`	`intkwargsMatched;`
`344`	`344`	`intdefaultsNeeded;`
`345`	`345`	`boolisOperator=OperatorMethod.IsOperatorMethod(mi);`
`346`		`-intclrnargs=pi.Length;`
`347`	`346`	`// Binary operator methods will have 2 CLR args but only one Python arg`
`348`	`347`	`// (unary operators will have 1 less each), since Python operator methods are bound.`
`349`		`-isOperator=isOperator&&pynargs==clrnargs-1;`
	`348`	`+isOperator=isOperator&&pynargs==pi.Length-1;`
	`349`	`+boolisReverse=isOperator&&OperatorMethod.IsReverse((MethodInfo)mi);// Only cast if isOperator.`
	`350`	`+if(isReverse&&OperatorMethod.IsComparisonOp((MethodInfo)mi))`
	`351`	`+continue;// Comparison operators in Python have no reverse mode.`
`350`	`352`	`if(!MatchesArgumentCount(pynargs,pi,kwargDict,outparamsArray,outdefaultArgList,outkwargsMatched,outdefaultsNeeded)&&!isOperator)`
`351`	`353`	`{`
`352`	`354`	`continue;`
`353`	`355`	`}`
`354`	`356`	`// Preprocessing pi to remove either the first or second argument.`
`355`		`-boolisReverse=isOperator&&OperatorMethod.IsReverse((MethodInfo)mi);// Only cast if isOperator.`
`356`	`357`	`if(isOperator&&!isReverse){`
`357`	`358`	`// The first Python arg is the right operand, while the bound instance is the left.`
`358`	`359`	`// We need to skip the first (left operand) CLR argument.`

Comments

(0)