lambda-calculus 2.2.3__tar.gz → 3.1.0__tar.gz

lambda_calculus-3.1.0/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 100
+extend-ignore = E221,E501

lambda_calculus-3.1.0/.gitignore

@@ -0,0 +1,164 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+.direnv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# VSCode
+.vscode/

lambda_calculus-3.1.0/.readthedocs.yaml

@@ -0,0 +1,20 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.10"
+
+formats:
+  - pdf
+  - epub
+
+sphinx:
+  configuration: docs/conf.py
+  fail_on_warning: true
+
+python:
+  install:
+    - requirements: docs/requirements.txt
+    - method: pip
+      path: .

{lambda_calculus-2.2.3 → lambda_calculus-3.1.0}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: lambda_calculus
-Version: 2.2.3
+Version: 3.1.0
 Summary: Implementation of the Lambda calculus
-Author-email: Eric Niklas Wolf <eric_niklas.wolf@mailbox.tu-dresden.de>
 Project-URL: Repository, https://github.com/Deric-W/lambda_calculus
 Project-URL: Documentation, http://lambda-calculus.readthedocs.io/
 Project-URL: Bugtracker, https://github.com/Deric-W/lambda_calculus/issues
+Author-email: Eric Niklas Wolf <eric_niklas.wolf@mailbox.tu-dresden.de>
+License-File: LICENSE
 Classifier: Intended Audience :: Education
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
@@ -15,10 +16,10 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 # lambda_calculus
 
