remove redundant code and add comments

fdanny · fdanny · commit 20d81f102f43 · 2015-08-03T21:56:16.000-06:00
diff --git a/src/runtime/classobject.cs b/src/runtime/classobject.cs
@@ -233,36 +233,27 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v) {
                 free = true;
             }
 
-            // Add args given from caller + 1 for the value
+            // Get the args passed in.
             int i = Runtime.PyTuple_Size(args);
-            IntPtr real = Runtime.PyTuple_New(i + 1);
+            IntPtr defaultArgs = cls.indexer.GetDefaultArgs(args);
+            int numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);
+            int temp = i + numOfDefaultArgs;
+            IntPtr real = Runtime.PyTuple_New(temp + 1);
             for (int n = 0; n < i; n++) {
                 IntPtr item = Runtime.PyTuple_GetItem(args, n);
                 Runtime.Incref(item);
                 Runtime.PyTuple_SetItem(real, n, item);
             }
 
-            // Do we need default arguments added to the list
-            if (cls.indexer.NeedsDefaultArgs(real)) {
-                // Need to add default args to the end of real tuple
-                // before adding the value v
-                IntPtr defaultArgs = cls.indexer.GetDefaultArgs(real);
-                int numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);
-                int temp = i + numOfDefaultArgs;
-                real = Runtime.PyTuple_New(temp + 1);
-                for (int n = 0; n < i; n++) {
-                    IntPtr item = Runtime.PyTuple_GetItem(args, n);
-                    Runtime.Incref(item);
-                    Runtime.PyTuple_SetItem(real, n, item);
-                }
-
-                for (int n = 0; n < numOfDefaultArgs; n++) {
-                    IntPtr item = Runtime.PyTuple_GetItem(defaultArgs, n);
-                    Runtime.Incref(item);
-                    Runtime.PyTuple_SetItem(real, n + i, item);
-                }
-                i = temp;
+            // Add Default Args if needed
+            for (int n = 0; n < numOfDefaultArgs; n++) {
+                IntPtr item = Runtime.PyTuple_GetItem(defaultArgs, n);
+                Runtime.Incref(item);
+                Runtime.PyTuple_SetItem(real, n + i, item);
             }
+            // no longer need defaultArgs 
+            Runtime.Decref(defaultArgs);
+            i = temp;
 
             // Add value to argument list
             Runtime.Incref(v);
diff --git a/src/runtime/indexer.cs b/src/runtime/indexer.cs
@@ -63,7 +63,7 @@ internal void SetItem(IntPtr inst, IntPtr args) {
         }
 
         internal bool NeedsDefaultArgs(IntPtr args){
-            int pynargs = Runtime.PyTuple_Size(args) - 1;
+            int pynargs = Runtime.PyTuple_Size(args);
             var methods = SetterBinder.GetMethods();
             if(methods.Length == 0)
                 return false;
@@ -72,7 +72,7 @@ internal bool NeedsDefaultArgs(IntPtr args){
             ParameterInfo[] pi = mi.GetParameters();
             // need to subtract one for the value
             int clrnargs = pi.Length - 1;
-            if(pynargs == clrnargs)
+            if (pynargs == clrnargs || pynargs > clrnargs)
                 return false;
 
             for (int v = pynargs; v < clrnargs; v++){
@@ -82,34 +82,30 @@ internal bool NeedsDefaultArgs(IntPtr args){
             return true;
         }
 
+        /// <summary>
+        /// This will return default arguments a new instance of a tuple. The size 
+        ///  of the tuple will indicate the number of default arguments. 
+        /// </summary>
+        /// <param name="args">This is pointing to the tuple args passed in</param>
+        /// <returns>a new instance of the tuple containing the default args</returns>
         internal IntPtr GetDefaultArgs(IntPtr args){
-            //IntPtr real = Runtime.PyTuple_New(i + 1);
-            int pynargs = Runtime.PyTuple_Size(args) - 1;
+
+            // if we don't need default args return empty tuple
+            if(!NeedsDefaultArgs(args))
+                return Runtime.PyTuple_New(0);
+            int pynargs = Runtime.PyTuple_Size(args);
+           
+            // Get the default arg tuple
             var methods = SetterBinder.GetMethods();
-            IntPtr defaultArgs;
-            if(methods.Length == 0){
-                 defaultArgs = Runtime.PyTuple_New(0);
-                return defaultArgs;
-            }
             MethodBase mi = methods[0];
             ParameterInfo[] pi = mi.GetParameters();
             int clrnargs = pi.Length - 1;
-            if(pynargs == clrnargs|| pynargs > clrnargs){
-                 defaultArgs = Runtime.PyTuple_New(0);
-                return defaultArgs;
-            }
-
-            defaultArgs = Runtime.PyTuple_New(clrnargs - pynargs);
+            IntPtr defaultArgs = Runtime.PyTuple_New(clrnargs - pynargs);
             for (int i = 0; i < (clrnargs - pynargs); i++) {
-                // Here we own the reference to the Python value, and we
-                // give the ownership to the arg tuple.
                 if (pi[i + pynargs].DefaultValue == DBNull.Value)
                     continue;
                 else{
                     IntPtr arg = Converter.ToPython(pi[i + pynargs].DefaultValue, pi[i + pynargs].ParameterType);
-                    Type type = typeof(String);
-                    Object arg2;
-                    Converter.ToManaged(arg, type, out arg2, false);
                     Runtime.PyTuple_SetItem(defaultArgs, i, arg);
                 }
             }
