Reflect PR #10 Runtime DecimalType

Author: C-SELLERS

src/runtime/converter.cs

@@ -99,6 +99,9 @@ internal static Type GetTypeByAlias(IntPtr op)
             if (op == Runtime.PyBoolType)
                 return boolType;
 
+            if (op == Runtime.PyDecimalType)
+                return decimalType;
+
             return null;
         }
 
@@ -119,12 +122,15 @@ internal static IntPtr GetPythonTypeByAlias(Type op)
             if (op == doubleType)
                 return Runtime.PyFloatType;
 
-            if (op == singleType || op == decimalType)
+            if (op == singleType)
                 return Runtime.PyFloatType;
 
             if (op == boolType)
                 return Runtime.PyBoolType;
 
+            if (op == decimalType)
+                return Runtime.PyDecimalType;
+
             return IntPtr.Zero;
         }
 

src/runtime/methodbinder.cs

@@ -216,6 +216,13 @@ internal static int GetPrecedence(MethodBase mi)
                 val += ArgPrecedence(pi[i].ParameterType);
             }
 
+            var info = mi as MethodInfo;
+            if (info != null)
+            {
+                val += ArgPrecedence(info.ReturnType);
+                val += mi.DeclaringType == mi.ReflectedType ? 0 : 3000;
+            }
+
             return val;
         }
 
@@ -757,7 +764,6 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool
                         {
                             parameterType = underlyingType;
                         }
-
                         // this takes care of enum values
                         TypeCode parameterTypeCode = Type.GetTypeCode(parameterType);
                         TypeCode clrTypeCode = Type.GetTypeCode(clrtype);
@@ -771,6 +777,13 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool
                             Exceptions.RaiseTypeError($"Expected {parameterTypeCode}, got {clrTypeCode}");
                         }
 
+                        // accepts non-decimal numbers in decimal parameters 
+                        if (parameterType == typeof(decimal))
+                        {
+                            clrtype = parameterType;
+                            typematch = Converter.ToManaged(argument, clrtype, out _, false);
+                        }
+
                         // this takes care of implicit conversions
                         var opImplicit = parameterType.GetMethod("op_Implicit", new[] { clrtype });
                         if (opImplicit != null)

src/runtime/runtime.cs

@@ -277,6 +277,14 @@ private static void InitPyMembers()
                 () => PyFloatType = IntPtr.Zero);
             XDecref(op);
 
+            IntPtr decimalMod = PyImport_ImportModule("decimal");
+            IntPtr decimalCtor = PyObject_GetAttrString(decimalMod, "Decimal");
+            op = PyObject_CallObject(decimalCtor, IntPtr.Zero);
+            PyDecimalType = PyObject_Type(op);
+            XDecref(op);
+            XDecref(decimalMod);
+            XDecref(decimalCtor);
+
             PyClassType = IntPtr.Zero;
             PyInstanceType = IntPtr.Zero;
 
@@ -557,6 +565,7 @@ private static void MoveClrInstancesOnwershipToPython()
         internal static IntPtr PyBoolType;
         internal static IntPtr PyNoneType;
         internal static IntPtr PyTypeType;
+        internal static IntPtr PyDecimalType;
 
         internal static IntPtr Py_NoSiteFlag;