lambda-repl 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

lambda_repl/__init__.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 from cmd import Cmd
+from importlib import import_module
 from typing import Any
 from lambda_calculus.terms import Term
 from lambda_calculus.visitors.normalisation import (
@@ -14,7 +15,7 @@ from lark.exceptions import UnexpectedInput
 from .parsing import LambdaTransformer
 from .aliases import Aliases
 
-__version__ = "1.1.0"
+__version__ = "1.2.1"
 __author__  = "Eric Niklas Wolf"
 __email__   = "eric_niklas.wolf@mailbox.tu-dresden.de"
 __all__ = (
@@ -51,6 +52,19 @@ class LambdaREPL(Cmd):
             self.stdout.write(error.get_context(term))
         return None
 
+    def import_term(self, location: str) -> Term[str] | None:
+        """import a term and handle error display"""
+        module, _, name = location.strip().rpartition(".")
+        try:
+            term = getattr(import_module(module), name)
+        except Exception as error:  # pylint: disable=W0718
+            self.stdout.write(f"Error while importing: {error}\n")
+            return None
+        if not isinstance(term, Term):
+            self.stdout.write(f"Error: object {term} is not a lambda term\n")
+            return None
+        return term
+
     def emptyline(self) -> bool:
         """ignore empty lines"""
         return False
@@ -95,6 +109,17 @@ class LambdaREPL(Cmd):
                 self.stdout.write("invalid Command: missing alias value\n")
         return False
 
+    def do_import(self, arg: str) -> bool:
+        """import an alias from a module with name = module.name"""
+        match arg.partition("="):
+            case (alias, "=", location):
+                term = self.import_term(location)
+                if term is not None:
+                    self.aliases[alias.strip()] = term
+            case _:
+                self.stdout.write("invalid Command: missing import location\n")
+        return False
+
     def do_aliases(self, _: object) -> bool:
         """list defined aliases"""
         for alias, term in self.aliases.items():

lambda_repl/grammar.lark

@@ -4,8 +4,10 @@ VARIABLE: /[^\s().λ\\]+/
 
 abstraction: ("\\" | "λ") VARIABLE "." term
 
-application: ( abstraction | VARIABLE | brackets ) ( _WHITESPACE ( abstraction | VARIABLE | brackets ) )+
+application: _application_term _WHITESPACE (abstraction | _simple_term)
 
-?brackets: "(" term ")"
+?term: abstraction | _application_term
 
-?term: abstraction | application | VARIABLE | brackets
+_application_term: application | _simple_term
+
+_simple_term: VARIABLE | "(" term ")"

lambda_repl/parsing.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 from collections import deque
-from collections.abc import Iterator, Sequence
+from collections.abc import Iterator
 from itertools import chain
 from lambda_calculus.terms import Abstraction, Application, Term, Variable
 from lark import Lark, Token
@@ -52,10 +52,10 @@ class LambdaTransformer(Transformer[Token, Term[str]]):
         """parse a string and return the transformed lambda term"""
         # the parser sometimes return tokens directly instead of a tree
         match PARSER.parse(string):
-            case Token(type="VARIABLE") as name:    # type: ignore
-                return self.VARIABLE(name)          # type: ignore
-            case Token() as token:                  # type: ignore
-                raise UnexpectedToken(token, {"VARIABLE",})
+            case Token(type="VARIABLE") as name:
+                return self.VARIABLE(name)
+            case Token() as token:
+                raise UnexpectedToken(token, {"VARIABLE", })
             case tree:
                 return self.transform(tree)
 
@@ -63,6 +63,10 @@ class LambdaTransformer(Transformer[Token, Term[str]]):
         """handle unknown nodes"""
         raise UnexpectedInput(f"unknown node: {data}")
 
+    def __default_token__(self, token: Token) -> Token:
+        """handle unknown tokens"""
+        raise UnexpectedInput(f"unknown token: {token}")
+
     def VARIABLE(self, name: Token) -> Variable[str]:
         """transform a variable node"""
         return Variable(name.value)
@@ -72,9 +76,10 @@ class LambdaTransformer(Transformer[Token, Term[str]]):
         """transform an abstraction"""
         return Abstraction(variable.name, body)
 
-    def application(self, children: Sequence[Term[str]]) -> Application[str]:
+    @v_args(inline=True)
+    def application(self, abstraction: Term[str], argument: Term[str]) -> Application[str]:
         """transform an application"""
-        return Application.with_arguments(children[0], children[1:])
+        return Application(abstraction, argument)
 
 
 PARSER = Lark.open_from_package(

{lambda_repl-1.1.0.dist-info → lambda_repl-1.2.1.dist-info}/METADATA

@@ -1,10 +1,11 @@
-Metadata-Version: 2.1
-Name: lambda-repl
-Version: 1.1.0
+Metadata-Version: 2.4
+Name: lambda_repl
+Version: 1.2.1
 Summary: REPL for the lambda calculus
-Author-email: Eric Niklas Wolf <eric_niklas.wolf@mailbox.tu-dresden.de>
 Project-URL: Repository, https://github.com/Deric-W/lambda_repl
 Project-URL: Bugtracker, https://github.com/Deric-W/lambda_repl/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
@@ -13,23 +14,25 @@ Classifier: Topic :: Education
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
+Requires-Dist: lambda-calculus~=3.0
+Requires-Dist: lark~=1.0
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: lambda-calculus (~=2.0)
-Requires-Dist: lark (~=1.0)
 
 # lambda_repl
 
+[![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_repl/actions/workflows/Tests.yaml/badge.svg)
 [![codecov](https://codecov.io/gh/Deric-W/lambda_repl/branch/main/graph/badge.svg?token=SU3982mC17)](https://codecov.io/gh/Deric-W/lambda_repl)
 
-The `lambda_repl` package contains a [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop) for the [lambda calculus](https://en.wikipedia.org/wiki/Lambda_calculus).
+The `lambda_repl` package contains a [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop)
+for the [lambda calculus](https://en.wikipedia.org/wiki/Lambda_calculus).
 
 To use it, execute `lambda-repl` or `python3 -m lambda_repl` and enter commands.
 
 ## Requirements
 
-Python >= 3.10 and the `lambda_calculus` package are required to use this package.
+Python >= 3.10 and the packages [`lambda_calculus`](https://github.com/Deric-W/lambda_calculus)
+and [`lark`](https://github.com/lark-parser/lark) are required to use this package.
 
 ## Installation
 
@@ -44,9 +47,11 @@ python3 -m lambda_repl
 Welcome to the the Lambda REPL, type 'help' for help
 λ alias I = \x.x
 λ alias K = λx.λy.x
+λ import SUCC = lambda_calculus.terms.arithmetic.SUCCESSOR
 λ aliases
 I = (λx.x)
 K = (λx.(λy.x))
+SUCC = (λn.(λf.(λx.(f ((n f) x)))))
 λ trace K a b
 β ((λy.a) b)
 β a

lambda_repl-1.2.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+lambda_repl/__init__.py,sha256=3cAdjhU-P2CvQ7-Yww1ag8OawfcrW1uONab9J6XDsdQ,4823
+lambda_repl/__main__.py,sha256=0R69kMLopBXwWwgiq_kB8vdvUXHWF_95iRIrPYMtidg,103
+lambda_repl/aliases.py,sha256=U0-JFP3fI-9-su0M3DiTqp6fMfZQfcdmOxxdzE5iHgQ,1815
+lambda_repl/grammar.lark,sha256=C3Cn24FyOBQERwLvgZ2iYnspA9of2OQKJoFVNlD3DE0,291
+lambda_repl/main.py,sha256=SrxFQwUfQFWCpXYgyCn1h-cHyJnBYee-kIdZn0CbbBU,1229
+lambda_repl/parsing.py,sha256=eZuHX7qR0aAqeIxX83SHM_Az8MvdROL7KmplS1zFGTM,3112
+lambda_repl/py.typed,sha256=rVxfNzv1aKmfThIlRztkUwWiKeYa4XTdtNMh3FV-dGM,25
+lambda_repl-1.2.1.dist-info/METADATA,sha256=uI6qGfcbmt6zfcVcJ19L3-I-ra_fFSgz2CtsPmmjWz8,1986
+lambda_repl-1.2.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+lambda_repl-1.2.1.dist-info/entry_points.txt,sha256=k_lpUdSJyLWmOpBUiJG569al7o5XOZNeGJBrBqYBaNc,58
+lambda_repl-1.2.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+lambda_repl-1.2.1.dist-info/RECORD,,

{lambda_repl-1.1.0.dist-info → lambda_repl-1.2.1.dist-info}/WHEEL

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

lambda_repl-1.1.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-lambda_repl/__init__.py,sha256=r8q0eqyRnsAalTxsEjmi5nbNy1gC-Dkj8fq2itOXeEU,3781
-lambda_repl/__main__.py,sha256=0R69kMLopBXwWwgiq_kB8vdvUXHWF_95iRIrPYMtidg,103
-lambda_repl/aliases.py,sha256=U0-JFP3fI-9-su0M3DiTqp6fMfZQfcdmOxxdzE5iHgQ,1815
-lambda_repl/grammar.lark,sha256=yE3sSoIpEShOzplMIWnDeS5e4o7ODA_JJtMLzsTlUUs,279
-lambda_repl/main.py,sha256=SrxFQwUfQFWCpXYgyCn1h-cHyJnBYee-kIdZn0CbbBU,1229
-lambda_repl/parsing.py,sha256=1pWv_C0KMLeTXcaoFPRDFJgypFpo1IuueUEJkAQ1mE0,3025
-lambda_repl/py.typed,sha256=rVxfNzv1aKmfThIlRztkUwWiKeYa4XTdtNMh3FV-dGM,25
-lambda_repl-1.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-lambda_repl-1.1.0.dist-info/METADATA,sha256=V_vD35_eGvdTebqHxYmNGHIlZBTy0a2NNRMcW6-oVE0,1686
-lambda_repl-1.1.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-lambda_repl-1.1.0.dist-info/entry_points.txt,sha256=k_lpUdSJyLWmOpBUiJG569al7o5XOZNeGJBrBqYBaNc,58
-lambda_repl-1.1.0.dist-info/top_level.txt,sha256=S7zlQx9MQUHM6OzLqKf8U6pW1ucdFKOMe-WHYK0T2N0,12
-lambda_repl-1.1.0.dist-info/RECORD,,

lambda_repl-1.1.0.dist-info/top_level.txt

@@ -1 +0,0 @@
-lambda_repl