Updated max function to accept key and default kwargs

Updated max function to work with all values instead of just numbers
Added additional autotests for max

Author: JennaSys

transcrypt/development/automated_tests/transcrypt/module_builtin/__init__.py

@@ -14,9 +14,18 @@ def canonizeStringList (stringList):
 def run (autoTester):
     autoTester.check ('min', min (-1.1, -1, -3))
     autoTester.check ('max', max (-1.1, -1, -3))
+    autoTester.check ('max', max ([-1.1, -1, -3]))
+    autoTester.check ('max', max ((-1.1, -1, -3)))
+    autoTester.check ('max', max ('abc', 'ABC', 'xyz', 'XYZ'))
+    autoTester.check ('max', max ('abc', 'ABC', 'xyz', 'XYZ', key=lambda v: v[1]))
+    autoTester.check ('max', max (['abc', 'ABC', 'xyz', 'XYZ']))
+    autoTester.check ('max', autoTester.expectException(lambda: max ([])))
+    autoTester.check ('max', max ([], default='zzz'))
     autoTester.check ('abs', abs (-1), abs (1), abs (0), abs (-0.1), abs (0.1))
+
     autoTester.check ('ord', ord ('a'), ord ('e´'[0]))  # This is the 2 codepoint version
-    
+    autoTester.check ('chr', chr (97), chr (122), chr (65), chr (90))  # a z A Z
+
     autoTester.check ('round',
         round (4.006),
         round (4.006, 2),
@@ -104,21 +113,23 @@ def run (autoTester):
             '<br>'
         )
 
-    autoTester.check("".isalpha())
-    autoTester.check("123".isalpha())
-    autoTester.check("abc".isalpha())
-    autoTester.check("abc123".isalpha())
+    autoTester.check("isalpha",
+                     "".isalpha(),
+                     "123".isalpha(),
+                     "abc".isalpha(),
+                     "abc123".isalpha(),
+                     )
 
     enumerate_list = ['a', 'b', 'c', 'd', 'e']
     # JS does not have tuples so coerce  to list of lists
-    autoTester.check(
+    autoTester.check("enumerate",
         [list(item) for item in enumerate(enumerate_list)],
         [list(item) for item in enumerate(enumerate_list, 1)],
         [list(item) for item in enumerate(enumerate_list, start=2)]
     )
 
     replace_test = "abcabcabcabc"
-    autoTester.check(
+    autoTester.check("replace",
         replace_test.replace("c", "x"),
         replace_test.replace("c", "x", -1),
         replace_test.replace("c", "x", 0),
@@ -127,7 +138,7 @@ def run (autoTester):
         replace_test.replace("c", "x", 10),
     )
 
-    autoTester.check(
+    autoTester.check("bin-oct-hex",
         bin(42),
         oct(42),
         hex(42),
@@ -140,7 +151,8 @@ def run (autoTester):
     )
 
     string_test = "abcdefghijkl"
-    autoTester.check(string_test.startswith(""),
+    autoTester.check("startswith",
+        string_test.startswith(""),
         string_test.startswith("abcd"),
         string_test.startswith("efgh"),
         string_test.startswith("efgh", 2),
@@ -157,7 +169,7 @@ def run (autoTester):
         string_test.startswith(("abc", "defgh"), 3, 6),
     )
 
-    autoTester.check(
+    autoTester.check("endswith",
         string_test.endswith(""),
         string_test.endswith("ijkl"),
         string_test.endswith("efgh"),

transcrypt/modules/org/transcrypt/__builtin__.js

@@ -553,7 +553,7 @@ export function py_typeof (anObject) {
         }
     }
     else {
-        return (    // Odly, the braces are required here
+        return (    // Oddly, the braces are required here
             aType == 'boolean' ? bool :
             aType == 'string' ? str :
             aType == 'number' ? (anObject % 1 == 0 ? int : float) :
@@ -667,10 +667,38 @@ export function ord (aChar) {
     return aChar.charCodeAt (0);
 };
 
-// Maximum of n numbers
-export function max (nrOrSeq) {
-    return arguments.length == 1 ? Math.max (...nrOrSeq) : Math.max (...arguments);       
-};
+// Maximum of n values
+export function max (...args) {
+    // Assume no kwargs
+    let dflt = undefined;
+    function key(x) {return x}
+
+    if (args.length > 0) {
+        if (args[args.length-1] && args[args.length-1].hasOwnProperty ("__kwargtrans__")) {
+            const kwargs = args[args.length - 1];
+            args = args.slice(0, -1);
+            if (kwargs.hasOwnProperty('key')) key = kwargs['key'];
+            if (kwargs.hasOwnProperty('py_default')) dflt = kwargs['py_default'];
+        }
+    }
+
+    if (args.length === 0) throw TypeError("expected at least 1 argument, got 0", new Error ());
+    if (args.length > 1 && dflt !== undefined) throw TypeError("Cannot specify a default with multiple positional arguments", new Error ());
+    if (args.length === 1){
+        if (Object.prototype.toString.call(args[0]) === '[object Array]'){
+            args = args[0];
+        } else {
+            throw TypeError("object is not iterable", new Error());
+        }
+    }
+    if (args === null || args.length === 0){
+        if (dflt === undefined) throw ValueError ("max() arg is an empty sequence", new Error ());
+        return dflt
+    }
+
+    return args.reduce((max_val, cur_val) => key(cur_val) > key(max_val) ? cur_val : max_val);
+    // return arguments.length == 1 ? Math.max (...nrOrSeq) : Math.max (...arguments);
+}
 
 // Minimum of n numbers
 export function min (nrOrSeq) {

transcrypt/modules/org/transcrypt/__runtime__.py

@@ -123,7 +123,6 @@ def sorted (iterable, key = None, reverse = False):
 #__pragma__ ('nokwargs')
 
 def map (func, *iterables):
-    # return [func (item) for item in iterable]
     return [func(*items) for items in zip(*iterables)]
 
 def filter (func, iterable):