evhub · evhub · Aug 8, 2019 · Aug 16, 2018 · Aug 16, 2018 · Aug 17, 2018
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -12,9 +12,6 @@ environment:
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "32"
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "32"
     - PYTHON: "C:\\Python34"
       PYTHON_VERSION: "3.4.x"
       PYTHON_ARCH: "32"
@@ -26,9 +23,10 @@ environment:
       PYTHON_ARCH: "32"
 
 install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;c:\\MinGW\\bin;%PATH%"
+  - "SET PATH=%APPDATA%\\Python;%APPDATA%\\Python\\Scripts;%PYTHON%;%PYTHON%\\Scripts;c:\\MinGW\\bin;%PATH%"
   - "copy c:\\MinGW\\bin\\mingw32-make.exe c:\\MinGW\\bin\\make.exe"
-  - make install
+  - python -m pip install --user --upgrade setuptools pip
+  - python -m pip install .[tests]
 
 build: false
 

diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,7 @@ bin/
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
+pip-wheel-metadata/
 
 # Unit test / coverage reports
 htmlcov/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: git://github.com/pre-commit/pre-commit-hooks.git
-    rev: v1.3.0
+    rev: v2.2.3
     hooks:
     -   id: check-byte-order-marker
     -   id: check-merge-conflict
@@ -15,17 +15,20 @@ repos:
     -   id: pretty-format-json
         args:
         - --autofix
-    -   id: autopep8-wrapper
+    -   id: flake8
+        args:
+        - --ignore=W503,E501,E265,E402,F405,E305,E126
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.4.4
+    hooks:
+    -   id: autopep8
         args:
         - --in-place
         - --aggressive
         - --aggressive
         - --experimental
-        - --ignore=W503,E501,E722
-    -   id: flake8
-        args:
-        - --ignore=W503,E501,E265,E402,F405,E305
+        - --ignore=W503,E501,E722,E402
 -   repo: https://github.com/asottile/add-trailing-comma
-    rev: v0.6.4
+    rev: v1.4.1
     hooks:
     -   id: add-trailing-comma
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,8 @@ notifications:
 sudo: false
 cache: pip
 python:
-- '2.6'
 - '2.7'
 - pypy
-- '3.3'
-- '3.4'
 - '3.5'
 - '3.6'
 - pypy3

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -152,18 +152,22 @@ After you've tested your changes locally, you'll want to add more permanent test
             - python35
                 - `py35_test.coco`
                     + Tests to be run only on Python 3.5 with `--target 3.5`.
+            - python36
+                - `py36_test.coco`
+                    + Tests to be run only on Python 3.6 with `--target 3.6`.
 
 ## Release Process
 
 1. Preparation:
-    1. Run `make check` and update dependencies as necessary
+    1. Run `make check-reqs` and update dependencies as necessary
     1. Run `make format`
