coconut-develop 3.0.0a0.dev18__tar.gz → 3.0.0a0.dev20__tar.gz

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/DOCS.md

@@ -450,7 +450,7 @@ user@computer ~ $ $(ls -la) |> .splitlines() |> len
 30
 ```
 
-Note that the way that Coconut integrates with `xonsh`, `@(<code>)` syntax will only work with Python code, not Coconut code.
+Note that the way that Coconut integrates with `xonsh`, `@(<code>)` syntax and the `execx` command will only work with Python code, not Coconut code.
 
 Additionally, Coconut will only compile individual commands—Coconut will not touch the `.xonshrc` or any other `.xsh` files.
 

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coconut-develop
-Version: 3.0.0a0.dev18
+Version: 3.0.0a0.dev20
 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.dev18 → coconut-develop-3.0.0a0.dev20}/__coconut__/__init__.pyi

@@ -874,7 +874,8 @@ def _coconut_bool_or(a: _t.Literal[False], b: _T) -> _T: ...
 def _coconut_bool_or(a: _T, b: _U) -> _t.Union[_T, _U]: ...
 
 
-def _coconut_not_in(a: _T, b: _t.Sequence[_T]) -> bool: ...
+def _coconut_in(a: _T, b: _t.Sequence[_T]) -> bool: ...
+_coconut_not_in = _coconut_in
 
 
 @_t.overload

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/__coconut__.pyi

@@ -1,2 +1,2 @@
 from __coconut__ import *
-from __coconut__ import _coconut_tail_call, _coconut_tco, _coconut_call_set_names, _coconut_handle_cls_kwargs, _coconut_handle_cls_stargs, _namedtuple_of, _coconut, _coconut_super, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_multi_dim_arr, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_not_in
+from __coconut__ import _coconut_tail_call, _coconut_tco, _coconut_call_set_names, _coconut_handle_cls_kwargs, _coconut_handle_cls_stargs, _namedtuple_of, _coconut, _coconut_super, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_multi_dim_arr, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/compiler/grammar.py

@@ -1033,7 +1033,7 @@ class Grammar(object):
         # must come after is not / not in
         | fixto(keyword("not"), "_coconut.operator.not_")
         | fixto(keyword("is"), "_coconut.operator.is_")
-        | fixto(keyword("in"), "_coconut.operator.contains")
+        | fixto(keyword("in"), "_coconut_in")
     )
     partialable_op = base_op_item | infix_op
     partial_op_item_tokens = (

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/compiler/header.py

@@ -541,7 +541,7 @@ for _coconut_varname in dir(MatchError):
     #  (extra_format_dict is to keep indentation levels matching)
     extra_format_dict = dict(
         # when anything is added to this list it must also be added to *both* __coconut__ stub files
-        underscore_imports="{tco_comma}{call_set_names_comma}{handle_cls_args_comma}_namedtuple_of, _coconut, _coconut_super, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_multi_dim_arr, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_not_in".format(**format_dict),
+        underscore_imports="{tco_comma}{call_set_names_comma}{handle_cls_args_comma}_namedtuple_of, _coconut, _coconut_super, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_multi_dim_arr, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in".format(**format_dict),
         import_typing=pycondition(
             (3, 5),
             if_ge="import typing",

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/compiler/templates/header.py_template

@@ -469,6 +469,9 @@ def _coconut_bool_and(a, b):
 def _coconut_bool_or(a, b):
     """Boolean or operator (or). Equivalent to (a, b) -> a or b."""
     return a or b
+def _coconut_in(a, b):
+    """Containment operator (in). Equivalent to (a, b) -> a in b."""
+    return a in b
 def _coconut_not_in(a, b):
     """Negative containment operator (not in). Equivalent to (a, b) -> a not in b."""
     return a not in b

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/constants.py

@@ -1112,6 +1112,8 @@ all_keywords = keyword_vars + const_vars + reserved_vars
 
 conda_build_env_var = "CONDA_BUILD"
 
+disabled_xonsh_modes = ("exec", "eval")
+
 # -----------------------------------------------------------------------------------------------------------------------
 # DOCUMENTATION CONSTANTS:
 # -----------------------------------------------------------------------------------------------------------------------

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/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.dev18 → coconut-develop-3.0.0a0.dev20}/coconut/integrations.py

@@ -21,7 +21,10 @@ from coconut.root import *  # NOQA
 
 from types import MethodType
 
-from coconut.constants import coconut_kernel_kwargs
+from coconut.constants import (
+    coconut_kernel_kwargs,
+    disabled_xonsh_modes,
+)
 
 # -----------------------------------------------------------------------------------------------------------------------
 # IPYTHON:
@@ -88,9 +91,7 @@ class CoconutXontribLoader(object):
     """Implements Coconut's _load_xontrib_."""
     compiler = None
     runner = None
-
-    def __init__(self):
-        self.timing_info = []
+    timing_info = []
 
     def __call__(self, xsh, **kwargs):
         # hide imports to avoid circular dependencies
@@ -111,16 +112,17 @@ class CoconutXontribLoader(object):
 
         self.runner.update_vars(xsh.ctx)
 
-        def new_parse(execer, s, *args, **kwargs):
+        def new_parse(execer, code, mode="exec", *args, **kwargs):
             """Coconut-aware version of xonsh's _parse."""
-            parse_start_time = get_clock_time()
-            try:
-                s = self.compiler.parse_xonsh(s, keep_state=True)
-            except CoconutException as err:
-                err_str = format_error(err).splitlines()[0]
-                s += "  #" + err_str
-            self.timing_info.append(("parse", get_clock_time() - parse_start_time))
-            return execer.__class__.parse(execer, s, *args, **kwargs)
+            if mode not in disabled_xonsh_modes:
+                parse_start_time = get_clock_time()
+                try:
+                    code = self.compiler.parse_xonsh(code, keep_state=True)
+                except CoconutException as err:
+                    err_str = format_error(err).splitlines()[0]
+                    code += "  #" + err_str
+                self.timing_info.append(("parse", get_clock_time() - parse_start_time))
+            return execer.__class__.parse(execer, code, mode=mode, *args, **kwargs)
 
         main_parser = xsh.execer.parser
         main_parser._coconut_old_parse = main_parser.parse
@@ -140,7 +142,7 @@ class CoconutXontribLoader(object):
 
         main_parser = xsh.execer.parser
         if not hasattr(main_parser, "_coconut_old_parse"):
-            raise CoconutException("attempting to unldoad Coconut xontrib but it was never loaded")
+            raise CoconutException("attempting to unload Coconut xontrib but it was never loaded")
         main_parser.parser = main_parser._coconut_old_parse
 
         ctx_parser = xsh.execer.ctxtransformer.parser

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev20}/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 = 18
+DEVELOP = 20
 ALPHA = True  # for pre releases rather than post releases
 
 # -----------------------------------------------------------------------------------------------------------------------

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

@@ -1580,4 +1580,7 @@ def primary_test() -> bool:
     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
+    assert (in)(1, [1, 2])
+    assert not (1 not in .)([1, 2])
+    assert not (in)([[]], [])
     return True