Nodes in SpecialAttributesFunctions can cast their 2nd argument and "dim" uses that to cast it to a integer vector

Author: steve-s

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/MiscNodes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -277,7 +277,7 @@ public abstract static class NamesGetsNode extends FFIUpCallNode.Arg2 {
 
         @Specialization
         Object doNewObject(Object vec, Object val) {
-            setNamesNode.execute(vec, val);
+            setNamesNode.setAttr(vec, val);
             return vec;
         }
 

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/RMultinomNode.java

@@ -2,7 +2,7 @@
  * Copyright (c) 1995, 1996  Robert Gentleman and Ross Ihaka
  * Copyright (c) 1997-2012, The R Core Team
  * Copyright (c) 2003-2008, The R Foundation
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -142,7 +142,7 @@ protected RIntVector doMultinom(int n, int size, RAbstractDoubleVector probs,
                 Object probsNames = getNamesNode.execute(probs.getAttributes());
                 updateSharedAttributeNode.execute(probs, probsNames);
                 Object[] dimnamesData = new Object[]{probsNames, RNull.instance};
-                setDimNamesNode.execute(resultVec.getAttributes(), RDataFactory.createList(dimnamesData));
+                setDimNamesNode.setAttr(resultVec.getAttributes(), RDataFactory.createList(dimnamesData));
             }
             return resultVec;
         }

com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/TypeConvert.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -227,7 +227,7 @@ protected Object typeConvert(RAbstractStringVector x, RAbstractStringVector naSt
                 }
             }
             RIntVector res = RDataFactory.createIntVector(data, complete);
-            setLevelsAttrNode.execute(res, RDataFactory.createStringVector(levels.keySet().toArray(new String[0]), RDataFactory.COMPLETE_VECTOR));
+            setLevelsAttrNode.setAttr(res, RDataFactory.createStringVector(levels.keySet().toArray(new String[0]), RDataFactory.COMPLETE_VECTOR));
             return RVector.setVectorClassAttr(res, RDataFactory.createStringVector("factor"));
         }
     }

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/EnvFunctions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -432,7 +432,7 @@ protected static Object updateEnvironment(RAbstractContainer obj, REnvironment e
         @TruffleBoundary
         protected static Object updateEnvironment(RAttributable obj, REnvironment env,
                         @Cached("createSetEnvAttrNode()") SetFixedAttributeNode setEnvAttrNode) {
-            setEnvAttrNode.execute(obj, env);
+            setEnvAttrNode.setAttr(obj, env);
             return obj;
         }
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/GrepFunctions.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995-2015, The R Core Team
  * Copyright (c) 2003, The R Foundation
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -904,20 +904,20 @@ protected Object regexp(RAbstractStringVector patternArg, RAbstractStringVector
                     }
                 }
                 RIntVector ret = RDataFactory.createIntVector(result, RDataFactory.COMPLETE_VECTOR);
-                setMatchLengthAttrNode.execute(ret, RDataFactory.createIntVector(matchLength, RDataFactory.COMPLETE_VECTOR));
+                setMatchLengthAttrNode.setAttr(ret, RDataFactory.createIntVector(matchLength, RDataFactory.COMPLETE_VECTOR));
                 if (useBytes) {
-                    setIndexTypeAttrNode.execute(ret, indexType);
-                    setUseBytesAttrNode.execute(ret, RRuntime.LOGICAL_TRUE);
+                    setIndexTypeAttrNode.setAttr(ret, indexType);
+                    setUseBytesAttrNode.setAttr(ret, RRuntime.LOGICAL_TRUE);
                 }
                 if (hasCaptureResult) {
                     RStringVector captureNamesVec = RDataFactory.createStringVector(captureNames, RDataFactory.COMPLETE_VECTOR);
                     RIntVector captureStartVec = RDataFactory.createIntVector(captureStart, RDataFactory.COMPLETE_VECTOR, new int[]{vector.getLength(), captureNames.length});
-                    setDimNamesAttrNode.execute(captureStartVec, RDataFactory.createList(new Object[]{RNull.instance, captureNamesVec.copy()}));
-                    setCaptureStartAttrNode.execute(ret, captureStartVec);
+                    setDimNamesAttrNode.setAttr(captureStartVec, RDataFactory.createList(new Object[]{RNull.instance, captureNamesVec.copy()}));
+                    setCaptureStartAttrNode.setAttr(ret, captureStartVec);
                     RIntVector captureLengthVec = RDataFactory.createIntVector(captureLength, RDataFactory.COMPLETE_VECTOR, new int[]{vector.getLength(), captureNames.length});
-                    setDimNamesAttrNode.execute(captureLengthVec, RDataFactory.createList(new Object[]{RNull.instance, captureNamesVec.copy()}));
-                    setCaptureLengthAttrNode.execute(ret, captureLengthVec);
-                    setCaptureNamesAttrNode.execute(ret, captureNamesVec);
+                    setDimNamesAttrNode.setAttr(captureLengthVec, RDataFactory.createList(new Object[]{RNull.instance, captureNamesVec.copy()}));
+                    setCaptureLengthAttrNode.setAttr(ret, captureLengthVec);
+                    setCaptureNamesAttrNode.setAttr(ret, captureNamesVec);
                 }
                 return ret;
             } catch (PatternSyntaxException e) {
@@ -1088,12 +1088,12 @@ protected Object regexp(RAbstractStringVector patternArg, RAbstractStringVector
                         }
                     }
                     RIntVector matches = RDataFactory.createIntVector(matchPos, RDataFactory.COMPLETE_VECTOR);