-    1. Check changes in [`compiled-cocotest`](https://github.com/evhub/compiled-cocotest) and [`pyprover`](https://github.com/evhub/pyprover)
-    1. Check [Codacy issues](https://www.codacy.com/app/evanjhub) (for `coconut` and `compiled-cocotest`) and [LGTM alerts](https://lgtm.com/projects/g/evhub/coconut/)
+    1. Check changes in [`compiled-cocotest`](https://github.com/evhub/compiled-cocotest), [`pyprover`](https://github.com/evhub/pyprover), and [`coconut-prelude`](https://github.com/evhub/coconut-prelude)
+    1. Check [Codebeat](https://codebeat.co/a/evhub/projects) and [LGTM](https://lgtm.com/dashboard) for `coconut` and `compiled-cocotest`
     1. Make sure [`coconut-develop`](https://pypi.python.org/pypi/coconut-develop) package looks good
     1. Run `make docs` and ensure local documentation looks good
     1. Make sure [develop documentation](http://coconut.readthedocs.io/en/develop/) looks good
     1. Make sure [Travis](https://travis-ci.org/evhub/coconut/builds) and [AppVeyor](https://ci.appveyor.com/project/evhub/coconut) are passing
+    1. Run `make test-easter-eggs`
    1. Turn off `develop` in `root.py`
     1. Set `root.py` to new version number
     1. If major release, set `root.py` to new version name

diff --git a/DOCS.md b/DOCS.md
diff --git a/FAQ.md b/FAQ.md
@@ -71,7 +71,7 @@ I certainly hope not! Unlike most transpiled languages, all valid Python is vali
 
 ### I want to use Coconut in a production environment; how do I achieve maximum performance?
 
-First, you're going to want a fast compiler, so you should either [install Coconut with the `cPyparsing` option](DOCS.html#installation), or use [`PyPy`](https://pypy.org/). Second, there are two simple things you can do to make Coconut produce faster Python: compile with `--no-tco` and compile with a `--target` specification for the exact version of Python you want to run your code on. Passing `--target` helps Coconut optimize the compiled code for the Python version you want, and, though [Tail Call Optimization](DOCS.html#tail-call-optimization) is useful, it will usually significantly slow down functions that use it, so disabling it will often provide a major performance boost.
+First, you're going to want a fast compiler, so you should either use [`cPyparsing`](https://github.com/evhub/cpyparsing) or [`PyPy`](https://pypy.org/). Second, there are two simple things you can do to make Coconut produce faster Python: compile with `--no-tco` and compile with a `--target` specification for the exact version of Python you want to run your code on. Passing `--target` helps Coconut optimize the compiled code for the Python version you want, and, though [Tail Call Optimization](DOCS.html#tail-call-optimization) is useful, it will usually significantly slow down functions that use it, so disabling it will often provide a major performance boost.
 
 ### I want to contribute to Coconut, how do I get started?
 

diff --git a/FUNDING.yml b/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+# patreon: # Replace with a single Patreon username
+open_collective: coconut
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# otechie: # Replace with a single Otechie username
+# custom: # Replace with a single custom sponsorship URL
diff --git a/HELP.md b/HELP.md
@@ -43,7 +43,7 @@ Installing Coconut, including all the features above, is drop-dead simple. Just
 pip install coconut
 ```
 
-_Note: Try re-running the above command with the `--user` option if you are encountering errors. Be sure that Coconut's installation location (on UNIX `/usr/local/bin` if you didn't use `--user` or `${HOME}/.local/bin/` if you did) is in your `PATH` environment variable. If you are still encountering errors installing Coconut with `pip`, you can also install Coconut with `conda` by following the [conda installation instructions in the documentation](DOCS.html#using-conda)._
+_Note: If you are having trouble installing Coconut, try following the debugging steps in the [installation section of Coconut's documentation](DOCS.html#installation)._
 
 To check that your installation is functioning properly, try entering into the command line
 ```
@@ -352,12 +352,11 @@ def factorial(n):
         raise TypeError("the argument to factorial must be an integer >= 0")
 ```
 
-By making use of the [Coconut built-in `addpattern`](DOCS.html#addpattern), we can take that from three indentation levels down to one. Take a look:
+By making use of the [Coconut `addpattern` syntax](DOCS.html#addpattern), we can take that from three indentation levels down to one. Take a look:
 ```
 def factorial(0) = 1
 
-@addpattern(factorial)
-def factorial(n is int if n > 0) =
+addpattern def factorial(n is int if n > 0) =
     """Compute n! where n is an integer >= 0."""
     range(1, n+1) |> reduce$(*)
 
@@ -373,14 +372,13 @@ First, assignment function notation. This one's pretty straightforward. If a fun
 
 Second, pattern-matching function definition. Pattern-matching function definition does exactly that—pattern-matches against all the arguments that are passed to the function. Unlike normal function definition, however, if the pattern doesn't match (if for example the wrong number of arguments are passed), your function will raise a `MatchError`. Finally, like destructuring assignment, if you want to be more explicit about using pattern-matching function definition, you can add a `match` before the `def`.
 
-Third, `addpattern`. `addpattern` takes one argument, a previously-defined pattern-matching function, and returns a decorator that decorates a new pattern-matching function by adding the new pattern as an additional case to the old patterns. Thus, `addpattern` can be thought of as doing exactly what it says—it adds a new pattern to an existing pattern-matching function.
+Third, `addpattern`. `addpattern` creates a new pattern-matching function by adding the new pattern as an additional case to the old pattern-matching function it is replacing. Thus, `addpattern` can be thought of as doing exactly what it says—it adds a new pattern to an existing pattern-matching function.
 
 Finally, not only can we rewrite the iterative approach using `addpattern`, as we did above, we can also rewrite the recursive approach using `addpattern`, like so:
 ```coconut
 def factorial(0) = 1
 
-@addpattern(factorial)
-def factorial(n is int if n > 0) =
+addpattern def factorial(n is int if n > 0) =
     """Compute n! where n is an integer >= 0."""
     n * factorial(n - 1)
 
@@ -402,8 +400,7 @@ First up is `quick_sort` for lists. We're going to use a recursive `addpattern`-
 ```coconut
 def quick_sort([]) = []
 
-@addpattern(quick_sort)
-def quick_sort([head] + tail) =
+addpattern def quick_sort([head] + tail) =
     """Sort the input sequence using the quick sort algorithm."""
     quick_sort(left) + [head] + quick_sort(right) where:
         left = [x for x in tail if x < head]
@@ -544,7 +541,7 @@ Copy, paste! The big new thing here is how to write `data` constructors. Since `
 
 In this case, the constructor checks whether nothing but another `vector` was passed, in which case it returns that, otherwise it returns the result of passing the arguments to the underlying constructor, the form of which is `vector(*pts)`, since that is how we declared the data type. We use sequence pattern-matching to determine whether we were passed a single vector, which is just a list or tuple of patterns to match against the contents of the sequence.
 
-The other new construct used here is the `|*>`, or star-pipe, operator, which functions exactly like the normal pipe, except that instead of calling the function with one argument, it calls it with as many arguments as there are elements in the sequence passed into it. The difference between `|*>` and `|>` is exactly analogous to the difference between `f(args)` and `f(*args)`.
+The other new construct used here is the `|*>`, or star-pipe, operator, which functions exactly like the normal pipe, except that instead of calling the function with one argument, it calls it with as many arguments as there are elements in the sequence passed into it. The difference between `|>` and `|*>` is exactly analogous to the difference between `f(args)` and `f(*args)`.
 
 ### n-Vector Methods
 

diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 .PHONY: install
 install:
-	pip install "pip>=7.1.2"
+	pip install --upgrade setuptools pip
 	pip install .[tests]
 
 .PHONY: dev
 dev:
-	python -m pip install --upgrade setuptools pip
+	pip install --upgrade setuptools pip
 	pip install --upgrade -e .[dev]
 	pre-commit install -f --install-hooks
 
@@ -17,37 +17,44 @@ format: dev
 # test-all takes a very long time and should usually only be run by Travis
 .PHONY: test-all
 test-all:
-	pytest --strict -s tests
+	pytest --strict -s ./tests
 
 # for quickly testing nearly everything locally, just use test-basic
 .PHONY: test-basic
 test-basic:
-	python ./tests --force
+	python ./tests --strict --force
 	python ./tests/dest/runner.py
 	python ./tests/dest/extras.py
 
 # same as test-basic, but doesn't recompile unchanged test files;
 # should only be used when testing the tests not the compiler
 .PHONY: test-tests
 test-tests:
-	python ./tests
+	python ./tests --strict
 	python ./tests/dest/runner.py
 	python ./tests/dest/extras.py
 
 # same as test-basic but also runs mypy
 .PHONY: test-mypy
 test-mypy:
-	python ./tests --force --target sys --mypy --follow-imports silent --ignore-missing-imports
+	python ./tests --strict --force --target sys --line-numbers --mypy --follow-imports silent --ignore-missing-imports
 	python ./tests/dest/runner.py
 	python ./tests/dest/extras.py
 
 # same as test-basic but includes verbose output for better debugging
 .PHONY: test-verbose
 test-verbose:
-	python ./tests --force --verbose --jobs 0
+	python ./tests --strict --force --verbose --jobs 0
 	python ./tests/dest/runner.py
 	python ./tests/dest/extras.py
 
+# same as test-basic but also tests easter eggs
+.PHONY: test-easter-eggs
+test-easter-eggs:
+	python ./tests --strict --force
+	python ./tests/dest/runner.py --test-easter-eggs
+	python ./tests/dest/extras.py
+
 .PHONY: diff
 diff:
 	git diff origin/develop
@@ -60,8 +67,8 @@ docs: clean
 .PHONY: clean
 clean:
 	rm -rf ./docs ./dist ./build ./tests/dest index.rst profile.json
-	find . -name '*.pyc' -delete
-	find . -name '__pycache__' -delete
+	-find . -name '*.pyc' -delete
+	-find . -name '__pycache__' -delete
 
 .PHONY: wipe
 wipe: clean
@@ -82,8 +89,8 @@ just-upload:
 .PHONY: upload
 upload: clean dev just-upload
 
-.PHONY: check
-check:
+.PHONY: check-reqs
+check-reqs:
 	python ./coconut/requirements.py
 
 .PHONY: profile-code

diff --git a/coconut/myparsing.py → coconut/_pyparsing.py b/coconut/myparsing.py → coconut/_pyparsing.py
@@ -19,7 +19,9 @@
 
 from coconut.root import *  # NOQA
 
+import os
 import traceback
+import functools
 
 from coconut.constants import (
     packrat_cache,
@@ -28,46 +30,84 @@
     min_versions,
     ver_str_to_tuple,
     ver_tuple_to_str,
+    get_next_version,
+    pure_python_env_var,
+    PURE_PYTHON,
 )
 
 # warning: do not name this file cPyparsing or pyparsing or it might collide with the following imports
 try:
+
+    if PURE_PYTHON:
+        raise ImportError("skipping cPyparsing check due to " + pure_python_env_var + " = " + os.environ.get(pure_python_env_var, ""))
+
+    import cPyparsing as _pyparsing
     from cPyparsing import *  # NOQA
     from cPyparsing import (  # NOQA
         _trim_arity,
         _ParseResultsWithOffset,
         __version__,
     )
-    PYPARSING = "Cython cPyparsing v" + __version__
+    PYPARSING_PACKAGE = "cPyparsing"
+    PYPARSING_INFO = "Cython cPyparsing v" + __version__
 
 except ImportError:
     try:
 
+        import pyparsing as _pyparsing
         from pyparsing import *  # NOQA
         from pyparsing import (  # NOQA
             _trim_arity,
             _ParseResultsWithOffset,
             __version__,
         )
-        PYPARSING = "Python pyparsing v" + __version__
+        PYPARSING_PACKAGE = "pyparsing"
+        PYPARSING_INFO = "Python pyparsing v" + __version__
 
     except ImportError:
         traceback.print_exc()
         __version__ = None
+        PYPARSING_PACKAGE = "pyparsing"
+        PYPARSING_INFO = None
 
 # -----------------------------------------------------------------------------------------------------------------------
 # SETUP:
 # -----------------------------------------------------------------------------------------------------------------------
 
-if __version__ is None or ver_str_to_tuple(__version__) < min_versions["pyparsing"]:
-    req_ver_str = ver_tuple_to_str(min_versions["pyparsing"])
+min_ver = min(min_versions["pyparsing"], min_versions["cPyparsing"][:3])
+max_ver = get_next_version(max(min_versions["pyparsing"], min_versions["cPyparsing"][:3]))
+
+if __version__ is None or not min_ver <= ver_str_to_tuple(__version__) < max_ver:
+    min_ver_str = ver_tuple_to_str(min_ver)
+    max_ver_str = ver_tuple_to_str(max_ver)
     raise ImportError(
-        "Coconut requires pyparsing version >= " + req_ver_str
-        + ("; got version " + __version__ if __version__ is not None else "")
-        + " (run 'pip install --upgrade pyparsing' or"
-        + " 'pip install --upgrade cPyparsing' to fix)",
+        "Coconut requires pyparsing/cPyparsing version >= " + min_ver_str + " and < " + max_ver_str
+        + ("; got " + PYPARSING_INFO if PYPARSING_INFO is not None else "")
+        + " (run 'pip install --upgrade " + PYPARSING_PACKAGE + "' to fix)",
     )
 
+
+def fast_str(cls):
+    """A very simple __str__ implementation."""
+    return "<" + cls.__name__ + ">"
+
+
+def fast_repr(cls):
+    """A very simple __repr__ implementation."""
+    return "<" + cls.__name__ + ">"
+
+
+# makes pyparsing much faster if it doesn't have to compute expensive
+#  nested string representations
+for obj in vars(_pyparsing).values():
+    try:
+        if issubclass(obj, ParserElement):
+            obj.__str__ = functools.partial(fast_str, obj)
+            obj.__repr__ = functools.partial(fast_repr, obj)
+    except TypeError:
+        pass
+
+
 if packrat_cache:
     ParserElement.enablePackrat(packrat_cache)
 

diff --git a/coconut/command/cli.py b/coconut/command/cli.py
@@ -185,7 +185,7 @@
 )
 
 arguments.add_argument(
-    "--argv",
+    "--argv", "--args",
     type=str,
     nargs=argparse.REMAINDER,
     help="set sys.argv to source plus remaining args for use in Coconut script being run",
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,11 +4,8 @@ notifications: @@
     sudo: false
     cache: pip
     python:
-    - '2.6'
     - '2.7'
     - pypy
-    - '3.3'
-    - '3.4'
     - '3.5'
     - '3.6'
     - pypy3
@@ Expand Down @@