Remove ForeignDateBuiltins

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -263,7 +263,6 @@
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignAbstractClassBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignBooleanBuiltins;
-import com.oracle.graal.python.builtins.objects.foreign.ForeignDateBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignDateTimeBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignExecutableBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignInstantiableBuiltins;
@@ -504,7 +503,6 @@ private static PythonBuiltins[] initializeBuiltins(TruffleLanguage.Env env) {
                         new ForeignObjectBuiltins(),
                         new ForeignNumberBuiltins(),
                         new ForeignBooleanBuiltins(),
-                        new ForeignDateBuiltins(),
                         new ForeignDateTimeBuiltins(),
                         new ForeignTimeBuiltins(),
                         new ForeignTimeZoneBuiltins(),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -181,7 +181,6 @@
 import com.oracle.graal.python.builtins.objects.floats.FloatBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignAbstractClassBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignBooleanBuiltins;
-import com.oracle.graal.python.builtins.objects.foreign.ForeignDateBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignDateTimeBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignExecutableBuiltins;
 import com.oracle.graal.python.builtins.objects.foreign.ForeignInstantiableBuiltins;
@@ -1235,7 +1234,7 @@ def takewhile(predicate, iterable):
                     newBuilder().moduleName("datetime").publishInModule("_datetime").slots(TimeZoneBuiltins.SLOTS).doc("Fixed offset from UTC implementation of tzinfo.")),
 
     // foreign datetime
-    ForeignDate("ForeignDate", PDate, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignDateBuiltins.SLOTS)),
+    ForeignDate("ForeignDate", PDate, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation()),
     ForeignTime("ForeignTime", PTime, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignTimeBuiltins.SLOTS)),
     ForeignDateTime("ForeignDateTime", PDateTime, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignDateTimeBuiltins.SLOTS)),
     ForeignTimeZone("ForeignTimeZone", PTzInfo, newBuilder().publishInModule(J_POLYGLOT).basetype().addDict().disallowInstantiation().slots(ForeignTimeZoneBuiltins.SLOTS)),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/datetime/DateBuiltins.java

@@ -116,6 +116,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.IsForeignObjectNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
@@ -378,7 +379,7 @@ private static Object addBoundary(Object left, Object right, Node inliningTarget
 
             LocalDate localDate = ChronoUnit.DAYS.addTo(from, days - 1);
             return DateNodes.SubclassNewNode.getUncached().execute(inliningTarget,
-                            GetClassNode.executeUncached(dateObj),
+                            getResultDateType(dateObj),
                             localDate.getYear(),
                             localDate.getMonthValue(),
                             localDate.getDayOfMonth());
@@ -443,7 +444,7 @@ private static Object subBoundary(Object left, Object right, Node inliningTarget
 
                 LocalDate localDate = ChronoUnit.DAYS.addTo(from, days - 1);
                 return DateNodes.SubclassNewNode.getUncached().execute(inliningTarget,
-                                GetClassNode.executeUncached(left),
+                                getResultDateType(left),
                                 localDate.getYear(),
                                 localDate.getMonthValue(),
                                 localDate.getDayOfMonth());
@@ -521,6 +522,10 @@ static int getDay(Object self,
         }
     }
 
+    private static Object getResultDateType(Object dateObj) {
+        return IsForeignObjectNode.executeUncached(dateObj) ? PythonBuiltinClassType.PDate : GetClassNode.executeUncached(dateObj);
+    }
+
     @Builtin(name = "today", minNumOfPositionalArgs = 1, isClassmethod = true, parameterNames = {"self"})
     @GenerateNodeFactory
     public abstract static class TodayNode extends PythonBuiltinNode {