-                    setMatchLengthAttrNode.execute(matches, RDataFactory.createIntVector(matchLength, RDataFactory.COMPLETE_VECTOR));
+                    setMatchLengthAttrNode.setAttr(matches, RDataFactory.createIntVector(matchLength, RDataFactory.COMPLETE_VECTOR));
                     ret.setElement(i, matches);
                 }
                 if (useBytes) {
-                    setIndexTypeAttrNode.execute(ret, indexType);
-                    setUseBytesAttrNode.execute(ret, RRuntime.LOGICAL_TRUE);
+                    setIndexTypeAttrNode.setAttr(ret, indexType);
+                    setUseBytesAttrNode.setAttr(ret, RRuntime.LOGICAL_TRUE);
                 }
                 return ret;
             } catch (PatternSyntaxException e) {
@@ -1163,12 +1163,12 @@ private void setNoCaptureAttributes(RIntVector vec, RStringVector captureNames)
             Arrays.fill(captureStartData, -1);
             Arrays.fill(captureLengthData, -1);
             RIntVector captureStart = RDataFactory.createIntVector(captureStartData, RDataFactory.COMPLETE_VECTOR, new int[]{1, captureNames.getLength()});
-            setDimNamesAttrNode.execute(captureStart, RDataFactory.createList(new Object[]{RNull.instance, captureNames.copy()}));
+            setDimNamesAttrNode.setAttr(captureStart, RDataFactory.createList(new Object[]{RNull.instance, captureNames.copy()}));
             RIntVector captureLength = RDataFactory.createIntVector(captureLengthData, RDataFactory.COMPLETE_VECTOR, new int[]{1, captureNames.getLength()});
-            setDimNamesAttrNode.execute(captureLength, RDataFactory.createList(new Object[]{RNull.instance, captureNames.copy()}));
-            setCaptureStartAttrNode.execute(vec, captureStart);
-            setCaptureLengthAttrNode.execute(vec, captureLength);
-            setCaptureNamesAttrNode.execute(vec, captureNames);
+            setDimNamesAttrNode.setAttr(captureLength, RDataFactory.createList(new Object[]{RNull.instance, captureNames.copy()}));
+            setCaptureStartAttrNode.setAttr(vec, captureStart);
+            setCaptureLengthAttrNode.setAttr(vec, captureLength);
+            setCaptureNamesAttrNode.setAttr(vec, captureNames);
         }
 
         @Specialization
@@ -1205,18 +1205,18 @@ protected Object regexp(RAbstractStringVector patternArg, RAbstractStringVector
                             resData[j] = j + 1;
                         }
                         res = RDataFactory.createIntVector(resData, RDataFactory.COMPLETE_VECTOR);
