[GR-30482] Migrate remaining numeric conversions to nodes

PullRequest: graalpython/1788

Author: msimacek

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/objects/PythonObjectLibraryTests.java

@@ -40,16 +40,13 @@
  */
 package com.oracle.graal.python.test.objects;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
 
-import java.math.BigInteger;
 import java.util.concurrent.Callable;
 
-import com.oracle.graal.python.builtins.objects.ints.PInt;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyExecutable;
@@ -100,17 +97,6 @@ public void testLookupAttribute() {
         lookupAttr(() -> "abc", noSuchMethod, true);
     }
 
-    @Test
-    public void testPIntAsJavaLong() {
-        execInContext(() -> {
-            PInt p = PythonObjectFactory.getUncached().createInt(BigInteger.valueOf(123));
-            PythonObjectLibrary lib = PythonObjectLibrary.getFactory().getUncached();
-            assertEquals(123, lib.asJavaLong(p));
-            assertEquals(123, lib.asJavaLong(p, null));
-            return null;
-        });
-    }
-
     private void lookupAttr(Callable<Object> createValue, String attrName, boolean expectNoValue) {
         PythonObjectLibrary lib = PythonObjectLibrary.getFactory().getUncached();
         execInContext(() -> {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -5,14 +5,19 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
+
+import java.util.List;
+
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.complex.ComplexBuiltins;
 import com.oracle.graal.python.builtins.objects.complex.PComplex;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.lib.PyFloatAsDoubleNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -32,12 +37,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.library.CachedLibrary;
-
-import java.util.List;
-
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
-import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
 @CoreFunctions(defineModule = "cmath")
 public class CmathModuleBuiltins extends PythonBuiltins {
@@ -338,11 +337,11 @@ PComplex doDD(double r, double phi) {
             return rect(r, phi);
         }
 
-        @Specialization(limit = "2")
-        PComplex doGeneral(Object r, Object phi,
-                        @CachedLibrary("r") PythonObjectLibrary rLib,
-                        @CachedLibrary("phi") PythonObjectLibrary phiLib) {
-            return rect(rLib.asJavaDouble(r), phiLib.asJavaDouble(phi));
+        @Specialization
+        PComplex doGeneral(VirtualFrame frame, Object r, Object phi,
+                        @Cached PyFloatAsDoubleNode rAsDoubleNode,
+                        @Cached PyFloatAsDoubleNode phiAsDoubleNode) {
+            return rect(rAsDoubleNode.execute(frame, r), phiAsDoubleNode.execute(frame, phi));
         }
 
         @TruffleBoundary
@@ -1015,16 +1014,16 @@ boolean doCCNN(PComplex a, PComplex b, PNone relTolObj, PNone absTolObj) {
             return isClose(a, b, DEFAULT_REL_TOL, DEFAULT_ABS_TOL);
         }
 
-        @Specialization(limit = "2")
+        @Specialization
         boolean doGeneral(VirtualFrame frame, Object aObj, Object bObj, Object relTolObj, Object absTolObj,
                         @Cached CoerceToComplexNode coerceAToComplex,
                         @Cached CoerceToComplexNode coerceBToComplex,
-                        @CachedLibrary("relTolObj") PythonObjectLibrary relTolLib,
-                        @CachedLibrary("absTolObj") PythonObjectLibrary absTolLib) {
+                        @Cached PyFloatAsDoubleNode relAsDoubleNode,
+                        @Cached PyFloatAsDoubleNode absAsDoubleNode) {
             PComplex a = coerceAToComplex.execute(frame, aObj);
             PComplex b = coerceBToComplex.execute(frame, bObj);
-            double relTol = PGuards.isNoValue(relTolObj) ? DEFAULT_REL_TOL : relTolLib.asJavaDouble(relTolObj);
-            double absTol = PGuards.isPNone(absTolObj) ? DEFAULT_ABS_TOL : absTolLib.asJavaDouble(absTolObj);
+            double relTol = PGuards.isNoValue(relTolObj) ? DEFAULT_REL_TOL : relAsDoubleNode.execute(frame, relTolObj);
+            double absTol = PGuards.isPNone(absTolObj) ? DEFAULT_ABS_TOL : absAsDoubleNode.execute(frame, absTolObj);
             return isClose(a, b, relTol, absTol);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CmathModuleBuiltins.java

@@ -54,8 +54,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
-import com.oracle.graal.python.builtins.objects.function.PArguments;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.lib.PyLongAsLongNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -69,7 +68,6 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.library.CachedLibrary;
 
 @CoreFunctions(defineModule = "_locale")
 public class LocaleModuleBuiltins extends PythonBuiltins {
@@ -309,12 +307,11 @@ Object doWithLocaleID(int category, String posixLocaleID) {
             return toPosix(newLocale);
         }
 
-        @Specialization(replaces = {"doWithoutLocaleID", "doWithLocaleID"}, limit = "3")
+        @Specialization(replaces = {"doWithoutLocaleID", "doWithLocaleID"})
         Object doGeneric(VirtualFrame frame, Object category, Object posixLocaleID,
-                        @CachedLibrary("category") PythonObjectLibrary categoryLib,
+                        @Cached PyLongAsLongNode asLongNode,
                         @Cached CastToJavaStringNode castToJavaStringNode) {
-
-            long l = categoryLib.asJavaLongWithState(category, PArguments.getThreadState(frame));
+            long l = asLongNode.execute(frame, category);
             if (!isValidCategory(l)) {
                 throw raise(PythonErrorType.ValueError, ErrorMessages.INVALID_LOCALE_CATEGORY);
             }