Rename PythonObject.hpyFields to hpyData

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -2293,7 +2293,7 @@ public long ctxFieldLoad(long bits, long idx) {
         Object owner = getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(bits));
         // HPyField index is always non-zero because zero means: uninitialized
         assert idx > 0;
-        Object referent = ((PythonObject) owner).getHpyFields()[(int) idx];
+        Object referent = ((PythonObject) owner).getHPyData()[(int) idx];
         return GraalHPyBoxing.boxHandle(getHPyHandleForObject(referent));
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -2885,7 +2885,7 @@ Object execute(Object[] arguments,
         }
 
         static int assign(PythonObject owner, Object referent, int location) {
-            Object[] hpyFields = owner.getHpyFields();
+            Object[] hpyFields = owner.getHPyData();
             if (location != 0) {
                 assert hpyFields != null;
                 hpyFields[location] = referent;
@@ -2900,7 +2900,7 @@ static int assign(PythonObject owner, Object referent, int location) {
                     hpyFields = PythonUtils.arrayCopyOf(hpyFields, newLocation + 1);
                     hpyFields[newLocation] = referent;
                 }
-                owner.setHpyFields(hpyFields);
+                owner.setHPyData(hpyFields);
                 return newLocation;
             }
         }
@@ -2948,7 +2948,7 @@ Object execute(Object[] arguments,
                 }
                 Object owner = asPythonObjectNode.execute(context, arguments[1]);
                 if (owner instanceof PythonObject) {
-                    referent = ((PythonObject) owner).getHpyFields()[idx];
+                    referent = ((PythonObject) owner).getHPyData()[idx];
                 } else {
                     throw CompilerDirectives.shouldNotReachHere("HPyField owner is not a PythonObject!");
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/PythonHPyObject.java

@@ -48,7 +48,7 @@ public final class PythonHPyObject extends PythonObject {
     public PythonHPyObject(Object pythonClass, Shape instanceShape, Object hpyNativeSpace) {
         super(pythonClass, instanceShape);
         if (hpyNativeSpace != null) {
-            this.setHpyFields(new Object[]{hpyNativeSpace});
+            this.setHPyData(new Object[]{hpyNativeSpace});
         }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObject.java

@@ -73,7 +73,7 @@ public class PythonObject extends PythonAbstractObject {
 
     private final Object initialPythonClass;
 
-    private Object[] hpyFields;
+    private Object[] hpyData;
 
     public PythonObject(Object pythonClass, Shape instanceShape) {
         super(instanceShape);
@@ -175,23 +175,23 @@ public static int getCallSiteInlineCacheMaxDepth() {
         return PythonOptions.getCallSiteInlineCacheMaxDepth();
     }
 
-    public final Object[] getHpyFields() {
-        return hpyFields;
+    public final Object[] getHPyData() {
+        return hpyData;
     }
 
-    public final void setHpyFields(Object[] hpyFields) {
-        this.hpyFields = hpyFields;
+    public final void setHPyData(Object[] hpyFields) {
+        this.hpyData = hpyFields;
     }
 
     public final void setHPyNativeSpace(Object dataPtr) {
-        if (hpyFields == null) {
-            hpyFields = new Object[]{dataPtr};
+        if (hpyData == null) {
+            hpyData = new Object[]{dataPtr};
         } else {
-            hpyFields[0] = dataPtr;
+            hpyData[0] = dataPtr;
         }
     }
 
     public final Object getHPyNativeSpace() {
-        return hpyFields != null ? hpyFields[0] : 0L;
+        return hpyData != null ? hpyData[0] : 0L;
     }
 }