[GR-23255][GR-23259] get test_range test_slice to pass

PullRequest: graalpython/1099

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/PRangeTests.java

@@ -28,6 +28,7 @@
 import static com.oracle.graal.python.test.PythonTests.assertPrints;
 import static org.junit.Assert.assertEquals;
 
+import com.oracle.graal.python.builtins.objects.range.PIntRange;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -67,7 +68,7 @@ public void doInsert(Node child) {
 
     @Test
     public void loopWithOnlyStop() throws UnexpectedResultException {
-        PRange range = PythonObjectFactory.getUncached().createRange(10);
+        PRange range = PythonObjectFactory.getUncached().createIntRange(10);
         int index = 0;
         TestRoot testRoot = new TestRoot(PythonLanguage.getCurrent());
         GetIteratorNode getIter = GetIteratorNode.create();
@@ -91,7 +92,7 @@ public void loopWithOnlyStop() throws UnexpectedResultException {
 
     @Test
     public void loopWithStep() throws UnexpectedResultException {
-        PRange range = PythonObjectFactory.getUncached().createRange(0, 10, 2);
+        PRange range = PythonObjectFactory.getUncached().createIntRange(0, 10, 2, 5);
         int index = 0;
         TestRoot testRoot = new TestRoot(PythonLanguage.getCurrent());
         GetIteratorNode getIter = GetIteratorNode.create();
@@ -115,8 +116,8 @@ public void loopWithStep() throws UnexpectedResultException {
 
     @Test
     public void getItem() {
-        PRange range = PythonObjectFactory.getUncached().createRange(10);
-        assertEquals(3, range.getItemNormalized(3));
+        PIntRange range = PythonObjectFactory.getUncached().createIntRange(10);
+        assertEquals(3, range.getIntItemNormalized(3));
     }
 
     @Test

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_range.txt

@@ -1,11 +1,16 @@
 *graalpython.lib-python.3.test.test_range.RangeTest.test_attributes
+*graalpython.lib-python.3.test.test_range.RangeTest.test_comparison
+*graalpython.lib-python.3.test.test_range.RangeTest.test_contains
+*graalpython.lib-python.3.test.test_range.RangeTest.test_count
 *graalpython.lib-python.3.test.test_range.RangeTest.test_empty
+*graalpython.lib-python.3.test.test_range.RangeTest.test_exhausted_iterator_pickling
+*graalpython.lib-python.3.test.test_range.RangeTest.test_index
 *graalpython.lib-python.3.test.test_range.RangeTest.test_invalid_invocation
 *graalpython.lib-python.3.test.test_range.RangeTest.test_issue11845
 *graalpython.lib-python.3.test.test_range.RangeTest.test_iterator_pickling
 *graalpython.lib-python.3.test.test_range.RangeTest.test_large_exhausted_iterator_pickling
+*graalpython.lib-python.3.test.test_range.RangeTest.test_large_operands
+*graalpython.lib-python.3.test.test_range.RangeTest.test_large_range
 *graalpython.lib-python.3.test.test_range.RangeTest.test_odd_bug
 *graalpython.lib-python.3.test.test_range.RangeTest.test_pickling
 *graalpython.lib-python.3.test.test_range.RangeTest.test_range
-*graalpython.lib-python.3.test.test_range.RangeTest.test_range_iterators_invocation
-*graalpython.lib-python.3.test.test_range.RangeTest.test_repr

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_slice.txt

@@ -1,2 +1,9 @@
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_cmp
 *graalpython.lib-python.3.test.test_slice.SliceTest.test_constructor
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_cycle
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_hash
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_indices
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_members
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_pickle
 *graalpython.lib-python.3.test.test_slice.SliceTest.test_repr
+*graalpython.lib-python.3.test.test_slice.SliceTest.test_setslice_without_getslice

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -96,7 +96,7 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     PNone("NoneType"),
     PNotImplemented("NotImplementedType"),
     PRandom("Random", "_random"),
-    PRange("range", BuiltinNames.BUILTINS),
+    PRange("range", BuiltinNames.BUILTINS, false),
     PReferenceType("ReferenceType", "_weakref"),
     PSentinelIterator("callable_iterator"),
     PForeignArrayIterator("foreign_iterator"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ArrayModuleBuiltins.java

@@ -39,7 +39,7 @@
 import com.oracle.graal.python.builtins.objects.array.PArray;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
-import com.oracle.graal.python.builtins.objects.range.PRange;
+import com.oracle.graal.python.builtins.objects.range.PIntRange;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
@@ -78,16 +78,16 @@ PArray array(Object cls, String typeCode, @SuppressWarnings("unused") PNone init
         }
 
         @Specialization
-        PArray arrayWithRangeInitializer(Object cls, String typeCode, PRange range) {
+        PArray arrayWithRangeInitializer(Object cls, String typeCode, PIntRange range) {
             if (!typeCode.equals("i")) {
                 typeError(typeCode, range);
             }
 
-            int[] intArray = new int[range.len()];
+            int[] intArray = new int[range.getIntLength()];
 
-            int start = range.getStart();
-            int stop = range.getStop();
-            int step = range.getStep();
+            int start = range.getIntStart();
+            int stop = range.getIntStop();
+            int step = range.getIntStep();
 
             int index = 0;
             for (int i = start; i < stop; i += step) {