Rename callFunction to callObject

msimacek · msimacek · commit 269bb82cbfff · 2020-08-05T16:20:03.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java
@@ -1592,16 +1592,16 @@ PNone printAllGiven(VirtualFrame frame, Object[] values, String sep, String end,
             int lastValue = values.length - 1;
             Object writeMethod = fileLib.lookupAttributeStrict(file, frame, "write");
             for (int i = 0; i < lastValue; i++) {
-                methodLib.callFunction(writeMethod, frame, valueLib.asPString(values[i]));
-                methodLib.callFunction(writeMethod, frame, sep);
+                methodLib.callObject(writeMethod, frame, valueLib.asPString(values[i]));
+                methodLib.callObject(writeMethod, frame, sep);
             }
             if (lastValue >= 0) {
-                methodLib.callFunction(writeMethod, frame, valueLib.asPString(values[lastValue]));
+                methodLib.callObject(writeMethod, frame, valueLib.asPString(values[lastValue]));
             }
-            methodLib.callFunction(writeMethod, frame, end);
+            methodLib.callObject(writeMethod, frame, end);
             if (flush) {
                 Object flushMethod = fileLib.lookupAttributeStrict(file, frame, "flush");
-                methodLib.callFunction(flushMethod, frame);
+                methodLib.callObject(flushMethod, frame);
             }
             return PNone.NONE;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -1055,7 +1055,7 @@ public static Object lookupAttributeImpl(Object type, String name, boolean stric
     }
 
     @ExportMessage
-    public Object callFunctionWithState(ThreadState state, Object[] arguments,
+    public Object callObjectWithState(ThreadState state, Object[] arguments,
                     @Shared("gotState") @Cached ConditionProfile gotState,
                     @Exclusive @Cached CallNode callNode) {
         VirtualFrame frame = null;
@@ -1121,7 +1121,7 @@ public Object lookupAndCallRegularMethodWithState(ThreadState state, String meth
                     @CachedLibrary("this") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(this, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 
     @ExportMessage
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonBooleanExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonBooleanExports.java
@@ -316,6 +316,6 @@ public static Object lookupAndCallRegularMethodWithState(Boolean receiver, Threa
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonDoubleExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonDoubleExports.java
@@ -239,6 +239,6 @@ public static Object lookupAndCallRegularMethodWithState(Double receiver, Thread
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonIntegerExports.java
@@ -313,6 +313,6 @@ public static Object lookupAndCallRegularMethodWithState(Integer receiver, Threa
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonLongExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonLongExports.java
@@ -344,6 +344,6 @@ public static Object lookupAndCallRegularMethodWithState(Long receiver, ThreadSt
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonObjectExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonObjectExports.java
@@ -359,6 +359,6 @@ public static Object lookupAndCallRegularMethodWithState(Object receiver, Thread
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/DefaultPythonStringExports.java
@@ -228,6 +228,6 @@ public static Object lookupAndCallRegularMethodWithState(String receiver, Thread
                     @CachedLibrary("receiver") PythonObjectLibrary plib,
                     @Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {
         Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);
-        return methodLib.callFunctionWithState(method, state, arguments);
+        return methodLib.callObjectWithState(method, state, arguments);
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/PythonObjectLibrary.java
@@ -670,18 +670,18 @@ protected Object lookupAttributeOnTypeInternal(Object receiver, String name, boo
     /**
      * Call a callable object.
      */
-    public final Object callFunction(Object callable, VirtualFrame frame, Object... arguments) {
+    public final Object callObject(Object callable, VirtualFrame frame, Object... arguments) {
         ThreadState state = null;
         if (profileHasFrame(frame)) {
             state = PArguments.getThreadState(frame);
         }
-        return callFunctionWithState(callable, state, arguments);
+        return callObjectWithState(callable, state, arguments);
     }
 
     /**
      * Call a callable object.
      */
-    public Object callFunctionWithState(Object callable, ThreadState state, Object... arguments) {
+    public Object callObjectWithState(Object callable, ThreadState state, Object... arguments) {
         throw PRaiseNode.getUncached().raise(TypeError, ErrorMessages.OBJ_ISNT_CALLABLE, callable);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1592,16 +1592,16 @@ PNone printAllGiven(VirtualFrame frame, Object[] values, String sep, String end,`
`1592`	`1592`	`int lastValue = values.length - 1;`
`1593`	`1593`	`Object writeMethod = fileLib.lookupAttributeStrict(file, frame, "write");`
`1594`	`1594`	`for (int i = 0; i < lastValue; i++) {`
`1595`		`- methodLib.callFunction(writeMethod, frame, valueLib.asPString(values[i]));`
`1596`		`- methodLib.callFunction(writeMethod, frame, sep);`
	`1595`	`+ methodLib.callObject(writeMethod, frame, valueLib.asPString(values[i]));`
	`1596`	`+ methodLib.callObject(writeMethod, frame, sep);`
`1597`	`1597`	`}`
`1598`	`1598`	`if (lastValue >= 0) {`
`1599`		`- methodLib.callFunction(writeMethod, frame, valueLib.asPString(values[lastValue]));`
	`1599`	`+ methodLib.callObject(writeMethod, frame, valueLib.asPString(values[lastValue]));`
`1600`	`1600`	`}`
`1601`		`- methodLib.callFunction(writeMethod, frame, end);`
	`1601`	`+ methodLib.callObject(writeMethod, frame, end);`
`1602`	`1602`	`if (flush) {`
`1603`	`1603`	`Object flushMethod = fileLib.lookupAttributeStrict(file, frame, "flush");`
`1604`		`- methodLib.callFunction(flushMethod, frame);`
	`1604`	`+ methodLib.callObject(flushMethod, frame);`
`1605`	`1605`	`}`
`1606`	`1606`	`return PNone.NONE;`
`1607`	`1607`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,6 @@ public static Object lookupAndCallRegularMethodWithState(Boolean receiver, Threa`
`316`	`316`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`317`	`317`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`318`	`318`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`319`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`319`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`320`	`320`	`}`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,6 @@ public static Object lookupAndCallRegularMethodWithState(Double receiver, Thread`
`239`	`239`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`240`	`240`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`241`	`241`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`242`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`242`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`243`	`243`	`}`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,6 @@ public static Object lookupAndCallRegularMethodWithState(Integer receiver, Threa`
`313`	`313`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`314`	`314`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`315`	`315`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`316`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`316`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`317`	`317`	`}`
`318`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,6 @@ public static Object lookupAndCallRegularMethodWithState(Long receiver, ThreadSt`
`344`	`344`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`345`	`345`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`346`	`346`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`347`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`347`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`348`	`348`	`}`
`349`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,6 @@ public static Object lookupAndCallRegularMethodWithState(Object receiver, Thread`
`359`	`359`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`360`	`360`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`361`	`361`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`362`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`362`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`363`	`363`	`}`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,6 @@ public static Object lookupAndCallRegularMethodWithState(String receiver, Thread`
`228`	`228`	`@CachedLibrary("receiver") PythonObjectLibrary plib,`
`229`	`229`	`@Shared("methodLib") @CachedLibrary(limit = "2") PythonObjectLibrary methodLib) {`
`230`	`230`	`Object method = plib.lookupAttributeStrictWithState(receiver, state, methodName);`
`231`		`- return methodLib.callFunctionWithState(method, state, arguments);`
	`231`	`+ return methodLib.callObjectWithState(method, state, arguments);`
`232`	`232`	`}`
`233`	`233`	`}`