coconut-develop 3.0.0a0.dev12__tar.gz → 3.0.0a0.dev14__tar.gz

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coconut-develop
-Version: 3.0.0a0.dev12
+Version: 3.0.0a0.dev14
 Summary: Simple, elegant, Pythonic functional programming.
 Home-page: http://coconut-lang.org
 Author: Evan Hubinger
@@ -125,14 +125,14 @@ Classifier: Framework :: IPython
 Classifier: Framework :: Jupyter
 Classifier: Typing :: Typed
 Provides-Extra: kernel
-Provides-Extra: watch
-Provides-Extra: jobs
-Provides-Extra: mypy
-Provides-Extra: backports
-Provides-Extra: xonsh
-Provides-Extra: jupyter
 Provides-Extra: all
-Provides-Extra: ipython
+Provides-Extra: mypy
+Provides-Extra: jobs
 Provides-Extra: docs
+Provides-Extra: xonsh
+Provides-Extra: watch
 Provides-Extra: tests
+Provides-Extra: backports
 Provides-Extra: dev
+Provides-Extra: ipython
+Provides-Extra: jupyter

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/__coconut__/__init__.pyi

@@ -1108,16 +1108,16 @@ class _coconut_lifted_1(_t.Generic[_T, _W]):
     #     self,
     #     _g: _t.Callable[[_X], _T],
     # ) -> _t.Callable[[_X], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y], _T],
