Fixed handling BigNumber values for slice indices.

RobAmos · Apr 22, 2011 · 91515c8 · 91515c8
1 parent 7cced41
commit 91515c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/numpy/NumpyDotNet/NpyIndexes.cs b/numpy/NumpyDotNet/NpyIndexes.cs
@@ -266,7 +266,7 @@ public void AddIndex(ISlice slice)
             }
             else
             {
-                step = (IntPtr) Convert.ToInt64(slice.Step);
+                step = NpyUtil_ArgProcessing.IntpConverter(slice.Step);
                 negativeStep = (step.ToInt64() < 0);
             }
 
@@ -277,7 +277,7 @@ public void AddIndex(ISlice slice)
             }
             else
             {
-                start = (IntPtr) Convert.ToInt64(slice.Start);
+                start = NpyUtil_ArgProcessing.IntpConverter(slice.Start);
             }
 
 
@@ -288,7 +288,7 @@ public void AddIndex(ISlice slice)
             }
             else {
                 hasStop = true;
-                stop = (IntPtr) Convert.ToInt64(slice.Stop);
+                stop = NpyUtil_ArgProcessing.IntpConverter(slice.Stop);
             }
 
             // Write the type

diff --git a/numpy/NumpyDotNet/NpyUtils.cs b/numpy/NumpyDotNet/NpyUtils.cs
@@ -198,6 +198,8 @@ internal static long ConvertToLong(object obj, CodeContext cntx = null) {
                 return (long)obj;
             } else if (obj is int) {
                 return (long)(int)obj;
+            } else if (obj is BigInteger) {
+                return (long)(BigInteger)obj;
             } else if (obj is ScalarInt64) {
                 return (long)(ScalarInt64)obj;
             } else if (obj is ScalarInt32) {

diff --git a/numpy/random/mtrand/mtrand.vcxproj b/numpy/random/mtrand/mtrand.vcxproj
@@ -77,18 +77,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <Reference Include="IronPython, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\..\..\..\IronPython\bin\Debug\IronPython.dll</HintPath>
-    </Reference>
-    <Reference Include="IronPython.Modules, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\..\..\..\IronPython\bin\Debug\IronPython.Modules.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\..\..\..\IronPython\bin\Debug\Microsoft.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\..\..\..\IronPython\bin\Debug\Microsoft.Scripting.dll</HintPath>
-    </Reference>
+    <Reference Include="IronPython" />
+    <Reference Include="IronPython.Modules" />
+    <Reference Include="Microsoft.Dynamic" />
+    <Reference Include="Microsoft.Scripting" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Numerics" />