Commit7a2b5e2

committed

Simplify PyObj casting, logic of if blocks.

1 parent6d4dec7 commit7a2b5e2Copy full SHA for 7a2b5e2

File tree

-18

lines changed

-18

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public OperableObject(int num)`
`217`	`217`	`using(Py.GIL())`
`218`	`218`	`{`
`219`	`219`	`// Assuming b is a tuple, take the first element.`
`220`		`-intbNum=(int)b.ToArray()[0].AsManagedObject(typeof(int));`
	`220`	`+intbNum=b[0].As<int>();`
`221`	`221`	`returna.Num>=bNum;`
`222`	`222`	`}`
`223`	`223`	`}`
`@@ -226,7 +226,7 @@ public OperableObject(int num)`
`226`	`226`	`using(Py.GIL())`
`227`	`227`	`{`
`228`	`228`	`// Assuming b is a tuple, take the first element.`
`229`		`-intbNum=(int)b.ToArray()[0].AsManagedObject(typeof(int));`
	`229`	`+intbNum=b[0].As<int>();`
`230`	`230`	`returna.Num<=bNum;`
`231`	`231`	`}`
`232`	`232`	`}`

Lines changed: 5 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,16 +89,10 @@ public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op)`
`89`	`89`	`// otherwise fallback to checking if an IComparable interface is handled.`
`90`	`90`	`if(cls.richcompare.TryGetValue(op,outvarmethodObject))`
`91`	`91`	`{`
`92`		`-IntPtrargs=other;`
`93`		`-varfree=false;`
`94`		`-if(true)`
`95`		`-{`
`96`		-// Wrap the `other` argument of a binary comparison operator in a PyTuple.
`97`		`-args=Runtime.PyTuple_New(1);`
`98`		`-Runtime.XIncref(other);`
`99`		`-Runtime.PyTuple_SetItem(args,0,other);`
`100`		`-free=true;`
`101`		`-}`
	`92`	+// Wrap the `other` argument of a binary comparison operator in a PyTuple.
	`93`	`+IntPtrargs=Runtime.PyTuple_New(1);`
	`94`	`+Runtime.XIncref(other);`
	`95`	`+Runtime.PyTuple_SetItem(args,0,other);`
`102`	`96`
`103`	`97`	`IntPtrvalue;`
`104`	`98`	`try`
`@@ -107,10 +101,7 @@ public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op)`
`107`	`101`	`}`
`108`	`102`	`finally`
`109`	`103`	`{`
`110`		`-if(free)`
`111`		`-{`
`112`		`-Runtime.XDecref(args);// Free args pytuple`
`113`		`-}`
	`104`	`+Runtime.XDecref(args);// Free args pytuple`
`114`	`105`	`}`
`115`	`106`	`returnvalue;`
`116`	`107`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ public static void FixupSlots(IntPtr pyType, Type clrType)`
`104`	`104`	`Debug.Assert(_opType!=null);`
`105`	`105`	`foreach(varmethodinclrType.GetMethods(flags))`
`106`	`106`	`{`
`107`		`-// Wedon't want to override slots foreither non-operatorsor`
	`107`	`+// Weonly want to override slots for operatorsexcluding`
`108`	`108`	`// comparison operators, which are handled by ClassBase.tp_richcompare.`
`109`		`-if(!IsOperatorMethod(method)\|\|IsComparisonOp(method))`
	`109`	`+if(!OpMethodMap.ContainsKey(method.Name))`
`110`	`110`	`{`
`111`	`111`	`continue;`
`112`	`112`	`}`

Comments

(0)