Replace RToListVectorClosure with storage strategy for RList

Author: steve-s

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RList.java

@@ -33,6 +33,7 @@
 import com.oracle.truffle.api.library.ExportMessage.Ignore;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.RType;
+import com.oracle.truffle.r.runtime.data.closures.RClosures;
 import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
 import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
@@ -75,6 +76,16 @@ public static RList createForeignWrapper(TruffleObject obj, int size) {
         return new RList(new RListForeignObjData(obj), size);
     }
 
+    public static RList createClosure(RAbstractVector delegate, boolean keepAttrs) {
+        RList result = new RList(VectorDataClosure.fromVector(delegate, RType.List), delegate.getLength());
+        if (keepAttrs) {
+            result.initAttributes(delegate.getAttributes());
+        } else {
+            RClosures.initRegAttributes(result, delegate);
+        }
+        return result;
+    }
+
     private void setData(Object data, int newLen) {
         this.data = data;
         if (data instanceof VectorDataWithOwner) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/VectorDataClosure.java

@@ -85,6 +85,8 @@ private static Object create(RAbstractVector delegate, Object data, RType target
                 return new RawClosure(delegate, data, targetType);
             case Character:
                 return new StringClosure(delegate, data, targetType);
+            case List:
+                return new ListClosure(delegate, data, targetType);
             default:
                 throw RInternalError.shouldNotReachHere();
         }
@@ -146,10 +148,11 @@ public RandomAccessIterator randomAccessIterator(@CachedLibrary("this.data") Vec
     @ExportMessage
     public NACheck getNACheck() {
         // the contract is that the check is enabled if the vector may contain NA values,
-        // we cannot say that upfront, because NAs can occur as the result of type conversions
+        // we cannot say upfront that it does not, because NAs can occur as the result of type
+        // conversions
         // NOTE: this method and "isComplete" can be improved for type conversions that are known to
         // never introduce NA values (e.g., int -> double)
-        return NACheck.getDisabled();
+        return NACheck.getEnabled();
     }
 
     // Integer
@@ -340,6 +343,37 @@ public String getString(RandomAccessIterator it, int index,
         return dataLib.getString(data, it, index);
     }
 
+    // List
+
+    @ExportMessage
+    public Object[] getListDataCopy(@CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        assert getTargetType() == RType.List;
+        Object[] result = new Object[getLength(dataLib)];
+        SeqIterator it = dataLib.iterator(data);
+        while (dataLib.next(data, it)) {
+            result[it.getIndex()] = dataLib.getNextElement(data, it);
+        }
+        return result;
+    }
+
+    @ExportMessage
+    public Object getElementAt(int index,
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getElementAt(data, index);
+    }
+
+    @ExportMessage
+    public Object getNextElement(SeqIterator it,
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getNextElement(data, it);
+    }
+
+    @ExportMessage
+    public Object getElement(RandomAccessIterator it, int index,
+                    @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getElement(data, it, index);
+    }
+
     // Support of the RClosure interface
 
     @Override
@@ -376,7 +410,7 @@ protected VectorDataClosure copyDataClosure() {
     }
 
     @ExportLibrary(VectorDataLibrary.class)
-    static class DoubleClosure extends VectorDataClosure {
+    static final class DoubleClosure extends VectorDataClosure {
         DoubleClosure(RAbstractVector delegate, Object data, RType targetType) {
             super(delegate, data, targetType);
         }
@@ -393,7 +427,7 @@ protected VectorDataClosure copyDataClosure() {
     }
 
     @ExportLibrary(VectorDataLibrary.class)
-    static class LogicalClosure extends VectorDataClosure {
+    static final class LogicalClosure extends VectorDataClosure {
         LogicalClosure(RAbstractVector delegate, Object data, RType targetType) {
             super(delegate, data, targetType);
         }
@@ -410,7 +444,7 @@ protected VectorDataClosure copyDataClosure() {
     }
 
     @ExportLibrary(VectorDataLibrary.class)
-    static class RawClosure extends VectorDataClosure {
+    static final class RawClosure extends VectorDataClosure {
         RawClosure(RAbstractVector delegate, Object data, RType targetType) {
             super(delegate, data, targetType);
         }
@@ -427,7 +461,7 @@ protected VectorDataClosure copyDataClosure() {
     }
 
     @ExportLibrary(VectorDataLibrary.class)
-    static class ComplexClosure extends VectorDataClosure {
+    static final class ComplexClosure extends VectorDataClosure {
         ComplexClosure(RAbstractVector delegate, Object data, RType targetType) {
             super(delegate, data, targetType);
         }
@@ -444,7 +478,7 @@ protected VectorDataClosure copyDataClosure() {
     }
 
     @ExportLibrary(VectorDataLibrary.class)
-    static class StringClosure extends VectorDataClosure {
+    static final class StringClosure extends VectorDataClosure {
         StringClosure(RAbstractVector delegate, Object data, RType targetType) {
             super(delegate, data, targetType);
         }
@@ -459,4 +493,21 @@ protected VectorDataClosure copyDataClosure() {
             return new StringClosure(delegate, data, RType.Character);
         }
     }
+
+    @ExportLibrary(VectorDataLibrary.class)
+    static final class ListClosure extends VectorDataClosure {
+        ListClosure(RAbstractVector delegate, Object data, RType targetType) {
+            super(delegate, data, targetType);
+        }
+
+        @Override
+        protected RType getTargetType() {
+            return RType.List;
+        }
+
+        @Override
+        protected VectorDataClosure copyDataClosure() {
+            return new ListClosure(delegate, data, RType.Integer);
+        }
+    }
 }

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosures.java

@@ -25,12 +25,11 @@
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
+import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
 import com.oracle.truffle.r.runtime.data.RIntVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
-import com.oracle.truffle.r.runtime.data.model.RAbstractLogicalVector;
-import com.oracle.truffle.r.runtime.data.RRawVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractStringVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
 
@@ -68,28 +67,8 @@ public static RAbstractVector createFactorToVector(RIntVector factor, boolean wi
 
     // ... To List
 
-    public static RAbstractListVector createToListVector(RAbstractLogicalVector vector, boolean keepAttributes) {
-        return new RLogicalToListVectorClosure(vector, keepAttributes);
-    }
-
-    public static RAbstractListVector createToListVector(RIntVector vector, boolean keepAttributes) {
-        return new RIntToListVectorClosure(vector, keepAttributes);
-    }
-
-    public static RAbstractListVector createToListVector(RDoubleVector vector, boolean keepAttributes) {
-        return new RDoubleToListVectorClosure(vector, keepAttributes);
-    }
-
-    public static RAbstractListVector createToListVector(RRawVector vector, boolean keepAttributes) {
-        return new RRawToListVectorClosure(vector, keepAttributes);
-    }
-
-    public static RAbstractListVector createToListVector(RAbstractComplexVector vector, boolean keepAttributes) {
-        return new RComplexToListVectorClosure(vector, keepAttributes);
-    }
-
-    public static RAbstractListVector createToListVector(RAbstractStringVector vector, boolean keepAttributes) {
-        return new RStringToListVectorClosure(vector, keepAttributes);
+    public static RAbstractListVector createToListVector(RAbstractVector vector, boolean keepAttributes) {
+        return RList.createClosure(vector, keepAttributes);
     }
 
     /**