Mark
/
lamb
Archived
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed package for pypi

master
Mark 2022-11-11 17:20:59 -08:00
parent a30bd7b870
commit 45493c1093
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
14 changed files with 96 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_bin.py
View File

@ -1,10 +0,0 @@
import PyInstaller.__main__
# Run this file to build a standalone executable.
# pyinstaller does not build cross-platform.
PyInstaller.__main__.run([
"lamb/__main__.py",
"--onefile",
"--console"
])

0
lamb/__init__.py → lamb_engine/__init__.py
View File

20
lamb/__main__.py → lamb_engine/__main__.py
View File

@ -1,5 +1,5 @@
if __name__ != "__main__":
raise ImportError("lamb.__main__ should never be imported. Run it directly.")
raise ImportError("lamb_engine.__main__ should never be imported. Run it directly.")
from prompt_toolkit import PromptSession
from prompt_toolkit import print_formatted_text as printf
@ -7,17 +7,17 @@ from prompt_toolkit.formatted_text import FormattedText
from prompt_toolkit.formatted_text import to_plain_text
from pyparsing import exceptions as ppx
import lamb
import lamb_engine
lamb.utils.show_greeting()
lamb_engine.utils.show_greeting()
r = lamb.Runner(
r = lamb_engine.Runner(
prompt_session = PromptSession(
style = lamb.utils.style,
lexer = lamb.utils.LambdaLexer(),
key_bindings = lamb.utils.bindings
style = lamb_engine.utils.style,
lexer = lamb_engine.utils.LambdaLexer(),
key_bindings = lamb_engine.utils.bindings
),
prompt_message = FormattedText([
("class:prompt", "==> ")
@ -50,12 +50,12 @@ while True:
("class:err", " "*(e.loc + l) + "^\n"),
("class:err", f"Syntax error at char {e.loc}."),
("class:text", "\n")
]), style = lamb.utils.style)
]), style = lamb_engine.utils.style)
continue
except lamb.nodes.ReductionError as e:
except lamb_engine.nodes.ReductionError as e:
printf(FormattedText([
("class:err", f"{e.msg}\n")
]), style = lamb.utils.style)
]), style = lamb_engine.utils.style)
continue
printf("")

0
lamb/nodes/__init__.py → lamb_engine/nodes/__init__.py
View File

10
lamb/nodes/functions.py → lamb_engine/nodes/functions.py
View File

@ -1,5 +1,5 @@
import lamb
import lamb.nodes as lbn
import lamb_engine
import lamb_engine.nodes as lbn
def print_node(node: lbn.Node, *, export: bool = False) -> str:
if not isinstance(node, lbn.Node):
@ -28,7 +28,7 @@ def print_node(node: lbn.Node, *, export: bool = False) -> str:
i = -1
p = o
while o in bound_subs.values():
o = p + lamb.utils.subscript(i := i + 1)
o = p + lamb_engine.utils.subscript(i := i + 1)
bound_subs[n.input.identifier] = o
else:
bound_subs[n.input.identifier] = n.input.print_value()
@ -168,7 +168,7 @@ def prepare(root: lbn.Root, *, ban_macro_name = None) -> list:
warnings += [
("class:code", "$"),
("class:warn", " will be expanded to ")
] + lamb.utils.lex_str(str(n.expand()[1]))
] + lamb_engine.utils.lex_str(str(n.expand()[1]))
# If this expression is part of a macro,
# make sure we don't reference it inside itself.
@ -208,7 +208,7 @@ def prepare(root: lbn.Root, *, ban_macro_name = None) -> list:
raise lbn.ReductionError(f"Bound variable name conflict: \"{n.input.name}\"")
else:
bound_variables[n.input.name] = lbn.Bound(
lamb.utils.remove_sub(n.input.name),
lamb_engine.utils.remove_sub(n.input.name),
macro_name = n.input.name
)
n.input = bound_variables[n.input.name]

0
lamb/nodes/misc.py → lamb_engine/nodes/misc.py
View File

6
lamb/nodes/nodes.py → lamb_engine/nodes/nodes.py
View File

