lamb/__main__.py

@@ -45,9 +45,9 @@ r.run_lines([
 	"T = λab.a",
 	"F = λab.b",
 	"NOT = λa.(a F T)",
-	"AND = λab.(a b F)",
+	"AND = λab.(a F b)",
 	"OR = λab.(a T b)",
-	"XOR = λab.(a (NOT b) b)",
+	"XOR = λab.(a (NOT a b) b)",
 	"M = λx.(x x)",
 	"W = M M",
 	"Y = λf.( (λx.(f (x x))) (λx.(f (x x))) )",

lamb/node.py

@@ -372,7 +372,7 @@ class Call(Node):
 def print_node(node: Node) -> str:
 	if not isinstance(node, Node):
 		raise TypeError(f"I don't know how to print a {type(node)}")
-
+	else:
 		out = ""
 
 	for s, n in node:
@@ -489,13 +489,16 @@ def bind_variables(node: Node, *, ban_macro_name = None) -> None:
 # Returns the function's output.
 def call_func(fn: Func, arg: Node):
 	for s, n in fn:
-		if isinstance(n, Bound) and (s == Direction.UP):
+		if isinstance(n, Bound):
 			if n == fn.input:
 				if n.parent is None:
 					raise Exception("Tried to substitute a None bound variable.")
 
-				n.parent.set_side(n.parent_side, clone(arg)) # type: ignore
+				if n.parent_side == Direction.LEFT:
-	return clone(fn.left)
+					n.parent.left = clone(arg)
+				else:
+					n.parent.right = clone(arg)
+	return fn.left
 
 
 # Do a single reduction step
@@ -511,10 +514,7 @@ def reduce(node: Node, *, macro_table = {}) -> tuple[ReductionType, Node]:
 					out = call_func(n.left, n.right)
 					out._set_parent(None, None)
 				else:
-					n.parent.set_side(
+					n.parent.left = call_func(n.left, n.right)
-						n.parent_side, # type: ignore
-						call_func(n.left, n.right)
-					)
 
 				return ReductionType.FUNCTION_APPLY, out
 

lamb/runner.py

@@ -1,9 +1,7 @@
 from prompt_toolkit import PromptSession
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit import print_formatted_text as printf
-from prompt_toolkit.shortcuts import clear as clear_screen
 import enum
-import math
 
 import lamb
 
@@ -13,6 +11,7 @@ class StopReason(enum.Enum):
 	LOOP_DETECTED	= ("class:warn", "Loop detected")
 	MAX_EXCEEDED	= ("class:err", "Too many reductions")
 	INTERRUPT		= ("class:warn", "User interrupt")
+	RECURSION		= ("class:err", "Python Recursion Error")
 
 class MacroDef:
 	@staticmethod
@@ -79,11 +78,6 @@ class Runner:
 		# a bound variable.
 		self.bound_variable_counter = 0
 
-		# Update iteration after this many iterations
-		# Make sure every place value has a non-zero digit
-		# so that all digits appear to be changing.
-		self.iter_update = 231
-
 	def prompt(self):
 		return self.prompt_session.prompt(message = self.prompt_message)
 
@@ -108,19 +102,14 @@ class Runner:
 
 		while (self.reduction_limit is None) or (i < self.reduction_limit):
 
-			# Show reduction count
-			if (i >= self.iter_update) and (i % self.iter_update == 0):
-				print(f" Reducing... {i}", end = "\r")
-
 			try:
 				red_type, new_node = lamb.node.reduce(
 					node,
 					macro_table = self.macro_table
 				)
-			except KeyboardInterrupt:
+			except RecursionError:
-				stop_reason = StopReason.INTERRUPT
+				stop_reason = StopReason.RECURSION
 				break
-
 			node = new_node
 
 			# If we can't reduce this expression anymore,
@@ -134,9 +123,6 @@ class Runner:
 			if red_type == lamb.node.ReductionType.FUNCTION_APPLY:
 				macro_expansions += 1
 
-		if i >= self.iter_update:
-			# Clear reduction counter
-			print(" " * round(14 + math.log10(i)), end = "\r")
 
 		if (
 				stop_reason == StopReason.BETA_NORMAL or