-                        setMatchLengthAttrNode.execute(res, RDataFactory.createIntVector(txt.length()));
+                        setMatchLengthAttrNode.setAttr(res, RDataFactory.createIntVector(txt.length()));
                         if (useBytes) {
-                            setIndexTypeAttrNode.execute(res, indexType);
-                            setUseBytesAttrNode.execute(res, RRuntime.LOGICAL_TRUE);
+                            setIndexTypeAttrNode.setAttr(res, indexType);
+                            setUseBytesAttrNode.setAttr(res, RRuntime.LOGICAL_TRUE);
                         }
                     } else {
                         List<Info> l = getInfo(common, pattern, vector.getDataAt(i), ignoreCase, perl, fixed);
                         res = toIndexOrSizeVector(l, true);
-                        setMatchLengthAttrNode.execute(res, toIndexOrSizeVector(l, false));
+                        setMatchLengthAttrNode.setAttr(res, toIndexOrSizeVector(l, false));
                         if (useBytes) {
-                            setIndexTypeAttrNode.execute(res, indexType);
-                            setUseBytesAttrNode.execute(res, RRuntime.LOGICAL_TRUE);
+                            setIndexTypeAttrNode.setAttr(res, indexType);
+                            setUseBytesAttrNode.setAttr(res, RRuntime.LOGICAL_TRUE);
                         }
                         RIntVector captureStart = toCaptureStartOrLength(l, true);
                         if (captureStart != null) {
@@ -1231,9 +1231,9 @@ protected Object regexp(RAbstractStringVector patternArg, RAbstractStringVector
                                 }
                             }
                             hasAnyCapture = true;
-                            setCaptureStartAttrNode.execute(res, captureStart);
-                            setCaptureLengthAttrNode.execute(res, captureLength);
-                            setCaptureNamesAttrNode.execute(res, captureNames);
+                            setCaptureStartAttrNode.setAttr(res, captureStart);
+                            setCaptureLengthAttrNode.setAttr(res, captureLength);
+                            setCaptureNamesAttrNode.setAttr(res, captureNames);
                         } else if (hasAnyCapture) {
                             assert captureNames != null;
                             // it's capture names from previous iteration, so copy
@@ -1277,7 +1277,7 @@ private RIntVector toCaptureStartOrLength(List<Info> list, boolean start) {
                 }
             }
             RIntVector ret = RDataFactory.createIntVector(arr, RDataFactory.COMPLETE_VECTOR, new int[]{list.size(), firstInfo.captureNames.length});
-            setDimNamesAttrNode.execute(ret, RDataFactory.createList(new Object[]{RNull.instance, RDataFactory.createStringVector(firstInfo.captureNames, RDataFactory.COMPLETE_VECTOR)}));
+            setDimNamesAttrNode.setAttr(ret, RDataFactory.createList(new Object[]{RNull.instance, RDataFactory.createStringVector(firstInfo.captureNames, RDataFactory.COMPLETE_VECTOR)}));
             return ret;
         }
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/LaFunctions.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995-2012, The R Core Team
  * Copyright (c) 2003, The R Foundation
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -520,7 +520,7 @@ protected RList doDetGeReal(RAbstractDoubleVector aIn, boolean useLog,
                 }
             }
             RDoubleVector modulusVec = RDataFactory.createDoubleVectorFromScalar(modulus);
-            setLogAttrNode.execute(modulusVec, RRuntime.asLogical(useLog));
+            setLogAttrNode.setAttr(modulusVec, RRuntime.asLogical(useLog));
             RList result = RDataFactory.createList(new Object[]{modulusVec, sign}, NAMES_VECTOR);
             RVector.setVectorClassAttr(result, DET_CLASS);
             return result;
@@ -593,8 +593,8 @@ protected RDoubleVector doDetGeReal(RAbstractDoubleVector aIn, boolean piv, doub
             }
 
             RDoubleVector result = (RDoubleVector) copyAttributesNode.execute(RDataFactory.createDoubleVector(aData, RDataFactory.INCOMPLETE_VECTOR), aIn);
-            setPivotAttrNode.execute(result, RDataFactory.createIntVector(ipiv, false));
-            setRankAttrNode.execute(result, rank[0]);
+            setPivotAttrNode.setAttr(result, RDataFactory.createIntVector(ipiv, false));
+            setRankAttrNode.setAttr(result, rank[0]);
             RList dn = getDimNamesNode.getDimNames(aIn);
             if (dn != null && dn.getDataAt(0) != null) {
                 Object[] dn2 = new Object[m];

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Parse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -264,7 +264,7 @@ private void addAttributes(RExpression exprs, Source source, REnvironment srcFil
                 throw RInternalError.unimplemented("attribute of type " + data.getClass().getSimpleName());
             }
         }