+[![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch)
 ![Tests](https://github.com/Deric-W/lambda_calculus/actions/workflows/Tests.yaml/badge.svg)
 [![codecov](https://codecov.io/gh/Deric-W/lambda_calculus/branch/main/graph/badge.svg?token=SU3982mC17)](https://codecov.io/gh/Deric-W/lambda_calculus)
 [![Documentation Status](https://readthedocs.org/projects/lambda-calculus/badge/?version=stable)](https://lambda-calculus.readthedocs.io/en/stable/?badge=stable)
@@ -111,4 +112,4 @@ assert BetaNormalisingVisitor().skip_intermediate(term) == Application.with_argu
     Variable("+"),
     (Variable("4"), Variable("3"))
 )
-```
+```

{lambda_calculus-2.2.3 → lambda_calculus-3.1.0}/README.md

@@ -1,5 +1,6 @@
 # lambda_calculus
 
+[![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch)
 ![Tests](https://github.com/Deric-W/lambda_calculus/actions/workflows/Tests.yaml/badge.svg)
 [![codecov](https://codecov.io/gh/Deric-W/lambda_calculus/branch/main/graph/badge.svg?token=SU3982mC17)](https://codecov.io/gh/Deric-W/lambda_calculus)
 [![Documentation Status](https://readthedocs.org/projects/lambda-calculus/badge/?version=stable)](https://lambda-calculus.readthedocs.io/en/stable/?badge=stable)

lambda_calculus-3.1.0/docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

lambda_calculus-3.1.0/docs/api/errors.rst

@@ -0,0 +1,8 @@
+Module errors
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.errors
+    :members:

lambda_calculus-3.1.0/docs/api/terms/abc.rst

@@ -0,0 +1,8 @@
+Module abc
+==========
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.terms.abc
+    :members:

lambda_calculus-3.1.0/docs/api/terms/arithmetic.rst

@@ -0,0 +1,8 @@
+Module arithmetic
+=================
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.terms.arithmetic
+    :members:

lambda_calculus-3.1.0/docs/api/terms/combinators.rst

@@ -0,0 +1,8 @@
+Module combinators
+==================
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.terms.combinators
+    :members:

lambda_calculus-3.1.0/docs/api/terms/logic.rst

@@ -0,0 +1,8 @@
+Module logic
+============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.terms.logic
+    :members:

lambda_calculus-3.1.0/docs/api/terms/pairs.rst

@@ -0,0 +1,8 @@
+Module pairs
+============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.terms.pairs
+    :members:

lambda_calculus-3.1.0/docs/api/terms.rst

@@ -0,0 +1,15 @@
+Package terms
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+   terms/abc
+   terms/logic
+   terms/arithmetic
+   terms/pairs
+   terms/combinators
+
+.. automodule:: lambda_calculus.terms
+    :members:
+    :special-members: __iter__, __str__

lambda_calculus-3.1.0/docs/api/visitors/normalisation.rst

@@ -0,0 +1,8 @@
+Module normalisation
+====================
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.visitors.normalisation
+    :members:

lambda_calculus-3.1.0/docs/api/visitors/substitution/checked.rst

@@ -0,0 +1,8 @@
+Module checked
+==============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.visitors.substitution.checked
+    :members:

lambda_calculus-3.1.0/docs/api/visitors/substitution/renaming.rst

@@ -0,0 +1,8 @@
+Module renaming
+===============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.visitors.substitution.renaming
+    :members:

lambda_calculus-3.1.0/docs/api/visitors/substitution/unsafe.rst

@@ -0,0 +1,8 @@
+Module unsafe
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.visitors.substitution.unsafe
+    :members:

lambda_calculus-3.1.0/docs/api/visitors/substitution.rst

@@ -0,0 +1,12 @@
+Package substitution
+====================
+
+.. toctree::
+   :maxdepth: 2
+
+   substitution/checked
+   substitution/renaming
+   substitution/unsafe
+
+.. automodule:: lambda_calculus.visitors.substitution
+    :members:

lambda_calculus-3.1.0/docs/api/visitors/walking.rst

@@ -0,0 +1,8 @@
+Module walking
+==============
+
+.. toctree::
+   :maxdepth: 2
+
+.. automodule:: lambda_calculus.visitors.walking
+    :members:

lambda_calculus-3.1.0/docs/api/visitors.rst

@@ -0,0 +1,12 @@
+Package visitors
+================
+
+.. toctree::
+   :maxdepth: 2
+
+   visitors/substitution
+   visitors/normalisation
+   visitors/walking
+
+.. automodule:: lambda_calculus.visitors
+    :members:

lambda_calculus-3.1.0/docs/api.rst

@@ -0,0 +1,23 @@
+Package API
+===========
+
+.. toctree::
+   :maxdepth: 2
+
+   api/terms
+   api/visitors
+   api/errors
+
+.. automodule:: lambda_calculus
+
+    .. autoclass:: Variable
+
+        Reference to :class:`.terms.Variable` for convenience
+
+    .. autoclass:: Abstraction
+
+        Reference to :class:`.terms.Abstraction` for convenience
+
+    .. autoclass:: Application
+
+        Reference to :class:`.terms.Application` for convenience

lambda_calculus-3.1.0/docs/conf.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+"""Sphinx configuration"""
+
+import sys
+import os.path
+from sphinx_pyproject import SphinxConfig
+
+
+sys.path.append(os.path.abspath(".."))
+
+config = SphinxConfig("../pyproject.toml", globalns=globals())
+
+intersphinx_mapping = {
+    "python": ("https://docs.python.org/3/", None),
+    "sphinx": ("https://www.sphinx-doc.org/en/stable/", None),
+}

lambda_calculus-3.1.0/docs/index.rst

@@ -0,0 +1,25 @@
+lambda_calculus
+===============
+
+Welcome to lambda_calculus`s documentation.
+
+This project implements basic operations of the `Lambda calculus <https://en.wikipedia.org/wiki/Lambda_calculus>`_
+as a python package and contains helpers to define custom ones.
+
+It is intended to be used for educational purposes and is not optimized for speed.
+Furthermore, it expects all terms to be finite, which means the absence of cycles.
+:py:class:`RecursionError` may be raised when using an infinite term or the evaluation is too complex.
+
+.. toctree::
+   :maxdepth: 2
+
+   installation
+   api
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

lambda_calculus-3.1.0/docs/installation.rst

@@ -0,0 +1,33 @@
+Installation
+============
+
+.. toctree::
+   :maxdepth: 2
+
+Overview over the most common ways of installing this project.
+
+Installation from PyPI
+----------------------
+
+If you just want to get started or receive updates you can use
+the package available on `PyPI <https://pypi.org/project/lambda-calculus/>`_ and
+install it with the following command:
+
+.. code:: bash
+
+    python3 -m pip install lambda-calculus
+
+`Sematic Versioning <https://semver.org/>`_ is is attempted to be adhered to.
+
+Installation from source
+------------------------
+
+This project adheres to `PEP 517 <https://peps.python.org/pep-0517>`_ and
+can be build using `build <https://pypi.org/project/build/>`_:
+
+.. code:: bash
+
+    python3 -m build
+
+The resulting wheel should be platform and machine independent
+because this is a pure python project.

lambda_calculus-3.1.0/docs/requirements.txt

@@ -0,0 +1,3 @@
+sphinx ~= 5.2.0
+sphinx-pyproject ~= 0.1.0
+sphinx-rtd-theme ~= 1.0.0

{lambda_calculus-2.2.3 → lambda_calculus-3.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lambda_calculus"
-version = "2.2.3"
+version = "3.1.0"
 description = "Implementation of the Lambda calculus"
 requires-python = ">=3.10"
 keywords = []
@@ -28,11 +28,59 @@ Documentation = "http://lambda-calculus.readthedocs.io/"
 Bugtracker = "https://github.com/Deric-W/lambda_calculus/issues"
 
 [build-system]
-requires = ["setuptools >= 61.0.0"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
-[tool.setuptools.package-data]
-lambda_calculus = ["py.typed"]
+[tool.hatch.envs.test]
+dependencies = [
+    "coverage[toml] == 7.*"
+]
+
+[tool.hatch.envs.test.scripts]
+test = "python -m unittest discover {args}"
+cov-run = "coverage run -m unittest discover {args}"
+cov-report = [
+    "- coverage combine",
+    "coverage report"
+]
+cov = [
+    "cov-run",
+    "cov-report"
+]
+
+[[tool.hatch.envs.test.matrix]]
+python = ["3.10", "3.11", "3.12"]
+
+[tool.hatch.envs.lint]
+dependencies = [
+    "mypy >= 1.0.0",
+    "pylint >= 2.12.2",
+    "flake8 >= 5.0.0",
+    "isort >= 5.10.1"
+]
+
+[tool.hatch.envs.lint.scripts]
+lint = [
+    "- flake8 src/lambda_calculus",
+    "- pylint src/lambda_calculus"
+]
+typecheck = "mypy -p lambda_calculus"
+release = [
+    "typecheck"
+]
+
+[tool.hatch.envs.docs]
+dependencies = [
+    "sphinx ~= 5.2.0",
+    "sphinx-pyproject ~= 0.1.0",
+    "sphinx-rtd-theme ~= 1.0.0"
+]
+
+[tool.hatch.envs.docs.scripts]
+build = "sphinx-build {args} docs docs/_build"
+
+[tool.hatch.build.targets.sdist]
+exclude = ["/.github"]
 
 [tool.mypy]
 disallow_any_unimported = true
@@ -45,6 +93,14 @@ warn_unused_ignores = true
 warn_return_any = true
 warn_unreachable = true
 
+[tool.pylint]
+max-line-length = 100
+
+[tool.coverage.run]
+source_pkgs = ["lambda_calculus"]
+branch = true
+parallel = true
+
 [tool.sphinx-pyproject]
 project = "lambda_calculus"
 copyright = "2022 Eric Wolf"

{lambda_calculus-2.2.3 → lambda_calculus-3.1.0/src}/lambda_calculus/__init__.py

@@ -4,7 +4,7 @@
 
 from .terms import Variable, Abstraction, Application
 
-__version__ = "2.2.3"
+__version__ = "3.1.0"
 __author__  = "Eric Niklas Wolf"
 __email__   = "eric_niklas.wolf@mailbox.tu-dresden.de"
 __all__ = (

{lambda_calculus-2.2.3 → lambda_calculus-3.1.0/src}/lambda_calculus/terms/__init__.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 from abc import abstractmethod
 from collections.abc import Sequence, Set, Iterable, Iterator
 from dataclasses import dataclass
-from typing import TypeVar
+from typing import TypeVar, final
 from .. import visitors
 from ..errors import CollisionError
 from ..visitors import walking
@@ -17,6 +17,7 @@ __all__ = (
     "Variable",
     "Abstraction",
     "Application",
+    "abc",
     "arithmetic",
     "logic",
     "pairs",
@@ -128,6 +129,7 @@ class Term(Iterable["Term[V]"]):
         return not self.free_variables()
 
 
+@final
 @dataclass(unsafe_hash=True, slots=True)
 class Variable(Term[V]):
     """
@@ -197,6 +199,7 @@ class Variable(Term[V]):
         return visitor.visit_variable(self)
 
 
+@final
 @dataclass(unsafe_hash=True, slots=True)
 class Abstraction(Term[V]):
     """
@@ -278,7 +281,7 @@ class Abstraction(Term[V]):
             )
         raise CollisionError("new variable would bind free variable in body", (new,))
 
-    def eta_reduction(self) -> Term[V]:   # type: ignore[return]
+    def eta_reduction(self) -> Term[V]:
         """
         Remove a useless abstraction.
 
@@ -289,8 +292,6 @@ class Abstraction(Term[V]):
             case Application(f, Variable(x)) if x == self.bound and x not in f.free_variables():
                 return f
             case _:
-                # mypy detects missing returns
-                # because of https://github.com/python/mypy/issues/12534
                 raise ValueError("abstraction is not useless")
 
     def accept(self, visitor: visitors.Visitor[T, V]) -> T:
@@ -316,6 +317,7 @@ class Abstraction(Term[V]):
         )
 
 
+@final
 @dataclass(unsafe_hash=True, slots=True)
 class Application(Term[V]):
     """

lambda_calculus-3.1.0/src/lambda_calculus/terms/abc.py

@@ -0,0 +1,17 @@
+#!/usr/bin/python3
+
+"""Predefined Variables for all ASCII letters"""
+
+from string import ascii_letters
+from . import Variable
+
+__all__ = tuple(ascii_letters)
+
+# better IDE autocompletion
+a, b, c, d, e, f, g, h, i, j = map(Variable, "abcdefghij")
+k, l, m, n, o, p, q, r, s, t = map(Variable, "klmnopqrst")
+u, v, w, x, y, z = map(Variable, "uvwxyz")
+
+A, B, C, D, E, F, G, H, I, J = map(Variable, "ABCDEFGHIJ")
+K, L, M, N, O, P, Q, R, S, T = map(Variable, "KLMNOPQRST")
+U, V, W, X, Y, Z = map(Variable, "UVWXYZ")