lambda-calculus 2.2.3__py3-none-any.whl → 3.1.0__py3-none-any.whl

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/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/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")

lambda_calculus/terms/arithmetic.py

@@ -2,6 +2,7 @@
 
 """Implementations of natural numbers and arithmetic operators"""
 
+from typing import Final
 from . import Term, Variable, Abstraction, Application
 from .logic import TRUE, FALSE
 
@@ -16,13 +17,13 @@ __all__ = (
     "number"
 )
 
-ISZERO = Variable("n").apply_to(FALSE.abstract("x"), TRUE).abstract("n")
+ISZERO: Final = Variable("n").apply_to(FALSE.abstract("x"), TRUE).abstract("n")
 """
 Term which evaluates to :const:`lambda_calculus.terms.logic.TRUE`
 if its argument is zero, :const:`lambda_calculus.terms.logic.FALSE` otherwise
 """
 
-SUCCESSOR = Abstraction.curried(
+SUCCESSOR: Final = Abstraction.curried(
     ("n", "f", "x"),
     Application(
         Variable("f"),
@@ -36,7 +37,7 @@ SUCCESSOR = Abstraction.curried(
 Term evaluating to its argument incremented by one.
 """
 
-PREDECESSOR = Abstraction.curried(
+PREDECESSOR: Final = Abstraction.curried(
     ("n", "f", "x"),
     Application.with_arguments(
         Variable("n"),
@@ -60,7 +61,7 @@ PREDECESSOR = Abstraction.curried(
 Term ealuating to its argument decremented by one.
 """
 
-ADD = Abstraction.curried(
+ADD: Final = Abstraction.curried(
     ("m", "n", "f", "x"),
     Application.with_arguments(
         Variable("m"),
@@ -77,7 +78,7 @@ ADD = Abstraction.curried(
 Term evaluating to the sum of its two arguments.
 """
 
-SUBTRACT = Abstraction.curried(
+SUBTRACT: Final = Abstraction.curried(
     ("m", "n"),
     Application.with_arguments(
         Variable("n"),
@@ -88,7 +89,7 @@ SUBTRACT = Abstraction.curried(
 Term evaluating to the difference of its two arguments.
 """
 
-MULTIPLY = Abstraction.curried(
+MULTIPLY: Final = Abstraction.curried(
     ("m", "n", "f"),
     Application(
         Variable("m"),
@@ -102,7 +103,7 @@ MULTIPLY = Abstraction.curried(
 Term evaluating to the product of its two arguments.
 """
 
-POWER = Abstraction.curried(
+POWER: Final = Abstraction.curried(
     ("b", "e"),
     Application(
         Variable("e"),

lambda_calculus/terms/combinators.py

@@ -2,6 +2,7 @@
 
 """Common combinators"""
 
+from typing import Final
 from . import Variable, Application
 
 __all__ = (
@@ -16,7 +17,7 @@ __all__ = (
     "OMEGA"
 )
 
-Y = Application(
+Y: Final = Application(
     Variable("g").apply_to(
         Variable("x").apply_to(Variable("x"))
     ).abstract("x"),
@@ -28,7 +29,7 @@ Y = Application(
 Y combinator used to define recursive terms.
 """
 
-S = Variable("x").apply_to(
+S: Final = Variable("x").apply_to(
     Variable("z"),
     Variable("y").apply_to(Variable("z"))
 ).abstract("x", "y", "z")
@@ -36,24 +37,24 @@ S = Variable("x").apply_to(
 S combinator of the SKI combinator calculus.
 """
 
-K = Variable("x").abstract("x", "y")
+K: Final = Variable("x").abstract("x", "y")
 """
 K combinator of the SKI combinator calculus.
 """
 
-I = Variable("x").abstract("x")
+I: Final = Variable("x").abstract("x")
 """
 I combinator of the SKI combinator calculus.
 """
 
-B = Variable("x").apply_to(
+B: Final = Variable("x").apply_to(
     Variable("y").apply_to(Variable("z"))
 ).abstract("x", "y", "z")
 """
 B combinator of the BCKW combinator calculus.
 """
 
-C = Variable("x").apply_to(
+C: Final = Variable("x").apply_to(
     Variable("z"),
     Variable("y")
 ).abstract("x", "y", "z")
@@ -61,7 +62,7 @@ C = Variable("x").apply_to(
 C combinator of the BCKW combinator calculus.
 """
 
-W = Variable("x").apply_to(
+W: Final = Variable("x").apply_to(
     Variable("y"),
     Variable("y")
 ).abstract("x", "y")
@@ -69,14 +70,14 @@ W = Variable("x").apply_to(
 W combinator of the BCKW combinator calculus.
 """
 
-DELTA = Variable("x").apply_to(
+DELTA: Final = Variable("x").apply_to(
     Variable("x")
 ).abstract("x")
 """
 Term applying its argument to itself.
 """
 
-OMEGA = DELTA.apply_to(DELTA)
+OMEGA: Final = DELTA.apply_to(DELTA)
 """
 Smallest term with no beta normal form.
 """

lambda_calculus/terms/logic.py

@@ -2,6 +2,7 @@
 
 """Implementations of boolean values and logical operators"""
 
+from typing import Final
 from . import Variable, Abstraction, Application
 
 __all__ = (
@@ -13,17 +14,17 @@ __all__ = (
     "IF_THEN_ELSE"
 )
 
-TRUE = Abstraction.curried(("x", "y"), Variable("x"))
+TRUE: Final = Abstraction.curried(("x", "y"), Variable("x"))
 """
 Term representing True.
 """
 
-FALSE = Abstraction.curried(("x", "y"), Variable("y"))
+FALSE: Final = Abstraction.curried(("x", "y"), Variable("y"))
 """
 Term representing False
 """
 
-AND = Abstraction.curried(
+AND: Final = Abstraction.curried(
     ("p", "q"),
     Application.with_arguments(Variable("p"), (Variable("q"), Variable("p")))
 )
@@ -31,7 +32,7 @@ AND = Abstraction.curried(
 Term implementing logical conjunction between its two arguments.
 """
 
-OR = Abstraction.curried(
+OR: Final = Abstraction.curried(
     ("p", "q"),
     Application.with_arguments(Variable("p"), (Variable("p"), Variable("q")))
 )
@@ -39,12 +40,12 @@ OR = Abstraction.curried(
 Term implementing logical disjunction between its two arguments.
 """
 
-NOT = Abstraction("p", Application.with_arguments(Variable("p"), (FALSE, TRUE)))
+NOT: Final = Abstraction("p", Application.with_arguments(Variable("p"), (FALSE, TRUE)))
 """
 Term performing logical negation of its argument.
 """
 
-IF_THEN_ELSE = Abstraction.curried(
+IF_THEN_ELSE: Final = Abstraction.curried(
     ("p", "a", "b"),
     Application.with_arguments(Variable("p"), (Variable("a"), Variable("b")))
 )

lambda_calculus/terms/pairs.py

@@ -2,6 +2,7 @@
 
 """Implementation of pairs"""
 
+from typing import Final
 from . import Variable, Abstraction, Application
 from .logic import TRUE, FALSE
 
@@ -13,7 +14,7 @@ __all__ = (
     "NULL"
 )
 
-PAIR = Abstraction.curried(
+PAIR: Final = Abstraction.curried(
     ("x", "y", "f"),
     Application.with_arguments(
         Variable("f"),
@@ -24,22 +25,22 @@ PAIR = Abstraction.curried(
 Term evaluating to a ordered pair of its two arguments.
 """
 
-FIRST = Abstraction("p", Application(Variable("p"), TRUE))
+FIRST: Final = Abstraction("p", Application(Variable("p"), TRUE))
 """
 Term evaluating to the first value in its argument.
 """
 
-SECOND = Abstraction("p", Application(Variable("p"), FALSE))
+SECOND: Final = Abstraction("p", Application(Variable("p"), FALSE))
 """
 Term evaluating to the second value in its argument.
 """
 
-NIL = Abstraction("x", TRUE)
+NIL: Final = Abstraction("x", TRUE)
 """
 Special Term encoding an empty pair.
 """
 
-NULL = Abstraction(
+NULL: Final = Abstraction(
     "p",
     Application(
         Variable("p"),

lambda_calculus/visitors/normalisation.py

@@ -46,7 +46,7 @@ class BetaNormalisingVisitor(Visitor[Iterator[Step], str]):
     def skip_intermediate(self, term: terms.Term[str]) -> terms.Term[str]:
         """
         Calculate the beta normal form directly.
-        
+
         :param term: term which should be transformed into ist beta normal form
         :return: new term representing the beta normal form if it exists
         """
@@ -77,7 +77,7 @@ class BetaNormalisingVisitor(Visitor[Iterator[Step], str]):
     def beta_reducation(self, abstraction: terms.Abstraction[str], argument: terms.Term[str]) -> Generator[Step, None, terms.Term[str]]:
         """
         Perform beta reduction of an application.
-        
+
         :param abstraction: abstraction of the application
         :param argument: argument of the application
         :return: Generator yielding steps and returning the reduced term

lambda_calculus/visitors/substitution/unsafe.py

@@ -3,7 +3,6 @@
 """Substitutions which dont check if the substitutions are valid"""
 
 from __future__ import annotations
-from collections.abc import Set
 from typing import TypeVar, final
 from ... import terms
 from . import DeferrableSubstitution
@@ -28,18 +27,14 @@ class UnsafeSubstitution(DeferrableSubstitution[V]):
 
     value: terms.Term[V]
 
-    free_variables: Set[V]
-
     __slots__ = (
         "variable",
-        "value",
-        "free_variables"
+        "value"
     )
 
-    def __init__(self, variable: V, value: terms.Term[V], free_variables: Set[V]) -> None:
+    def __init__(self, variable: V, value: terms.Term[V]) -> None:
         self.variable = variable
         self.value = value
-        self.free_variables = free_variables
 
     @classmethod
     def from_substitution(cls, variable: V, value: terms.Term[V]) -> UnsafeSubstitution[V]:
@@ -50,7 +45,7 @@ class UnsafeSubstitution(DeferrableSubstitution[V]):
         :param value: value which should be substituted
         :return: new instance
         """
-        return cls(variable, value, value.free_variables())
+        return cls(variable, value)
 
     def visit_variable(self, variable: terms.Variable[V]) -> terms.Term[V]:
         """

lambda_calculus/visitors/walking.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 from collections.abc import Iterator
-from typing import TypeVar
+from typing import TypeVar, final
 from .. import terms
 from . import BottomUpVisitor
 
@@ -15,6 +15,7 @@ __all__ = (
 V = TypeVar("V")
 
 
+@final
 class DepthFirstVisitor(BottomUpVisitor[Iterator["terms.Term[V]"], V]):
     """
     Visitor yielding subterms depth first
@@ -24,6 +25,8 @@ class DepthFirstVisitor(BottomUpVisitor[Iterator["terms.Term[V]"], V]):
         V: represents the type of variables used in terms
     """
 
+    __slots__ = ()
+
     def visit_variable(self, variable: terms.Variable[V]) -> Iterator[terms.Term[V]]:
         """
         Visit a Variable term.

{lambda_calculus-2.2.3.dist-info → lambda_calculus-3.1.0.dist-info}/METADATA

@@ -1,11 +1,12 @@
-Metadata-Version: 2.1
-Name: lambda-calculus
-Version: 2.2.3
+Metadata-Version: 2.3
+Name: lambda_calculus
+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-3.1.0.dist-info/RECORD

@@ -0,0 +1,20 @@
+lambda_calculus/__init__.py,sha256=4HEzc-fklHdsxdB5vQY8Goxpay2xomfhpIVG_EEY3y4,340
+lambda_calculus/errors.py,sha256=WVoIbibq6Ey-nzr99fUdITneGBxR871xnvGKWWhG37E,1185
+lambda_calculus/py.typed,sha256=rVxfNzv1aKmfThIlRztkUwWiKeYa4XTdtNMh3FV-dGM,25
+lambda_calculus/terms/__init__.py,sha256=tHVY4J7MaDWqpkOrxgcIqYuKn38drbjIm2lPFdZjhrU,12440
+lambda_calculus/terms/abc.py,sha256=PyJDArUZM4TzskF7LqPx6luG34ptUawYUChkBlM2az0,510
+lambda_calculus/terms/arithmetic.py,sha256=0-vvpTvioTfVLiMNt1MazrO28eMZAxHZudzt0IUoel0,2934
+lambda_calculus/terms/combinators.py,sha256=OXbOKIA1V-7UYpPsx8HW8vA0-07ZtV72-OjXWK8wZgQ,1525
+lambda_calculus/terms/logic.py,sha256=40tunDbyjQlm6ENse3psuosfJEsp1jR5hZPrEEruisE,1246
+lambda_calculus/terms/pairs.py,sha256=h1OwLxda7FVxQ0mDYuTVHbJ28WuZPQnus4mIzc8UCUc,1045
+lambda_calculus/visitors/__init__.py,sha256=jQoqB86o5gBuVbIFaG_-Zhiyk39ttHWqScGn85zSNfU,5033
+lambda_calculus/visitors/normalisation.py,sha256=EUFaA1xIssJVL7MDAK3IWuLEArk3HdVjSP2lKr9Dz-s,4471
+lambda_calculus/visitors/walking.py,sha256=01QgvJ-zjhQCF2r7zJQB__49WekGiNEa55JuZoF5v0g,1889
+lambda_calculus/visitors/substitution/__init__.py,sha256=hBAKMal-mhx4wL0m-TJUEK2ZNwKIvnIXfFgYkf058tk,4326
+lambda_calculus/visitors/substitution/checked.py,sha256=ZP9lEFyEvNXlJPh6-wXoMC_IK_h3IoLdtjTa-N8DW7o,4445
+lambda_calculus/visitors/substitution/renaming.py,sha256=4m-OEbOw8ibkUkF7rk-0vpf3WP_44gXjrgSCVE4lvDk,7707
+lambda_calculus/visitors/substitution/unsafe.py,sha256=aholWL9aBuC_R4BuPRLZr6oodRKSFPrYvCHQZotkFTY,2419
+lambda_calculus-3.1.0.dist-info/METADATA,sha256=Tk5GxJZlkZLwdZXIkQwTRwaq2z4fepsqzvnzfa_ve60,3790
+lambda_calculus-3.1.0.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
+lambda_calculus-3.1.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lambda_calculus-3.1.0.dist-info/RECORD,,

{lambda_calculus-2.2.3.dist-info → lambda_calculus-3.1.0.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: hatchling 1.22.5
 Root-Is-Purelib: true
 Tag: py3-none-any
-

lambda_calculus-2.2.3.dist-info/RECORD

@@ -1,20 +0,0 @@
-lambda_calculus/__init__.py,sha256=AAZfBOYtqGWRwluKg5hnif-q3un0lT_01ZncU7P5e9g,340
-lambda_calculus/errors.py,sha256=WVoIbibq6Ey-nzr99fUdITneGBxR871xnvGKWWhG37E,1185
-lambda_calculus/py.typed,sha256=rVxfNzv1aKmfThIlRztkUwWiKeYa4XTdtNMh3FV-dGM,25
-lambda_calculus/terms/__init__.py,sha256=QO2CUqvxDOOS_wGF0YYk7wj8LH85N6Ovgk-K0x631zY,12546
-lambda_calculus/terms/arithmetic.py,sha256=wSAgtl58u5LimyD9s5FPIuCmjcvRdZXPE4wnDh59nT8,2860
-lambda_calculus/terms/combinators.py,sha256=cjIeKxgaSLOgmozEIU_Umr5QqgQQ6o7IsGlROD-uY_U,1437
-lambda_calculus/terms/logic.py,sha256=P397XB-Yjqc4kwjctbNzE1P1F6SCSkngCKAFkKrpT3U,1179
-lambda_calculus/terms/pairs.py,sha256=azxo3jtbhh7cyRLa8QU6VF96GEb6IZWQ5gr1hO_IDeQ,985
-lambda_calculus/visitors/__init__.py,sha256=jQoqB86o5gBuVbIFaG_-Zhiyk39ttHWqScGn85zSNfU,5033
-lambda_calculus/visitors/normalisation.py,sha256=VWBbienaPH5B-vbs8T5Q7StElGmpgoJnVfvuizyVfgE,4487
-lambda_calculus/visitors/walking.py,sha256=HjU7nTq1hMy0YWo95TjsyM6YNw2zvUWBeCX9EG2OfMk,1855
-lambda_calculus/visitors/substitution/__init__.py,sha256=hBAKMal-mhx4wL0m-TJUEK2ZNwKIvnIXfFgYkf058tk,4326
-lambda_calculus/visitors/substitution/checked.py,sha256=ZP9lEFyEvNXlJPh6-wXoMC_IK_h3IoLdtjTa-N8DW7o,4445
-lambda_calculus/visitors/substitution/renaming.py,sha256=4m-OEbOw8ibkUkF7rk-0vpf3WP_44gXjrgSCVE4lvDk,7707
-lambda_calculus/visitors/substitution/unsafe.py,sha256=CMAsi-Z-c0sO-Eu9iwQiJuCE0NcR0tsyUoS52jEvx5o,2598
-lambda_calculus-2.2.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lambda_calculus-2.2.3.dist-info/METADATA,sha256=3RC99zbDUYF1wVglrdkPmmSQva6zYDrWbunw4VZAUG0,3681
-lambda_calculus-2.2.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-lambda_calculus-2.2.3.dist-info/top_level.txt,sha256=p_Qfc-yRgkY5j0TZmT15x86trbd0oCVEJyEsF3kHKTo,16
-lambda_calculus-2.2.3.dist-info/RECORD,,

lambda_calculus-2.2.3.dist-info/top_level.txt

@@ -1 +0,0 @@
-lambda_calculus