Fix (s)byte & (u)short code (#410)

HurricanKai · web-flow · commit 4492596e2d6e · 2021-02-14T21:42:26.000+01:00
diff --git a/src/Maths/Silk.NET.Maths.Tests/PowIntTests.cs b/src/Maths/Silk.NET.Maths.Tests/PowIntTests.cs
@@ -45,7 +45,7 @@ public void Pow2Minus4()
         {
             var a = 2;
             var b = -4;
-            var expected = (int)(1f / (2 << 3));
+            var expected = Scalar.Reciprocal(2 << 3);
             Assert.Equal(expected, Scalar.Pow(a, b));
         }
     }
diff --git a/src/Maths/Silk.NET.Maths/Scalar.BaseOps.cs b/src/Maths/Silk.NET.Maths/Scalar.BaseOps.cs
@@ -1439,7 +1439,7 @@ static T SByte(T left, T right)
             {
                 if (typeof(T) == typeof(sbyte))
                 {
-                    return (T) (object) ((sbyte) (object) left + (sbyte) (object) right);
+                    return (T) (object) (sbyte) ((sbyte) (object) left + (sbyte) (object) right);
                 }
 
                 return Byte(left, right);
@@ -1450,7 +1450,7 @@ static T Byte(T left, T right)
             {
                 if (typeof(T) == typeof(byte))
                 {
-                    return (T) (object) ((byte) (object) left + (byte) (object) right);
+                    return (T) (object) (byte) ((byte) (object) left + (byte) (object) right);
                 }
 
                 return Short(left, right);
@@ -1461,7 +1461,7 @@ static T Short(T left, T right)
             {
                 if (typeof(T) == typeof(short))
                 {
-                    return (T) (object) ((short) (object) left + (short) (object) right);
+                    return (T) (object) (short) ((short) (object) left + (short) (object) right);
                 }
 
                 return UShort(left, right);
@@ -1472,7 +1472,7 @@ static T UShort(T left, T right)
             {
                 if (typeof(T) == typeof(ushort))
                 {
-                    return (T) (object) ((ushort) (object) left + (ushort) (object) right);
+                    return (T) (object) (ushort) ((ushort) (object) left + (ushort) (object) right);
                 }
 
                 return Int(left, right);
@@ -1579,7 +1579,7 @@ static T SByte(T left, T right)
             {
                 if (typeof(T) == typeof(sbyte))
                 {
-                    return (T) (object) ((sbyte) (object) left - (sbyte) (object) right);
+                    return (T) (object) (sbyte) ((sbyte) (object) left - (sbyte) (object) right);
                 }
 
                 return Byte(left, right);
@@ -1590,7 +1590,7 @@ static T Byte(T left, T right)
             {
                 if (typeof(T) == typeof(byte))
                 {
-                    return (T) (object) ((byte) (object) left - (byte) (object) right);
+                    return (T) (object) (byte) ((byte) (object) left - (byte) (object) right);
                 }
 
                 return Short(left, right);
@@ -1601,7 +1601,7 @@ static T Short(T left, T right)
             {
                 if (typeof(T) == typeof(short))
                 {
-                    return (T) (object) ((short) (object) left - (short) (object) right);
+                    return (T) (object) (short) ((short) (object) left - (short) (object) right);
                 }
 
                 return UShort(left, right);
@@ -1612,7 +1612,7 @@ static T UShort(T left, T right)
             {
                 if (typeof(T) == typeof(ushort))
                 {
-                    return (T) (object) ((ushort) (object) left - (ushort) (object) right);
+                    return (T) (object) (ushort) ((ushort) (object) left - (ushort) (object) right);
                 }
 
                 return Int(left, right);
@@ -1719,7 +1719,7 @@ static T SByte(T left, T right)
             {
                 if (typeof(T) == typeof(sbyte))
                 {
-                    return (T) (object) ((sbyte) (object) left * (sbyte) (object) right);
+                    return (T) (object) (sbyte) ((sbyte) (object) left * (sbyte) (object) right);
                 }
 
                 return Byte(left, right);
@@ -1730,7 +1730,7 @@ static T Byte(T left, T right)
             {
                 if (typeof(T) == typeof(byte))
                 {
-                    return (T) (object) ((byte) (object) left * (byte) (object) right);
+                    return (T) (object) (byte) ((byte) (object) left * (byte) (object) right);
                 }
 
                 return Short(left, right);
@@ -1741,7 +1741,7 @@ static T Short(T left, T right)
             {
                 if (typeof(T) == typeof(short))
                 {
-                    return (T) (object) ((short) (object) left * (short) (object) right);
+                    return (T) (object) (short) ((short) (object) left * (short) (object) right);
                 }
 
                 return UShort(left, right);
@@ -1752,7 +1752,7 @@ static T UShort(T left, T right)
             {
                 if (typeof(T) == typeof(ushort))
                 {
-                    return (T) (object) ((ushort) (object) left * (ushort) (object) right);
+                    return (T) (object) (ushort) ((ushort) (object) left * (ushort) (object) right);
                 }
 
                 return Int(left, right);
@@ -1859,7 +1859,7 @@ static T SByte(T left, T right)
             {
                 if (typeof(T) == typeof(sbyte))
                 {
-                    return (T) (object) ((sbyte) (object) left / (sbyte) (object) right);
+                    return (T) (object) (sbyte) ((sbyte) (object) left / (sbyte) (object) right);
                 }
 
                 return Byte(left, right);
@@ -1870,7 +1870,7 @@ static T Byte(T left, T right)
             {
                 if (typeof(T) == typeof(byte))
                 {
-                    return (T) (object) ((byte) (object) left / (byte) (object) right);
+                    return (T) (object) (byte) ((byte) (object) left / (byte) (object) right);
                 }
 
                 return Short(left, right);
@@ -1881,7 +1881,7 @@ static T Short(T left, T right)
             {
                 if (typeof(T) == typeof(short))
                 {
-                    return (T) (object) ((short) (object) left / (short) (object) right);
+                    return (T) (object) (short) ((short) (object) left / (short) (object) right);
                 }
 
                 return UShort(left, right);
@@ -1892,7 +1892,7 @@ static T UShort(T left, T right)
             {
                 if (typeof(T) == typeof(ushort))
                 {
-                    return (T) (object) ((ushort) (object) left / (ushort) (object) right);
+                    return (T) (object) (ushort) ((ushort) (object) left / (ushort) (object) right);
                 }
 
                 return Int(left, right);
diff --git a/src/Maths/Silk.NET.Maths/Scalar.Constants.cs b/src/Maths/Silk.NET.Maths/Scalar.Constants.cs
@@ -224,6 +224,8 @@ static Scalar()
                 PositiveInfinity = default;
                 One = (T) (object) (sbyte) 1;
                 Two = (T) (object) (sbyte) 2;
+                MinusOne = (T) (object) (sbyte) -1;
+                MinusTwo = (T) (object) (sbyte) -2;
                 E = (T) (object) (sbyte) FloatE;
                 Pi = (T) (object) (sbyte) FloatPi;
                 Tau = (T) (object) (sbyte) FloatTau;
diff --git a/src/Maths/Silk.NET.Maths/Scalar.Inverse.cs b/src/Maths/Silk.NET.Maths/Scalar.Inverse.cs
@@ -64,7 +64,7 @@ static T SByte(T x)
             {
                 if (typeof(T) == typeof(sbyte))
                 {
-                    return (T) (object) (((sbyte) 1) / (sbyte) (object) x);
+                    return (T) (object) (sbyte) (((sbyte) 1) / (sbyte) (object) x);
                 }
 
                 return Byte(x);
@@ -75,7 +75,7 @@ static T Byte(T x)
             {
                 if (typeof(T) == typeof(byte))
                 {
-                    return (T) (object) (((byte) 1) / (byte) (object) x);
+                    return (T) (object) (byte) (((byte) 1) / (byte) (object) x);
                 }
 
                 return UShort(x);
@@ -86,7 +86,7 @@ static T UShort(T x)
             {
                 if (typeof(T) == typeof(ushort))
                 {
-                    return (T) (object) (((ushort) 1) / (ushort) (object) x);
+                    return (T) (object) (ushort) (((ushort) 1) / (ushort) (object) x);
                 }
 
                 return Short(x);
@@ -97,7 +97,7 @@ static T Short(T x)
             {
                 if (typeof(T) == typeof(short))
                 {
-                    return (T) (object) (((short) 1) / (short) (object) x);
+                    return (T) (object) (short) (((short) 1) / (short) (object) x);
                 }
 
                 return UInt(x);
diff --git a/src/Maths/Silk.NET.Maths/Scalar.MathFPort.cs b/src/Maths/Silk.NET.Maths/Scalar.MathFPort.cs
@@ -4568,7 +4568,7 @@ static T ULong(T x, T y)
         /// ## Remarks  
         ///             The following table indicates the return value when various values or ranges of values are specified for the `x` and `y` parameters. For more information, see <xref:System.Single.PositiveInfinity?displayProperty=nameWithType>, <xref:System.Single.NegativeInfinity?displayProperty=nameWithType>, and <xref:System.Single.NaN?displayProperty=nameWithType>.  
         ///   
-        ///             |Parameters|Return value|  
+        ///         |Parameters|Return value|  
         ///         |----------------|------------------|  
         ///         |`x` or `y` = `NaN`.|`NaN`|  
         ///         |`x` = Any value except `NaN`; `y` = 0.|1|  
@@ -4657,7 +4657,7 @@ static T SByte(T x, T y)
 
                         if (oabsy == py)
                             return (T) (object) result;
-                        return (T) (object) (sbyte) (1f / result);
+                        return (T) (object) (sbyte) Scalar.Reciprocal(result);
                     }
                     else
                     {
@@ -4727,7 +4727,7 @@ static T Short(T x, T y)
 
                         if (oabsy == py)
                             return (T) (object) result;
-                        return (T) (object) (short) (1f / result);
+                        return (T) (object) (short) Scalar.Reciprocal(result);
                     }
                     else
                     {
@@ -4797,7 +4797,7 @@ static T Int(T x, T y)
 
                         if (oabsy == py)
                             return (T) (object) result;
-                        return (T) (object) (int) (1f / result);
+                        return (T) (object) (int) Scalar.Reciprocal(result);
                     }
                     else
                     {
@@ -4867,7 +4867,7 @@ static T Long(T x, T y)
 
                         if (oabsy == py)
                             return (T) (object) result;
-                        return (T) (object) (long) (1f / result);
+                        return (T) (object) (long) Scalar.Reciprocal(result);
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void Pow2Minus4()`
`45`	`45`	`{`
`46`	`46`	`var a = 2;`
`47`	`47`	`var b = -4;`
`48`		`- var expected = (int)(1f / (2 << 3));`
	`48`	`+ var expected = Scalar.Reciprocal(2 << 3);`
`49`	`49`	`Assert.Equal(expected, Scalar.Pow(a, b));`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1439,7 +1439,7 @@ static T SByte(T left, T right)`
`1439`	`1439`	`{`
`1440`	`1440`	`if (typeof(T) == typeof(sbyte))`
`1441`	`1441`	`{`
`1442`		`- return (T) (object) ((sbyte) (object) left + (sbyte) (object) right);`
	`1442`	`+ return (T) (object) (sbyte) ((sbyte) (object) left + (sbyte) (object) right);`
`1443`	`1443`	`}`
`1444`	`1444`
`1445`	`1445`	`return Byte(left, right);`
`@@ -1450,7 +1450,7 @@ static T Byte(T left, T right)`
`1450`	`1450`	`{`
`1451`	`1451`	`if (typeof(T) == typeof(byte))`
`1452`	`1452`	`{`
`1453`		`- return (T) (object) ((byte) (object) left + (byte) (object) right);`
	`1453`	`+ return (T) (object) (byte) ((byte) (object) left + (byte) (object) right);`
`1454`	`1454`	`}`
`1455`	`1455`
`1456`	`1456`	`return Short(left, right);`
`@@ -1461,7 +1461,7 @@ static T Short(T left, T right)`
`1461`	`1461`	`{`
`1462`	`1462`	`if (typeof(T) == typeof(short))`
`1463`	`1463`	`{`
`1464`		`- return (T) (object) ((short) (object) left + (short) (object) right);`
	`1464`	`+ return (T) (object) (short) ((short) (object) left + (short) (object) right);`
`1465`	`1465`	`}`
`1466`	`1466`
`1467`	`1467`	`return UShort(left, right);`
`@@ -1472,7 +1472,7 @@ static T UShort(T left, T right)`
`1472`	`1472`	`{`
`1473`	`1473`	`if (typeof(T) == typeof(ushort))`
`1474`	`1474`	`{`
`1475`		`- return (T) (object) ((ushort) (object) left + (ushort) (object) right);`
	`1475`	`+ return (T) (object) (ushort) ((ushort) (object) left + (ushort) (object) right);`
`1476`	`1476`	`}`
`1477`	`1477`
`1478`	`1478`	`return Int(left, right);`
`@@ -1579,7 +1579,7 @@ static T SByte(T left, T right)`
`1579`	`1579`	`{`
`1580`	`1580`	`if (typeof(T) == typeof(sbyte))`
`1581`	`1581`	`{`
`1582`		`- return (T) (object) ((sbyte) (object) left - (sbyte) (object) right);`
	`1582`	`+ return (T) (object) (sbyte) ((sbyte) (object) left - (sbyte) (object) right);`
`1583`	`1583`	`}`
`1584`	`1584`
`1585`	`1585`	`return Byte(left, right);`
`@@ -1590,7 +1590,7 @@ static T Byte(T left, T right)`
`1590`	`1590`	`{`
`1591`	`1591`	`if (typeof(T) == typeof(byte))`
`1592`	`1592`	`{`
`1593`		`- return (T) (object) ((byte) (object) left - (byte) (object) right);`
	`1593`	`+ return (T) (object) (byte) ((byte) (object) left - (byte) (object) right);`
`1594`	`1594`	`}`
`1595`	`1595`
`1596`	`1596`	`return Short(left, right);`
`@@ -1601,7 +1601,7 @@ static T Short(T left, T right)`
`1601`	`1601`	`{`
`1602`	`1602`	`if (typeof(T) == typeof(short))`
`1603`	`1603`	`{`
`1604`		`- return (T) (object) ((short) (object) left - (short) (object) right);`
	`1604`	`+ return (T) (object) (short) ((short) (object) left - (short) (object) right);`
`1605`	`1605`	`}`
`1606`	`1606`
`1607`	`1607`	`return UShort(left, right);`
`@@ -1612,7 +1612,7 @@ static T UShort(T left, T right)`
`1612`	`1612`	`{`
`1613`	`1613`	`if (typeof(T) == typeof(ushort))`
`1614`	`1614`	`{`
`1615`		`- return (T) (object) ((ushort) (object) left - (ushort) (object) right);`
	`1615`	`+ return (T) (object) (ushort) ((ushort) (object) left - (ushort) (object) right);`
`1616`	`1616`	`}`
`1617`	`1617`
`1618`	`1618`	`return Int(left, right);`
`@@ -1719,7 +1719,7 @@ static T SByte(T left, T right)`
`1719`	`1719`	`{`
`1720`	`1720`	`if (typeof(T) == typeof(sbyte))`
`1721`	`1721`	`{`
`1722`		`- return (T) (object) ((sbyte) (object) left * (sbyte) (object) right);`
	`1722`	`+ return (T) (object) (sbyte) ((sbyte) (object) left * (sbyte) (object) right);`
`1723`	`1723`	`}`
`1724`	`1724`
`1725`	`1725`	`return Byte(left, right);`
`@@ -1730,7 +1730,7 @@ static T Byte(T left, T right)`
`1730`	`1730`	`{`
`1731`	`1731`	`if (typeof(T) == typeof(byte))`
`1732`	`1732`	`{`
`1733`		`- return (T) (object) ((byte) (object) left * (byte) (object) right);`
	`1733`	`+ return (T) (object) (byte) ((byte) (object) left * (byte) (object) right);`
`1734`	`1734`	`}`
`1735`	`1735`
`1736`	`1736`	`return Short(left, right);`
`@@ -1741,7 +1741,7 @@ static T Short(T left, T right)`
`1741`	`1741`	`{`
`1742`	`1742`	`if (typeof(T) == typeof(short))`
`1743`	`1743`	`{`
`1744`		`- return (T) (object) ((short) (object) left * (short) (object) right);`
	`1744`	`+ return (T) (object) (short) ((short) (object) left * (short) (object) right);`
`1745`	`1745`	`}`
`1746`	`1746`
`1747`	`1747`	`return UShort(left, right);`
`@@ -1752,7 +1752,7 @@ static T UShort(T left, T right)`
`1752`	`1752`	`{`
`1753`	`1753`	`if (typeof(T) == typeof(ushort))`
`1754`	`1754`	`{`
`1755`		`- return (T) (object) ((ushort) (object) left * (ushort) (object) right);`
	`1755`	`+ return (T) (object) (ushort) ((ushort) (object) left * (ushort) (object) right);`
`1756`	`1756`	`}`
`1757`	`1757`
`1758`	`1758`	`return Int(left, right);`
`@@ -1859,7 +1859,7 @@ static T SByte(T left, T right)`
`1859`	`1859`	`{`
`1860`	`1860`	`if (typeof(T) == typeof(sbyte))`
`1861`	`1861`	`{`
`1862`		`- return (T) (object) ((sbyte) (object) left / (sbyte) (object) right);`
	`1862`	`+ return (T) (object) (sbyte) ((sbyte) (object) left / (sbyte) (object) right);`
`1863`	`1863`	`}`
`1864`	`1864`
`1865`	`1865`	`return Byte(left, right);`
`@@ -1870,7 +1870,7 @@ static T Byte(T left, T right)`
`1870`	`1870`	`{`
`1871`	`1871`	`if (typeof(T) == typeof(byte))`
`1872`	`1872`	`{`
`1873`		`- return (T) (object) ((byte) (object) left / (byte) (object) right);`
	`1873`	`+ return (T) (object) (byte) ((byte) (object) left / (byte) (object) right);`
`1874`	`1874`	`}`
`1875`	`1875`
`1876`	`1876`	`return Short(left, right);`
`@@ -1881,7 +1881,7 @@ static T Short(T left, T right)`
`1881`	`1881`	`{`
`1882`	`1882`	`if (typeof(T) == typeof(short))`
`1883`	`1883`	`{`
`1884`		`- return (T) (object) ((short) (object) left / (short) (object) right);`
	`1884`	`+ return (T) (object) (short) ((short) (object) left / (short) (object) right);`
`1885`	`1885`	`}`
`1886`	`1886`
`1887`	`1887`	`return UShort(left, right);`
`@@ -1892,7 +1892,7 @@ static T UShort(T left, T right)`
`1892`	`1892`	`{`
`1893`	`1893`	`if (typeof(T) == typeof(ushort))`
`1894`	`1894`	`{`
`1895`		`- return (T) (object) ((ushort) (object) left / (ushort) (object) right);`
	`1895`	`+ return (T) (object) (ushort) ((ushort) (object) left / (ushort) (object) right);`
`1896`	`1896`	`}`
`1897`	`1897`
`1898`	`1898`	`return Int(left, right);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ static T SByte(T x)`
`64`	`64`	`{`
`65`	`65`	`if (typeof(T) == typeof(sbyte))`
`66`	`66`	`{`
`67`		`- return (T) (object) (((sbyte) 1) / (sbyte) (object) x);`
	`67`	`+ return (T) (object) (sbyte) (((sbyte) 1) / (sbyte) (object) x);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`return Byte(x);`
`@@ -75,7 +75,7 @@ static T Byte(T x)`
`75`	`75`	`{`
`76`	`76`	`if (typeof(T) == typeof(byte))`
`77`	`77`	`{`
`78`		`- return (T) (object) (((byte) 1) / (byte) (object) x);`
	`78`	`+ return (T) (object) (byte) (((byte) 1) / (byte) (object) x);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`return UShort(x);`
`@@ -86,7 +86,7 @@ static T UShort(T x)`
`86`	`86`	`{`
`87`	`87`	`if (typeof(T) == typeof(ushort))`
`88`	`88`	`{`
`89`		`- return (T) (object) (((ushort) 1) / (ushort) (object) x);`
	`89`	`+ return (T) (object) (ushort) (((ushort) 1) / (ushort) (object) x);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`return Short(x);`
`@@ -97,7 +97,7 @@ static T Short(T x)`
`97`	`97`	`{`
`98`	`98`	`if (typeof(T) == typeof(short))`
`99`	`99`	`{`
`100`		`- return (T) (object) (((short) 1) / (short) (object) x);`
	`100`	`+ return (T) (object) (short) (((short) 1) / (short) (object) x);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return UInt(x);`
Original file line number	Diff line number	Diff line change
`@@ -4568,7 +4568,7 @@ static T ULong(T x, T y)`
`4568`	`4568`	`/// ## Remarks`
`4569`	`4569`	/// The following table indicates the return value when various values or ranges of values are specified for the `x` and `y` parameters. For more information, see <xref:System.Single.PositiveInfinity?displayProperty=nameWithType>, <xref:System.Single.NegativeInfinity?displayProperty=nameWithType>, and <xref:System.Single.NaN?displayProperty=nameWithType>.
`4570`	`4570`	`///`
`4571`		`- /// \|Parameters\|Return value\|`
	`4571`	`+ /// \|Parameters\|Return value\|`
`4572`	`4572`	`/// \|----------------\|------------------\|`
`4573`	`4573`	/// \|`x` or `y` = `NaN`.\|`NaN`\|
`4574`	`4574`	/// \|`x` = Any value except `NaN`; `y` = 0.\|1\|
`@@ -4657,7 +4657,7 @@ static T SByte(T x, T y)`
`4657`	`4657`
`4658`	`4658`	`if (oabsy == py)`
`4659`	`4659`	`return (T) (object) result;`
`4660`		`- return (T) (object) (sbyte) (1f / result);`
	`4660`	`+ return (T) (object) (sbyte) Scalar.Reciprocal(result);`
`4661`	`4661`	`}`
`4662`	`4662`	`else`
`4663`	`4663`	`{`
`@@ -4727,7 +4727,7 @@ static T Short(T x, T y)`
`4727`	`4727`
`4728`	`4728`	`if (oabsy == py)`
`4729`	`4729`	`return (T) (object) result;`
`4730`		`- return (T) (object) (short) (1f / result);`
	`4730`	`+ return (T) (object) (short) Scalar.Reciprocal(result);`
`4731`	`4731`	`}`
`4732`	`4732`	`else`
`4733`	`4733`	`{`
`@@ -4797,7 +4797,7 @@ static T Int(T x, T y)`
`4797`	`4797`
`4798`	`4798`	`if (oabsy == py)`
`4799`	`4799`	`return (T) (object) result;`
`4800`		`- return (T) (object) (int) (1f / result);`
	`4800`	`+ return (T) (object) (int) Scalar.Reciprocal(result);`
`4801`	`4801`	`}`
`4802`	`4802`	`else`
`4803`	`4803`	`{`
`@@ -4867,7 +4867,7 @@ static T Long(T x, T y)`
`4867`	`4867`
`4868`	`4868`	`if (oabsy == py)`
`4869`	`4869`	`return (T) (object) result;`
`4870`		`- return (T) (object) (long) (1f / result);`
	`4870`	`+ return (T) (object) (long) Scalar.Reciprocal(result);`
`4871`	`4871`	`}`
`4872`	`4872`	`else`
`4873`	`4873`	`{`