Remove the scalar list and replace with regular list

Author: steve-s

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedReplaceVectorNode.java

@@ -58,7 +58,6 @@
 import com.oracle.truffle.r.runtime.data.RList;
 import com.oracle.truffle.r.runtime.data.RMissing;
 import com.oracle.truffle.r.runtime.data.RNull;
-import com.oracle.truffle.r.runtime.data.RScalarList;
 import com.oracle.truffle.r.runtime.data.RScalarVector;
 import com.oracle.truffle.r.runtime.data.RSharingAttributeStorage;
 import com.oracle.truffle.r.runtime.data.RStringVector;
@@ -200,7 +199,7 @@ public Object apply(RAbstractVector originalVector, Object[] originalPositions,
         } else {
             if ((castType == RType.List || castType == RType.Expression) && mode.isSubscript() && !isDeleteElements() && !(castValue instanceof RScalarVector)) {
                 // wrap into a list when
-                value = RScalarList.valueOf(castValue);
+                value = RDataFactory.createListFromScalar(castValue);
             } else {
                 value = (RAbstractContainer) castValue;
             }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public RAbstractVector castSafe(RType type, ConditionProfile isNAProfile, boolea
             case Character:
                 return RString.valueOf(RContext.getRRuntimeASTAccess().encodeComplex(this));
             case List:
-                return RScalarList.valueOf(this);
+                return RDataFactory.createListFromScalar(this);
             default:
                 return null;
         }

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

@@ -1143,6 +1143,11 @@ public static RList createList() {
         return createList(new Object[0]);
     }
 
+    public static RList createListFromScalar(Object value) {
+        assert value != null;
+        return new RList(new Object[]{value});
+    }
+
     public static RList createList(int n) {
         return createList(createRNullArray(n));
     }

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

@@ -95,7 +95,7 @@ public RAbstractVector castSafe(RType type, ConditionProfile isNAProfile, boolea
             case Character:
                 return RString.valueOf(RRuntime.logicalToString(value));
             case List:
-                return RScalarList.valueOf(this);
+                return RDataFactory.createListFromScalar(this);
             default:
                 return null;
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,7 +80,7 @@ public RAbstractVector castSafe(RType type, ConditionProfile isNAProfile, boolea
             case Character:
                 return this;
             case List:
-                return RScalarList.valueOf(this);
+                return RDataFactory.createListFromScalar(this);
             default:
                 return null;
         }

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

@@ -45,7 +45,6 @@
 import com.oracle.truffle.r.runtime.data.RRaw;
 import com.oracle.truffle.r.runtime.data.RRawVector;
 import com.oracle.truffle.r.runtime.data.RScalar;
-import com.oracle.truffle.r.runtime.data.RScalarList;
 import com.oracle.truffle.r.runtime.data.RScalarVector;
 import com.oracle.truffle.r.runtime.data.RSequence;
 import com.oracle.truffle.r.runtime.data.RString;
@@ -136,17 +135,6 @@ protected static Object wrap(RLogical value, boolean protect,
         }
     }
 
-    @Specialization
-    protected static Object wrap(RScalarList value, boolean protect,
-                    @Cached("createBinaryProfile()") ConditionProfile isProtected) {
-        if (isProtected.profile(protect)) {
-            return protectMaterialized(value, v -> RDataFactory.createList(new Object[]{v.getValue()}));
-        } else {
-            return value.materialize();
-
-        }
-    }
-
     // Sequences: life-cycle of the materialized vector is cached and tied with the sequence via a
     // field inside the sequence