@ -1,5 +1,5 @@
import lamb
import lamb.nodes as lbn
import lamb_engine
import lamb_engine.nodes as lbn
class TreeWalker:
"""
@ -82,7 +82,7 @@ class Node:
# The runner this node is attached to.
# Set by Node.set_runner()
self.runner: lamb.runner.Runner = None # type: ignore
self.runner: lamb_engine.runner.Runner = None # type: ignore
def __iter__(self):
return TreeWalker(self)

0
lamb/parser.py → lamb_engine/parser.py
View File

0
lamb/runner/__init__.py → lamb_engine/runner/__init__.py
View File

70
lamb/runner/commands.py → lamb_engine/runner/commands.py
View File

@ -7,7 +7,7 @@ from prompt_toolkit import prompt
import os.path
from pyparsing import exceptions as ppx
import lamb
import lamb_engine
commands = {}
help_texts = {}
@ -38,7 +38,7 @@ def cmd_step(command, runner) -> None:
HTML(
f"<err>Command <code>:{command.name}</code> takes no more than one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -53,7 +53,7 @@ def cmd_step(command, runner) -> None:
HTML(
f"<err>Usage: <code>:step [yes|no]</code></err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -63,7 +63,7 @@ def cmd_step(command, runner) -> None:
HTML(
f"<warn>Enabled step-by-step reduction.</warn>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
runner.step_reduction = True
else:
@ -71,7 +71,7 @@ def cmd_step(command, runner) -> None:
HTML(
f"<warn>Disabled step-by-step reduction.</warn>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
runner.step_reduction = False
@ -85,7 +85,7 @@ def cmd_expand(command, runner) -> None:
HTML(
f"<err>Command <code>:{command.name}</code> takes no more than one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -100,7 +100,7 @@ def cmd_expand(command, runner) -> None:
HTML(
f"<err>Usage: <code>:expand [yes|no]</code></err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -110,7 +110,7 @@ def cmd_expand(command, runner) -> None:
HTML(
f"<warn>Enabled complete expansion.</warn>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
runner.full_expansion = True
else:
@ -118,7 +118,7 @@ def cmd_expand(command, runner) -> None:
HTML(
f"<warn>Disabled complete expansion.</warn>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
runner.full_expansion = False
@ -133,7 +133,7 @@ def cmd_save(command, runner) -> None:
HTML(
f"<err>Command <code>:{command.name}</code> takes exactly one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -144,7 +144,7 @@ def cmd_save(command, runner) -> None:
("class:warn", "File exists. Overwrite? "),
("class:text", "[yes/no]: ")
]),
style = lamb.utils.style
style = lamb_engine.utils.style
).lower()
if confirm != "yes":
@ -152,7 +152,7 @@ def cmd_save(command, runner) -> None:
HTML(
"<err>Cancelled.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -165,7 +165,7 @@ def cmd_save(command, runner) -> None:
HTML(
f"Wrote {len(runner.macro_table)} macros to <code>{target}</code>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
@ -179,7 +179,7 @@ def cmd_load(command, runner):
HTML(
f"<err>Command <code>:{command.name}</code> takes exactly one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -189,7 +189,7 @@ def cmd_load(command, runner):
HTML(
f"<err>File {target} doesn't exist.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -215,18 +215,18 @@ def cmd_load(command, runner):
("class:err", l[e.loc]),
("class:code", l[e.loc+1:])
]),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
if not isinstance(x, lamb.runner.runner.MacroDef):
if not isinstance(x, lamb_engine.runner.runner.MacroDef):
printf(
FormattedText([
("class:warn", f"Skipping line {i+1:02}: "),
("class:code", l),
("class:warn", f" is not a macro definition.")
]),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -235,8 +235,8 @@ def cmd_load(command, runner):
printf(
FormattedText([
("class:ok", f"Loaded {x.label}: ")
] + lamb.utils.lex_str(str(x.expr))),
style = lamb.utils.style
] + lamb_engine.utils.lex_str(str(x.expr))),
style = lamb_engine.utils.style
)
@ -249,7 +249,7 @@ def mdel(command, runner) -> None:
HTML(
f"<err>Command <code>:{command.name}</code> takes exactly one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -259,7 +259,7 @@ def mdel(command, runner) -> None:
HTML(
f"<warn>Macro \"{target}\" is not defined</warn>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -274,7 +274,7 @@ def delmac(command, runner) -> None:
("class:warn", "Are you sure? "),
("class:text", "[yes/no]: ")
]),
style = lamb.utils.style
style = lamb_engine.utils.style
).lower()
if confirm != "yes":
@ -282,7 +282,7 @@ def delmac(command, runner) -> None:
HTML(
"<err>Cancelled.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -297,7 +297,7 @@ def macros(command, runner) -> None:
printf(FormattedText([
("class:warn", "No macros are defined."),
]),
style = lamb.utils.style
style = lamb_engine.utils.style
)
else:
printf(FormattedText([
@ -307,7 +307,7 @@ def macros(command, runner) -> None:
("class:text", f"\t{name} \t {exp}\n")
for name, exp in runner.macro_table.items()
]),
style = lamb.utils.style
style = lamb_engine.utils.style
)
@lamb_command(
@ -315,7 +315,7 @@ def macros(command, runner) -> None:
)
def clear(command, runner) -> None:
clear_screen()
lamb.utils.show_greeting()
lamb_engine.utils.show_greeting()
@lamb_command(
help_text = "Get or set reduction limit"
@ -327,14 +327,14 @@ def rlimit(command, runner) -> None:
HTML(
"<ok>No reduction limit is set</ok>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
else:
printf(
HTML(
f"<ok>Reduction limit is {runner.reduction_limit:,}</ok>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -343,7 +343,7 @@ def rlimit(command, runner) -> None:
HTML(
f"<err>Command <code>:{command.name}</code> takes exactly one argument.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -354,7 +354,7 @@ def rlimit(command, runner) -> None:
HTML(
f"<ok>Removed reduction limit</ok>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -365,7 +365,7 @@ def rlimit(command, runner) -> None:
HTML(
"<err>Reduction limit must be a positive integer or \"none\".</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -374,7 +374,7 @@ def rlimit(command, runner) -> None:
HTML(
"<err>Reduction limit must be at least 50.</err>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
return
@ -383,7 +383,7 @@ def rlimit(command, runner) -> None:
HTML(
f"<ok>Set reduction limit to {t:,}</ok>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)
@ -416,5 +416,5 @@ def help(command, runner) -> None:
"<muted>Detailed documentation can be found on this project's git page.</muted>" +
"</text>"
),
style = lamb.utils.style
style = lamb_engine.utils.style
)

4
lamb/runner/misc.py → lamb_engine/runner/misc.py
View File

@ -1,5 +1,5 @@
import enum
import lamb
import lamb_engine
class StopReason(enum.Enum):
BETA_NORMAL = ("class:text", "β-normal form")
@ -16,7 +16,7 @@ class MacroDef:
result[1]
)
def __init__(self, label: str, expr: lamb.nodes.Node):
def __init__(self, label: str, expr: lamb_engine.nodes.Node):
self.label = label
self.expr = expr

76
lamb/runner/runner.py → lamb_engine/runner/runner.py
View File

@ -7,12 +7,12 @@ import collections
import math
import time
import lamb
import lamb_engine
from lamb.runner.misc import MacroDef
from lamb.runner.misc import Command
from lamb.runner.misc import StopReason
from lamb.runner import commands as cmd
from lamb_engine.runner.misc import MacroDef
from lamb_engine.runner.misc import Command
from lamb_engine.runner.misc import StopReason
from lamb_engine.runner import commands as cmd
# Keybindings for step prompt.
@ -32,15 +32,15 @@ class Runner:
self.macro_table = {}
self.prompt_session = prompt_session
self.prompt_message = prompt_message
self.parser = lamb.parser.LambdaParser(
action_func = lamb.nodes.Func.from_parse,
action_bound = lamb.nodes.Macro.from_parse,
action_macro = lamb.nodes.Macro.from_parse,
action_call = lamb.nodes.Call.from_parse,
action_church = lamb.nodes.Church.from_parse,
self.parser = lamb_engine.parser.LambdaParser(
action_func = lamb_engine.nodes.Func.from_parse,
action_bound = lamb_engine.nodes.Macro.from_parse,
action_macro = lamb_engine.nodes.Macro.from_parse,
action_call = lamb_engine.nodes.Call.from_parse,
action_church = lamb_engine.nodes.Church.from_parse,
action_macro_def = MacroDef.from_parse,
action_command = Command.from_parse,
action_history = lamb.nodes.History.from_parse
action_history = lamb_engine.nodes.History.from_parse
)
# Maximum amount of reductions.
@ -74,23 +74,23 @@ class Runner:
message = self.prompt_message
)
def parse(self, line) -> tuple[lamb.nodes.Root | MacroDef | Command, list]:
def parse(self, line) -> tuple[lamb_engine.nodes.Root | MacroDef | Command, list]:
e = self.parser.parse_line(line)
w = []
if isinstance(e, MacroDef):
e.expr = lamb.nodes.Root(e.expr)
e.expr = lamb_engine.nodes.Root(e.expr)
e.set_runner(self)
w = lamb.nodes.prepare(e.expr, ban_macro_name = e.label)
elif isinstance(e, lamb.nodes.Node):
e = lamb.nodes.Root(e)
w = lamb_engine.nodes.prepare(e.expr, ban_macro_name = e.label)
elif isinstance(e, lamb_engine.nodes.Node):
e = lamb_engine.nodes.Root(e)
e.set_runner(self)
w = lamb.nodes.prepare(e)
w = lamb_engine.nodes.prepare(e)
return e, w
def reduce(self, node: lamb.nodes.Root, *, warnings = []) -> None:
def reduce(self, node: lamb_engine.nodes.Root, *, warnings = []) -> None:
# Reduction Counter.
# We also count macro (and church) expansions,
@ -103,16 +103,16 @@ class Runner:
out_text = []
only_macro = (
isinstance(node.left, lamb.nodes.Macro) or
isinstance(node.left, lamb.nodes.Church)
isinstance(node.left, lamb_engine.nodes.Macro) or
isinstance(node.left, lamb_engine.nodes.Church)
)
if only_macro:
stop_reason = StopReason.SHOW_MACRO
m, node = lamb.nodes.expand(node, force_all = only_macro)
m, node = lamb_engine.nodes.expand(node, force_all = only_macro)
macro_expansions += m
if len(warnings) != 0:
printf(FormattedText(warnings), style = lamb.utils.style)
printf(FormattedText(warnings), style = lamb_engine.utils.style)
if self.step_reduction:
printf(FormattedText([
@ -123,7 +123,7 @@ class Runner:
("class:muted", "Press "),
("class:cmd_key", "enter"),
("class:muted", " to step.\n"),
]), style = lamb.utils.style)
]), style = lamb_engine.utils.style)
skip_to_end = False
@ -142,20 +142,20 @@ class Runner:
print(f" Reducing... {k:,}", end = "\r")
try:
red_type, node = lamb.nodes.reduce(node)
red_type, node = lamb_engine.nodes.reduce(node)
except KeyboardInterrupt:
stop_reason = StopReason.INTERRUPT
break
# If we can't reduce this expression anymore,
# it's in beta-normal form.
if red_type == lamb.nodes.ReductionType.NOTHING:
if red_type == lamb_engine.nodes.ReductionType.NOTHING:
stop_reason = StopReason.BETA_NORMAL
break
# Count reductions
k += 1
if red_type == lamb.nodes.ReductionType.FUNCTION_APPLY:
if red_type == lamb_engine.nodes.ReductionType.FUNCTION_APPLY:
macro_expansions += 1
# Pause after step if necessary
@ -163,17 +163,17 @@ class Runner:
try:
s = prompt(
message = FormattedText([
("class:prompt", lamb.nodes.reduction_text[red_type]),
("class:prompt", lamb_engine.nodes.reduction_text[red_type]),
("class:prompt", f":{k:03} ")
] + lamb.utils.lex_str(str(node))),
style = lamb.utils.style,
] + lamb_engine.utils.lex_str(str(node))),
style = lamb_engine.utils.style,
key_bindings = step_bindings
)
except KeyboardInterrupt or EOFError:
skip_to_end = True
printf(FormattedText([
("class:warn", "Skipping to end."),
]), style = lamb.utils.style)
]), style = lamb_engine.utils.style)
# Print a space between step messages
if self.step_reduction:
@ -185,7 +185,7 @@ class Runner:
# Expand fully if necessary
if self.full_expansion:
o, node = lamb.nodes.expand(node, force_all = True)
o, node = lamb_engine.nodes.expand(node, force_all = True)
macro_expansions += o
if only_macro:
@ -221,18 +221,18 @@ class Runner:
):
out_text += [
("class:ok", "\n\n => ")
] + lamb.utils.lex_str(str(node))
] + lamb_engine.utils.lex_str(str(node))
printf(
FormattedText(out_text),
style = lamb.utils.style
style = lamb_engine.utils.style
)
# Save to history
# Do this at the end so we don't always fully expand.
self.history.appendleft(
lamb.nodes.expand( # type: ignore
lamb_engine.nodes.expand( # type: ignore
node,
force_all = True
)[1]
@ -253,7 +253,7 @@ class Runner:
("class:code", macro.label),
("class:text", " to "),
("class:code", str(macro.expr))
]), style = lamb.utils.style)
]), style = lamb_engine.utils.style)
# Apply a list of definitions
def run(
@ -275,13 +275,13 @@ class Runner:
FormattedText([
("class:warn", f"Unknown command \"{e.name}\"")
]),
style = lamb.utils.style
style = lamb_engine.utils.style
)
else:
cmd.commands[e.name](e, self)
# If this line is a plain expression, reduce it.
elif isinstance(e, lamb.nodes.Node):
elif isinstance(e, lamb_engine.nodes.Node):
self.reduce(e, warnings = w)
# We shouldn't ever get here.

0
lamb/utils.py → lamb_engine/utils.py
View File

8
pyproject.toml
View File

@ -45,10 +45,6 @@ requires = [ "setuptools>=61.0" ]
build-backend = "setuptools.build_meta"
[tool.setuptools.packages.find]
where = ["lamb"]
include = ["lamb*"]
where = ["lamb_engine"]
include = ["lamb_engine*"]
namespaces = false
[project.optional-dependencies]
# Used to build a standalone executable
pyinstaller = [ "pyinstaller==5.5" ]