Consider keyword-only arg 'default' in min/max.

Author: fangerer

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

@@ -1281,32 +1281,38 @@ protected final BinaryComparisonNode createComparison() {
         }
 
         @Specialization(guards = "args.length == 0")
-        Object maxSequence(VirtualFrame frame, Object arg1, Object[] args, @SuppressWarnings("unused") PNone keywordArg,
-                        @Cached("create()") GetIteratorNode getIterator,
-                        @Cached("create()") GetNextNode next,
+        Object maxSequence(VirtualFrame frame, Object arg1, Object[] args, @SuppressWarnings("unused") PNone key, Object defaultVal,
+                        @Cached GetIteratorNode getIterator,
+                        @Cached GetNextNode next,
                         @Cached("createComparison()") BinaryComparisonNode compare,
                         @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile1,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile2) {
-            return minmaxSequenceWithKey(frame, arg1, args, null, getIterator, next, compare, castToBooleanNode, null, errorProfile1, errorProfile2);
+                        @Cached IsBuiltinClassProfile errorProfile1,
+                        @Cached IsBuiltinClassProfile errorProfile2,
+                        @Shared("hasDefaultProfile") @Cached("createBinaryProfile()") ConditionProfile hasDefaultProfile) {
+            return minmaxSequenceWithKey(frame, arg1, args, null, defaultVal, getIterator, next, compare, castToBooleanNode, null, errorProfile1, errorProfile2, hasDefaultProfile);
         }
 
         @Specialization(guards = "args.length == 0")
-        Object minmaxSequenceWithKey(VirtualFrame frame, Object arg1, @SuppressWarnings("unused") Object[] args, Object keywordArg,
-                        @Cached("create()") GetIteratorNode getIterator,
-                        @Cached("create()") GetNextNode next,
+        Object minmaxSequenceWithKey(VirtualFrame frame, Object arg1, @SuppressWarnings("unused") Object[] args, Object keywordArg, Object defaultVal,
+                        @Cached GetIteratorNode getIterator,
+                        @Cached GetNextNode next,
                         @Cached("createComparison()") BinaryComparisonNode compare,
                         @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
-                        @Cached("create()") CallNode keyCall,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile1,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile2) {
+                        @Cached CallNode keyCall,
+                        @Cached IsBuiltinClassProfile errorProfile1,
+                        @Cached IsBuiltinClassProfile errorProfile2,
+                        @Shared("hasDefaultProfile") @Cached("createBinaryProfile()") ConditionProfile hasDefaultProfile) {
             Object iterator = getIterator.executeWith(frame, arg1);
             Object currentValue;
             try {
                 currentValue = next.execute(frame, iterator);
             } catch (PException e) {
                 e.expectStopIteration(errorProfile1);
-                throw raise(PythonErrorType.ValueError, ErrorMessages.ARG_IS_EMPTY_SEQ, this instanceof MaxNode ? "max" : "min");
+                if (hasDefaultProfile.profile(PGuards.isNoValue(defaultVal))) {
+                    throw raise(PythonErrorType.ValueError, ErrorMessages.ARG_IS_EMPTY_SEQ, getName());
+                } else {
+                    currentValue = defaultVal;
+                }
             }
             Object currentKey = applyKeyFunction(frame, keywordArg, keyCall, currentValue);
             while (true) {
@@ -1338,20 +1344,30 @@ Object minmaxSequenceWithKey(VirtualFrame frame, Object arg1, @SuppressWarnings(
             return currentValue;
         }
 
+        private String getName() {
+            return this instanceof MaxNode ? "max" : "min";
+        }
+
         @Specialization(guards = "args.length != 0")
-        Object minmaxBinary(VirtualFrame frame, Object arg1, Object[] args, @SuppressWarnings("unused") PNone keywordArg,
+        Object minmaxBinary(VirtualFrame frame, Object arg1, Object[] args, @SuppressWarnings("unused") PNone keywordArg, Object defaultVal,
                         @Cached("createComparison()") BinaryComparisonNode compare,
                         @Cached("createBinaryProfile()") ConditionProfile moreThanTwo,
-                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode) {
-            return minmaxBinaryWithKey(frame, arg1, args, null, compare, null, moreThanTwo, castToBooleanNode);
+                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
+                        @Shared("hasDefaultProfile") @Cached("createBinaryProfile()") ConditionProfile hasDefaultProfile) {
+            return minmaxBinaryWithKey(frame, arg1, args, null, defaultVal, compare, null, moreThanTwo, castToBooleanNode, hasDefaultProfile);
         }
 
         @Specialization(guards = "args.length != 0")
-        Object minmaxBinaryWithKey(VirtualFrame frame, Object arg1, Object[] args, Object keywordArg,
+        Object minmaxBinaryWithKey(VirtualFrame frame, Object arg1, Object[] args, Object keywordArg, @SuppressWarnings("unused") Object defaultVal,
                         @Cached("createComparison()") BinaryComparisonNode compare,
                         @Cached CallNode keyCall,
                         @Cached("createBinaryProfile()") ConditionProfile moreThanTwo,
-                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode) {
+                        @Shared("castToBooleanNode") @Cached("createIfTrueNode()") CoerceToBooleanNode castToBooleanNode,
+                        @Shared("hasDefaultProfile") @Cached("createBinaryProfile()") ConditionProfile hasDefaultProfile) {
+
+            if (!hasDefaultProfile.profile(PGuards.isNoValue(defaultVal))) {
+                throw raise(PythonBuiltinClassType.TypeError, "Cannot specify a default for %s with multiple positional arguments", getName());
+            }
             Object currentValue = arg1;
             Object currentKey = applyKeyFunction(frame, keywordArg, keyCall, currentValue);
             Object nextValue = args[0];
@@ -1399,15 +1415,15 @@ private static Object applyKeyFunction(VirtualFrame frame, Object keywordArg, Ca
 
     // max(iterable, *[, key])
     // max(arg1, arg2, *args[, key])
-    @Builtin(name = MAX, minNumOfPositionalArgs = 1, takesVarArgs = true, keywordOnlyNames = {"key"})
+    @Builtin(name = MAX, minNumOfPositionalArgs = 1, takesVarArgs = true, keywordOnlyNames = {"key", "default"})
     @GenerateNodeFactory
     public abstract static class MaxNode extends MinMaxNode {
 
     }
 
     // min(iterable, *[, key])
     // min(arg1, arg2, *args[, key])
-    @Builtin(name = MIN, minNumOfPositionalArgs = 1, takesVarArgs = true, keywordOnlyNames = {"key"})
+    @Builtin(name = MIN, minNumOfPositionalArgs = 1, takesVarArgs = true, keywordOnlyNames = {"key", "default"})
     @GenerateNodeFactory
     public abstract static class MinNode extends MinMaxNode {