logival value for string and double sequence

Author: thurka

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RDetailsProvider.java

@@ -52,6 +52,10 @@ public class RDetailsProvider extends DetailsProvider.Basic {
     private static final String RCOMPLEX_VECTOR_FQN = "com.oracle.truffle.r.runtime.data.RComplexVector";   // NOI18N
     private static final String RINT_SEQUENCE_FQN = "com.oracle.truffle.r.runtime.data.RIntSequence";   // NOI18N
     private static final String RINT_SEQUENCE1_FQN = "com.oracle.truffle.r.runtime.data.RIntSeqVectorData";   // NOI18N
+    private static final String RDOUBLE_SEQUENCE_FQN = "com.oracle.truffle.r.runtime.data.RDoubleSequence";   // NOI18N
+    private static final String RDOUBLE_SEQUENCE1_FQN = "com.oracle.truffle.r.runtime.data.RDoubleSeqVectorData";   // NOI18N
+    private static final String RSTRING_SEQUENCE_FQN = "com.oracle.truffle.r.runtime.data.RStringSequence";   // NOI18N
+    private static final String RSTRING_SEQUENCE1_FQN = "com.oracle.truffle.r.runtime.data.RStringSeqVectorData";   // NOI18N
     private static final String REXPRESSION_FQN = "com.oracle.truffle.r.runtime.data.RExpression";   // NOI18N
     private static final String RWRAPPER_MASK = "com.oracle.truffle.r.runtime.data.RForeignWrapper+";  // NOI18N
     private static final String RSYMBOL_MASK = "com.oracle.truffle.r.runtime.data.RSymbol"; //NOI18N
@@ -67,8 +71,9 @@ public class RDetailsProvider extends DetailsProvider.Basic {
 
     public RDetailsProvider() {
         super(RVECTOR_MASK, RABSTRACT_VECTOR_MASK, RSCALAR_VECTOR_MASK, RINT_SEQUENCE_FQN,
-              RINT_SEQUENCE1_FQN, RWRAPPER_MASK, RSYMBOL_MASK, RFUNCTION_MASK,
-              RS4OBJECT_MASK, RNULL_MASK, RENVIRONMENT_MASK, CHARSXPWRAPPER_FQN);
+              RINT_SEQUENCE1_FQN, RDOUBLE_SEQUENCE_FQN, RDOUBLE_SEQUENCE1_FQN,
+              RSTRING_SEQUENCE_FQN, RSTRING_SEQUENCE1_FQN, RWRAPPER_MASK, RSYMBOL_MASK,
+              RFUNCTION_MASK, RS4OBJECT_MASK, RNULL_MASK, RENVIRONMENT_MASK, CHARSXPWRAPPER_FQN);
     }
 
     public String getDetailsString(String className, Instance instance, Heap heap) {
@@ -164,18 +169,33 @@ public String getDetailsString(String className, Instance instance, Heap heap) {
             return getScalar(instance, heap);
         }
         if (RINT_SEQUENCE_FQN.equals(className) || RINT_SEQUENCE1_FQN.equals(className)) {
-            Integer stride = (Integer) instance.getValueOfField("stride"); // NOI18N
-            Integer start = (Integer) instance.getValueOfField("start"); // NOI18N
+            String val =  logicalValueForIntSeq(instance);
+            if (val != null) {
+                return val;
+            }
+        }
+        if (RDOUBLE_SEQUENCE_FQN.equals(className) || RDOUBLE_SEQUENCE1_FQN.equals(className)) {
+            Double stride = (Double) instance.getValueOfField("stride"); // NOI18N
+            Double start = (Double) instance.getValueOfField("start"); // NOI18N
             Integer len = (Integer) instance.getValueOfField("length"); // NOI18N
 
             if (stride != null && start != null & len != null) {
                 int length = len.intValue();
                 if (length == 0) {  // empty vector
-                    return "[]";
+                    return "[]";    // NOI18N
                 }
-                if (stride.intValue() == 1) {
-                    int end = start.intValue() + length-1;
-                    return "["+start.intValue()+":"+end+"]";
+                double end = start.doubleValue()+ (length-1) * stride.doubleValue();
+                return "seq("+start+","+end+","+stride+")";     // NOI18N
+            }
+        }
+        if (RSTRING_SEQUENCE_FQN.equals(className) || RSTRING_SEQUENCE1_FQN.equals(className)) {
+            String val = logicalValueForIntSeq(instance);
+            if (val != null) {
+                String prefix = DetailsUtils.getInstanceFieldString(instance, "prefix", heap);  // NOI18N
+                String suffix = DetailsUtils.getInstanceFieldString(instance, "suffix", heap);  // NOI18N
+
+                if (prefix != null && suffix != null) {
+                    return "paste0(\""+prefix+"\", "+val+", \""+suffix+"\")";
                 }
             }
         }
@@ -217,6 +237,25 @@ public String getDetailsString(String className, Instance instance, Heap heap) {
          return null;
     }
 
+    private String logicalValueForIntSeq(Instance instance) {
+        Integer stride = (Integer) instance.getValueOfField("stride"); // NOI18N
+        Integer start = (Integer) instance.getValueOfField("start"); // NOI18N
+        Integer len = (Integer) instance.getValueOfField("length"); // NOI18N
+
+        if (stride != null && start != null & len != null) {
+            int length = len.intValue();
+            if (length == 0) {  // empty vector
+                return "[]";    // NOI18N
+            }
+            int end = start.intValue() + (length-1) * stride.intValue();
+            if (stride.intValue() == 1) {
+                return "["+start.intValue()+":"+end+"]";    // NOI18N
+            }
+            return "seq("+start+","+end+","+stride+")";     // NOI18N
+        }
+        return null;
+    }
+
     private String getRClassName(Instance instance, Heap heap) {
         Instance attributesInst = (Instance) instance.getValueOfField("attributes");   // NOI18N
         if (attributesInst != null) {