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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coconut-develop
-Version: 3.0.0a0.dev14
+Version: 3.0.0a0.dev16
 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: all
-Provides-Extra: mypy
+Provides-Extra: watch
 Provides-Extra: jobs
-Provides-Extra: docs
+Provides-Extra: mypy
+Provides-Extra: backports
 Provides-Extra: xonsh
-Provides-Extra: watch
+Provides-Extra: jupyter
+Provides-Extra: all
+Provides-Extra: ipython
+Provides-Extra: docs
 Provides-Extra: tests
-Provides-Extra: backports
 Provides-Extra: dev
-Provides-Extra: ipython
-Provides-Extra: jupyter

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

@@ -485,6 +485,16 @@ def __lt__(self, other):
             indent=1,
             newline=True,
         ),
+        assign_multiset_views=pycondition(
+            (3,),
+            if_lt='''
+keys = _coconut.collections.Counter.viewkeys
+values = _coconut.collections.Counter.viewvalues
+items = _coconut.collections.Counter.viewitems
+            ''',
+            indent=1,
+            newline=True,
+        ),
 
         # used in the second round
         tco_comma="_coconut_tail_call, _coconut_tco, " if not no_tco else "",

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

@@ -1438,7 +1438,7 @@ class multiset(_coconut.collections.Counter{comma_object}):
         if result < 0:
             raise _coconut.ValueError("multiset has negative count for " + _coconut.repr(item))
         return result
-{def_total_and_comparisons}_coconut.abc.MutableSet.register(multiset)
+{def_total_and_comparisons}{assign_multiset_views}_coconut.abc.MutableSet.register(multiset)
 def _coconut_base_makedata(data_type, args):
     if _coconut.hasattr(data_type, "_make") and _coconut.issubclass(data_type, _coconut.tuple):
         return data_type._make(args)

{coconut-develop-3.0.0a0.dev14 → coconut-develop-3.0.0a0.dev16}/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.dev14 → coconut-develop-3.0.0a0.dev16}/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 = 14
+DEVELOP = 16
 ALPHA = True  # for pre releases rather than post releases
 
 # -----------------------------------------------------------------------------------------------------------------------
@@ -58,17 +58,6 @@ PY26 = _coconut_sys.version_info < (2, 7)
 PY37 = _coconut_sys.version_info >= (3, 7)
 
 _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":
@@ -89,6 +78,18 @@ if not hasattr(_coconut_sys, "__breakpointhook__"):
     _coconut_sys.__breakpointhook__ = _coconut_default_breakpointhook
 def breakpoint(*args, **kwargs):
     return _coconut.getattr(_coconut_sys, "breakpointhook", _coconut_default_breakpointhook)(*args, **kwargs)
+class _coconut_dict_meta(type):
+    def __instancecheck__(cls, inst):
+        return _coconut.isinstance(inst, _coconut_py_dict)
+    def __subclasscheck__(cls, subcls):
+        return _coconut.issubclass(subcls, _coconut_py_dict)
+class _coconut_dict_base(_coconut_OrderedDict):
+    __slots__ = ()
+    __doc__ = getattr(_coconut_OrderedDict, "__doc__", "<see help(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()) + "}"
+dict = _coconut_dict_meta(py_str("dict"), _coconut_dict_base.__bases__, _coconut_dict_base.__dict__.copy())
 '''
 
 # if a new assignment is added below, a new builtins import should be added alongside it

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

@@ -1575,4 +1575,9 @@ def primary_test() -> bool:
     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)
+    a_multiset = m{1,1,2}
+    assert not a_multiset.keys() `isinstance` list
+    assert not a_multiset.values() `isinstance` list
+    assert not a_multiset.items() `isinstance` list
+    assert len(a_multiset.keys()) == len(a_multiset.values()) == len(a_multiset.items()) == 2
     return True

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

@@ -223,7 +223,8 @@ def gam_eps_rate(bitarr) = (
     except CoconutParseError as err:
         err_str = str(err)
         assert "misplaced '?'" in err_str
-        assert """
+        if not PYPY:
+            assert """
   |> map$(int(?, 2))
          ~~~~~^""" in err_str or """
       |> map$(int(?, 2))