changed method signature to one arg and renamed a local variable name

fdanny · fdanny · commit 8b179ffcf967 · 2015-08-01T17:08:05.000-06:00
diff --git a/src/runtime/classobject.cs b/src/runtime/classobject.cs
@@ -233,7 +233,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v) {
                 free = true;
             }
 
-            // Add args given from caller
+            // Add args given from caller + 1 for the value
             int i = Runtime.PyTuple_Size(args);
             IntPtr real = Runtime.PyTuple_New(i + 1);
             for (int n = 0; n < i; n++) {
@@ -243,24 +243,24 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v) {
             }
 
             // Do we need default arguments added to the list
-            if (cls.indexer.NeedsDefaultArgs(ob, real)) {
-                IntPtr defaultArgs = cls.indexer.GetDefaultArgs(ob, real);
-                int sizeOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);
-                int temp = i + sizeOfDefaultArgs;
+            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 < sizeOfDefaultArgs; n++) {
-
+                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;
             }
 
diff --git a/src/runtime/indexer.cs b/src/runtime/indexer.cs
@@ -62,7 +62,7 @@ internal void SetItem(IntPtr inst, IntPtr args) {
             SetterBinder.Invoke(inst, args, IntPtr.Zero);
         }
 
-        internal bool NeedsDefaultArgs(IntPtr inst, IntPtr args){
+        internal bool NeedsDefaultArgs(IntPtr args){
             int pynargs = Runtime.PyTuple_Size(args) - 1;
             var methods = SetterBinder.GetMethods();
             if(methods.Length == 0)
@@ -82,7 +82,7 @@ internal bool NeedsDefaultArgs(IntPtr inst, IntPtr args){
             return true;
         }
 
-        internal IntPtr GetDefaultArgs(IntPtr inst, IntPtr args){
+        internal IntPtr GetDefaultArgs(IntPtr args){
             //IntPtr real = Runtime.PyTuple_New(i + 1);
             int pynargs = Runtime.PyTuple_Size(args) - 1;
             var methods = SetterBinder.GetMethods();