-    ) -> _t.Callable[[_X, _Y], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y, _Z], _T],
-    ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y], _T],
+    # ) -> _t.Callable[[_X, _Y], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y, _Z], _T],
+    # ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
     @_t.overload
     def __call__(
         self,
@@ -1142,18 +1142,18 @@ class _coconut_lifted_2(_t.Generic[_T, _U, _W]):
     #     _g: _t.Callable[[_X], _T],
     #     _h: _t.Callable[[_X], _U],
     # ) -> _t.Callable[[_X], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y], _T],
-        _h: _t.Callable[[_X, _Y], _U],
-    ) -> _t.Callable[[_X, _Y], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y, _Z], _T],
-        _h: _t.Callable[[_X, _Y, _Z], _U],
-    ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y], _T],
+    #     _h: _t.Callable[[_X, _Y], _U],
+    # ) -> _t.Callable[[_X, _Y], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y, _Z], _T],
+    #     _h: _t.Callable[[_X, _Y, _Z], _U],
+    # ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
     @_t.overload
     def __call__(
         self,
@@ -1182,20 +1182,20 @@ class _coconut_lifted_3(_t.Generic[_T, _U, _V, _W]):
     #     _h: _t.Callable[[_X], _U],
     #     _i: _t.Callable[[_X], _V],
     # ) -> _t.Callable[[_X], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y], _T],
-        _h: _t.Callable[[_X, _Y], _U],
-        _i: _t.Callable[[_X, _Y], _V],
-    ) -> _t.Callable[[_X, _Y], _W]: ...
-    @_t.overload
-    def __call__(
-        self,
-        _g: _t.Callable[[_X, _Y, _Z], _T],
-        _h: _t.Callable[[_X, _Y, _Z], _U],
-        _i: _t.Callable[[_X, _Y, _Z], _V],
-    ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y], _T],
+    #     _h: _t.Callable[[_X, _Y], _U],
+    #     _i: _t.Callable[[_X, _Y], _V],
+    # ) -> _t.Callable[[_X, _Y], _W]: ...
+    # @_t.overload
+    # def __call__(
+    #     self,
+    #     _g: _t.Callable[[_X, _Y, _Z], _T],
+    #     _h: _t.Callable[[_X, _Y, _Z], _U],
+    #     _i: _t.Callable[[_X, _Y, _Z], _V],
+    # ) -> _t.Callable[[_X, _Y, _Z], _W]: ...
     @_t.overload
     def __call__(
         self,

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/compiler/compiler.py

@@ -3685,22 +3685,26 @@ __annotations__["{name}"] = {annotation}
         """Handle non-comprehension list literals."""
         return self.testlist_star_expr_handle(original, loc, tokens, is_list=True)
 
+    def make_dict(self, tok_grp):
+        """Construct a dictionary literal out of the given group."""
+        if self.target_info >= (3, 7):
+            return "{" + join_dict_group(tok_grp) + "}"
+        else:
+            return "_coconut.dict((" + join_dict_group(tok_grp, as_tuples=True) + "))"
+
     def dict_literal_handle(self, tokens):
         """Handle {**d1, **d2}."""
         if not tokens:
-            return "{}" if self.target.startswith("3") else "_coconut.dict()"
+            return "{}" if self.target_info >= (3, 7) else "_coconut.dict()"
 
         groups, has_star, _ = split_star_expr_tokens(tokens, is_dict=True)
 
         if not has_star:
             internal_assert(len(groups) == 1, "dict_literal group splitting failed on", tokens)
-            if self.target.startswith("3"):
-                return "{" + join_dict_group(groups[0]) + "}"
-            else:
-                return "_coconut.dict((" + join_dict_group(groups[0], as_tuples=True) + "))"
+            return self.make_dict(groups[0])
 
-        # naturally supported on 3.5+
-        elif self.target_info >= (3, 5):
+        # supported on 3.5, but only guaranteed to be ordered on 3.7
+        elif self.target_info >= (3, 7):
             to_literal = []
             for g in groups:
                 if isinstance(g, list):
@@ -3714,7 +3718,7 @@ __annotations__["{name}"] = {annotation}
             to_merge = []
             for g in groups:
                 if isinstance(g, list):
-                    to_merge.append("{" + join_dict_group(g) + "}")
+                    to_merge.append(self.make_dict(g))
                 else:
                     to_merge.append(g)
             return "_coconut_dict_merge(" + ", ".join(to_merge) + ")"

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/compiler/header.py

@@ -208,7 +208,8 @@ def process_header_args(which, use_hash, target, no_tco, strict, no_wrap):
 
     format_dict = dict(
         COMMENT=COMMENT,
-        empty_dict="{}" if target_startswith == "3" else "_coconut.dict()",
+        empty_dict="{}" if target_info >= (3, 7) else "_coconut.dict()",
+        empty_py_dict="{}" if target_info >= (3, 7) else "_coconut_py_dict()",
         lbrace="{",
         rbrace="}",
         is_data_var=is_data_var,

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/compiler/templates/header.py_template

@@ -58,7 +58,7 @@ def _coconut_handle_cls_kwargs(**kwargs):
     return coconut_handle_cls_kwargs_wrapper
 def _coconut_handle_cls_stargs(*args):
     temp_names = ["_coconut_base_cls_%s" % (i,) for i in _coconut.range(_coconut.len(args))]
-    ns = _coconut.dict(_coconut.zip(temp_names, args))
+    ns = _coconut_py_dict(_coconut.zip(temp_names, args))
     _coconut_exec("class _coconut_cls_stargs_base(" + ", ".join(temp_names) + "): pass", ns)
     return ns["_coconut_cls_stargs_base"]
 class _coconut_baseclass{object}:
@@ -1259,7 +1259,7 @@ def _coconut_get_function_match_error():
 class _coconut_base_pattern_func(_coconut_baseclass):{COMMENT.no_slots_to_allow_func_attrs}
     _coconut_is_match = True
     def __init__(self, *funcs):
-        self.FunctionMatchError = _coconut.type(_coconut_py_str("MatchError"), ({_coconut_}MatchError,), {empty_dict})
+        self.FunctionMatchError = _coconut.type(_coconut_py_str("MatchError"), ({_coconut_}MatchError,), {empty_py_dict})
         self.patterns = []
         self.__doc__ = None
         self.__name__ = None
@@ -1707,7 +1707,7 @@ class _coconut_lifted(_coconut_baseclass):
     def __reduce__(self):
         return (self.__class__, (self.func,) + self.func_args, {lbrace}"func_kwargs": self.func_kwargs{rbrace})
     def __call__(self, *args, **kwargs):
-        return self.func(*(g(*args, **kwargs) for g in self.func_args), **_coconut.dict((k, h(*args, **kwargs)) for k, h in self.func_kwargs.items()))
+        return self.func(*(g(*args, **kwargs) for g in self.func_args), **_coconut_py_dict((k, h(*args, **kwargs)) for k, h in self.func_kwargs.items()))
     def __repr__(self):
         return "lift(%r)(%s%s)" % (self.func, ", ".join(_coconut.repr(g) for g in self.func_args), ", ".join(k + "=" + _coconut.repr(h) for k, h in self.func_kwargs.items()))
 class lift(_coconut_baseclass):

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/icoconut/coconut/kernel.json

@@ -1,11 +1,11 @@
 {
+ "display_name": "Coconut", 
+ "language": "coconut", 
  "argv": [
   "python", 
   "-m", 
   "coconut.icoconut", 
   "-f", 
   "{connection_file}"
- ], 
- "display_name": "Coconut", 
- "language": "coconut"
+ ]
 }

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/root.py

@@ -26,7 +26,7 @@ import sys as _coconut_sys
 VERSION = "3.0.0"
 VERSION_NAME = None
 # False for release, int >= 1 for develop
-DEVELOP = 12
+DEVELOP = 14
 ALPHA = True  # for pre releases rather than post releases
 
 # -----------------------------------------------------------------------------------------------------------------------
@@ -57,7 +57,19 @@ PY2 = _coconut_sys.version_info < (3,)
 PY26 = _coconut_sys.version_info < (2, 7)
 PY37 = _coconut_sys.version_info >= (3, 7)
 
-_non_py37_extras = r'''def _coconut_default_breakpointhook(*args, **kwargs):
+_non_py37_extras = r'''from collections import OrderedDict as _coconut_OrderedDict
+class dict(_coconut_OrderedDict):
+    __slots__ = ()
+    __doc__ = getattr(_coconut_OrderedDict, "__doc__", "<see help(py_dict)>")
+    class __metaclass__(type):
+        def __instancecheck__(cls, inst):
+            return _coconut.isinstance(inst, _coconut_py_dict)
+        def __subclasscheck__(cls, subcls):
+            return _coconut.issubclass(subcls, _coconut_py_dict)
+    __eq__ = _coconut_py_dict.__eq__
+    def __repr__(self):
+        return "{" + ", ".join("{k!r}: {v!r}".format(k=k, v=v) for k, v in self.items()) + "}"
+def _coconut_default_breakpointhook(*args, **kwargs):
     hookname = _coconut.os.getenv("PYTHONBREAKPOINT")
     if hookname != "0":
         if not hookname:
@@ -82,7 +94,7 @@ def breakpoint(*args, **kwargs):
 # if a new assignment is added below, a new builtins import should be added alongside it
 _base_py3_header = r'''from builtins import chr, dict, hex, input, int, map, object, oct, open, print, range, str, super, zip, filter, reversed, enumerate, repr
 py_chr, py_dict, py_hex, py_input, py_int, py_map, py_object, py_oct, py_open, py_print, py_range, py_str, py_super, py_zip, py_filter, py_reversed, py_enumerate, py_repr = chr, dict, hex, input, int, map, object, oct, open, print, range, str, super, zip, filter, reversed, enumerate, repr
-_coconut_py_str, _coconut_py_super = str, super
+_coconut_py_str, _coconut_py_super, _coconut_py_dict = str, super, dict
 from functools import wraps as _coconut_wraps
 exec("_coconut_exec = exec")
 '''
@@ -100,7 +112,7 @@ PY27_HEADER = r'''from __builtin__ import chr, dict, hex, input, int, map, objec
 py_chr, py_dict, py_hex, py_input, py_int, py_map, py_object, py_oct, py_open, py_print, py_range, py_str, py_super, py_zip, py_filter, py_reversed, py_enumerate, py_raw_input, py_xrange, py_repr = chr, dict, hex, input, int, map, object, oct, open, print, range, str, super, zip, filter, reversed, enumerate, raw_input, xrange, repr
 _coconut_py_raw_input, _coconut_py_xrange, _coconut_py_int, _coconut_py_long, _coconut_py_print, _coconut_py_str, _coconut_py_super, _coconut_py_unicode, _coconut_py_repr, _coconut_py_dict = raw_input, xrange, int, long, print, str, super, unicode, repr, dict
 from functools import wraps as _coconut_wraps
-from collections import Sequence as _coconut_Sequence, OrderedDict as _coconut_OrderedDict
+from collections import Sequence as _coconut_Sequence
 from future_builtins import *
 chr, str = unichr, unicode
 from io import open
@@ -124,20 +136,6 @@ class int(_coconut_py_int):
             return _coconut.isinstance(inst, (_coconut_py_int, _coconut_py_long))
         def __subclasscheck__(cls, subcls):
             return _coconut.issubclass(subcls, (_coconut_py_int, _coconut_py_long))
-class dict(_coconut_OrderedDict):
-    __slots__ = ()
-    __doc__ = getattr(_coconut_OrderedDict, "__doc__", "<see help(py_dict)>")
-    class __metaclass__(type):
-        def __instancecheck__(cls, inst):
-            return _coconut.isinstance(inst, _coconut_py_dict)
-        def __subclasscheck__(cls, subcls):
-            return _coconut.issubclass(subcls, _coconut_py_dict)
-    __eq__ = _coconut_py_dict.__eq__
-    __repr__ = _coconut_py_dict.__repr__
-    __str__ = _coconut_py_dict.__str__
-    keys = _coconut_OrderedDict.viewkeys
-    values = _coconut_OrderedDict.viewvalues
-    items = _coconut_OrderedDict.viewitems
 class range(object):
     __slots__ = ("_xrange",)
     __doc__ = getattr(_coconut_py_xrange, "__doc__", "<see help(py_xrange)>")
@@ -250,7 +248,10 @@ def _coconut_exec(obj, globals=None, locals=None):
     if globals is None:
         globals = _coconut_sys._getframe(1).f_globals
     exec(obj, globals, locals)
-''' + _non_py37_extras
+''' + _non_py37_extras + '''dict.keys = _coconut_OrderedDict.viewkeys
+dict.values = _coconut_OrderedDict.viewvalues
+dict.items = _coconut_OrderedDict.viewitems
+'''
 
 PY2_HEADER = PY27_HEADER + '''if _coconut_sys.version_info < (2, 7):
     import functools as _coconut_functools, copy_reg as _coconut_copy_reg

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/tests/src/cocotest/agnostic/primary.coco

@@ -1562,14 +1562,17 @@ def primary_test() -> bool:
     a_dict[1] = 1
     a_dict[3] = 2
     a_dict[2] = 3
+    assert a_dict |> str == "{1: 1, 3: 2, 2: 3}" == a_dict |> repr, a_dict
     assert a_dict.keys() |> tuple == (1, 3, 2)
     assert not a_dict.keys() `isinstance` list
     assert not a_dict.values() `isinstance` list
     assert not a_dict.items() `isinstance` list
+    assert len(a_dict.keys()) == len(a_dict.values()) == len(a_dict.items()) == 3
     assert {1: 1, 3: 2, 2: 3}.keys() |> tuple == (1, 3, 2)
     assert {**[(1, 1), (3, 2), (2, 3)]}.keys() |> tuple == (1, 3, 2)
     assert a_dict == {1: 1, 2: 3, 3: 2}
     assert {1: 1} |> str == "{1: 1}" == {1: 1} |> repr
     assert py_dict `issubclass` dict
     assert py_dict() `isinstance` dict
+    assert {5:0, 3:0, **{2:0, 6:0}, 8:0}.keys() |> tuple == (5, 3, 2, 6, 8)
     return True

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/tests/src/cocotest/agnostic/suite.coco

@@ -1016,6 +1016,7 @@ forward 2""") == 900
     assert sum_evens(7, 3) == 0 == sum_evens(4, 4)
     assert num_it() |> list == [5]
     assert left_right_diff([10,4,8,3]) |> list == [15, 1, 11, 22]
+    assert num_until_neg_sum([2,-1,0,1,-3,3,-3]) == 6
 
     # must come at end
     assert fibs_calls[0] == 1

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/tests/src/cocotest/agnostic/util.coco

@@ -1543,7 +1543,7 @@ data End(offset `isinstance` int = 0 if offset <= 0):  # type: ignore
 end = End()
 
 
-# advent of code
+# coding challenges
 proc_moves = (
     .strip()
     ..> .splitlines()
@@ -1679,6 +1679,15 @@ left_right_diff = (
     ..> map$(abs)
 )  # type: ignore
 
+num_until_neg_sum = (
+    sorted
+    ..> reversed
+    ..> scan$(+)
+    ..> filter$(.>0)
+    ..> list
+    ..> len
+)
+
 
 # Search patterns
 def first_twin(_ + [p, (.-2) -> p] + _) = (p, p+2)

{coconut-develop-3.0.0a0.dev12 → coconut-develop-3.0.0a0.dev14}/coconut/tests/src/extras.coco

@@ -228,7 +228,7 @@ def gam_eps_rate(bitarr) = (
          ~~~~~^""" in err_str or """
       |> map$(int(?, 2))
 
-  ~~~~~~~~~~~~~~~~~^""" in err_str
+  ~~~~~~~~~~~~~~~~~^""" in err_str, err_str
     else:
         assert False
 
@@ -422,7 +422,7 @@ def test_numpy() -> bool:
     assert list(enumeration) == [((0, 0), 1), ((0, 1), 2), ((1, 0), 3), ((1, 1), 4)]
     for ind, x in multi_enumerate(np.array([1, 2])):
         assert ind `isinstance` tuple, (type(ind), ind)
-        assert x `isinstance` np.int32, (type(x), x)
+        assert x `isinstance` (np.int32, np.int64), (type(x), x)
     assert all_equal(np.array([]))
     assert all_equal(np.array([1]))
     assert all_equal(np.array([1, 1]))