-        setSrcRefAttrNode.execute(exprs, RDataFactory.createList(srcrefData));
+        setSrcRefAttrNode.setAttr(exprs, RDataFactory.createList(srcrefData));
         int[] wholeSrcrefData = new int[8];
         int endOffset = source.getCharacters().length() - 1;
         wholeSrcrefData[0] = source.getLineNumber(0);
@@ -273,8 +273,8 @@ private void addAttributes(RExpression exprs, Source source, REnvironment srcFil
         wholeSrcrefData[6] = wholeSrcrefData[0];
         wholeSrcrefData[6] = wholeSrcrefData[3];
 
-        setWholeSrcRefAttrNode.execute(exprs, RDataFactory.createIntVector(wholeSrcrefData, RDataFactory.COMPLETE_VECTOR));
-        setSrcFileAttrNode.execute(exprs, srcFile);
+        setWholeSrcRefAttrNode.setAttr(exprs, RDataFactory.createIntVector(wholeSrcrefData, RDataFactory.COMPLETE_VECTOR));
+        setSrcFileAttrNode.setAttr(exprs, srcFile);
 
         RIntVector parseData = new ParseDataVisitor(exprs).getParseData();
         srcFile.safePut("parseData", parseData);

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Transpose.java

@@ -2,7 +2,7 @@
  * Copyright (c) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
  * Copyright (c) 1995-2014, The R Core Team
  * Copyright (c) 2002-2008, The R Foundation
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -243,12 +243,12 @@ protected RVector<?> transposeNonMatrixGeneric(RAbstractVector x,
     }
 
     private void putNewDimsFromDimnames(RAbstractVector source, RAbstractVector dest, int[] newDim) {
-        putDimensions.execute(initAttributes.execute(dest), RDataFactory.createIntVector(newDim, RDataFactory.COMPLETE_VECTOR));
+        putDimensions.setAttr(initAttributes.execute(dest), RDataFactory.createIntVector(newDim, RDataFactory.COMPLETE_VECTOR));
         convertDimNames(source, dest);
     }
 
     private void putNewDimsFromNames(RAbstractVector source, RAbstractVector dest, int[] newDim) {
-        putDimensions.execute(initAttributes.execute(dest), RDataFactory.createIntVector(newDim, RDataFactory.COMPLETE_VECTOR));
+        putDimensions.setAttr(initAttributes.execute(dest), RDataFactory.createIntVector(newDim, RDataFactory.COMPLETE_VECTOR));
         convertNamesToDimnames(source, dest);
     }
 
@@ -261,7 +261,7 @@ private void convertDimNames(RAbstractVector source, RAbstractVector dest) {
             RStringVector axisNames = extractAxisNamesNode.execute(dimNames);
             RStringVector transAxisNames = axisNames == null ? null : RDataFactory.createStringVector(new String[]{axisNames.getDataAt(1), axisNames.getDataAt(0)}, true);
             RList newDimNames = RDataFactory.createList(new Object[]{dimNames.getDataAt(1), dimNames.getDataAt(0)}, transAxisNames);
-            putDimNames.execute(dest.getAttributes(), newDimNames);
+            putDimNames.setAttr(dest.getAttributes(), newDimNames);
         }
     }
 
@@ -274,7 +274,7 @@ private void convertNamesToDimnames(RAbstractVector source, RAbstractVector dest
         if (names != null) {
             RList newDimNames = RDataFactory.createList(new Object[]{RNull.instance, names});
             DynamicObject attributes = dest.getAttributes();
-            putDimNames.execute(attributes, newDimNames);
+            putDimNames.setAttr(attributes, newDimNames);
             if (removeAttributeNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 removeAttributeNode = insert(RemoveAttributeNode.create());

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateComment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -65,7 +65,7 @@ protected Object dim(RSharingAttributeStorage container, RAbstractStringVector v
             CompilerDirectives.transferToInterpreterAndInvalidate();
             setCommentAttrNode = insert(createGetCommentAttrNode());
         }
-        setCommentAttrNode.execute(container, value);
+        setCommentAttrNode.setAttr(container, value);
         return container;
     }
 

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/UpdateDim.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -87,7 +87,7 @@ protected RAbstractVector updateDim(RAbstractVector vector, RAbstractIntVector d
             attrs = RAttributesLayout.createDim(dimensionsMaterialized);
             result.initAttributes(attrs);
         } else {
-            putDimensions.execute(attrs, dimensionsMaterialized);
+            putDimensions.setAttr(attrs, dimensionsMaterialized);
         }
         return result;
     }